diff --git a/Microsoft.Maui-dev.sln b/Microsoft.Maui-dev.sln
index 173f67c0086d..b3ca986d71bb 100644
--- a/Microsoft.Maui-dev.sln
+++ b/Microsoft.Maui-dev.sln
@@ -179,6 +179,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Skia.Console
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Skia.Mac", "src\Graphics\samples\GraphicsTester.Skia.Mac\GraphicsTester.Skia.Mac.csproj", "{5E8D70F3-990D-4B40-8B13-AA818F21E8A0}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Skia.Tizen", "src\Graphics\samples\GraphicsTester.Skia.Tizen\GraphicsTester.Skia.Tizen.csproj", "{20756558-1284-42D6-AB7B-3E59DF8A6B34}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Skia.Windows", "src\Graphics\samples\GraphicsTester.Skia.Windows\GraphicsTester.Skia.Windows.csproj", "{8441FA70-9041-4727-91B9-2F39881CC0EE}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.WinUI.Desktop", "src\Graphics\samples\GraphicsTester.WinUI.Desktop\GraphicsTester.WinUI.Desktop.csproj", "{4BF0AF30-6E18-47D8-B90C-E99C1917BEF5}"
@@ -497,6 +499,10 @@ Global
 		{5E8D70F3-990D-4B40-8B13-AA818F21E8A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5E8D70F3-990D-4B40-8B13-AA818F21E8A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5E8D70F3-990D-4B40-8B13-AA818F21E8A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{20756558-1284-42D6-AB7B-3E59DF8A6B34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20756558-1284-42D6-AB7B-3E59DF8A6B34}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20756558-1284-42D6-AB7B-3E59DF8A6B34}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{20756558-1284-42D6-AB7B-3E59DF8A6B34}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8441FA70-9041-4727-91B9-2F39881CC0EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8441FA70-9041-4727-91B9-2F39881CC0EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8441FA70-9041-4727-91B9-2F39881CC0EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -685,6 +691,7 @@ Global
 		{546614BB-07AA-4E8E-B6AE-EBDC183C4DAB} = {1BA0121E-0B83-4C8F-81BE-C293E7E35DCE}
 		{EF6ACA06-D4DF-4C21-9F65-FBFEC6325094} = {1BA0121E-0B83-4C8F-81BE-C293E7E35DCE}
 		{5E8D70F3-990D-4B40-8B13-AA818F21E8A0} = {1BA0121E-0B83-4C8F-81BE-C293E7E35DCE}
+		{20756558-1284-42D6-AB7B-3E59DF8A6B34} = {1BA0121E-0B83-4C8F-81BE-C293E7E35DCE}
 		{8441FA70-9041-4727-91B9-2F39881CC0EE} = {1BA0121E-0B83-4C8F-81BE-C293E7E35DCE}
 		{4BF0AF30-6E18-47D8-B90C-E99C1917BEF5} = {1BA0121E-0B83-4C8F-81BE-C293E7E35DCE}
 		{AFD9D653-08C4-456C-AA1B-F5C9F621D655} = {42AB9AE1-631D-4AD4-85B7-910FF0940BDB}
diff --git a/Microsoft.Maui-vscode.sln b/Microsoft.Maui-vscode.sln
index 43a7d780d85d..3b425e561726 100644
--- a/Microsoft.Maui-vscode.sln
+++ b/Microsoft.Maui-vscode.sln
@@ -159,12 +159,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Android", "s
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.iOS", "src\Graphics\samples\GraphicsTester.iOS\GraphicsTester.iOS.csproj", "{0F1BC26B-5041-4D64-B533-2959287D8197}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Mac", "src\Graphics\samples\GraphicsTester.Mac\GraphicsTester.Mac.csproj", "{0A44978B-81FD-4565-9997-3E7218C66596}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.MacCatalyst", "src\Graphics\samples\GraphicsTester.MacCatalyst\GraphicsTester.MacCatalyst.csproj", "{B3DD0741-2EC3-4A54-82B7-73923DE4CF48}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Portable", "src\Graphics\samples\GraphicsTester.Portable\GraphicsTester.Portable.csproj", "{546614BB-07AA-4E8E-B6AE-EBDC183C4DAB}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Skia.Console", "src\Graphics\samples\GraphicsTester.Skia.Console\GraphicsTester.Skia.Console.csproj", "{EF6ACA06-D4DF-4C21-9F65-FBFEC6325094}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Skia.Mac", "src\Graphics\samples\GraphicsTester.Skia.Mac\GraphicsTester.Skia.Mac.csproj", "{5E8D70F3-990D-4B40-8B13-AA818F21E8A0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Skia.Tizen", "src\Graphics\samples\GraphicsTester.Skia.Tizen\GraphicsTester.Skia.Tizen.csproj", "{20756558-1284-42D6-AB7B-3E59DF8A6B34}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Graphics.Skia.GtkSharp", "src\Graphics\src\Graphics.Skia.GtkSharp\Graphics.Skia.GtkSharp.csproj", "{AFD9D653-08C4-456C-AA1B-F5C9F621D655}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Skia.Gtk", "src\Graphics\samples\GraphicsTester.Skia.Gtk\GraphicsTester.Skia.Gtk.csproj", "{F351A992-18E4-473C-8ADD-2BA0BAA7B5A2}"
@@ -433,6 +439,10 @@ Global
 		{0F1BC26B-5041-4D64-B533-2959287D8197}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0F1BC26B-5041-4D64-B533-2959287D8197}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0F1BC26B-5041-4D64-B533-2959287D8197}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{0A44978B-81FD-4565-9997-3E7218C66596}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A44978B-81FD-4565-9997-3E7218C66596}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0A44978B-81FD-4565-9997-3E7218C66596}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0A44978B-81FD-4565-9997-3E7218C66596}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B3DD0741-2EC3-4A54-82B7-73923DE4CF48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B3DD0741-2EC3-4A54-82B7-73923DE4CF48}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B3DD0741-2EC3-4A54-82B7-73923DE4CF48}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -445,6 +455,14 @@ Global
 		{EF6ACA06-D4DF-4C21-9F65-FBFEC6325094}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EF6ACA06-D4DF-4C21-9F65-FBFEC6325094}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EF6ACA06-D4DF-4C21-9F65-FBFEC6325094}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5E8D70F3-990D-4B40-8B13-AA818F21E8A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5E8D70F3-990D-4B40-8B13-AA818F21E8A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5E8D70F3-990D-4B40-8B13-AA818F21E8A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5E8D70F3-990D-4B40-8B13-AA818F21E8A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{20756558-1284-42D6-AB7B-3E59DF8A6B34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20756558-1284-42D6-AB7B-3E59DF8A6B34}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20756558-1284-42D6-AB7B-3E59DF8A6B34}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{20756558-1284-42D6-AB7B-3E59DF8A6B34}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AFD9D653-08C4-456C-AA1B-F5C9F621D655}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AFD9D653-08C4-456C-AA1B-F5C9F621D655}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AFD9D653-08C4-456C-AA1B-F5C9F621D655}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -599,9 +617,12 @@ Global
 		{56DF52FC-A48C-4757-8130-A412050CEBB8} = {936C47A9-A7EA-4FBD-8733-CED1D4100E69}
 		{2B02595C-BB82-44F2-8FB7-423EF2DE3A73} = {1BA0121E-0B83-4C8F-81BE-C293E7E35DCE}
 		{0F1BC26B-5041-4D64-B533-2959287D8197} = {1BA0121E-0B83-4C8F-81BE-C293E7E35DCE}
+		{0A44978B-81FD-4565-9997-3E7218C66596} = {1BA0121E-0B83-4C8F-81BE-C293E7E35DCE}
 		{B3DD0741-2EC3-4A54-82B7-73923DE4CF48} = {1BA0121E-0B83-4C8F-81BE-C293E7E35DCE}
 		{546614BB-07AA-4E8E-B6AE-EBDC183C4DAB} = {1BA0121E-0B83-4C8F-81BE-C293E7E35DCE}
 		{EF6ACA06-D4DF-4C21-9F65-FBFEC6325094} = {1BA0121E-0B83-4C8F-81BE-C293E7E35DCE}
+		{5E8D70F3-990D-4B40-8B13-AA818F21E8A0} = {1BA0121E-0B83-4C8F-81BE-C293E7E35DCE}
+		{20756558-1284-42D6-AB7B-3E59DF8A6B34} = {1BA0121E-0B83-4C8F-81BE-C293E7E35DCE}
 		{AFD9D653-08C4-456C-AA1B-F5C9F621D655} = {42AB9AE1-631D-4AD4-85B7-910FF0940BDB}
 		{F351A992-18E4-473C-8ADD-2BA0BAA7B5A2} = {1BA0121E-0B83-4C8F-81BE-C293E7E35DCE}
 		{F68932B0-81A2-4CC3-A4F7-28091EE91B23} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E}
diff --git a/eng/pipelines/common/ui-tests.yml b/eng/pipelines/common/ui-tests.yml
index ad5aaf536c7e..dad7c0812772 100644
--- a/eng/pipelines/common/ui-tests.yml
+++ b/eng/pipelines/common/ui-tests.yml
@@ -34,7 +34,7 @@ stages:
           - ${{ each api in parameters.androidApiLevels }}:
             - ${{ if not(containsValue(project.androidApiLevelsExclude, api)) }}:
               - job: android_ui_tests_${{ project.name }}_${{ api }}
-                timeoutInMinutes: 240 # how long to run the job before automatically cancelling
+                timeoutInMinutes: 120 # how long to run the job before automatically cancelling
                 workspace:
                   clean: all
                 displayName: ${{ coalesce(project.desc, project.name) }} (API ${{ api }})
@@ -64,7 +64,7 @@ stages:
           - ${{ each version in parameters.iosVersions }}:
             - ${{ if not(containsValue(project.iosVersionsExclude, version)) }}:
               - job: ios_ui_tests_${{ project.name }}_${{ replace(version, '.', '_') }}
-                timeoutInMinutes: 240 # how long to run the job before automatically cancelling
+                timeoutInMinutes: 120 # how long to run the job before automatically cancelling
                 workspace:
                   clean: all
                 displayName: ${{ coalesce(project.desc, project.name) }} (v${{ version }})
@@ -95,7 +95,7 @@ stages:
       - ${{ each project in parameters.projects }}:
         - ${{ if ne(project.winui, '') }}:
               - job: winui_ui_tests_${{ project.name }}
-                timeoutInMinutes: 240 # how long to run the job before automatically cancelling
+                timeoutInMinutes: 120 # how long to run the job before automatically cancelling
                 workspace:
                   clean: all
                 displayName: ${{ coalesce(project.desc, project.name) }}
@@ -118,7 +118,7 @@ stages:
       - ${{ each project in parameters.projects }}:
         - ${{ if ne(project.mac, '') }}:
               - job: mac_ui_tests_${{ project.name }}
-                timeoutInMinutes: 240 # how long to run the job before automatically cancelling
+                timeoutInMinutes: 120 # how long to run the job before automatically cancelling
                 workspace:
                   clean: all
                 displayName: ${{ coalesce(project.desc, project.name) }}
diff --git a/eng/pipelines/device-tests.yml b/eng/pipelines/device-tests.yml
index 708c1dad0444..1f7a4fb1c1b6 100644
--- a/eng/pipelines/device-tests.yml
+++ b/eng/pipelines/device-tests.yml
@@ -149,7 +149,8 @@ stages:
           windowsPackageId: 'com.microsoft.maui.controls.devicetests'
           android: $(System.DefaultWorkingDirectory)/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
           ios: $(System.DefaultWorkingDirectory)/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
-          catalyst: $(System.DefaultWorkingDirectory)/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
+          # Skip this one for Mac Catalyst for now, it's crashing
+          catalyst: #$(System.DefaultWorkingDirectory)/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
           # Skip this one for Windows for now, it's crashing
           windows: #$(System.DefaultWorkingDirectory)/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
         - name: blazorwebview
diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/DoubleTapGallery.cs b/src/Controls/samples/Controls.Sample.UITests/Elements/DoubleTapGallery.cs
index fa532917d67e..fbac1007585c 100644
--- a/src/Controls/samples/Controls.Sample.UITests/Elements/DoubleTapGallery.cs
+++ b/src/Controls/samples/Controls.Sample.UITests/Elements/DoubleTapGallery.cs
@@ -16,12 +16,10 @@ public DoubleTapGallery()
 			{
 				HeightRequest = 200,
 				WidthRequest = 200,
-				BackgroundColor = Microsoft.Maui.Graphics.Colors.AliceBlue
+				BackgroundColor = Microsoft.Maui.Graphics.Colors.AliceBlue,
+				AutomationId = "DoubleTapSurface"
 			};
 
-			var dtLabel = new Label { Text = "DoubleTapSurface", AutomationId = "DoubleTapSurface" };
-			tapSurface.Add(dtLabel);
-
 			var doubleTapRecognizer = new TapGestureRecognizer() { NumberOfTapsRequired = 2 };
 			doubleTapRecognizer.Tapped += (sender, args) => { result.Text = "Success"; };
 
diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue16787.cs b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue16787.cs
deleted file mode 100644
index d1470218d46a..000000000000
--- a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue16787.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using Microsoft.Maui.Controls;
-
-namespace Maui.Controls.Sample.Issues
-{
-	[Issue(IssueTracker.Github, 16787, "CollectionView runtime binding errors when loading the ItemSource asynchronously", PlatformAffected.UWP)]
-	public class Issue16787 : TestContentPage
-	{
-		protected override void OnBindingContextChanged()
-		{
-			base.OnBindingContextChanged();
-		}
-		protected override void Init()
-		{
-			var cv = new CollectionView();
-			cv.BindingContextChanged += Cv_BindingContextChanged;
-			this.BindingContext = this;
-			cv.ItemTemplate = new DataTemplate(() =>
-			{
-				int bindingContextChanges = 0;
-				var label = new Label();
-				label.BindingContextChanged += (_, _) =>
-				{
-					bindingContextChanges++;
-					label.Text = bindingContextChanges.ToString();
-				};
-				label.AutomationId = "LabelBindingCount";
-				return label;
-			});
-
-			cv.ItemsSource = new[] { "random" };
-
-
-			var layout = new VerticalStackLayout()
-			{
-				new Label()
-				{
-					Text = "The value below this label should be a 1. That's how many times the BindingContext has changed on the Templated element"
-				}
-			};
-
-			Content = cv;
-		}
-
-		private void Cv_BindingContextChanged(object sender, System.EventArgs e)
-		{
-		}
-	}
-}
diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue17347.cs b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue17347.cs
deleted file mode 100644
index fbf889f4e779..000000000000
--- a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue17347.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using System;
-using Microsoft.Maui.Controls;
-
-namespace Maui.Controls.Sample.Issues
-{
-	[Issue(IssueTracker.Github, 17347, "Setting a new TitleView on an already created page crashes iOS", PlatformAffected.iOS)]
-	public class Issue17347 : TestContentPage
-	{
-		protected override void Init()
-		{
-			var navPage = new NavigationPage(new MainPage());
-			NavigatedTo += Issue16499_NavigatedTo;
-
-			async void Issue16499_NavigatedTo(object sender, NavigatedToEventArgs e)
-			{
-				NavigatedTo -= Issue16499_NavigatedTo;
-
-				await Navigation.PushModalAsync(navPage);
-				await navPage.Navigation.PushAsync(new MainPage());
-				await navPage.Navigation.PushAsync(new MainPage());
-				await navPage.Navigation.PopAsync();
-				await navPage.Navigation.PopAsync();
-			}
-		}
-
-		public partial class MainPage : ContentPage
-		{
-			Label TopView;
-			static int i = 0;
-			protected override void OnAppearing()
-			{
-				Content = new VerticalStackLayout()
-				{
-					new Button()
-					{
-						AutomationId = "PopMeButton",
-						Command = new Command(async () =>
-						{
-							if (Navigation.NavigationStack.Count == 1)
-								await Navigation.PopModalAsync();
-							else
-								await Navigation.PopAsync();
-						}),
-						Text = "Click to Pop This Page If Needed"
-					}
-				};
-
-				var increment = $"{i++}";
-				TopView = new()
-				{
-					AutomationId = "TitleViewLabel" + increment
-				};
-
-				TopView.SetBinding(Label.TextProperty, "AutomationId");
-				TopView.BindingContext = TopView;
-
-				TopView.WidthRequest = App.Current.Windows[0].Page.Width / 2;
-				NavigationPage.SetTitleView(this, TopView);
-				NavigationPage.SetHasNavigationBar(this, true);
-				NavigationPage.SetHasBackButton(this, false);
-				base.OnAppearing();
-			}
-		}
-	}
-}
diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issues16561.xaml b/src/Controls/samples/Controls.Sample.UITests/Issues/Issues16561.xaml
index 2c0ec975796d..55693dc12e87 100644
--- a/src/Controls/samples/Controls.Sample.UITests/Issues/Issues16561.xaml
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issues16561.xaml
@@ -4,14 +4,15 @@
              x:Class="Maui.Controls.Sample.Issues.Issue16561">
     <StackLayout>
 
-        <Grid BackgroundColor="LightBlue"
+        <Grid x:Name="TapArea"
+              AutomationId="TapArea"
+              BackgroundColor="LightBlue"
               Margin="10"
-              x:Name="TapArea"
               HeightRequest="300">
-            <Label HorizontalOptions="Start" VerticalOptions="Start"
+            <Label HorizontalOptions="Center"
+                   VerticalOptions="Center"
                    TextColor="Black"
-                   AutomationId="TapArea"
-                   Text="Tap In This Grid. This label needs to be long so the Windows test will work." />
+                   Text="Tap In This Grid" />
         </Grid>
 
         <Label HeightRequest="100"
