diff --git a/.github/instructions/uitests.instructions.md b/.github/instructions/uitests.instructions.md
index f69bcb4f4aee..b8eb01bab8f3 100644
--- a/.github/instructions/uitests.instructions.md
+++ b/.github/instructions/uitests.instructions.md
@@ -523,6 +523,17 @@ cat /tmp/ios_crash.log | grep -A 20 -B 5 "Exception"
 5. **Check for platform-specific issues** - iOS version compatibility, permissions, etc.
 6. If you can't determine the fix, **ask for guidance** with the full exception details
 
+### Dangerous System Commands (Never Run)
+
+**🚨 NEVER run these commands — they cause destructive system-wide side effects:**
+
+- **`tccutil reset`** — Wipes ALL macOS permissions (Accessibility, Camera, etc.) system-wide. This breaks Appium/WebDriverAgent, Xcode, and other tools. Once reset, permissions must be manually re-granted through System Settings.
+- **`csrutil disable`** — Disables System Integrity Protection
+- **`networksetup`** — Modifies network configuration
+- **`defaults delete`** on system domains — Resets system preferences
+
+**General rule:** Do not run commands that modify macOS system-level privacy, security, or permission settings. If you need to check permissions, read them — never reset or modify them.
+
 ## Before Committing
 
 Verify the following checklist before committing UI tests:
diff --git a/.github/scripts/BuildAndRunHostApp.ps1 b/.github/scripts/BuildAndRunHostApp.ps1
index c6103609de46..60d15963eb66 100644
--- a/.github/scripts/BuildAndRunHostApp.ps1
+++ b/.github/scripts/BuildAndRunHostApp.ps1
@@ -260,7 +260,9 @@ if ($Platform -eq "catalyst") {
             & chmod +x $executablePath
         }
         
-        Write-Success "MacCatalyst app prepared (Appium will launch with test name)"
+        # Set MAC_APP_PATH so Appium mac2 driver can launch the app directly
+        $env:MAC_APP_PATH = $appPath
+        Write-Success "MacCatalyst app prepared (MAC_APP_PATH=$appPath)"
     } else {
         Write-Warn "MacCatalyst app not found at: $appPath"
         Write-Warn "Test may use wrong app bundle if another version is registered"
diff --git a/.github/scripts/shared/Start-Emulator.ps1 b/.github/scripts/shared/Start-Emulator.ps1
index 9fd9d227331a..b842d840a6cc 100644
--- a/.github/scripts/shared/Start-Emulator.ps1
+++ b/.github/scripts/shared/Start-Emulator.ps1
@@ -6,7 +6,7 @@
 .DESCRIPTION
     Handles device detection and startup for both Android and iOS platforms.
     - Android: Automatically selects and starts emulator with priority: API 30 Nexus > API 30 > Nexus > First available
-    - iOS: Automatically selects iPhone Xs with iOS 18.5 by default
+    - iOS: Automatically selects iPhone Xs with iOS 18.x (or iPhone 11 Pro with iOS 26.x) to match CI
 
 .PARAMETER Platform
     Target platform: "android" or "ios"
@@ -344,10 +344,17 @@ if ($Platform -eq "android") {
         Write-Info "Auto-detecting iOS simulator..."
         $simList = xcrun simctl list devices available --json | ConvertFrom-Json
         
-        # Preferred devices in order of priority
-        $preferredDevices = @("iPhone 16 Pro", "iPhone 15 Pro", "iPhone 14 Pro", "iPhone Xs")
         # Preferred iOS versions in order (stable preferred, beta fallback)
         $preferredVersions = @("iOS-18", "iOS-17", "iOS-26")
+        # Preferred devices per iOS version to match CI configuration:
+        #   iOS 18.x → iPhone Xs (matches CI default in UITest.cs)
+        #   iOS 26.x → iPhone 11 Pro (matches CI visual test requirement)
+        #   iOS 17.x → iPhone Xs (fallback)
+        $preferredDevicesPerVersion = @{
+            "iOS-18" = @("iPhone Xs", "iPhone 16 Pro", "iPhone 15 Pro", "iPhone 14 Pro")
+            "iOS-17" = @("iPhone Xs", "iPhone 15 Pro", "iPhone 14 Pro")
+            "iOS-26" = @("iPhone 11 Pro", "iPhone 16 Pro", "iPhone 15 Pro")
+        }
         
         $selectedDevice = $null
         $selectedVersion = $null
@@ -356,13 +363,16 @@ if ($Platform -eq "android") {
         foreach ($version in $preferredVersions) {
             if ($selectedDevice) { break }
             
-            # Get all runtimes matching this version prefix
+            # Get all runtimes matching this version prefix, sorted by version descending
+            # so the latest minor version is preferred (e.g., iOS-18-5 before iOS-18-3)
             $matchingRuntimes = $simList.devices.PSObject.Properties | 
-                Where-Object { $_.Name -match $version }
+                Where-Object { $_.Name -match $version } |
+                Sort-Object { $_.Name } -Descending
             
             if ($matchingRuntimes) {
-                # Try each preferred device
-                foreach ($deviceName in $preferredDevices) {
+                # Try each preferred device for this version
+                $devicesForVersion = if ($preferredDevicesPerVersion.ContainsKey($version)) { $preferredDevicesPerVersion[$version] } else { @("iPhone Xs", "iPhone 16 Pro") }
+                foreach ($deviceName in $devicesForVersion) {
                     $device = $null
                     $deviceRuntime = $null
                     foreach ($rt in $matchingRuntimes) {
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue16910.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue16910.xaml
index 0e44acbe1f7e..b790faef3092 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue16910.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue16910.xaml
@@ -2,20 +2,35 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Maui.Controls.Sample.Issues.Issue16910">
-    <ContentPage.Content>
-        <Grid RowDefinitions="Auto,100,*,50,50" x:Name="grid">
-            <Label Grid.Row="1" Text="Interact with the RefreshView and make sure the IsRefreshing Label correctly Represents current state." />
-            <RefreshView x:Name="refreshView" Grid.Row="2" IsRefreshing="{Binding IsRefreshing, Mode=TwoWay}">
-                <CollectionView ItemsSource="{Binding ItemSource}" AutomationId="CollectionView">
-                    <CollectionView.ItemTemplate>
-                        <DataTemplate>
-                            <Label Text="{Binding Text}" AutomationId="{Binding AutomationId}" />
-                        </DataTemplate>
-                    </CollectionView.ItemTemplate>
-                </CollectionView>
-            </RefreshView>
-            <Button x:Name="StopRefreshing" AutomationId="StopRefreshing" Grid.Row="3" Text="Stop Refresh" Clicked="OnStopRefreshClicked" />
-            <Button x:Name="StartRefreshing" AutomationId="StartRefreshing" Grid.Row="4" Text="Refresh" Clicked="OnRefreshClicked" />
-        </Grid>
-    </ContentPage.Content>
+    <Grid RowDefinitions="Auto,*,50,50" x:Name="grid">
+        <Label Grid.Row="0" Text="Interact with the RefreshView and make sure the IsRefreshing Label correctly Represents current state." />
+        <RefreshView x:Name="refreshView" Grid.Row="1" IsRefreshing="{Binding IsRefreshing, Mode=TwoWay}">
+            <ScrollView AutomationId="RefreshScrollView">
+                <VerticalStackLayout Padding="10" Spacing="5">
+                    <Label Text="Item 1" />
+                    <Label Text="Item 2" />
+                    <Label Text="Item 3" />
+                    <Label Text="Item 4" />
+                    <Label Text="Item 5" />
+                    <Label Text="Item 6" />
+                    <Label Text="Item 7" />
+                    <Label Text="Item 8" />
+                    <Label Text="Item 9" />
+                    <Label Text="Item 10" />
+                    <Label Text="Item 11" />
+                    <Label Text="Item 12" />
+                    <Label Text="Item 13" />
+                    <Label Text="Item 14" />
+                    <Label Text="Item 15" />
+                    <Label Text="Item 16" />
+                    <Label Text="Item 17" />
+                    <Label Text="Item 18" />
+                    <Label Text="Item 19" />
+                    <Label Text="Item 20" />
+                </VerticalStackLayout>
+            </ScrollView>
+        </RefreshView>
+        <Button x:Name="StopRefreshing" AutomationId="StopRefreshing" Grid.Row="2" Text="Stop Refresh" Clicked="OnStopRefreshClicked" />
+        <Button x:Name="StartRefreshing" AutomationId="StartRefreshing" Grid.Row="3" Text="Refresh" Clicked="OnRefreshClicked" />
+    </Grid>
 </ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue16910.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue16910.xaml.cs
index 5cb7595561d3..101a753825d9 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue16910.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue16910.xaml.cs
@@ -1,6 +1,4 @@
-using System.Collections;
-
-namespace Maui.Controls.Sample.Issues
+namespace Maui.Controls.Sample.Issues
 {
 	[Issue(IssueTracker.Github, 16910, "IsRefreshing binding works", PlatformAffected.All)]
 	public partial class Issue16910 : ContentPage
@@ -10,8 +8,6 @@ public partial class Issue16910 : ContentPage
 
 		bool _isRefreshing;
 
-		public IEnumerable ItemSource { get; set; }
-
 		public bool IsRefreshing
 		{
 			get => _isRefreshing;
@@ -45,15 +41,9 @@ public Issue16910()
 		{
 			InitializeComponent();
 			UpdateRefreshingLabels();
-			ItemSource =
-				Enumerable.Range(0, 100)
-					.Select(x => new { Text = $"Item {x}", AutomationId = $"Item{x}" })
-					.ToList();
-
-			this.BindingContext = this;
+			BindingContext = this;
 		}
 
-
 		void OnStopRefreshClicked(object sender, EventArgs e)
 		{
 			refreshView.IsRefreshing = false;
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue1905.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue1905.cs
index 3f1865c68c71..561f338634f6 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue1905.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue1905.cs
@@ -1,50 +1,81 @@
-using Microsoft.Maui.Controls.PlatformConfiguration;
+using Microsoft.Maui.Controls.PlatformConfiguration;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
 using ListView = Microsoft.Maui.Controls.ListView;
 
 namespace Maui.Controls.Sample.Issues
 {
+[Issue(IssueTracker.Github, 1905, "Pull to refresh doesn't work if iOS 11 large titles is enabled", PlatformAffected.iOS)]
+public class Issue1905LargeTitles : TestNavigationPage
+{
+protected override void Init()
+{
+// Large titles is the specific trigger for this bug
+On<iOS>().SetPrefersLargeTitles(true);
+
+var statusLabel = new Label
+{
+Text = "Ready",
+AutomationId = "TestResult",
+FontSize = 20,
+};
+
+bool refreshCompleted = false;
+
+var items = new List<string>();
+for (int i = 0; i < 20; i++)
+{
+items.Add($"pull to {i}");
+}
+
+var lst = new ListView
+{
+IsPullToRefreshEnabled = true,
+ItemsSource = items,
+};
+
+lst.RefreshCommand = new Command(async () =>
+{
+await Task.Delay(500);
+lst.ItemsSource = new List<string> { "data refreshed" };
+lst.EndRefresh();
+refreshCompleted = true;
+});
+
+var runButton = new Button
+{
+Text = "Run Test",
+AutomationId = "RunTest",
+};
+
+runButton.Clicked += async (s, e) =>
+{
+statusLabel.Text = "Running...";
+refreshCompleted = false;
+
+// BeginRefresh programmatically — this is what fails with large titles
+lst.BeginRefresh();
+
+// Wait for refresh to complete (max 10s)
+for (int i = 0; i < 20; i++)
+{
+await Task.Delay(500);
+if (refreshCompleted)
+break;
+}
+
+statusLabel.Text = refreshCompleted ? "SUCCESS" : "FAIL: refresh did not complete";
+};
+
+var page = new ContentPage
+{
+Title = "Pull Large Titles",
+Content = new VerticalStackLayout
+{
+Children = { runButton, statusLabel, lst }
+}
+};
 
-	[Issue(IssueTracker.Github, 1905, "Pull to refresh doesn't work if iOS 11 large titles is enabled", PlatformAffected.iOS)]
-	public class Issue1905LargeTitles : TestNavigationPage
-	{
-		protected override void Init()
-		{
-			On<iOS>().SetPrefersLargeTitles(true);
-			var items = new List<string>();
-			for (int i = 0; i < 1000; i++)
-			{
-				items.Add($"pull to {DateTime.Now.Ticks}");
-			}
-			var page = new ContentPage
-			{
-				Title = "Pull Large Titles"
-			};
-
-			var lst = new ListView();
-			lst.IsPullToRefreshEnabled = true;
-			lst.ItemsSource = items;
-			lst.RefreshCommand = new Command(async () =>
-			{
-				var newitems = new List<string>();
-				newitems.Add("data refreshed");
-				await Task.Delay(5000);
-				for (int i = 0; i < 1000; i++)
-				{
-					newitems.Add($"data {DateTime.Now.Ticks} refreshed");
-				}
-				lst.ItemsSource = newitems;
-				lst.EndRefresh();
-			});
-			page.Content = new StackLayout { Children = { lst } };
-			page.Appearing += async (sender, e) =>
-			{
-				await Task.Delay(500);
-				lst.BeginRefresh();
-			};
-			page.ToolbarItems.Add(new ToolbarItem { Text = "Refresh", Command = new Command((obj) => lst.BeginRefresh()), AutomationId = "btnRefresh" });
-			Navigation.PushAsync(page);
-
-		}
-	}
-}
\ No newline at end of file
+Navigation.PushAsync(page);
+}
+}
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue3001.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue3001.cs
index a8ce7368285e..3a4d07e8a565 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue3001.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue3001.cs
@@ -1,66 +1,67 @@
-namespace Maui.Controls.Sample.Issues
+namespace Maui.Controls.Sample.Issues
 {
+[Issue(IssueTracker.Github, 3001, "[macOS] Navigating back from a complex page is highly inefficient", PlatformAffected.macOS)]
+public class Issue3001 : TestContentPage
+{
+const string ButtonId = "ClearButton";
+const string ReadyId = "ReadyLabel";
 
-	[Issue(IssueTracker.Github, 3001, "[macOS] Navigating back from a complex page is highly inefficient", PlatformAffected.macOS)]
-	public class Issue3001 : TestContentPage
-	{
-		const string ButtonId = "ClearButton";
-		const string ReadyId = "ReadyLabel";
-
-		int _counter = 0;
-		int _level = 0;
-		const int maxLevel = 5;
+int _counter = 0;
+int _level = 0;
+// Reduced from 5 to 4 levels: 4^4 = 256 labels instead of 4^5 = 1024
+// Still deep enough to exercise nested disposal, but avoids catalyst timeout
+const int maxLevel = 4;
 
-		public View BuildLevel()
-		{
-			if (_level == maxLevel)
-			{
-				_counter++;
-				return new Label { Text = _counter.ToString(), FontSize = 10 };
-			}
+public View BuildLevel()
+{
+if (_level == maxLevel)
+{
+_counter++;
+return new Label { Text = _counter.ToString(), FontSize = 10 };
+}
 
-			_level++;
-			var g1 = new Grid { RowSpacing = 0, ColumnSpacing = 0 };
+_level++;
+var g1 = new Grid { RowSpacing = 0, ColumnSpacing = 0 };
 
-			var g2 = new Grid { RowSpacing = 0, ColumnSpacing = 0 };
-			g1.Children.Add(g2);
+var g2 = new Grid { RowSpacing = 0, ColumnSpacing = 0 };
+g1.Children.Add(g2);
 
-			var g = new Grid { RowSpacing = 0, ColumnSpacing = 0 };
-			g2.Children.Add(g);
+var g = new Grid { RowSpacing = 0, ColumnSpacing = 0 };
+g2.Children.Add(g);
 
-			g.RowDefinitions.Add(new RowDefinition { Height = GridLength.Star });
-			g.RowDefinitions.Add(new RowDefinition { Height = GridLength.Star });
-			g.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Star });
-			g.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Star });
+g.RowDefinitions.Add(new RowDefinition { Height = GridLength.Star });
+g.RowDefinitions.Add(new RowDefinition { Height = GridLength.Star });
+g.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Star });
+g.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Star });
 
-			g.Add(BuildLevel(), 0, 0);
-			g.Add(BuildLevel(), 0, 1);
-			g.Add(BuildLevel(), 1, 0);
-			g.Add(BuildLevel(), 1, 1);
+g.Add(BuildLevel(), 0, 0);
+g.Add(BuildLevel(), 0, 1);
+g.Add(BuildLevel(), 1, 0);
+g.Add(BuildLevel(), 1, 1);
 
-			_level--;
+_level--;
 
-			return g1;
-		}
+return g1;
+}
 
-		protected override void Init()
-		{
-			var sp = new StackLayout();
-			sp.Children.Add(new Button
-			{
-				Text = "Start",
-				AutomationId = ButtonId,
-				Command = new Command(() =>
-				{
-					Content = new Label
-					{
-						Text = "Ready",
-						AutomationId = ReadyId
-					};
-				})
-			});
-			sp.Children.Add(BuildLevel());
-			Content = sp;
-		}
-	}
+protected override void Init()
+{
+var sp = new StackLayout();
+sp.Children.Add(new Button
+{
+Text = "Start",
+AutomationId = ButtonId,
+Command = new Command(() =>
+{
+Content = new Label
+{
+Text = "Ready",
+AutomationId = ReadyId
+};
+})
+});
+sp.Children.Add(BuildLevel());
+Content = sp;
+}
+}
 }
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue3275.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue3275.cs
index 479a766af525..7cd7c65bfa28 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue3275.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue3275.cs
@@ -1,9 +1,8 @@
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 using System.Windows.Input;
 
 namespace Maui.Controls.Sample.Issues
 {
-
 	[Issue(IssueTracker.Github, 3275, "For ListView in Recycle mode ScrollTo causes cell leak and in some cases NRE", PlatformAffected.iOS)]
 	public class Issue3275 : NavigationPage
 	{
@@ -14,11 +13,16 @@ public Issue3275() : base(new MainPage())
 		public class MainPage : ContentPage
 		{
 			static readonly string BtnLeakId = "btnLeak";
-			static readonly string BtnScrollToId = "btnScrollTo";
+			Label _statusLabel;
 
 			public MainPage()
 			{
-				var layout = new StackLayout();
+				_statusLabel = new Label
+				{
+					Text = "Ready",
+					AutomationId = "TestResult",
+					FontSize = 20,
+				};
 
 				var btn = new Button
 				{
@@ -26,189 +30,109 @@ public MainPage()
 					AutomationId = BtnLeakId,
 					Command = new Command(() =>
 					{
-						Navigation.PushAsync(new Issue3275TransactionsPage1());
+						_statusLabel.Text = "Navigated";
+						Navigation.PushAsync(new TransactionsPage());
 					})
 				};
-				layout.Children.Add(btn);
-				Content = layout;
-			}
 
-
-
-			public class Issue3275TransactionsPage1 : ContentPage
-			{
-				private readonly TransactionsViewModel _viewModel = new TransactionsViewModel();
-				FastListView _transactionsListView;
-
-				public Issue3275TransactionsPage1()
+				Content = new VerticalStackLayout
 				{
-					var grd = new Grid();
-					grd.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
-					grd.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
-					grd.RowDefinitions.Add(new RowDefinition());
-					_transactionsListView = new FastListView
-					{
-						HasUnevenRows = true,
-						ItemTemplate = new DataTemplate(() =>
-						{
-							var viewCell = new ViewCell();
-							var item = new MenuItem
-							{
-								Text = "test"
-							};
-							item.SetBinding(MenuItem.CommandProperty, new Binding("BindingContext.RepeatCommand", source: _transactionsListView));
-							item.SetBinding(MenuItem.CommandParameterProperty, new Binding("."));
-							viewCell.ContextActions.Add(item);
-							var lbl = new Label();
-							lbl.SetBinding(Label.TextProperty, "Name");
-							viewCell.View = lbl;
-							return viewCell;
-						})
-					};
-					_transactionsListView.SetBinding(ListView.ItemsSourceProperty, "Items");
-
-					grd.Children.Add(new Label
-					{
-						Text = "Click 'Scroll To' and go back"
-					});
-
-					var btn = new Button
-					{
-						Text = "Scroll to",
-						AutomationId = BtnScrollToId,
-						Command = new Command(() =>
-						{
-							var item = _viewModel.Items.Skip(250).First();
-							_transactionsListView.ScrollTo(item, ScrollToPosition.MakeVisible, false);
-						})
-					};
-
-					Grid.SetRow(btn, 1);
-					grd.Children.Add(btn);
-					Grid.SetRow(_transactionsListView, 2);
-					grd.Children.Add(_transactionsListView);
-
-					Content = grd;
-
-
-					BindingContext = _viewModel;
-				}
-
-				protected override void OnDisappearing()
-				{
-					BindingContext = null; // IMPORTANT!!! Prism.Forms does this under the hood
-				}
+					Spacing = 10,
+					Padding = 20,
+					Children = { btn, _statusLabel }
+				};
 			}
 
-			public sealed class FastListView : ListView
+			protected override void OnAppearing()
 			{
-				public FastListView() : base(ListViewCachingStrategy.RecycleElement)
+				base.OnAppearing();
+				// If we returned from the TransactionsPage without crashing, the test passed.
+				// The original bug causes an NRE crash during back navigation when
+				// OnDisappearing nulls BindingContext on recycled cells with ContextActions.
+				if (_statusLabel.Text == "Navigated")
 				{
+					_statusLabel.Text = "SUCCESS";
 				}
 			}
+		}
 
-			public class TransactionsViewModel
-			{
-				public TransactionsViewModel()
-				{
-					var items = Enumerable.Range(1, 500).Select(i => new Item { Name = i.ToString() });
-
-					Items = new ObservableCollection<Item>(items);
-
-					RepeatCommand = new AsyncDelegateCommand<object>(Repeat, x => true);
-				}
-
-				public ObservableCollection<Item> Items { get; }
-
-				public AsyncDelegateCommand<object> RepeatCommand { get; }
-
-				private Task Repeat(object item)
-				{
-					return Task.CompletedTask;
-				}
-			}
-
-			public class Item
-			{
-				public string Name { get; set; }
-			}
+		public class TransactionsPage : ContentPage
+		{
+			static readonly string BtnScrollToId = "btnScrollTo";
+			readonly TransactionsViewModel _viewModel = new();
+			readonly FastListView _listView;
 
-			public sealed class AsyncDelegateCommand<T> : ICommand
+			public TransactionsPage()
 			{
-#pragma warning disable 0067
-				public event EventHandler CanExecuteChanged;
-#pragma warning restore 0067
-
-				private readonly Func<T, Task> _executeMethod;
-				private readonly Func<T, bool> _canExecuteMethod;
-				private bool _isInFlight;
-
-#if XAMARIN
-		private DateTime _lastExecuted = DateTime.MinValue;
-#endif
-
-				public AsyncDelegateCommand(Func<T, Task> executeMethod)
-					: this(executeMethod, _ => true)
-				{
-				}
-
-				public AsyncDelegateCommand(Func<T, Task> executeMethod, Func<T, bool> canExecuteMethod)
+				Title = "Transactions";
+				_listView = new FastListView
 				{
-					var genericType = typeof(T);
-
-					// DelegateCommand allows object or Nullable<>.  
-					// note: Nullable<> is a struct so we cannot use a class constraint.
-					if (genericType.IsValueType)
+					HasUnevenRows = true,
+					ItemTemplate = new DataTemplate(() =>
 					{
-						if (!genericType.IsGenericType || !typeof(Nullable<>).IsAssignableFrom(genericType.GetGenericTypeDefinition()))
-							throw new InvalidCastException("T for DelegateCommand<T> is not an object nor Nullable.");
-					}
-
-					_executeMethod = executeMethod;
-					_canExecuteMethod = canExecuteMethod;
-				}
+						var viewCell = new ViewCell();
+						// ContextActions with command bindings back to ListView's BindingContext
+						// are part of the original leak/NRE surface area
+						var item = new MenuItem { Text = "test" };
+						item.SetBinding(MenuItem.CommandProperty, new Binding("BindingContext.RepeatCommand", source: _listView));
+						item.SetBinding(MenuItem.CommandParameterProperty, new Binding("."));
+						viewCell.ContextActions.Add(item);
+						var lbl = new Label();
+						lbl.SetBinding(Label.TextProperty, "Name");
+						viewCell.View = lbl;
+						return viewCell;
+					})
+				};
+				_listView.SetBinding(ListView.ItemsSourceProperty, "Items");
 
-				internal async Task Execute(T parameter)
+				var btn = new Button
 				{
-					if (_isInFlight)
-						return;
-
-#if XAMARIN
-			if (DateTime.UtcNow.Subtract(_lastExecuted).TotalMilliseconds < 200d)
-				return;
-#endif
-
-					try
-					{
-						_isInFlight = true;
-
-						await _executeMethod(parameter);
-					}
-					finally
+					Text = "Scroll to",
+					AutomationId = BtnScrollToId,
+					Command = new Command(() =>
 					{
-						_isInFlight = false;
+						var item = _viewModel.Items.Skip(25).First();
+						_listView.ScrollTo(item, ScrollToPosition.MakeVisible, false);
+					})
+				};
 
-#if XAMARIN
-				_lastExecuted = DateTime.UtcNow;
-#endif
-					}
-				}
+				var grid = new Grid();
+				grid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
+				grid.RowDefinitions.Add(new RowDefinition());
+				grid.Children.Add(btn);
+				Grid.SetRow(_listView, 1);
+				grid.Children.Add(_listView);
+				Content = grid;
+				BindingContext = _viewModel;
+			}
 
-				internal bool CanExecute(T parameter)
-				{
-					return _canExecuteMethod(parameter);
-				}
+			protected override void OnDisappearing()
+			{
+				BindingContext = null; // IMPORTANT!!! Prism.Forms does this under the hood
+			}
+		}
 