diff --git a/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/Windows/WindowsDragAndDropCustomization.xaml b/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/Windows/WindowsDragAndDropCustomization.xaml
deleted file mode 100644
index 681ebeef9173..000000000000
--- a/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/Windows/WindowsDragAndDropCustomization.xaml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ContentPage
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="Maui.Controls.Sample.Pages.WindowsDragAndDropCustomization"
-    Title="Drag and Drop Windows Platform-Specific">
-    <Grid Margin="20" RowDefinitions="290,*">
-
-        <Border Margin="15" Grid.Row="0">
-            <StackLayout>
-                <Label Text="Drag and Drop the items below" FontSize="Large" FontAttributes="Bold"/>
-                <CollectionView x:Name="CollectionView1">
-                    <CollectionView.ItemTemplate>
-                        <DataTemplate>
-                                <Label Text="{Binding Name}" Background="LightGray" HeightRequest="30" HorizontalOptions="Fill" Margin="3">
-                                    <Label.GestureRecognizers>
-                                        <DragGestureRecognizer />
-                                    </Label.GestureRecognizers>
-                                </Label>
-                        </DataTemplate>
-                    </CollectionView.ItemTemplate>
-                </CollectionView>
-            </StackLayout>
-        </Border>
-
-        <TableView Intent="Settings" Grid.Row="1" >
-            <TableRoot>
-                <TableSection Title="Drag Customization">
-
-                    <ViewCell>
-                        <Grid ColumnDefinitions="3*,*" VerticalOptions="Center" Margin="10,0,5,0">
-                            <Label Text="Show Glyph" VerticalTextAlignment="Center" Grid.Column="0"/>
-                            <Switch HorizontalOptions="End" x:Name="ShowGlyphSwitch" IsToggled="True" Grid.Column="1"/>
-                        </Grid>
-                    </ViewCell>
-
-                    <ViewCell>
-                        <Grid ColumnDefinitions="3*,*" VerticalOptions="Center" Margin="10,0,5,0">
-                            <Label Text="Custom Caption" VerticalTextAlignment="Center" Grid.Column="0"/>
-                            <Entry HorizontalOptions="End" WidthRequest="300" Placeholder="Copy" x:Name="CustomCaptionEntry" Grid.Column="1"/>
-                        </Grid>
-                    </ViewCell>
-
-                    <ViewCell>
-                        <Grid ColumnDefinitions="3*,*" VerticalOptions="Center" Margin="10,0,5,0">
-                            <Label Text="Show Caption" VerticalTextAlignment="Center" Grid.Column="0"/>
-                            <Switch HorizontalOptions="End" x:Name="ShowCaptionSwitch" IsToggled="True" Grid.Column="1"/>
-                        </Grid>
-                    </ViewCell>
-
-                    <ViewCell>
-                        <Grid ColumnDefinitions="3*,*" VerticalOptions="Center" Margin="10,0,5,0">
-                            <Label Text="Show Content" VerticalTextAlignment="Center" Grid.Column="0"/>
-                            <Switch HorizontalOptions="End" x:Name="ShowContentSwitch" Grid.Column="1" IsToggled="True"/>
-                        </Grid>
-                    </ViewCell>
-                </TableSection>
-
-            </TableRoot>
-        </TableView>
-        <Grid.GestureRecognizers>
-            <DropGestureRecognizer DragOver="DropGestureRecognizer_DragOver" />
-        </Grid.GestureRecognizers>
-    </Grid>
-</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/Windows/WindowsDragAndDropCustomization.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/Windows/WindowsDragAndDropCustomization.xaml.cs
deleted file mode 100644
index 93696adef036..000000000000
--- a/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/Windows/WindowsDragAndDropCustomization.xaml.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using Maui.Controls.Sample.ViewModels;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui.Controls.PlatformConfiguration;
-using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific;
-
-namespace Maui.Controls.Sample.Pages
-{
-	public partial class WindowsDragAndDropCustomization : ContentPage
-	{
-		public WindowsDragAndDropCustomization()
-		{
-			InitializeComponent();
-
-			CollectionView1.ItemsSource = new NameObject[]
-			{
-				new NameObject ("First Item"),
-				new NameObject ("Second Item"),
-				new NameObject ("Third Item"),
-				new NameObject ("Fourth Item"),
-				new NameObject ("Fifth Item"),
-				new NameObject ("Sixth Item"),
-			};
-		}
-
-		void DropGestureRecognizer_DragOver(System.Object sender, Microsoft.Maui.Controls.DragEventArgs e)
-		{
-#if WINDOWS
-			var dragUI = e.PlatformArgs.DragEventArgs.DragUIOverride;
-			dragUI.IsCaptionVisible = ShowCaptionSwitch.IsToggled;
-			dragUI.IsGlyphVisible = ShowGlyphSwitch.IsToggled;
-			dragUI.IsContentVisible = ShowContentSwitch.IsToggled;
-
-			dragUI.Caption = string.IsNullOrEmpty (CustomCaptionEntry.Text) ? "Copy" : CustomCaptionEntry.Text;
-#endif
-		}
-
-		public class NameObject
-		{
-			public NameObject(string name)
-			{
-				Name = name;
-			}
-
-			public string Name { get; set; }
-		}
-	}
-}
diff --git a/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSDragAndDropRequestFullSize.xaml b/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSDragAndDropRequestFullSize.xaml
deleted file mode 100644
index a4c2580feb3b..000000000000
--- a/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSDragAndDropRequestFullSize.xaml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ContentPage 
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui" 
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"            
-    x:Class="Maui.Controls.Sample.Pages.iOSDragAndDropRequestFullSize"
-    Title="Drag and Drop iOS Platform-Specific">
-    <Grid Margin="20" RowDefinitions="300,*">
-
-        <Border Margin="15" Grid.Row="0">
-            <StackLayout>
-                <Label Text="Drag and Drop the items below" FontSize="Large" FontAttributes="Bold"/>
-                <CollectionView x:Name="CollectionView1">
-                    <CollectionView.ItemTemplate>
-                        <DataTemplate>
-                            <Entry Text="{Binding Name}">
-                                <Entry.GestureRecognizers>
-                                    <DragGestureRecognizer DragStarting="DragGestureRecognizer_DragStarting" />
-                                    <DropGestureRecognizer DragOver="DropGestureRecognizer_DragOver" />
-                                </Entry.GestureRecognizers>
-                            </Entry>
-                        </DataTemplate>
-                    </CollectionView.ItemTemplate>
-                </CollectionView>
-            </StackLayout>
-        </Border>
-
-        <TableView Intent="Settings" Grid.Row="1" >
-            <TableRoot>
-                <TableSection Title="Drag size option">
-                    <ViewCell>
-                        <Grid ColumnDefinitions="3*,*" VerticalOptions="Center" Margin="10,0,5,0">
-                            <Label Text="Request Full-Sized Drag Previews" VerticalTextAlignment="Center" Grid.Column="0"/>
-                            <Switch HorizontalOptions="End" x:Name="fullSizedSwitch" Toggled="FullSized_Switch_Toggled" Grid.Column="1"/>
-                        </Grid>
-                    </ViewCell>
-                </TableSection>
-
-                <TableSection Title="Content Options">
-                    <ViewCell>
-                        <Grid ColumnDefinitions="3*,*" VerticalOptions="Center" Margin="10,0,5,0">
-                            <Label Text="Use drawn image" VerticalTextAlignment="Center" Grid.Column="0"/>
-                            <Switch HorizontalOptions="End" x:Name="drawnImageSwitch" Toggled="Drawn_Switch_Toggled" Grid.Column="1"/>
-                        </Grid>
-                    </ViewCell>
-
-                    <ViewCell>
-                        <Grid ColumnDefinitions="3*,*"  VerticalOptions="Center" Margin="10,0,5,0">
-                            <Label Text="Use dotnet bot image" VerticalTextAlignment="Center" Grid.Column="0"/>
-                            <Switch HorizontalOptions="End" x:Name="dotnetBotImageSwitch" Toggled="DotnetBot_Switch_Toggled" Grid.Column="1"/>
-                        </Grid>
-                    </ViewCell>
-                </TableSection>
-                    <TableSection Title="Drop Types">
-                    <ViewCell>
-                        <Grid ColumnDefinitions="3*,*" VerticalOptions="Center" Margin="10,0,5,0">
-                            <Label Text="UIDropProposal - Copy" VerticalTextAlignment="Center" Grid.Column="0"/>
-                            <Switch HorizontalOptions="End" x:Name="copySwitch" IsToggled="True" Toggled="Copy_Switch_Toggled" Grid.Column="1"/>
-                        </Grid>
-                    </ViewCell>
-
-                    <ViewCell>
-                        <Grid ColumnDefinitions="3*,*" VerticalOptions="Center" Margin="10,0,5,0">
-                            <Label Text="UIDropProposal - Move" VerticalTextAlignment="Center" Grid.Column="0"/>
-                            <Switch HorizontalOptions="End" x:Name="moveSwitch" Toggled="Move_Switch_Toggled" Grid.Column="1"/>
-                        </Grid>
-                    </ViewCell>
-
-                    <ViewCell>
-                        <Grid ColumnDefinitions="3*,*" VerticalOptions="Center" Margin="10,0,5,0">
-                            <Label Text="UIDropProposal - Forbidden" VerticalTextAlignment="Center" Grid.Column="0"/>
-                            <Switch HorizontalOptions="End" x:Name="forbiddenSwitch" Toggled="Forbidden_Switch_Toggled" Grid.Column="1"/>
-                        </Grid>
-                    </ViewCell>
-
-                </TableSection>
-            </TableRoot>
-        </TableView>
-    </Grid>
-</ContentPage>
diff --git a/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSDragAndDropRequestFullSize.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSDragAndDropRequestFullSize.xaml.cs
deleted file mode 100644
index 1b18dd64b54f..000000000000
--- a/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSDragAndDropRequestFullSize.xaml.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-using System;
-using Maui.Controls.Sample.ViewModels;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui.Controls.PlatformConfiguration;
-using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
-
-namespace Maui.Controls.Sample.Pages
-{
-	public partial class iOSDragAndDropRequestFullSize : ContentPage
-	{
-		public iOSDragAndDropRequestFullSize()
-		{
-			InitializeComponent();
-
-			CollectionView1.ItemsSource = new NameObject[]
-			{
-				new NameObject ("First Item"),
-				new NameObject ("Second Item"),
-				new NameObject ("Third Item"),
-				new NameObject ("Fourth Item"),
-				new NameObject ("Fifth Item"),
-				new NameObject ("Sixth Item"),
-			};
-
-			// Changing the drag preview is not observed working the same as in iOS
-#if MACCATALYST
-			fullSizedSwitch.IsEnabled = false;
-			drawnImageSwitch.IsEnabled = false;
-			dotnetBotImageSwitch.IsEnabled = false;
-#endif
-		}
-
-		void DragGestureRecognizer_DragStarting(System.Object sender, Microsoft.Maui.Controls.DragStartingEventArgs e)
-		{
-#if IOS || MACCATALYST
-			if (drawnImageSwitch.IsToggled)
-			{
-				Func<UIKit.UIDragPreview> action = () =>
-				{
-					var previewParameters = new UIKit.UIDragPreviewParameters();
-					var funkyPath = new UIKit.UIBezierPath();
-					funkyPath.MoveTo(new CoreGraphics.CGPoint(0, 0));
-					funkyPath.AddLineTo(new CoreGraphics.CGPoint(300, 0));
-					funkyPath.AddLineTo(new CoreGraphics.CGPoint(225, 150));
-					funkyPath.AddLineTo(new CoreGraphics.CGPoint(300, 300));
-					funkyPath.AddLineTo(new CoreGraphics.CGPoint(0, 300));
-					funkyPath.ClosePath();
-					previewParameters.VisiblePath = funkyPath;
-
-					return new UIKit.UIDragPreview(e.PlatformArgs.Sender, previewParameters);
-				};
-
-				e.PlatformArgs.SetPreviewProvider(action);
-			}
-
-			else if (dotnetBotImageSwitch.IsToggled)
-			{
-				Func<UIKit.UIDragPreview> action = () =>
-				{
-					var image = UIKit.UIImage.FromFile("dotnet_bot.png");
-
-					UIKit.UIImageView imageView = new UIKit.UIImageView(image);
-					imageView.ContentMode = UIKit.UIViewContentMode.Center;
-					imageView.Frame = new CoreGraphics.CGRect(0, 0, 250, 250);
-
-					return new UIKit.UIDragPreview(imageView);
-				};
-
-				e.PlatformArgs.SetPreviewProvider(action);
-			}
-
-
-			e.PlatformArgs.SetPrefersFullSizePreviews((interaction, session) => { return fullSizedSwitch.IsToggled; });
-#endif
-		}
-
-		void Drawn_Switch_Toggled(object sender, ToggledEventArgs e)
-		{
-			if (e.Value)
-				dotnetBotImageSwitch.IsToggled = false;
-		}
-
-		void DotnetBot_Switch_Toggled(object sender, ToggledEventArgs e)
-		{
-			if (e.Value)
-				drawnImageSwitch.IsToggled = false;
-		}
-
-		void DropGestureRecognizer_DragOver(System.Object sender, Microsoft.Maui.Controls.DragEventArgs e)
-		{
-#if IOS || MACCATALYST
-			if (copySwitch.IsToggled)
-				e.PlatformArgs.SetDropProposal(new UIKit.UIDropProposal(UIKit.UIDropOperation.Copy));
-			else if (moveSwitch.IsToggled)
-				e.PlatformArgs.SetDropProposal(new UIKit.UIDropProposal(UIKit.UIDropOperation.Move));
-			else if (forbiddenSwitch.IsToggled)
-				e.PlatformArgs.SetDropProposal(new UIKit.UIDropProposal(UIKit.UIDropOperation.Forbidden));
-#endif
-		}
-
-		void FullSized_Switch_Toggled(object sender, ToggledEventArgs e)
-		{
-		}
-
-		void Copy_Switch_Toggled(object sender, ToggledEventArgs e)
-		{
-			if (e.Value)
-			{
-				moveSwitch.IsToggled = false;
-				forbiddenSwitch.IsToggled = false;
-			}
-		}
-
-		void Move_Switch_Toggled(object sender, ToggledEventArgs e)
-		{
-			if (e.Value)
-			{
-				copySwitch.IsToggled = false;
-				forbiddenSwitch.IsToggled = false;
-			}
-		}
-
-		void Forbidden_Switch_Toggled(object sender, ToggledEventArgs e)
-		{
-			if (e.Value)
-			{
-				moveSwitch.IsToggled = false;
-				copySwitch.IsToggled = false;
-			}
-		}
-
-		public class NameObject
-		{
-			public NameObject(string name)
-			{
-				Name = name;
-			}
-
-			public string Name { get; set; }
-		}
-	}
-
-
-
-}
diff --git a/src/Controls/samples/Controls.Sample/ViewModels/PlatformSpecificsViewModel.cs b/src/Controls/samples/Controls.Sample/ViewModels/PlatformSpecificsViewModel.cs
index b58d185dd191..4efb4bfc8e02 100644
--- a/src/Controls/samples/Controls.Sample/ViewModels/PlatformSpecificsViewModel.cs
+++ b/src/Controls/samples/Controls.Sample/ViewModels/PlatformSpecificsViewModel.cs
@@ -60,9 +60,6 @@ protected override IEnumerable<SectionModel> CreateItems()
 				new SectionModel(typeof(iOSFlyoutPage), "FlyoutPage Shadow",
 					"This platform-specific controls whether the detail page of a FlyoutPage has shadow applied to it, when revealing the flyout page."),
 
-				new SectionModel(typeof(iOSDragAndDropRequestFullSize), "Drag and Drop Gesture Recognizer Platform-Specific",
-					"This iOS platform-specific controls whether to request full-sized drag shadows and the UIDropProposal types."),
-
 				new SectionModel(typeof(iOSHideHomeIndicatorPage), "Hide Home Indicator",
 					"This iOS platform-specific sets the visibility of the home indicator on a Page."),
 
@@ -126,9 +123,6 @@ protected override IEnumerable<SectionModel> CreateItems()
 				new SectionModel(typeof(WindowsCollapseWidthAdjusterPage), "FlyoutPage Navigation Bar",
 					"This WinUI platform-specific is used to collapse the navigation bar on a FlyoutPage."),
 
-				new SectionModel(typeof(WindowsDragAndDropCustomization), "Drag and Drop Gesture Recognizer Platform-Specific",
-					"This WinUI platform-specific displays drag and drop customization such as custom drag gylph and text."),
-
 				new SectionModel(typeof(WindowsListViewPage), "ListView Selection Mode",
 					"This WinUI platform-specific controls whether items in a ListView can respond to tap gestures, and hence whether the native ListView fires the ItemClick or Tapped event."),
 