-				public void Execute(object parameter)
-				{
-					//Execute((T)parameter).NotWait();
-				}
+		public sealed class FastListView : ListView
+		{
+			public FastListView() : base(ListViewCachingStrategy.RecycleElement) { }
+		}
 
-				public bool CanExecute(object parameter)
-				{
-					return CanExecute((T)parameter);
-				}
+		public class TransactionsViewModel
+		{
+			public TransactionsViewModel()
+			{
+				Items = new ObservableCollection<Item>(
+					Enumerable.Range(1, 50).Select(i => new Item { Name = i.ToString() }));
+				RepeatCommand = new Command(_ => { });
 			}
+
+			public ObservableCollection<Item> Items { get; }
+			public ICommand RepeatCommand { get; }
+		}
+
+		public class Item
+		{
+			public string Name { get; set; }
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla57910.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla57910.cs
index cd2fe3ce4b4a..cfa008da8048 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla57910.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla/Bugzilla57910.cs
@@ -22,9 +22,9 @@ public void Bugzilla57910Test()
 		{
 			for (int i = 0; i < 10; i++)
 			{
-				App.WaitForElement(ButtonId);
+				App.WaitForElement(ButtonId, timeout: TimeSpan.FromSeconds(45));
 				App.Tap(ButtonId);
-				App.WaitForElement(Button2Id);
+				App.WaitForElement(Button2Id, timeout: TimeSpan.FromSeconds(45));
 				App.Tap(Button2Id);
 			}
 		}
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue16910.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue16910.cs
index c77a2c0bcac6..e324286c8641 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue16910.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue16910.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using NUnit.Framework;
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
@@ -17,26 +16,33 @@ public Issue16910(TestDevice device)
 
 	}
 
+	// On MacCatalyst, each Appium FindElement call takes ~76s because the mac2 driver
+	// walks the entire accessibility tree. With RunWithTimeout capping commands at 45s,
+	// the test reliably times out. On main (without RunWithTimeout), the same test takes
+	// ~1m16s per run but eventually succeeds because nothing caps the HTTP call.
+	// See: build 1299547 (main) vs build 1306375 (this PR) for timing comparison.
+#if TEST_FAILS_ON_CATALYST
 	[Test]
 	public void BindingUpdatesFromProgrammaticRefresh()
 	{
-		_ = App.WaitForElement("StartRefreshing");
+		App.WaitForElement("StartRefreshing", timeout: TimeSpan.FromSeconds(45));
 		App.Tap("StartRefreshing");
-		App.WaitForElement("IsRefreshing");
+		App.WaitForElement("IsRefreshing", timeout: TimeSpan.FromSeconds(45));
 		App.Tap("StopRefreshing");
-		App.WaitForElement("IsNotRefreshing");
+		App.WaitForElement("IsNotRefreshing", timeout: TimeSpan.FromSeconds(45));
 	}
+#endif
 
 #if TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_WINDOWS // Failing on Mac and Windows. Flaky Test. More information: https://github.com/dotnet/maui/issues/28368
 	[Test]
 	public void BindingUpdatesFromInteractiveRefresh()
 	{
-		var collectionViewRect = App.WaitForElement("CollectionView").GetRect();
+		var scrollViewRect = App.WaitForElement("RefreshScrollView", timeout: TimeSpan.FromSeconds(45)).GetRect();
 		//In CI, using App.ScrollDown sometimes fails to trigger the refresh command, so here use DragCoordinates instead of the ScrollDown action in Appium.
-		App.DragCoordinates(collectionViewRect.CenterX(), collectionViewRect.Y + 50, collectionViewRect.CenterX(), collectionViewRect.Y + collectionViewRect.Height - 50);
-		App.WaitForElement("IsRefreshing");
+		App.DragCoordinates(scrollViewRect.CenterX(), scrollViewRect.Y + 50, scrollViewRect.CenterX(), scrollViewRect.Y + scrollViewRect.Height - 50);
+		App.WaitForElement("IsRefreshing", timeout: TimeSpan.FromSeconds(45));
 		App.Tap("StopRefreshing");
-		App.WaitForElement("IsNotRefreshing");
+		App.WaitForElement("IsNotRefreshing", timeout: TimeSpan.FromSeconds(45));
 	}
 #endif
 }
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue1905.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue1905.cs
index 7d3403d6e0b7..1e737029f34c 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue1905.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue1905.cs
@@ -16,8 +16,16 @@ public Issue1905(TestDevice testDevice) : base(testDevice)
 		[Category(UITestCategories.ListView)]
 		public void TestIssue1905RefreshShows()
 		{
-			App.WaitForElement("Refresh");
-			App.WaitForElement("data refreshed");
+			// Self-verifying: tap Run Test, the app calls BeginRefresh() on a ListView
+			// and verifies the RefreshCommand executes. Original bug: refresh doesn't
+			// trigger when large titles are enabled.
+			App.WaitForElement("RunTest");
+			App.Tap("RunTest");
+
+			// Wait for the refresh cycle to complete, then check the result
+			Task.Delay(5000).Wait();
+			var result = App.FindElement("TestResult").GetText();
+			Assert.That(result, Is.EqualTo("SUCCESS"), $"Test reported: {result}");
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue3001.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue3001.cs
index c80398dfd4b7..5958af1f522f 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue3001.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue3001.cs
@@ -19,8 +19,8 @@ public Issue3001(TestDevice testDevice) : base(testDevice)
 	[Category(UITestCategories.Navigation)]
 	public void Issue3001Test()
 	{
-		App.WaitForElement(ButtonId);
+		App.WaitForElement(ButtonId, timeout: TimeSpan.FromSeconds(15));
 		App.Tap(ButtonId);
-		App.WaitForElement(ReadyId, timeout: TimeSpan.FromSeconds(5));
+		App.WaitForElement(ReadyId, timeout: TimeSpan.FromSeconds(15));
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue3275.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue3275.cs
index 7f8a18fa5dd9..7eadd06792f6 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue3275.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue3275.cs
@@ -6,9 +6,6 @@ namespace Microsoft.Maui.TestCases.Tests.Issues
 {
 	public class Issue3275 : _IssuesUITest
 	{
-		readonly string BtnLeakId = "btnLeak";
-		readonly string BtnScrollToId = "btnScrollTo";
-
 		public Issue3275(TestDevice testDevice) : base(testDevice)
 		{
 		}
@@ -19,12 +16,23 @@ public Issue3275(TestDevice testDevice) : base(testDevice)
 		[Category(UITestCategories.ListView)]
 		public void Issue3275Test()
 		{
-			App.WaitForElement(BtnLeakId);
-			App.Tap(BtnLeakId);
-			App.WaitForElement(BtnScrollToId);
-			App.Tap(BtnScrollToId);
+			// Navigate into TransactionsPage via NavigationPage.PushAsync
+			App.WaitForElement("btnLeak");
+			App.Tap("btnLeak");
+
+			// Scroll to trigger cell recycling (the leak/NRE surface area)
+			App.WaitForElement("btnScrollTo");
+			App.Tap("btnScrollTo");
+
+			// Navigate back — this triggers OnDisappearing which nulls BindingContext,
+			// causing NRE on recycled cells with ContextAction command bindings if bug is present.
+			// If the app crashes, the next WaitForElement will fail with app-not-running.
 			App.TapBackArrow();
-			App.WaitForElement(BtnLeakId);
+
+			// Verify we returned to MainPage — OnAppearing sets TestResult to SUCCESS
+			App.WaitForElement("TestResult", timeout: TimeSpan.FromSeconds(10));
+			var result = App.FindElement("TestResult").GetText();
+			Assert.That(result, Is.EqualTo("SUCCESS"), $"Test reported: {result}");
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/Issue7678_1.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/Issue7678_1.cs
index 561f79373d79..8d21006dfcf1 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/Issue7678_1.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/Issue7678_1.cs
@@ -15,9 +15,9 @@ public Issue7678_1(TestDevice device) : base(device)
 		[Category(UITestCategories.CarouselView)]
 		public void VerifyCarouselViewBindingAndRendering()
 		{
-			App.WaitForElement("carouselView", timeout: TimeSpan.FromSeconds(2));
+			App.WaitForElement("carouselView", timeout: TimeSpan.FromSeconds(45));
 			// In source level, the data populate with some delay, so we need to timeout for the element to be present.
-			App.WaitForElementTillPageNavigationSettled("1", timeout: TimeSpan.FromSeconds(2));
+			App.WaitForElementTillPageNavigationSettled("1", timeout: TimeSpan.FromSeconds(45));
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/ShellSearchHandlerItemSizing.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/ShellSearchHandlerItemSizing.cs
index ac6e905144cf..77ce22ef3e5c 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/ShellSearchHandlerItemSizing.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/ShellSearchHandlerItemSizing.cs
@@ -17,9 +17,9 @@ public ShellSearchHandlerItemSizing(TestDevice testDevice) : base(testDevice)
 	[Category(UITestCategories.Shell)]
 	public void SearchHandlerSizesCorrectly()
 	{
-		App.WaitForElement("Instructions");
+		App.WaitForElement("Instructions", timeout: TimeSpan.FromSeconds(45));
 		App.EnterText(AppiumQuery.ByXPath("//XCUIElementTypeSearchField"), "Hello");
-		var contentSize = App.WaitForElement("searchresult").GetRect();
+		var contentSize = App.WaitForElement("searchresult", timeout: TimeSpan.FromSeconds(45)).GetRect();
 		Assert.That(contentSize.Height, Is.LessThan(100));
 	}
 #endif
diff --git a/src/Controls/tests/TestCases.Shared.Tests/UITest.cs b/src/Controls/tests/TestCases.Shared.Tests/UITest.cs
index 6a1e4c97c2d9..a099814b09df 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/UITest.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/UITest.cs
@@ -103,6 +103,13 @@ public override IConfig GetTestConfig()
 					
 					config.SetProperty("Headless", bool.Parse(Environment.GetEnvironmentVariable("HEADLESS") ?? "false"));
 					break;
+				case TestDevice.Mac:
+					var macAppPath = Environment.GetEnvironmentVariable("MAC_APP_PATH") ?? "";
+					if (!string.IsNullOrEmpty(macAppPath))
+					{
+						config.SetProperty("AppPath", macAppPath);
+					}
+					break;
 				case TestDevice.Windows:
 					var appProjectFolder = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!, "..\\..\\..\\Controls.TestCases.HostApp");
 					var windowsExe = "Controls.TestCases.HostApp.exe";
diff --git a/src/TestUtils/src/UITest.Appium/Actions/AppiumLifecycleActions.cs b/src/TestUtils/src/UITest.Appium/Actions/AppiumLifecycleActions.cs
index c754901a0f20..443babdf83d6 100644
--- a/src/TestUtils/src/UITest.Appium/Actions/AppiumLifecycleActions.cs
+++ b/src/TestUtils/src/UITest.Appium/Actions/AppiumLifecycleActions.cs
@@ -1,4 +1,5 @@
-using OpenQA.Selenium.Appium.iOS;
+using System.Diagnostics;
+using OpenQA.Selenium.Appium.iOS;
 using OpenQA.Selenium.Appium.Windows;
 using UITest.Core;
 
@@ -11,6 +12,7 @@ public class AppiumLifecycleActions : ICommandExecutionGroup
 		const string ForegroundAppCommand = "foregroundApp";
 		const string ResetAppCommand = "resetApp";
 		const string CloseAppCommand = "closeApp";
+		const string ForceCloseAppCommand = "forceCloseApp";
 		const string BackCommand = "back";
 		const string RefreshCommand = "refresh";
 
@@ -23,6 +25,7 @@ public class AppiumLifecycleActions : ICommandExecutionGroup
 			BackgroundAppCommand,
 			ResetAppCommand,
 			CloseAppCommand,
+			ForceCloseAppCommand,
 			BackCommand,
 			RefreshCommand
 		};
@@ -46,6 +49,7 @@ public CommandResponse Execute(string commandName, IDictionary<string, object> p
 				BackgroundAppCommand => BackgroundApp(parameters),
 				ResetAppCommand => ResetApp(parameters),
 				CloseAppCommand => CloseApp(parameters),
+				ForceCloseAppCommand => ForceCloseApp(parameters),
 				BackCommand => Back(parameters),
 				RefreshCommand => Refresh(parameters),
 				_ => CommandResponse.FailedEmptyResponse,
@@ -152,44 +156,150 @@ CommandResponse CloseApp(IDictionary<string, object> parameters)
 			}
 			catch (Exception)
 			{
-				// TODO: Pass in logger so we can log these exceptions
+				// App might be too locked up to even report state — try force close
+				return ForceCloseApp(parameters);
+			}
+
+			// Try normal Appium termination with a timeout to prevent hanging when app is unresponsive
+			try
+			{
+				var closeTask = Task.Run(() =>
+				{
+					if (_app.GetTestDevice() == TestDevice.Mac)
+					{
+						_app.Driver.ExecuteScript("macos: terminateApp", new Dictionary<string, object>
+						{
+							{ "bundleId", _app.GetAppId() },
+						});
+					}
+					else if (_app.Driver is WindowsDriver windowsDriver)
+					{
+						windowsDriver.CloseApp();
+					}
+					else
+					{
+						_app.Driver.TerminateApp(_app.GetAppId());
+					}
+				});
 
-				// Occasionally the app seems to get so locked up it can't 
-				// even report back the appstate. In that case, we'll just
-				// try to trigger a reset.
+				if (closeTask.Wait(TimeSpan.FromSeconds(15)))
+				{
+					return CommandResponse.SuccessEmptyResponse;
+				}
+
+				// Normal close timed out — app is likely unresponsive, use force close
+				Debug.WriteLine(">>>>> CloseApp timed out after 15s, falling back to ForceCloseApp");
+			}
+			catch (Exception ex)
+			{
+				// Normal close failed — fall through to force close
+				Debug.WriteLine($">>>>> CloseApp threw an exception, falling back to ForceCloseApp: {ex.Message}");
 			}
 
+			return ForceCloseApp(parameters);
+		}
+
+		/// <summary>
+		/// Force-terminates the app using platform-specific OS commands.
+		/// This bypasses Appium/WDA which may be stuck waiting for the app to become idle.
+		/// Use when the app is unresponsive (e.g., stuck in an infinite layout loop).
+		/// </summary>
+		CommandResponse ForceCloseApp(IDictionary<string, object> parameters)
+		{
 			try
 			{
-				if (_app.GetTestDevice() == TestDevice.Mac)
+				var appId = _app.GetAppId();
+				var testDevice = _app.GetTestDevice();
+
+				if (testDevice == TestDevice.iOS)
 				{
-					_app.Driver.ExecuteScript("macos: terminateApp", new Dictionary<string, object>
+					var udid = _app.Config.GetProperty<string>("Udid");
+					if (!string.IsNullOrEmpty(udid))
 					{
-						{ "bundleId", _app.GetAppId() },
+						Debug.WriteLine($">>>>> ForceCloseApp: xcrun simctl terminate {udid} {appId}");
+						using var process = Process.Start(new ProcessStartInfo
+						{
+							FileName = "xcrun",
+							ArgumentList = { "simctl", "terminate", udid, appId },
+							RedirectStandardOutput = true,
+							RedirectStandardError = true,
+							UseShellExecute = false,
+						});
+						if (process is not null && !process.WaitForExit(10000))
+						{
+							Debug.WriteLine(">>>>> ForceCloseApp: xcrun simctl terminate timed out, killing process");
+							try { process.Kill(); } catch { }
+						}
+						return CommandResponse.SuccessEmptyResponse;
+					}
+					else
+					{
+						Debug.WriteLine(">>>>> ForceCloseApp: iOS UDID not available, cannot force-terminate via simctl");
+					}
+				}
+				else if (testDevice == TestDevice.Android)
+				{
+					Debug.WriteLine($">>>>> ForceCloseApp: adb shell am force-stop {appId}");
+					using var process = Process.Start(new ProcessStartInfo
+					{
+						FileName = "adb",
+						ArgumentList = { "shell", "am", "force-stop", appId },
+						RedirectStandardOutput = true,
+						RedirectStandardError = true,
+						UseShellExecute = false,
 					});
+					if (process is not null && !process.WaitForExit(10000))
+					{
+						Debug.WriteLine(">>>>> ForceCloseApp: adb force-stop timed out, killing process");
+						try { process.Kill(); } catch { }
+					}
+					return CommandResponse.SuccessEmptyResponse;
 				}
-				else if (_app.Driver is WindowsDriver windowsDriver)
+				else if (testDevice == TestDevice.Mac)
 				{
-					// This is still here for now, but it looks like it will get removed just like
-					// LaunchApp was in 5.0.0, in which case we may need to use:
-					// windowsDriver.ExecuteScript("windows: closeApp", [_app.GetAppId()]);
-					windowsDriver.CloseApp();
+					// Use pkill -9 instead of osascript "tell app to quit" because a hung app
+					// won't process the cooperative Apple Event from osascript.
+					Debug.WriteLine($">>>>> ForceCloseApp: macOS force-kill for {appId}");
+					using var process = Process.Start(new ProcessStartInfo
+					{
+						FileName = "pkill",
+						ArgumentList = { "-9", "-f", appId },
+						RedirectStandardOutput = true,
+						RedirectStandardError = true,
+						UseShellExecute = false,
+					});
+					if (process is not null && !process.WaitForExit(10000))
+					{
+						Debug.WriteLine(">>>>> ForceCloseApp: pkill timed out, killing process");
+						try { process.Kill(); } catch { }
+					}
+					return CommandResponse.SuccessEmptyResponse;
 				}
-				else
+				else if (testDevice == TestDevice.Windows)
 				{
-					_app.Driver.TerminateApp(_app.GetAppId());
+					Debug.WriteLine($">>>>> ForceCloseApp: Windows taskkill for {appId}");
+					using var process = Process.Start(new ProcessStartInfo
+					{
+						FileName = "taskkill",
+						ArgumentList = { "/F", "/IM", $"{appId}.exe" },
+						RedirectStandardOutput = true,
+						RedirectStandardError = true,
+						UseShellExecute = false,
+					});
+					if (process is not null && !process.WaitForExit(10000))
+					{
+						Debug.WriteLine(">>>>> ForceCloseApp: taskkill timed out, killing process");
+						try { process.Kill(); } catch { }
+					}
+					return CommandResponse.SuccessEmptyResponse;
 				}
 			}
-			catch (Exception)
+			catch (Exception ex)
 			{
-				// TODO Pass in logger so we can log these exceptions
-
-				// Occasionally the app seems like it's already closed before we get here
-				// and then this throws an exception.
-				return CommandResponse.FailedEmptyResponse;
+				Debug.WriteLine($">>>>> ForceCloseApp failed: {ex.Message}");
 			}
 
-			return CommandResponse.SuccessEmptyResponse;
+			return CommandResponse.FailedEmptyResponse;
 		}
 
 		CommandResponse Back(IDictionary<string, object> parameters)
diff --git a/src/TestUtils/src/UITest.Appium/AppiumCatalystApp.cs b/src/TestUtils/src/UITest.Appium/AppiumCatalystApp.cs
index 8e198e70448e..00d50a645452 100644
--- a/src/TestUtils/src/UITest.Appium/AppiumCatalystApp.cs
+++ b/src/TestUtils/src/UITest.Appium/AppiumCatalystApp.cs
@@ -59,12 +59,22 @@ private static AppiumOptions GetOptions(IConfig config)
 			var options = new AppiumOptions();
 			SetGeneralAppiumOptions(config, options);
 
+			var appPath = config.GetProperty<string>("AppPath");
 			var appId = config.GetProperty<string>("AppId");
+
+			// Always set bundleId for app lifecycle management (queryAppState, etc.)
 			if (!string.IsNullOrWhiteSpace(appId))
 			{
 				options.AddAdditionalAppiumOption(IOSMobileCapabilityType.BundleId, appId);
 			}
 
+			// Also set app path if available — mac2 driver needs this to
+			// launch unregistered apps that aren't in LaunchServices
+			if (!string.IsNullOrEmpty(appPath))
+			{
+				options.App = appPath;
+			}
+
 			var args = config.GetProperty<Dictionary<string, string>>("TestConfigurationArgs");
 			if(args is not null && args.Count > 0)
 			{
diff --git a/src/TestUtils/src/UITest.Appium/HelperExtensions.cs b/src/TestUtils/src/UITest.Appium/HelperExtensions.cs
index 64a80e5f1f07..a2a1f5059307 100644
--- a/src/TestUtils/src/UITest.Appium/HelperExtensions.cs
+++ b/src/TestUtils/src/UITest.Appium/HelperExtensions.cs
@@ -1,6 +1,7 @@
 using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
+using System.Runtime.ExceptionServices;
 using System.Drawing;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Appium;
@@ -17,6 +18,13 @@ public static class HelperExtensions
 	{
 		static TimeSpan DefaultTimeout = TimeSpan.FromSeconds(15);
 
+		// Maximum time to wait for a single Appium command before assuming the app is unresponsive.
+		// This prevents tests from hanging indefinitely when the app enters an infinite loop
+		// (e.g., layout cycle) that blocks the UI thread and makes WDA wait forever for app idle.
+		// 45 seconds balances avoiding false positives on slow CI (normal operations: 10-30s)
+		// while still failing reasonably fast when the app is truly frozen.
+		static readonly TimeSpan AppiumCommandTimeout = TimeSpan.FromSeconds(45);
+
 		/// <summary>
 		/// For desktop, this will perform a mouse click on the target element.
 		/// For mobile, this will tap the element.
@@ -25,7 +33,7 @@ public static class HelperExtensions
 		/// <param name="element">Target Element.</param>
 		public static void Tap(this IApp app, string element)
 		{
-			FindElement(app, element).Click();
+			RunWithTimeout(() => FindElement(app, element).Click());
 		}
 
 		/// <summary>
@@ -36,7 +44,7 @@ public static void Tap(this IApp app, string element)
 		/// <param name="query">Represents the query that identify an element by parameters such as type, text it contains or identifier.</param>
 		public static void Tap(this IApp app, IQuery query)
 		{
-			app.FindElement(query).Tap();
+			RunWithTimeout(() => app.FindElement(query).Tap());
 		}
 
 		/// <summary>
@@ -46,7 +54,7 @@ public static void Tap(this IApp app, IQuery query)
 		/// <param name="element">Target Element.</param>
 		public static void Click(this IApp app, string element)
 		{
-			FindElement(app, element).Click();
+			RunWithTimeout(() => FindElement(app, element).Click());
 		}
 
 		/// <summary>
@@ -56,7 +64,7 @@ public static void Click(this IApp app, string element)
 		/// <param name="query">Represents the query that identify an element by parameters such as type, text it contains or identifier.</param>
 		public static void Click(this IApp app, IQuery query)
 		{
-			app.FindElement(query).Click();
+			RunWithTimeout(() => app.FindElement(query).Click());
 		}
 
 		public static void RightClick(this IApp app, string element)
@@ -113,11 +121,14 @@ public static void PressDown(this IApp app, string element)
 
 		public static string? GetText(this IUIElement element)
 		{
-			var response = element.Command.Execute("getText", new Dictionary<string, object>()
+			return RunWithTimeout(() =>
 			{
-				{ "element", element },
+				var response = element.Command.Execute("getText", new Dictionary<string, object>()
+				{
+					{ "element", element },
+				});
+				return (string?)response.Value;
 			});
-			return (string?)response.Value;
 		}
 
 		public static bool TryGetText(this IUIElement element, [NotNullWhen(true)] out string? text)
@@ -139,27 +150,33 @@ public static bool TryGetText(this IUIElement element, [NotNullWhen(true)] out s
 
 		public static T? GetAttribute<T>(this IUIElement element, string attributeName)
 		{
-			var response = element.Command.Execute("getAttribute", new Dictionary<string, object>()
+			return RunWithTimeout(() =>
 			{
-				{ "element", element },
-				{ "attributeName", attributeName },
+				var response = element.Command.Execute("getAttribute", new Dictionary<string, object>()
+				{
+					{ "element", element },
+					{ "attributeName", attributeName },
+				});
+				return (T?)response.Value;
 			});
-			return (T?)response.Value;
 		}
 
 		public static Rectangle GetRect(this IUIElement element)
 		{
-			var response = element.Command.Execute("getRect", new Dictionary<string, object>()
+			return RunWithTimeout(() =>
 			{
-				{ "element", element },
-			});
+				var response = element.Command.Execute("getRect", new Dictionary<string, object>()
+				{
+					{ "element", element },
+				});
 
-			if (response?.Value != null)
-			{
-				return (Rectangle)response.Value;
-			}
+				if (response?.Value != null)
+				{
+					return (Rectangle)response.Value;
+				}
 
-			throw new InvalidOperationException($"Could not get Rect of element");
+				throw new InvalidOperationException($"Could not get Rect of element");
+			})!;
 		}
 
 		/// <summary>
@@ -169,17 +186,20 @@ public static Rectangle GetRect(this IUIElement element)
 		/// <returns>Whether the element is selected (boolean).</returns>
 		public static bool IsSelected(this IUIElement element)
 		{
-			var response = element.Command.Execute("getSelected", new Dictionary<string, object>()
+			return RunWithTimeout(() =>
 			{
-				{ "element", element },
-			});
+				var response = element.Command.Execute("getSelected", new Dictionary<string, object>()
+				{
+					{ "element", element },
+				});
 
-			if (response?.Value != null)
-			{
-				return (bool)response.Value;
-			}
+				if (response?.Value != null)
+				{
+					return (bool)response.Value;
+				}
 
-			throw new InvalidOperationException($"Could not get Selected of element");
+				throw new InvalidOperationException($"Could not get Selected of element");
+			});
 		}
 
 		/// <summary>
@@ -2723,6 +2743,18 @@ static IUIElement Wait(Func<IUIElement?> query,
 			return result!;
 		}
 
+		/// <summary>
+		/// Returns the smaller of the remaining time and <see cref="AppiumCommandTimeout"/>,
+		/// with a minimum floor of 2 seconds to avoid near-zero timeouts on edge cases.
+		/// </summary>
+		static TimeSpan CapTimeout(TimeSpan totalTimeout, DateTime start)
+		{
+			var remaining = totalTimeout - (DateTime.Now - start);
+			if (remaining < TimeSpan.FromSeconds(2))
+				remaining = TimeSpan.FromSeconds(2);
+			return remaining < AppiumCommandTimeout ? remaining : AppiumCommandTimeout;
+		}
+
 		static IUIElement WaitForAtLeastOne(Func<IUIElement> query,
 			string? timeoutMessage = null,
 			TimeSpan? timeout = null,
@@ -2912,5 +2944,57 @@ static double GetIOSDisplayDensity(AppiumIOSApp iOSApp)
 
 			return 1.0;
 		}
+
+		/// <summary>
+		/// Executes a function with a timeout to prevent tests from hanging indefinitely
+		/// when the application becomes unresponsive (e.g., due to an infinite layout loop).
+		/// WDA (WebDriverAgent) waits for the app's main thread to be idle before executing
+		/// commands — if the app is stuck in an infinite loop, WDA blocks forever. This wrapper
+		/// runs the command on a background thread and enforces a hard timeout.
+		/// </summary>
+		static T? RunWithTimeout<T>(Func<T?> action, TimeSpan? timeout = null)
+		{
+			timeout ??= AppiumCommandTimeout;
+			using var cts = new CancellationTokenSource();
+			var task = Task.Run(action, cts.Token);
+			try
+			{
+				if (!task.Wait(timeout.Value))
+				{
+					// Signal cancellation (Appium driver won't respect it, but good hygiene)
+					cts.Cancel();
+					
+					// Warn about orphaned thread - the background task will continue blocking until
+					// the underlying Appium/WDA call times out or the process is killed
+					Debug.WriteLine($">>>>> Appium command timed out after {timeout.Value.TotalSeconds}s. Background thread may remain blocked until app is force-terminated.");
+					
+					// Observe any future exception from the orphaned task to prevent unobserved task exceptions
+					task.ContinueWith(t =>
+					{
+						if (t.Exception is not null)
+							Debug.WriteLine($">>>>> Orphaned Appium task faulted: {t.Exception.InnerException?.Message}");
+					}, TaskContinuationOptions.OnlyOnFaulted);
+					
+					throw new TimeoutException(
+						$"An Appium command did not complete within {timeout.Value.TotalSeconds}s. " +
+						"The application may be unresponsive (e.g., due to an infinite layout loop).");
+				}
+			}
+			catch (AggregateException ex) when (ex.InnerExceptions.Count == 1)
+			{
+				ExceptionDispatchInfo.Capture(ex.InnerExceptions[0]).Throw();
+			}
+			// Use GetAwaiter().GetResult() to unwrap AggregateException if the task faulted
+			return task.GetAwaiter().GetResult();
+		}
+
+		/// <summary>
+		/// Executes an action with a timeout to prevent tests from hanging indefinitely
+		/// when the application becomes unresponsive.
+		/// </summary>
+		static void RunWithTimeout(Action action, TimeSpan? timeout = null)
+		{
+			RunWithTimeout<object?>(() => { action(); return null; }, timeout);
+		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/TestUtils/src/UITest.NUnit/UITestBase.cs b/src/TestUtils/src/UITest.NUnit/UITestBase.cs
index e52a0cc4f82b..afad94d42068 100644
--- a/src/TestUtils/src/UITest.NUnit/UITestBase.cs
+++ b/src/TestUtils/src/UITest.NUnit/UITestBase.cs
@@ -1,5 +1,6 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
 using NUnit.Framework;
 using NUnit.Framework.Interfaces;
 using UITest.Core;
@@ -102,7 +103,48 @@ public void UITestBaseTearDown()
 		{
 			try
 			{
-				if (App.AppState != ApplicationState.Running)
+				ApplicationState appState;
+				try
+				{
+					// App.AppState queries via WDA which blocks if the app's main thread is stuck
+					// (e.g., infinite layout loop). Use a timeout to detect this.
+					// Retry once after a short delay — some tests leave the app briefly busy
+					// (e.g., RefreshView animations settling) but not truly frozen.
+					var appStateTask = Task.Run(() => App.AppState);
+					if (!appStateTask.Wait(TimeSpan.FromSeconds(15)))
+					{
+						// First attempt timed out — wait briefly and retry once before declaring frozen
+						Task.Delay(5000).Wait();
+						var retryTask = Task.Run(() => App.AppState);
+						if (!retryTask.Wait(TimeSpan.FromSeconds(15)))
+						{
+							throw new TimeoutException("App.AppState query did not complete — app is likely unresponsive");
+						}
+						appState = retryTask.GetAwaiter().GetResult();
+					}
+					else
+					{
+						appState = appStateTask.GetAwaiter().GetResult();
+					}
+				}
+				catch (TimeoutException)
+				{
+					// App is unresponsive - let the outer TimeoutException handler deal with it
+					throw;
+				}
+				catch (Exception)
+				{
+					// AppState query failed for some other reason (not a timeout/freeze).
+					// Force-close the app and treat it as not running.
+					try
+					{
+						App.CommandExecutor.Execute("forceCloseApp", new Dictionary<string, object>());
+					}
+					catch { /* best effort */ }
+					appState = ApplicationState.NotRunning;
+				}
+
+				if (appState != ApplicationState.Running)
 				{
 					SaveDeviceDiagnosticInfo();
 
@@ -117,6 +159,31 @@ public void UITestBaseTearDown()
 					Assert.Fail("The app was expected to be running still, investigate as possible crash");
 				}
 			}
+			catch (TimeoutException ex)
+			{
+				// App is stuck in an infinite loop (e.g., layout cycle). Force-terminate and reset.
+				TestContext.Error.WriteLine($">>>>> {DateTime.Now} App became unresponsive, force-closing: {ex.Message}");
+				try
+				{
+					App.CommandExecutor.Execute("forceCloseApp", new Dictionary<string, object>());
+				}
+				catch { /* best effort */ }
+
+				if (!ResetAfterEachTest)
+				{
+					try
+					{
+						Reset();
+						FixtureSetup();
+					}
+					catch (Exception resetEx)
+					{
+						TestContext.Error.WriteLine($">>>>> {DateTime.Now} Reset after force-close failed: {resetEx.Message}");
+					}
+				}
+
+				Assert.Fail($"The app became unresponsive and was force-terminated: {ex.Message}");
+			}
 			finally
 			{
 				var testOutcome = TestContext.CurrentContext.Result.Outcome;
@@ -124,7 +191,20 @@ public void UITestBaseTearDown()
 					testOutcome == ResultState.Failure)
 				{
 					SaveDeviceDiagnosticInfo();
-					SaveUIDiagnosticInfo();
+					// SaveUIDiagnosticInfo makes Appium calls that hang if app is frozen.
+					// Wrap in a timeout so we don't block the entire test run.
+					try
+					{
+						var diagTask = Task.Run(() => SaveUIDiagnosticInfo());
+						if (!diagTask.Wait(TimeSpan.FromSeconds(15)))
+						{
+							TestContext.Error.WriteLine($">>>>> {DateTime.Now} SaveUIDiagnosticInfo timed out — app may be unresponsive, skipping UI diagnostics");
+						}
+					}
+					catch (Exception ex)
+					{
+						TestContext.Error.WriteLine($">>>>> {DateTime.Now} SaveUIDiagnosticInfo failed: {ex.Message}");
+					}
 				}
 			}
 		}