diff --git a/src/Controls/src/Core/AppThemeBinding.cs b/src/Controls/src/Core/AppThemeBinding.cs
index ca21983c2519..d96b72ed9e06 100644
--- a/src/Controls/src/Core/AppThemeBinding.cs
+++ b/src/Controls/src/Core/AppThemeBinding.cs
@@ -14,7 +14,7 @@ class AppThemeBinding : BindingBase
 
 		internal override BindingBase Clone()
 		{
-			var clone = new AppThemeBinding
+			var clone =  new AppThemeBinding
 			{
 				Light = Light,
 				_isLightSet = _isLightSet,
diff --git a/src/Controls/src/Core/BindableObject.cs b/src/Controls/src/Core/BindableObject.cs
index 604cbc99642a..05cfeb4a1e30 100644
--- a/src/Controls/src/Core/BindableObject.cs
+++ b/src/Controls/src/Core/BindableObject.cs
@@ -253,19 +253,8 @@ public void RemoveBinding(BindableProperty property)
 		{
 			BindablePropertyContext context = GetContext(property ?? throw new ArgumentNullException(nameof(property)));
 
-			var specificity = SetterSpecificity.FromBinding;
-			if (context != null && context.Bindings.Count > 0)
-				specificity = context.Bindings.Last().Key;
-
-			RemoveBinding(property, specificity);
-		}
-
-		internal void RemoveBinding(BindableProperty property, SetterSpecificity specificity)
-		{
-			BindablePropertyContext context = GetContext(property ?? throw new ArgumentNullException(nameof(property)));
-
-			if (context != null && context.Bindings.Count > 0)
-				RemoveBinding(property, context, specificity);
+			if (context?.Binding != null)
+				RemoveBinding(property, context);
 		}
 
 		/// <summary>
@@ -294,27 +283,14 @@ internal void SetBinding(BindableProperty targetProperty, BindingBase binding, S
 			{
 				var kvp = context.Values.Last();
 				context.Values.Remove(kvp.Key);
-				context.Values[SetterSpecificity.FromBinding] = kvp.Value;
-			}
-
-			BindingBase oldBinding = null;
-			SetterSpecificity oldSpecificity = default;
-			if (context.Bindings.Count > 0)
-			{
-				var b_p = context.Bindings.Last();
-				oldSpecificity = b_p.Key;
-				oldBinding = b_p.Value;
+				context.Values.Add(SetterSpecificity.FromBinding, kvp.Value);
 			}
 
-			if (oldBinding != null && specificity.CompareTo(oldSpecificity) < 0)
-			{
-				context.Bindings[specificity] = binding;
-				return;
-			}
-
-			oldBinding?.Unapply();
+			context.Binding?.Unapply();
+			context.BindingSpecificity = specificity;
 
-			context.Bindings[specificity] = binding ?? throw new ArgumentNullException(nameof(binding));
+			BindingBase oldBinding = context.Binding;
+			context.Binding = binding ?? throw new ArgumentNullException(nameof(binding));
 
 			targetProperty.BindingChanging?.Invoke(this, oldBinding, binding);
 
@@ -343,11 +319,9 @@ public static void SetInheritedBindingContext(BindableObject bindable, object va
 			if (bpContext != null && oldContext == null)
 				oldContext = bpContext.Values.LastOrDefault().Value;
 
-			var binding = bpContext?.Bindings.Values.LastOrDefault();
-
-			if (binding != null)
+			if (bpContext != null && bpContext.Binding != null)
 			{
-				binding.Context = value;
+				bpContext.Binding.Context = value;
 				bindable._inheritedContext = null;
 			}
 			else
@@ -398,7 +372,12 @@ protected virtual void OnPropertyChanging([CallerMemberName] string propertyName
 		protected void UnapplyBindings()
 		{
 			foreach (var context in _properties.Values)
-				context.Bindings.Values.LastOrDefault()?.Unapply();
+			{
+				if (context.Binding == null)
+					continue;
+
+				context.Binding.Unapply();
+			}
 		}
 
 		internal bool GetIsBound(BindableProperty targetProperty)
@@ -407,7 +386,7 @@ internal bool GetIsBound(BindableProperty targetProperty)
 				throw new ArgumentNullException(nameof(targetProperty));
 
 			BindablePropertyContext bpcontext = GetContext(targetProperty);
-			return bpcontext != null && bpcontext.Bindings.Count > 0;
+			return bpcontext != null && bpcontext.Binding != null;
 		}
 
 		internal virtual void OnRemoveDynamicResource(BindableProperty property)
@@ -419,9 +398,6 @@ internal virtual void OnSetDynamicResource(BindableProperty property, string key
 		}
 
 		internal void RemoveDynamicResource(BindableProperty property)
-			=> RemoveDynamicResource(property, SetterSpecificity.DynamicResourceSetter);
-
-		internal void RemoveDynamicResource(BindableProperty property, SetterSpecificity specificity)
 		{
 			if (property == null)
 				throw new ArgumentNullException(nameof(property));
@@ -619,7 +595,7 @@ void SetValueActual(BindableProperty property, BindablePropertyContext context,
 			if ((context.Attributes & BindableContextAttributes.IsDynamicResource) != 0 && clearDynamicResources)
 				RemoveDynamicResource(property);
 
-			BindingBase binding = context.Bindings.Values.LastOrDefault();
+			BindingBase binding = context.Binding;
 
 			if (!silent && (!sameValue || raiseOnEqual))
 			{
@@ -642,10 +618,7 @@ internal void ApplyBindings(bool skipBindingContext, bool fromBindingContextChan
 			for (int i = 0, propLength = prop.Length; i < propLength; i++)
 			{
 				BindablePropertyContext context = prop[i];
-				var kvp = context.Bindings.LastOrDefault();
-				var specificity = kvp.Key;
-				var binding = kvp.Value;
-
+				BindingBase binding = context.Binding;
 				if (binding == null)
 					continue;
 
@@ -653,7 +626,7 @@ internal void ApplyBindings(bool skipBindingContext, bool fromBindingContextChan
 					continue;
 
 				binding.Unapply(fromBindingContextChanged: fromBindingContextChanged);
-				binding.Apply(BindingContext, this, context.Property, fromBindingContextChanged, specificity);
+				binding.Apply(BindingContext, this, context.Property, fromBindingContextChanged, context.BindingSpecificity);
 			}
 		}
 
@@ -696,31 +669,13 @@ BindablePropertyContext CreateAndAddContext(BindableProperty property)
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		BindablePropertyContext GetOrCreateContext(BindableProperty property) => GetContext(property) ?? CreateAndAddContext(property);
 
-		void RemoveBinding(BindableProperty property, BindablePropertyContext context, SetterSpecificity specificity)
+		void RemoveBinding(BindableProperty property, BindablePropertyContext context)
 		{
-			var count = context.Bindings.Count;
-
-			if (count == 0)
-				return; //used to fail;
+			context.Binding.Unapply();
 
-			var currentbinding = context.Bindings.Values.Last();
-			var binding = context.Bindings[specificity];
-			var isCurrent = binding == currentbinding;
-
-			if (isCurrent)
-			{
-				binding.Unapply();
-
-				currentbinding = null;
-				if (count > 1)
-					currentbinding = context.Bindings.Values.ElementAt(count - 2);
-
-				property.BindingChanging?.Invoke(this, binding, currentbinding);
-
-				currentbinding?.Apply(BindingContext, this, property, false, context.Bindings.Keys.ElementAt(count - 2));
-			}
+			property.BindingChanging?.Invoke(this, context.Binding, null);
 
-			context.Bindings.Remove(specificity);
+			context.Binding = null;
 		}
 
 		/// <summary>
@@ -785,7 +740,9 @@ internal class BindablePropertyContext
 		{
 			public BindableContextAttributes Attributes;
 
-			public SortedList<SetterSpecificity, BindingBase> Bindings = new();
+			//TODO should be a list of bindings/specificity
+			public BindingBase Binding;
+			public SetterSpecificity BindingSpecificity = SetterSpecificity.FromBinding;
 
 			public Queue<SetValueArgs> DelayedSetters;
 			public BindableProperty Property;
diff --git a/src/Controls/src/Core/BindableObjectExtensions.cs b/src/Controls/src/Core/BindableObjectExtensions.cs
index 43404c08434d..a6c6682b8cfd 100644
--- a/src/Controls/src/Core/BindableObjectExtensions.cs
+++ b/src/Controls/src/Core/BindableObjectExtensions.cs
@@ -1,7 +1,6 @@
 #nullable disable
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls
@@ -12,13 +11,11 @@ public static class BindableObjectExtensions
 		internal static void RefreshPropertyValue(this BindableObject self, BindableProperty property, object value)
 		{
 			var ctx = self.GetContext(property);
-			if (ctx != null && ctx.Bindings.Count > 0)
+			if (ctx?.Binding is not null)
 			{
-				var binding = ctx.Bindings.Last().Value;
-
 				// support bound properties
 				if (!ctx.Attributes.HasFlag(BindableObject.BindableContextAttributes.IsBeingSet))
-					binding.Apply(false);
+					ctx.Binding.Apply(false);
 			}
 			else
 			{
diff --git a/src/Controls/src/Core/Compatibility/Handlers/NavigationPage/iOS/NavigationRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/NavigationPage/iOS/NavigationRenderer.cs
index 80871ac000e5..9b2764c67d45 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/NavigationPage/iOS/NavigationRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/NavigationPage/iOS/NavigationRenderer.cs
@@ -1759,38 +1759,12 @@ public Container(View view, UINavigationBar bar) : base(bar.Bounds)
 				if (view != null)
 				{
 					_view = view;
-
-					if (_view.Parent is null)
-					{
-						_view.ParentSet += OnTitleViewParentSet;
-					}
-					else
-					{
-						SetupTitleView();
-					}
-				}
-
-				ClipsToBounds = true;
-			}
-
-			void OnTitleViewParentSet(object sender, EventArgs e)
-			{
-				if (sender is View view)
-					view.ParentSet -= OnTitleViewParentSet;
-
-				SetupTitleView();
-			}
-
-			void SetupTitleView()
-			{
-				var mauiContext = _view.FindMauiContext();
-				if (_view is not null && mauiContext is not null)
-				{
-					var platformView = _view.ToPlatform(mauiContext);
-					_child = (IPlatformViewHandler)_view.Handler;
+					var platformView = view.ToPlatform(view.FindMauiContext());
+					_child = (IPlatformViewHandler)view.Handler;
 					AddSubview(platformView);
 				}
 
+				ClipsToBounds = true;
 			}
 
 			public override CGSize IntrinsicContentSize => UILayoutFittingExpandedSize;
@@ -1900,11 +1874,6 @@ protected override void Dispose(bool disposing)
 						_child = null;
 					}
 
-					if (_view is not null)
-					{
-						_view.ParentSet -= OnTitleViewParentSet;
-					}
-
 					_view = null;
 
 					_icon?.Dispose();
diff --git a/src/Controls/src/Core/DragAndDrop/PlatformDragStartingEventArgs.cs b/src/Controls/src/Core/DragAndDrop/PlatformDragStartingEventArgs.cs
index 2f9a43acbb28..5b0faf1929fd 100644
--- a/src/Controls/src/Core/DragAndDrop/PlatformDragStartingEventArgs.cs
+++ b/src/Controls/src/Core/DragAndDrop/PlatformDragStartingEventArgs.cs
@@ -26,7 +26,6 @@ public class PlatformDragStartingEventArgs
 	internal Foundation.NSItemProvider? ItemProvider { get; private set; }
 	internal Func<UIKit.UIDragPreview?>? PreviewProvider { get; private set; }
 	internal UIKit.UIDragItem[]? DragItems { get; private set; }
-	internal Func<UIKit.UIDragInteraction, UIKit.IUIDragSession, bool>? PrefersFullSizePreviews { get; private set; }
 
 	internal PlatformDragStartingEventArgs(UIKit.UIView? sender, UIKit.UIDragInteraction dragInteraction,
 		UIKit.IUIDragSession dragSession)
@@ -72,21 +71,6 @@ public void SetDragItems(UIKit.UIDragItem[] dragItems)
 		DragItems = dragItems;
 	}
 
-	/// <summary>
-	/// Sets the func that requests to keep drag previews full-sized when dragging begins.
-	/// </summary>
-	/// <param name="prefersFullSizePreviews">Func that returns whether to request full size previews.</param>
-	/// <remarks>
-	/// The default behavior on iOS is to reduce the size of the drag shadow if not requested here.
-	/// Even if requested, it is up to the system whether or not to fulfill the request.
-	/// This method exists inside <see cref="PlatformDragStartingEventArgs"/> since the preview must
-	/// have this value set when dragging begins.
-	/// </remarks>
-	public void SetPrefersFullSizePreviews(Func<UIKit.UIDragInteraction, UIKit.IUIDragSession, bool>? prefersFullSizePreviews)
-	{
-		PrefersFullSizePreviews = prefersFullSizePreviews;
-	}
-
 #elif ANDROID
 	/// <summary>
 	/// Gets the native view attached to the event.
diff --git a/src/Controls/src/Core/Platform/GestureManager/GesturePlatformManager.iOS.cs b/src/Controls/src/Core/Platform/GestureManager/GesturePlatformManager.iOS.cs
index 38e8f8f851bd..f126638c8ce6 100644
--- a/src/Controls/src/Core/Platform/GestureManager/GesturePlatformManager.iOS.cs
+++ b/src/Controls/src/Core/Platform/GestureManager/GesturePlatformManager.iOS.cs
@@ -103,8 +103,6 @@ public void Dispose()
 			}
 			_gestureRecognizers.Clear();
 
-			_dragAndDropDelegate?.Disconnect();
-
 			Disconnect();
 
 			_platformView = null;
diff --git a/src/Controls/src/Core/Platform/Windows/CollectionView/ItemContentControl.cs b/src/Controls/src/Core/Platform/Windows/CollectionView/ItemContentControl.cs
index 22a4449f7c86..c41f7582bb70 100644
--- a/src/Controls/src/Core/Platform/Windows/CollectionView/ItemContentControl.cs
+++ b/src/Controls/src/Core/Platform/Windows/CollectionView/ItemContentControl.cs
@@ -169,7 +169,6 @@ internal void Realize()
 				// or if we need to switch DataTemplates (because this instance is being recycled)
 				// then we'll need to create the content from the template 
 				_visualElement = formsTemplate.CreateContent(dataContext, container) as VisualElement;
-				_visualElement.BindingContext = dataContext;
 				_renderer = _visualElement.ToHandler(mauiContext);
 
 				// We need to set IsPlatformStateConsistent explicitly; otherwise, it won't be set until the renderer's Loaded 
@@ -187,11 +186,11 @@ internal void Realize()
 			{
 				// We are reusing this ItemContentControl and we can reuse the Element
 				_visualElement = _renderer.VirtualView as VisualElement;
-				_visualElement.BindingContext = dataContext;
 			}
 
 			Content = _renderer.ToPlatform();
 			itemsView?.AddLogicalChild(_visualElement);
+			_visualElement.BindingContext = dataContext;
 		}
 
 		void SetNativeStateConsistent(VisualElement visualElement)
diff --git a/src/Controls/src/Core/Platform/iOS/DragAndDropDelegate.cs b/src/Controls/src/Core/Platform/iOS/DragAndDropDelegate.cs
index b2a1402d92c1..4199a5e87456 100644
--- a/src/Controls/src/Core/Platform/iOS/DragAndDropDelegate.cs
+++ b/src/Controls/src/Core/Platform/iOS/DragAndDropDelegate.cs
@@ -14,38 +14,11 @@ namespace Microsoft.Maui.Controls.Platform
 	class DragAndDropDelegate : NSObject, IUIDragInteractionDelegate, IUIDropInteractionDelegate
 	{
 		IPlatformViewHandler _viewHandler;
-		PlatformDragStartingEventArgs _platformDragStartingEventArgs;
-
 		public DragAndDropDelegate(IPlatformViewHandler viewHandler)
 		{
 			_viewHandler = viewHandler;
 		}
 
-		public void Disconnect ()
-		{
-			_viewHandler = null;
-		}
-
-		[Export("dragInteraction:prefersFullSizePreviewsForSession:")]
-		[Preserve(Conditional = true)]
-		public bool PrefersFullSizePreviews(UIDragInteraction interaction, IUIDragSession session)
-		{
-			return _platformDragStartingEventArgs?.PrefersFullSizePreviews?.Invoke(interaction, session) ?? false;
-		}
-
-		[Export("dropInteraction:sessionDidEnd:")]
-		[Preserve(Conditional = true)]
-		public void SessionDidEnd(UIDropInteraction interaction, IUIDropSession session)
-		{
-			_platformDragStartingEventArgs = null;
-		}
-
-		[Export("dragInteraction:session:didEndWithOperation:")]
-		public void SessionDidEnd(UIDragInteraction interaction, IUIDragSession session, UIDropOperation operation)
-		{
-			_platformDragStartingEventArgs = null;
-		}
-
 		[Export("dragInteraction:session:willEndWithOperation:")]
 		[Preserve(Conditional = true)]
 		public void SessionWillEnd(UIDragInteraction interaction, IUIDragSession session, UIDropOperation operation)
@@ -156,8 +129,6 @@ void SendEventArgs<TRecognizer>(Action<TRecognizer> func, View view)
 		public UIDragItem[] HandleDragStarting(View element, IPlatformViewHandler handler, IUIDragSession session, PlatformDragStartingEventArgs platformArgs)
 		{
 			UIDragItem[] returnValue = null;
-			// if we touch and hold an item but do not move it, the _platformDragStartingEventArgs could be assigned. Reset it here in that case.
-			_platformDragStartingEventArgs = null;
 			SendEventArgs<DragGestureRecognizer>(rec =>
 			{
 				if (!rec.CanDrag)
@@ -175,7 +146,6 @@ public UIDragItem[] HandleDragStarting(View element, IPlatformViewHandler handle
 				if (!args.Handled)
 #pragma warning restore CS0618 // Type or member is obsolete
 				{
-					_platformDragStartingEventArgs = args.PlatformArgs;
 
 					if (args.PlatformArgs.DragItems is UIDragItem[] dragItems)
 					{
diff --git a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index 7b769c25ed6f..103361925146 100644
--- a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -10,7 +10,6 @@ Microsoft.Maui.Controls.PlatformDragStartingEventArgs.DragInteraction.get -> UIK
 Microsoft.Maui.Controls.PlatformDragStartingEventArgs.DragSession.get -> UIKit.IUIDragSession!
 Microsoft.Maui.Controls.PlatformDragStartingEventArgs.Sender.get -> UIKit.UIView?
 Microsoft.Maui.Controls.PlatformDragStartingEventArgs.SetItemProvider(Foundation.NSItemProvider! itemProvider) -> void
-Microsoft.Maui.Controls.PlatformDragStartingEventArgs.SetPrefersFullSizePreviews(System.Func<UIKit.UIDragInteraction!, UIKit.IUIDragSession!, bool>? prefersFullSizePreviews) -> void
 Microsoft.Maui.Controls.PlatformDragStartingEventArgs.SetPreviewProvider(System.Func<UIKit.UIDragPreview?>! previewProvider) -> void
 Microsoft.Maui.Controls.PlatformDragStartingEventArgs.SetDragItems(UIKit.UIDragItem![]! dragItems) -> void
 Microsoft.Maui.Controls.PlatformDropCompletedEventArgs
@@ -214,6 +213,7 @@ Microsoft.Maui.Controls.ShellNavigationQueryParameters.Values.get -> System.Coll
 ~static readonly Microsoft.Maui.Controls.ContentPage.HideSoftInputOnTappedProperty -> Microsoft.Maui.Controls.BindableProperty
 Microsoft.Maui.Controls.ContentPage.HideSoftInputOnTapped.get -> bool
 Microsoft.Maui.Controls.ContentPage.HideSoftInputOnTapped.set -> void
+
 *REMOVED*~Microsoft.Maui.Controls.Editor.FontFamily.get -> string
 *REMOVED*~Microsoft.Maui.Controls.Editor.FontFamily.set -> void
 *REMOVED*Microsoft.Maui.Controls.Editor.CursorPosition.get -> int
@@ -226,6 +226,7 @@ Microsoft.Maui.Controls.ContentPage.HideSoftInputOnTapped.set -> void
 *REMOVED*Microsoft.Maui.Controls.Editor.FontSize.set -> void
 *REMOVED*Microsoft.Maui.Controls.Editor.SelectionLength.get -> int
 *REMOVED*Microsoft.Maui.Controls.Editor.SelectionLength.set -> void
+
 *REMOVED*~Microsoft.Maui.Controls.SearchBar.FontFamily.get -> string
 *REMOVED*~Microsoft.Maui.Controls.SearchBar.FontFamily.set -> void
 *REMOVED*Microsoft.Maui.Controls.SearchBar.CursorPosition.get -> int
@@ -238,6 +239,7 @@ Microsoft.Maui.Controls.ContentPage.HideSoftInputOnTapped.set -> void
 *REMOVED*Microsoft.Maui.Controls.SearchBar.FontSize.set -> void
 *REMOVED*Microsoft.Maui.Controls.SearchBar.SelectionLength.get -> int
 *REMOVED*Microsoft.Maui.Controls.SearchBar.SelectionLength.set -> void
+
 *REMOVED*~Microsoft.Maui.Controls.Entry.FontFamily.get -> string
 *REMOVED*~Microsoft.Maui.Controls.Entry.FontFamily.set -> void
 *REMOVED*Microsoft.Maui.Controls.Entry.CursorPosition.get -> int
@@ -250,3 +252,4 @@ Microsoft.Maui.Controls.ContentPage.HideSoftInputOnTapped.set -> void
 *REMOVED*Microsoft.Maui.Controls.Entry.FontSize.set -> void
 *REMOVED*Microsoft.Maui.Controls.Entry.SelectionLength.get -> int
 *REMOVED*Microsoft.Maui.Controls.Entry.SelectionLength.set -> void
+
diff --git a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index 1668b5d73a91..228329607d18 100644
--- a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -10,7 +10,6 @@ Microsoft.Maui.Controls.PlatformDropCompletedEventArgs
 Microsoft.Maui.Controls.PlatformDropCompletedEventArgs.DragInteraction.get -> UIKit.UIDragInteraction?
 Microsoft.Maui.Controls.PlatformDropCompletedEventArgs.DragSession.get -> UIKit.IUIDragSession?
 Microsoft.Maui.Controls.PlatformDropCompletedEventArgs.DropInteraction.get -> UIKit.UIDropInteraction?
-Microsoft.Maui.Controls.PlatformDragStartingEventArgs.SetPrefersFullSizePreviews(System.Func<UIKit.UIDragInteraction!, UIKit.IUIDragSession!, bool>? prefersFullSizePreviews) -> void
 Microsoft.Maui.Controls.PlatformDropCompletedEventArgs.DropOperation.get -> UIKit.UIDropOperation?
 Microsoft.Maui.Controls.PlatformDropCompletedEventArgs.DropSession.get -> UIKit.IUIDropSession?
 Microsoft.Maui.Controls.PlatformDropCompletedEventArgs.Sender.get -> UIKit.UIView?
diff --git a/src/Controls/src/Core/Setter.cs b/src/Controls/src/Core/Setter.cs
index f21b1f8b863e..6475d2ba6927 100644
--- a/src/Controls/src/Core/Setter.cs
+++ b/src/Controls/src/Core/Setter.cs
@@ -71,6 +71,8 @@ internal void Apply(BindableObject target, SetterSpecificity specificity)
 			if (Property == null)
 				return;
 
+			//FIXME: use Specificity everywhere
+			var fromStyle = specificity.Style > 0;
 			if (Value is BindingBase binding)
 				targetObject.SetBinding(Property, binding.Clone(), specificity);
 			else if (Value is DynamicResource dynamicResource)
@@ -94,10 +96,7 @@ internal void UnApply(BindableObject target, SetterSpecificity specificity)
 
 			if (Property == null)
 				return;
-			if (Value is BindingBase binding)
-				targetObject.RemoveBinding(Property, specificity);
-			else if (Value is DynamicResource dynamicResource)
-				targetObject.RemoveDynamicResource(Property, specificity);
+
 			targetObject.ClearValue(Property, specificity);
 		}
 	}
diff --git a/src/Controls/src/Xaml/XamlNode.cs b/src/Controls/src/Xaml/XamlNode.cs
index 36dbe6fe6dbe..a84f923c76e7 100644
--- a/src/Controls/src/Xaml/XamlNode.cs
+++ b/src/Controls/src/Xaml/XamlNode.cs
@@ -208,7 +208,7 @@ public override void Accept(IXamlNodeVisitor visitor, INode parentNode)
 			{
 				foreach (var node in Properties.Values.ToList())
 					node.Accept(visitor, this);
-				foreach (var node in CollectionItems.ToList())
+				foreach (var node in CollectionItems)
 					node.Accept(visitor, this);
 			}
 
diff --git a/src/Controls/tests/DeviceTests/DispatchingTests.cs b/src/Controls/tests/DeviceTests/DispatchingTests.cs
index f014460dc7a0..b94cf1e8b73b 100644
--- a/src/Controls/tests/DeviceTests/DispatchingTests.cs
+++ b/src/Controls/tests/DeviceTests/DispatchingTests.cs
@@ -17,11 +17,7 @@ namespace Microsoft.Maui.DeviceTests
 	[Category(TestCategory.Dispatcher)]
 	public class DispatchingTests : ControlsHandlerTestBase
 	{
-		[Fact(
-#if MACCATALYST
-			Skip = "Fails on Mac Catalyst, fixme"
-#endif
-			)]
+		[Fact]
 		public async Task DispatchFromBackgroundThread()
 		{
 			bool dispatched = false;
diff --git a/src/Controls/tests/DeviceTests/Elements/Accessibility/AccessibilityTests.cs b/src/Controls/tests/DeviceTests/Elements/Accessibility/AccessibilityTests.cs
index 5f78f0c00594..1e233ea223b1 100644
--- a/src/Controls/tests/DeviceTests/Elements/Accessibility/AccessibilityTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Accessibility/AccessibilityTests.cs
@@ -45,11 +45,7 @@ public async Task ExcludedWithChildren(bool result)
 		[Collection(ControlsHandlerTestBase.RunInNewWindowCollection)]
 		public class InNewWindowCollection : ControlsHandlerTestBase
 		{
-			[Fact(
-#if MACCATALYST
-			Skip = "Fails on Mac Catalyst, fixme"
-#endif
-			)]
+			[Fact]
 			public async Task ValidateIsImportantForAccessibility()
 			{
 				EnsureHandlerCreated(builder =>
diff --git a/src/Controls/tests/DeviceTests/Elements/FlyoutPage/FlyoutPageTests.cs b/src/Controls/tests/DeviceTests/Elements/FlyoutPage/FlyoutPageTests.cs
index 1bcf46594bed..333d52f96ca1 100644
--- a/src/Controls/tests/DeviceTests/Elements/FlyoutPage/FlyoutPageTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/FlyoutPage/FlyoutPageTests.cs
@@ -135,11 +135,7 @@ await CreateHandlerAndAddToWindow<FlyoutViewHandler>(flyoutPage, async (handler)
 			});
 		}
 
-		[Theory(DisplayName = "Details View Updates"
-#if MACCATALYST
-			, Skip = "Fails on Mac Catalyst, fixme"
-#endif
-		)]
+		[Theory(DisplayName = "Details View Updates")]
 		[ClassData(typeof(FlyoutPageLayoutBehaviorTestCases))]
 		public async Task DetailsViewUpdates(Type flyoutPageType)
 		{
@@ -177,11 +173,7 @@ FlyoutPage CreateFlyoutPage(Type type, Page detail, Page flyout)
 		}
 
 		[Theory]
-		[InlineData(false
-#if MACCATALYST
-			, Skip = "Fails on Mac Catalyst, fixme"
-#endif
-			)]
+		[InlineData(false)]
 		[InlineData(true)]
 		public async Task DetailsPageMeasuresCorrectlyInSplitMode(bool isRtl)
 		{
diff --git a/src/Controls/tests/DeviceTests/Elements/FlyoutPage/FlyoutPageTests.iOS.cs b/src/Controls/tests/DeviceTests/Elements/FlyoutPage/FlyoutPageTests.iOS.cs
index 9e46c844650c..9c601bde6524 100644
--- a/src/Controls/tests/DeviceTests/Elements/FlyoutPage/FlyoutPageTests.iOS.cs
+++ b/src/Controls/tests/DeviceTests/Elements/FlyoutPage/FlyoutPageTests.iOS.cs
@@ -27,11 +27,7 @@ public partial class FlyoutPageTests
 		bool IsPad => UIDevice.CurrentDevice.UserInterfaceIdiom == UIUserInterfaceIdiom.Pad;
 
 #if MACCATALYST
-		[Fact(DisplayName = "Flyout Page Takes Into Account Safe Area by Default"
-#if MACCATALYST
-			, Skip = "Fails on Mac Catalyst, fixme"
-#endif
-		)]
+		[Fact(DisplayName = "Flyout Page Takes Into Account Safe Area by Default")]
 		public async Task FlyoutPageTakesIntoAccountSafeAreaByDefault()
 		{
 			SetupBuilder();
diff --git a/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.cs b/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.cs
index 078709017f9f..c5590108fea2 100644
--- a/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.cs
@@ -302,7 +302,7 @@ public async Task FrameIncludesPadding()
 			Assert.Equal(expected, layoutFrame.Height, 1.0d);
 		}
 
-#if !ANDROID && !IOS && !MACCATALYST
+#if !ANDROID && !IOS
 		[Fact]
 		public async Task FrameResizesItsContents()
 		{
diff --git a/src/Controls/tests/DeviceTests/Elements/ScrollView/ScrollViewTests.cs b/src/Controls/tests/DeviceTests/Elements/ScrollView/ScrollViewTests.cs
index 911e599de7f3..839ba82f22d2 100644
--- a/src/Controls/tests/DeviceTests/Elements/ScrollView/ScrollViewTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/ScrollView/ScrollViewTests.cs
@@ -80,11 +80,7 @@ await AttachAndRun(scroll, async (handler) =>
 
 		// NOTE: this test is slightly different than MemoryTests.HandlerDoesNotLeak
 		// It calls CreateHandlerAndAddToWindow(), a valid test case.
-		[Fact(DisplayName = "ScrollView Does Not Leak"
-#if MACCATALYST
-			, Skip = "Fails on Mac Catalyst, fixme"
-#endif
-			)]
+		[Fact(DisplayName = "ScrollView Does Not Leak")]
 		public async Task DoesNotLeak()
 		{
 			SetupBuilder();
diff --git a/src/Controls/tests/DeviceTests/Elements/Shell/ShellFlyoutTests.cs b/src/Controls/tests/DeviceTests/Elements/Shell/ShellFlyoutTests.cs
index 5e9dd489a887..e5d5b1afde08 100644
--- a/src/Controls/tests/DeviceTests/Elements/Shell/ShellFlyoutTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Shell/ShellFlyoutTests.cs
@@ -17,7 +17,6 @@ namespace Microsoft.Maui.DeviceTests
 {
 	public partial class ShellTests : ControlsHandlerTestBase
 	{
-#if !MACCATALYST
 		[Fact]
 		public async Task LogicalChildrenPropagateCorrectly()
 		{
@@ -319,6 +318,5 @@ await CreateHandlerAndAddToWindow<ShellHandler>(shell, async (handler) =>
 				await testAction(shell, handler);
 			});
 		}
-#endif
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.cs b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.cs
index 26bb44856ece..8b2d1b75397b 100644
--- a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.cs
@@ -46,7 +46,7 @@ void SetupBuilder()
 				});
 			});
 		}
-#if !MACCATALYST
+
 		[Fact]
 		public async Task PageLayoutDoesNotExceedWindowBounds()
 		{
@@ -1108,7 +1108,7 @@ await CreateHandlerAndAddToWindow<IWindowHandler>(shell, _ =>
 				Assert.Equal(count, appearanceObservers.Count); // Count doesn't increase
 			});
 		}
-#endif
+
 		protected Task<Shell> CreateShellAsync(Action<Shell> action) =>
 			InvokeOnMainThreadAsync(() =>
 			{
diff --git a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.iOS.cs b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.iOS.cs
index 694dc8aec5e3..288b499a5244 100644
--- a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.iOS.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.iOS.cs
@@ -24,7 +24,6 @@ namespace Microsoft.Maui.DeviceTests
 	[Category(TestCategory.Shell)]
 	public partial class ShellTests
 	{
-#if !MACCATALYST
 		[Fact(DisplayName = "Page Adjust When Top Tabs Are Present")]
 		public async Task PageAdjustsWhenTopTabsArePresent()
 		{
@@ -382,7 +381,7 @@ await CreateHandlerAndAddToWindow<ShellHandler>(shell, async (handler) =>
 			});
 		}
 #endif
-#endif
+
 		async Task TapToSelect(ContentPage page)
 		{
 			var shellContent = page.Parent as ShellContent;
diff --git a/src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.cs b/src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.cs
index 92c34611d544..b43222c2d57a 100644
--- a/src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.cs
@@ -73,11 +73,7 @@ await CreateHandlerAndAddToWindow<WindowHandlerStub>(new Window(tabbedPage), (ha
 #endif
 
 
-		[Fact(DisplayName = "Bar Text Color"
-#if MACCATALYST
-			, Skip = "Fails on Mac Catalyst, fixme"
-#endif
-			)]
+		[Fact(DisplayName = "Bar Text Color")]
 		public async Task BarTextColor()
 		{
 			SetupBuilder();
@@ -107,11 +103,7 @@ await CreateHandlerAndAddToWindow<TabbedViewHandler>(tabbedPage, async handler =
 			});
 		}
 
-		[Fact(DisplayName = "Selected/Unselected Color"
-#if MACCATALYST
-			, Skip = "Fails on Mac Catalyst, fixme"
-#endif
-			)]
+		[Fact(DisplayName = "Selected/Unselected Color")]
 		public async Task SelectedAndUnselectedTabColor()
 		{
 			SetupBuilder();
@@ -322,7 +314,7 @@ await CreateHandlerAndAddToWindow<WindowHandlerStub>(new Window(tabbedPage), asy
 			});
 		}
 
-#if !WINDOWS && !MACCATALYST
+#if !WINDOWS
 		[Theory]
 		[ClassData(typeof(TabbedPagePivots))]
 		public async Task RemovingAllPagesDoesntCrash(bool bottomTabs, bool isSmoothScrollEnabled)
diff --git a/src/Controls/tests/DeviceTests/GestureTests.iOS.cs b/src/Controls/tests/DeviceTests/GestureTests.iOS.cs
index f41e884569e0..e51a04f3a3d3 100644
--- a/src/Controls/tests/DeviceTests/GestureTests.iOS.cs
+++ b/src/Controls/tests/DeviceTests/GestureTests.iOS.cs
@@ -30,11 +30,7 @@ await InvokeOnMainThreadAsync(() =>
 		}
 
 #if MACCATALYST
-		[Fact(
-#if MACCATALYST
-			Skip = "Fails on Mac Catalyst, fixme"
-#endif
-			)]
+		[Fact]
 		public async Task InteractionsAreRemovedWhenGestureIsRemoved()
 		{
 			var label = new Label();
@@ -60,11 +56,7 @@ await InvokeOnMainThreadAsync(() =>
 			});
 		}
 
-		[Fact(
-#if MACCATALYST
-			Skip = "Fails on Mac Catalyst, fixme"
-#endif
-			)]
+		[Fact]
 		public async Task InteractionsAreRemovedWhenGestureButtonMaskChanged()
 		{
 			var label = new Label();
diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue16561.cs b/src/Controls/tests/UITests/Tests/Issues/Issue16561.cs
index e3df06bc7760..6f3879c7aaf6 100644
--- a/src/Controls/tests/UITests/Tests/Issues/Issue16561.cs
+++ b/src/Controls/tests/UITests/Tests/Issues/Issue16561.cs
@@ -1,12 +1,8 @@
 using System.Drawing;
 using Microsoft.Maui.Appium;
 using NUnit.Framework;
-using OpenQA.Selenium.Appium.Interactions;
-using OpenQA.Selenium.Appium.iOS;
-using OpenQA.Selenium.Appium.Windows;
-using OpenQA.Selenium.Interactions;
+using OpenQA.Selenium.Appium.MultiTouch;
 using TestUtils.Appium.UITests;
-using PointerInputDevice = OpenQA.Selenium.Appium.Interactions.PointerInputDevice;
 
 namespace Microsoft.Maui.AppiumTests.Issues
 {
@@ -28,7 +24,7 @@ public void TapTwoPlacesQuickly()
 				throw new InvalidOperationException("Cannot run test. Missing driver to run quick tap actions.");
 			}
 
-			var tapAreaResult = App.WaitForElement(_tapAreaId, $"Timed out waiting for {_tapAreaId}");
+			var tapAreaResult = App.WaitForElement(_tapAreaId);
 			var tapArea = tapAreaResult[0].Rect;
 
 			// The test harness coordinates are absolute
@@ -45,75 +41,22 @@ public void TapTwoPlacesQuickly()
 			var expectedX1 = point1.X - tapArea.X;
 			var expectedX2 = point2.X - tapArea.X;
 
-			TapTwice(app2, point1, point2);
+			// Just calling Tap twice will be too slow; we need to queue up the actions so they happen quickly
+			var actionsList = new TouchAction(app2.Driver);
+
+			// Tap the first point, then the second point
+			actionsList.Tap(point1.X, point1.Y).Tap(point2.X, point2.Y);
+			app2.Driver.PerformTouchAction(actionsList);
 
 			// The results for each tap should show up in the labels on the screen; find the text
 			// of each tap result and check to see that it meets the expected values
-			var result = App.WaitForElement("Tap1Label", $"Timed out waiting for Tap1Label");
+			var result = App.WaitForElement("Tap1Label");
 			AssertCorrectTapLocation(result[0].Text, expectedX1, expectedY, "First");
 
-			result = App.WaitForElement("Tap2Label", $"Timed out waiting for Tap2Label");
+			result = App.WaitForElement("Tap2Label");
 			AssertCorrectTapLocation(result[0].Text, expectedX2, expectedY, "Second");
 		}
 
-		static void TapTwice(IApp2 app, PointF point1, PointF point2)
-		{
-			var driver = app.Driver ?? throw new InvalidOperationException("The Appium driver is null; cannot perform taps.");
-
-			if (driver is WindowsDriver)
-			{
-				// Windows will throw an error if we try to execute Taps with a TouchAction
-				// or if we try to use ExecuteScript, so we'll just use TapCoordinates instead
-				app.TapCoordinates(point1.X, point1.Y);
-				app.TapCoordinates(point2.X, point2.Y);
-			}
-			else if (driver is IOSDriver)
-			{
-				// iOS, on the other hand, will allow us to use ExecuteScript to run two taps quickly
-				// It will not work with an ActionSequence, though; one of the taps will simply never 
-				// happen. No errors, but no second tap.
-
-				driver.ExecuteScript("mobile: tap", new Dictionary<string, object> {
-					{ "x", point1.X },
-					{ "y", point1.Y }
-				});
-
-				driver.ExecuteScript("mobile: tap", new Dictionary<string, object> {
-					{ "x", point2.X },
-					{ "y", point2.Y }
-				});
-			}
-			else
-			{
-				// For Android, TapCoordinates won't work (it's far too slow), and ExecuteScript 
-				// throws an error. So we'll use an ActionSequence, which is what we wanted in 
-				// the first place.
-
-				PointerInputDevice touchDevice = new PointerInputDevice(PointerKind.Touch);
-				var sequence = new ActionSequence(touchDevice, 0);
-
-				// Move to the first location and tap
-				sequence.AddAction(touchDevice.CreatePointerMove(CoordinateOrigin.Viewport,
-					(int)point1.X, (int)point1.Y, TimeSpan.FromMilliseconds(250)));
-				sequence.AddAction(touchDevice.CreatePointerDown(PointerButton.TouchContact));
-				sequence.AddAction(touchDevice.CreatePointerUp(PointerButton.TouchContact));
-
-				// If we don't put some kind of pause between the taps, Appium will throw an exception
-				// We'll use a pause that's shorter than the default time for a double-tap on Android,
-				// so we're very clearly simulating two different taps on two different locations
-				sequence.AddAction(touchDevice.CreatePause(TimeSpan.FromMilliseconds(250)));
-
-				// Move to the second location and tap
-				sequence.AddAction(touchDevice.CreatePointerMove(CoordinateOrigin.Viewport,
-					(int)point2.X, (int)point2.Y, TimeSpan.FromMilliseconds(0)));
-				sequence.AddAction(touchDevice.CreatePointerDown(PointerButton.TouchContact));
-				sequence.AddAction(touchDevice.CreatePointerUp(PointerButton.TouchContact));
-
-				// Run the sequence we just built
-				driver.PerformActions(new List<ActionSequence> { sequence });
-			}
-		}
-
 		static void AssertCorrectTapLocation(string tapData, float expectedX, float expectedY, string which)
 		{
 			// Turn the text values into numbers so we can compare with a tolerance
diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue16787.cs b/src/Controls/tests/UITests/Tests/Issues/Issue16787.cs
deleted file mode 100644
index b9f804983697..000000000000
--- a/src/Controls/tests/UITests/Tests/Issues/Issue16787.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Microsoft.Maui.Appium;
-using NUnit.Framework;
-
-namespace Microsoft.Maui.AppiumTests.Issues
-{
-	public class Issue16787 : _IssuesUITest
-	{
-		public Issue16787(TestDevice device) : base(device)
-		{
-		}
-
-		public override string Issue => "CollectionView runtime binding errors when loading the ItemSource asynchronously";
-
-		[Test]
-		public void CollectionViewBindingContextOnlyChangesOnce()
-		{
-			Assert.AreEqual("1", App.WaitForElement("LabelBindingCount")[0].ReadText());
-		}
-	}
-}
diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue17347.cs b/src/Controls/tests/UITests/Tests/Issues/Issue17347.cs
deleted file mode 100644
index e6b4d83ee239..000000000000
--- a/src/Controls/tests/UITests/Tests/Issues/Issue17347.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Drawing;
-using Microsoft.Maui.Appium;
-using NUnit.Framework;
-using OpenQA.Selenium.Appium.MultiTouch;
-using TestUtils.Appium.UITests;
-
-namespace Microsoft.Maui.AppiumTests.Issues
-{
-	public class Issue17347 : _IssuesUITest
-	{
-		public Issue17347(TestDevice device) : base(device)
-		{
-		}
-
-		public override string Issue => "Setting a new TitleView on an already created page crashes iOS";
-
-		[Test]
-		public void AppDoesntCrashWhenSettingNewTitleViewOnExistingPage()
-		{
-			try
-			{
-				App.WaitForElement("TitleViewLabel4", timeout: TimeSpan.FromSeconds(4));
-			}
-			finally
-			{
-				App.Tap("PopMeButton");
-			}
-		}
-	}
-}
diff --git a/src/Controls/tests/Xaml.UnitTests/Issues/Maui16538.xaml b/src/Controls/tests/Xaml.UnitTests/Issues/Maui16538.xaml
deleted file mode 100644
index f1e870873270..000000000000
--- a/src/Controls/tests/Xaml.UnitTests/Issues/Maui16538.xaml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:local="clr-namespace:Microsoft.Maui.Controls.Xaml.UnitTests"
-             x:Class="Microsoft.Maui.Controls.Xaml.UnitTests.Maui16538">
-    <ContentPage.Resources>
-        <Color x:Key="Primary">#512BD4</Color>
-        <Color x:Key="White">White</Color>
-        <Color x:Key="Gray200">#C8C8C8</Color>
-        <Color x:Key="Gray600">#404040</Color>
-        <Color x:Key="Gray950">#141414</Color>
-        <Style TargetType="Button">
-            <!--<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Primary}}" />-->
-            <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
-            <!--<Setter Property="FontFamily" Value="OpenSansRegular"/>
-            <Setter Property="FontSize" Value="14"/>
-            <Setter Property="BorderWidth" Value="0"/>
-            <Setter Property="CornerRadius" Value="8"/>
-            <Setter Property="Padding" Value="14,10"/>
-            <Setter Property="MinimumHeightRequest" Value="44"/>
-            <Setter Property="MinimumWidthRequest" Value="44"/>-->
-            <Setter Property="VisualStateManager.VisualStateGroups">
-                <VisualStateGroupList>
-                    <VisualStateGroup x:Name="CommonStates">
-                        <VisualState x:Name="Normal" />
-                        <VisualState x:Name="Disabled">
-                            <VisualState.Setters>
-                                <!--<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray200}}" />-->
-                                <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray600}}" />
-                            </VisualState.Setters>
-                        </VisualState>
-                        <VisualState x:Name="PointerOver" />
-                    </VisualStateGroup>
-                </VisualStateGroupList>
-            </Setter>
-        </Style>
-    </ContentPage.Resources>
-    <Button x:Name="button0" IsEnabled="false"/>
-</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/Xaml.UnitTests/Issues/Maui16538.xaml.cs b/src/Controls/tests/Xaml.UnitTests/Issues/Maui16538.xaml.cs
deleted file mode 100644
index 9810cc6c2e9d..000000000000
--- a/src/Controls/tests/Xaml.UnitTests/Issues/Maui16538.xaml.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using Microsoft.Maui.ApplicationModel;
-using Microsoft.Maui.Controls.Core.UnitTests;
-using Microsoft.Maui.Controls.Shapes;
-using Microsoft.Maui.Devices;
-using Microsoft.Maui.Dispatching;
-using Microsoft.Maui.Graphics;
-using Microsoft.Maui.UnitTests;
-using NUnit.Framework;
-
-namespace Microsoft.Maui.Controls.Xaml.UnitTests;
-
-public partial class Maui16538
-{
-
-	public Maui16538() => InitializeComponent();
-
-	public Maui16538(bool useCompiledXaml)
-	{
-		//this stub will be replaced at compile time
-	}
-
-	[TestFixture]
-	class Test
-	{
-		[SetUp]
-		public void Setup()
-		{
-			Application.SetCurrentApplication(new MockApplication());
-			DispatcherProvider.SetCurrent(new DispatcherProviderStub());
-		}
-
-
-		[TearDown] public void TearDown() => AppInfo.SetCurrent(null);
-
-		[Test]
-		public void VSMandAppTheme([Values(false, true)] bool useCompiledXaml)
-		{
-
-			Application.Current.UserAppTheme = AppTheme.Dark;
-			var page = new Maui16538(useCompiledXaml);
-			Button button = page.button0;
-			Assert.That(button.BackgroundColor, Is.EqualTo(Color.FromHex("404040")));
-			button.IsEnabled = true;
-			Assert.That(button.BackgroundColor, Is.EqualTo(Colors.White));
-			Application.Current.UserAppTheme = AppTheme.Light;
-			Assert.That(button.BackgroundColor, Is.EqualTo(Color.FromHex("512BD4")));
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/tests/Xaml.UnitTests/Issues/Maui16960.xaml b/src/Controls/tests/Xaml.UnitTests/Issues/Maui16960.xaml
deleted file mode 100644
index 31db5b0230c7..000000000000
--- a/src/Controls/tests/Xaml.UnitTests/Issues/Maui16960.xaml
+++ /dev/null
@@ -1,35 +0,0 @@
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:local="clr-namespace:Microsoft.Maui.Controls.Xaml.UnitTests"
-             x:Class="Microsoft.Maui.Controls.Xaml.UnitTests.Maui16960">
-  <ContentPage.Resources>
-    <Style TargetType="Button">
-      <Setter Property="VisualStateManager.VisualStateGroups">
-        <Setter.Value>
-          <VisualStateGroupList>
-            <VisualStateGroup>
-              <VisualState x:Name="Normal" />
-              <VisualState x:Name="Pressed">
-                <VisualState.Setters>
-                  <Setter Property="BackgroundColor"
-                          Value="{AppThemeBinding Light=Yellow, Dark=Orange}" />
-                </VisualState.Setters>
-              </VisualState>
-              <VisualState x:Name="PointerOver">
-                <VisualState.Setters>
-                  <Setter Property="BackgroundColor"
-                          Value="Red" />
-                </VisualState.Setters>
-              </VisualState>
-            </VisualStateGroup>
-          </VisualStateGroupList>
-        </Setter.Value>
-      </Setter>
-    </Style>
-  </ContentPage.Resources>
-
-
-<Button x:Name="button"/>
-
-
-</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/Xaml.UnitTests/Issues/Maui16960.xaml.cs b/src/Controls/tests/Xaml.UnitTests/Issues/Maui16960.xaml.cs
deleted file mode 100644
index 76d2039460db..000000000000
--- a/src/Controls/tests/Xaml.UnitTests/Issues/Maui16960.xaml.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using Microsoft.Maui.ApplicationModel;
-using Microsoft.Maui.Controls.Core.UnitTests;
-using Microsoft.Maui.Controls.Shapes;
-using Microsoft.Maui.Devices;
-using Microsoft.Maui.Graphics;
-using Microsoft.Maui.Dispatching;
-
-
-using NUnit.Framework;
-using Microsoft.Maui.UnitTests;
-
-namespace Microsoft.Maui.Controls.Xaml.UnitTests;
-
-public partial class Maui16960
-{
-
-	public Maui16960() => InitializeComponent();
-
-	public Maui16960(bool useCompiledXaml)
-	{
-		//this stub will be replaced at compile time
-	}
-
-	[TestFixture]
-	class Test
-	{
-		[SetUp]
-		public void Setup()
-		{
-			Application.SetCurrentApplication(new MockApplication());
-			DispatcherProvider.SetCurrent(new DispatcherProviderStub());
-		}
-
-
-		[TearDown] public void TearDown() => AppInfo.SetCurrent(null);
-
-		[Test]
-		public void VSMandAppTheme([Values(false, true)] bool useCompiledXaml)
-		{
-
-			Application.Current.UserAppTheme = AppTheme.Light;
-
-			var page = new Maui16960(useCompiledXaml);
-			Button button = page.button;
-			Assert.That(button.BackgroundColor, Is.Null);
-
-			VisualStateManager.GoToState(button, "PointerOver");
-			Assert.That(button.BackgroundColor, Is.EqualTo(Colors.Red));
-
-			VisualStateManager.GoToState(button, "Pressed");
-			Assert.That(button.BackgroundColor, Is.EqualTo(Colors.Yellow));
-
-			VisualStateManager.GoToState(button, "Normal");
-			Assert.That(button.BackgroundColor, Is.Null);
-
-			VisualStateManager.GoToState(button, "PointerOver");
-			Assert.That(button.BackgroundColor, Is.EqualTo(Colors.Red));
-
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/tests/Xaml.UnitTests/Issues/Maui17222.xaml.cs b/src/Controls/tests/Xaml.UnitTests/Issues/Maui17222.xaml.cs
index 3b1db1eb0e33..6df8db5ecc97 100644
--- a/src/Controls/tests/Xaml.UnitTests/Issues/Maui17222.xaml.cs
+++ b/src/Controls/tests/Xaml.UnitTests/Issues/Maui17222.xaml.cs
@@ -1,7 +1,7 @@
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System;
 using Microsoft.Maui.ApplicationModel;
 using Microsoft.Maui.Controls.Core.UnitTests;
 using Microsoft.Maui.Controls.Shapes;
@@ -27,7 +27,6 @@ class Test
 #if DEBUG
 		[SetUp] public void Setup() => AppInfo.SetCurrent(new MockAppInfo());
 		[TearDown] public void TearDown() => AppInfo.SetCurrent(null);
-
 		[Test]
 		public void GetsourceInfo([Values(false)] bool useCompiledXaml)
 		{
diff --git a/src/Controls/tests/Xaml.UnitTests/Issues/Maui17333.xaml b/src/Controls/tests/Xaml.UnitTests/Issues/Maui17333.xaml
deleted file mode 100644
index 3e6232437851..000000000000
--- a/src/Controls/tests/Xaml.UnitTests/Issues/Maui17333.xaml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ResourceDictionary 
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="Microsoft.Maui.Controls.Xaml.UnitTests.Maui17333">   
-
-    <OnPlatform x:TypeArguments="x:String"
-        x:Key="RegularFont"
-        Default="OpenSansRegular"
-        />
-
-    <OnPlatform x:TypeArguments="x:String"
-        x:Key="BoldFont"
-        Default="OpenSansSemiBold"
-        />
-
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Controls/tests/Xaml.UnitTests/Issues/Maui17333.xaml.cs b/src/Controls/tests/Xaml.UnitTests/Issues/Maui17333.xaml.cs
deleted file mode 100644
index 2b94672f3da2..000000000000
--- a/src/Controls/tests/Xaml.UnitTests/Issues/Maui17333.xaml.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System;
-using Microsoft.Maui.ApplicationModel;
-using Microsoft.Maui.Controls.Core.UnitTests;
-using Microsoft.Maui.Controls.Shapes;
-using Microsoft.Maui.Devices;
-using Microsoft.Maui.Graphics;
-using NUnit.Framework;
-
-namespace Microsoft.Maui.Controls.Xaml.UnitTests;
-
-public partial class Maui17333 : ResourceDictionary
-{
-
-	public Maui17333() => InitializeComponent();
-
-	public Maui17333(bool useCompiledXaml)
-	{
-		//this stub will be replaced at compile time
-	}
-
-	[TestFixture]
-	class Test
-	{
-		[SetUp] public void Setup() => AppInfo.SetCurrent(new MockAppInfo());
-		[TearDown] public void TearDown() => AppInfo.SetCurrent(null);
-
-		[Test]
-		public void CompilerDoesntThrowOnOnPlatform([Values(true)] bool useCompiledXaml)
-		{
-			if (useCompiledXaml)
-			{
-				MockCompiler.Compile(typeof(Maui17333),targetFramework: "net-ios");
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/tests/Xaml.UnitTests/Issues/Maui17354.xaml b/src/Controls/tests/Xaml.UnitTests/Issues/Maui17354.xaml
deleted file mode 100644
index 105d26adc1f8..000000000000
--- a/src/Controls/tests/Xaml.UnitTests/Issues/Maui17354.xaml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:local="clr-namespace:Microsoft.Maui.Controls.Xaml.UnitTests"
-             x:Class="Microsoft.Maui.Controls.Xaml.UnitTests.Maui17354">
-    <Grid WidthRequest="500" ColumnDefinitions="*" x:Name="grid">
-        <VisualStateManager.VisualStateGroups>
-            <VisualStateGroupList>
-                <VisualStateGroup x:Name="CommonStates">
-                    <VisualState x:Name="PointerOver">
-                        <VisualState.Setters>
-                            <Setter Property="BackgroundColor" Value="{AppThemeBinding Dark=Red, Light=White}"/>
-                        </VisualState.Setters>
-                    </VisualState>
-                    <VisualState x:Name="Normal">
-                        <VisualState.Setters>
-                            <Setter Property="BackgroundColor" Value="Transparent" />
-                        </VisualState.Setters>
-                    </VisualState>
-                </VisualStateGroup>
-            </VisualStateGroupList>
-        </VisualStateManager.VisualStateGroups>
-        <Label Text="I'm a grid. Hover over me to change background color"/>
-    </Grid>
-</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/Xaml.UnitTests/Issues/Maui17354.xaml.cs b/src/Controls/tests/Xaml.UnitTests/Issues/Maui17354.xaml.cs
deleted file mode 100644
index d15f16db98b4..000000000000
--- a/src/Controls/tests/Xaml.UnitTests/Issues/Maui17354.xaml.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using Microsoft.Maui.ApplicationModel;
-using Microsoft.Maui.Controls.Core.UnitTests;
-using Microsoft.Maui.Controls.Shapes;
-using Microsoft.Maui.Devices;
-using Microsoft.Maui.Graphics;
-using NUnit.Framework;
-
-namespace Microsoft.Maui.Controls.Xaml.UnitTests;
-
-public partial class Maui17354 : ContentPage
-{
-
-	public Maui17354() => InitializeComponent();
-
-	public Maui17354(bool useCompiledXaml)
-	{
-		//this stub will be replaced at compile time
-	}
-
-	[TestFixture]
-	class Test
-	{
-		[SetUp] public void Setup() => AppInfo.SetCurrent(new MockAppInfo());
-		[TearDown] public void TearDown() => AppInfo.SetCurrent(null);
-
-		[Test]
-		public void VSMandAppTheme([Values(false, true)] bool useCompiledXaml)
-		{
-			var page = new Maui17354(useCompiledXaml);
-			var grid = page.grid;
-
-			Assert.That(grid.BackgroundColor, Is.EqualTo(Colors.Transparent));
-
-			Assert.True(VisualStateManager.GoToState(grid, "PointerOver"));
-			Assert.That(grid.BackgroundColor, Is.EqualTo(Colors.White));
-
-			Assert.True(VisualStateManager.GoToState(grid, "Normal"));
-			Assert.That(grid.BackgroundColor, Is.EqualTo(Colors.Transparent));
-
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/Apple/Codesign.cs b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/Apple/Codesign.cs
deleted file mode 100644
index 611f6c3737a9..000000000000
--- a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/Apple/Codesign.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Diagnostics;
-
-namespace Microsoft.Maui.IntegrationTests.Apple
-{
-	public static class Codesign
-	{
-		public static List<string> SearchForExpectedEntitlements(
-			string entitlementsPath,
-			string appLocation,
-			List<string> expectedEntitlements)
-		{
-			List<string> foundEntitlements = new();
-			string procOutput = ToolRunner.Run(new ProcessStartInfo()
-			{
-				FileName = "/usr/bin/codesign",
-				Arguments = $"-d --entitlements {entitlementsPath} --xml {appLocation}"
-			}, out int errorCode);
-
-			Assert.AreEqual(errorCode, 0, procOutput);
-			Assert.IsTrue(File.Exists(entitlementsPath));
-
-			string fileContent = File.ReadAllText(entitlementsPath);
-			foreach (string entitlement in expectedEntitlements)
-			{
-				if (fileContent.Contains(entitlement, StringComparison.OrdinalIgnoreCase))
-					foundEntitlements.Add(entitlement);
-			}
-
-			return foundEntitlements;
-		}
-	}
-}
-
diff --git a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/TemplateTests.cs b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/TemplateTests.cs
index bf5a4a36cba6..2af95af79cd4 100644
--- a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/TemplateTests.cs
+++ b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/TemplateTests.cs
@@ -1,4 +1,3 @@
-using Microsoft.Maui.IntegrationTests.Apple;
 
 namespace Microsoft.Maui.IntegrationTests
 {
@@ -183,39 +182,6 @@ public void BuildWithDifferentVersionNumber(string id, string config, string dis
 				$"Project {Path.GetFileName(projectFile)} failed to build. Check test output/attachments for errors.");
 		}
 
-		[Test]
-		[TestCase("maui-blazor", "Debug", DotNetCurrent)]
-		[TestCase("maui-blazor", "Release", DotNetCurrent)]
-		public void CheckEntitlementsForMauiBlazorOnMacCatalyst(string id, string config, string framework)
-		{
-			if (TestEnvironment.IsWindows)
-				Assert.Ignore("Running MacCatalyst templates is only supported on Mac.");
-
-			string projectDir = TestDirectory;
-			string projectFile = Path.Combine(projectDir, $"{Path.GetFileName(projectDir)}.csproj");
-			// Note: Debug app is stored in the maccatalyst-x64 folder, while the Release is in parent directory
-			string appLocation = config == "Release" ?
-				Path.Combine(projectDir, "bin", config, $"{framework}-maccatalyst", $"{Path.GetFileName(projectDir)}.app") :
-				Path.Combine(projectDir, "bin", config, $"{framework}-maccatalyst", "maccatalyst-x64", $"{Path.GetFileName(projectDir)}.app");
-			string entitlementsPath = Path.Combine(projectDir, "x.xml");
-
-			List<string> buildWithCodeSignProps = new List<string>(BuildProps)
-			{
-				"EnableCodeSigning=true"
-			};
-
-			Assert.IsTrue(DotnetInternal.New(id, projectDir, framework), $"Unable to create template {id}. Check test output for errors.");
-			Assert.IsTrue(DotnetInternal.Build(projectFile, config, framework: $"{framework}-maccatalyst", properties: buildWithCodeSignProps),
-				$"Project {Path.GetFileName(projectFile)} failed to build. Check test output/attachments for errors.");
-
-			List<string> expectedEntitlements = config == "Release" ?
-				new() { "com.apple.security.app-sandbox", "com.apple.security.network.client" } :
-				new() { "com.apple.security.get-task-allow" };
-			List<string> foundEntitlements = Codesign.SearchForExpectedEntitlements(entitlementsPath, appLocation, expectedEntitlements);
-
-			CollectionAssert.AreEqual(expectedEntitlements, foundEntitlements, "Entitlements missing from executable.");
-		}
-
 		void EnableTizen(string projectFile)
 		{
 			FileUtilities.ReplaceInFile(projectFile, new Dictionary<string, string>()