dotnet · kubaflo · Apr 3, 2026 · Mar 31, 2026 · Mar 31, 2026 · Mar 31, 2026
diff --git a/src/Controls/src/Core/Handlers/Items2/iOS/ItemsViewController2.cs b/src/Controls/src/Core/Handlers/Items2/iOS/ItemsViewController2.cs
@@ -67,20 +67,13 @@ public void UpdateLayout(UICollectionViewLayout newLayout)
 				ScrollDirection = compositionalLayout.Configuration.ScrollDirection;
 			}
 
-			// Preserve the content offset before updating the layout.
-			// SetCollectionViewLayout with animated:false can unexpectedly shift the content offset
-			// on UICollectionViewCompositionalLayout with estimated item sizes.
-			var savedOffset = CollectionView.ContentOffset;
-
 			ItemsViewLayout = newLayout;
 			_initialized = false;
 
 			EnsureLayoutInitialized();
 
 			if (_initialized)
 			{
-				// Restore the content offset that may have been changed by SetCollectionViewLayout
-				CollectionView.ContentOffset = savedOffset;
 				// Reload the data so the currently visible cells get laid out according to the new layout
 				ReloadData();
 			}

diff --git a/...apshots/android/BackButtonBehavior_IconOverride_CustomIconShownOnBackButton.png b/...apshots/android/BackButtonBehavior_IconOverride_CustomIconShownOnBackButton.png
diff --git a/...tests/TestCases.Android.Tests/snapshots/android/EnsureSearchBarExplicitSize.png b/...tests/TestCases.Android.Tests/snapshots/android/EnsureSearchBarExplicitSize.png
diff --git a/...s/TestCases.Android.Tests/snapshots/android/FontImageSourceShouldHonorColor.png b/...s/TestCases.Android.Tests/snapshots/android/FontImageSourceShouldHonorColor.png
diff --git a/...s/TestCases.Android.Tests/snapshots/android/HeaderFooterGridHorizontalWorks.png b/...s/TestCases.Android.Tests/snapshots/android/HeaderFooterGridHorizontalWorks.png
diff --git a/...trols/tests/TestCases.Android.Tests/snapshots/android/HeaderFooterGridWorks.png b/...trols/tests/TestCases.Android.Tests/snapshots/android/HeaderFooterGridWorks.png
diff --git a/...ts/TestCases.Android.Tests/snapshots/android/Issue12324TabbedPageVisualTest.png b/...ts/TestCases.Android.Tests/snapshots/android/Issue12324TabbedPageVisualTest.png
diff --git a/...oid.Tests/snapshots/android/LabelDisplayWithoutCroppingInsideVerticalLayout.png b/...oid.Tests/snapshots/android/LabelDisplayWithoutCroppingInsideVerticalLayout.png
diff --git a/...tCases.Android.Tests/snapshots/android/OnlyManuallySwipedItemShouldBeOpened.png b/...tCases.Android.Tests/snapshots/android/OnlyManuallySwipedItemShouldBeOpened.png
diff --git a/...stCases.Android.Tests/snapshots/android/ShellPages_PresentationModeAnimated.png b/...stCases.Android.Tests/snapshots/android/ShellPages_PresentationModeAnimated.png
diff --git a/...ases.Android.Tests/snapshots/android/ShellPages_PresentationModeNotAnimated.png b/...ases.Android.Tests/snapshots/android/ShellPages_PresentationModeNotAnimated.png
diff --git a/....Tests/snapshots/android/ShellPages_VerifyForegroundColorResetForBackButton.png b/....Tests/snapshots/android/ShellPages_VerifyForegroundColorResetForBackButton.png
diff --git a/.../tests/TestCases.Android.Tests/snapshots/android/ShellTabBarBackgroundColor.png b/.../tests/TestCases.Android.Tests/snapshots/android/ShellTabBarBackgroundColor.png
diff --git a/...s.Android.Tests/snapshots/android/ShouldAppearFlyoutIconAndContentPageTitle.png b/...s.Android.Tests/snapshots/android/ShouldAppearFlyoutIconAndContentPageTitle.png
diff --git a/...rols/tests/TestCases.Android.Tests/snapshots/android/ToolbarItemsShouldWork.png b/...rols/tests/TestCases.Android.Tests/snapshots/android/ToolbarItemsShouldWork.png
diff --git a/...Android.Tests/snapshots/android/UpdateSearchHandlerMenuItemForTabNavigation.png b/...Android.Tests/snapshots/android/UpdateSearchHandlerMenuItemForTabNavigation.png
diff --git a/...android/VerifyCustomEmptyViewDisplaysCorrectly_WithLeftToRightFlowDirection.png b/...android/VerifyCustomEmptyViewDisplaysCorrectly_WithLeftToRightFlowDirection.png
diff --git a/...android/VerifyCustomEmptyViewDisplaysCorrectly_WithRightToLeftFlowDirection.png b/...android/VerifyCustomEmptyViewDisplaysCorrectly_WithRightToLeftFlowDirection.png
diff --git a/...droid/VerifyEmptyViewTemplateDisplaysCorrectly_WithLeftToRightFlowDirection.png b/...droid/VerifyEmptyViewTemplateDisplaysCorrectly_WithLeftToRightFlowDirection.png
diff --git a/...droid/VerifyEmptyViewTemplateDisplaysCorrectly_WithRightToLeftFlowDirection.png b/...droid/VerifyEmptyViewTemplateDisplaysCorrectly_WithRightToLeftFlowDirection.png
diff --git a/...snapshots/android/VerifyFlowDirectionLTRAndMeasureFirstItemsWithGroupedList.png b/...snapshots/android/VerifyFlowDirectionLTRAndMeasureFirstItemsWithGroupedList.png
diff --git a/.../VerifyFlowDirectionLTRWithHeaderTemplateAndFooterTemplateAndHorizontalGrid.png b/.../VerifyFlowDirectionLTRWithHeaderTemplateAndFooterTemplateAndHorizontalGrid.png
diff --git a/...id/VerifyFlowDirectionLTRWithHeaderTemplateAndFooterTemplateAndVerticalGrid.png b/...id/VerifyFlowDirectionLTRWithHeaderTemplateAndFooterTemplateAndVerticalGrid.png
diff --git a/...id/VerifyFlowDirectionLTRWithHeaderTemplateAndFooterTemplateAndVerticalList.png b/...id/VerifyFlowDirectionLTRWithHeaderTemplateAndFooterTemplateAndVerticalList.png
diff --git a/...ases.Android.Tests/snapshots/android/VerifyFlowDirectionLTRWithVerticalGrid.png b/...ases.Android.Tests/snapshots/android/VerifyFlowDirectionLTRWithVerticalGrid.png
diff --git a/...ases.Android.Tests/snapshots/android/VerifyFlowDirectionLTRWithVerticalList.png b/...ases.Android.Tests/snapshots/android/VerifyFlowDirectionLTRWithVerticalList.png
diff --git a/...snapshots/android/VerifyFlowDirectionRTLAndMeasureFirstItemsWithGroupedList.png b/...snapshots/android/VerifyFlowDirectionRTLAndMeasureFirstItemsWithGroupedList.png
diff --git a/...ndroid/VerifyFlowDirectionRTLWithHeaderStringAndFooterStringAndVerticalGrid.png b/...ndroid/VerifyFlowDirectionRTLWithHeaderStringAndFooterStringAndVerticalGrid.png
diff --git a/...ndroid/VerifyFlowDirectionRTLWithHeaderStringAndFooterStringAndVerticalList.png b/...ndroid/VerifyFlowDirectionRTLWithHeaderStringAndFooterStringAndVerticalList.png
diff --git a/...id/VerifyFlowDirectionRTLWithHeaderTemplateAndFooterTemplateAndVerticalGrid.png b/...id/VerifyFlowDirectionRTLWithHeaderTemplateAndFooterTemplateAndVerticalGrid.png
diff --git a/...id/VerifyFlowDirectionRTLWithHeaderTemplateAndFooterTemplateAndVerticalList.png b/...id/VerifyFlowDirectionRTLWithHeaderTemplateAndFooterTemplateAndVerticalList.png
diff --git a/...ts/android/VerifyFlowDirectionRTLWithHeaderViewAndFooterViewAndVerticalGrid.png b/...ts/android/VerifyFlowDirectionRTLWithHeaderViewAndFooterViewAndVerticalGrid.png
diff --git a/...ts/android/VerifyFlowDirectionRTLWithHeaderViewAndFooterViewAndVerticalList.png b/...ts/android/VerifyFlowDirectionRTLWithHeaderViewAndFooterViewAndVerticalList.png
diff --git a/...ases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithVerticalGrid.png b/...ases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithVerticalGrid.png
diff --git a/...ases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithVerticalList.png b/...ases.Android.Tests/snapshots/android/VerifyFlowDirectionRTLWithVerticalList.png
diff --git a/...es.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsCenter.png b/...es.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsCenter.png
diff --git a/...Cases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsEnd.png b/...Cases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsEnd.png
diff --git a/...ases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsFill.png b/...ases.Android.Tests/snapshots/android/VerifyGridLayout_HorizontalOptionsFill.png
diff --git a/...ases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsCenter.png b/...ases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsCenter.png
diff --git a/...s/snapshots/android/VerifyGridLayout_VerticalOptionsCenterWithHeightRequest.png b/...s/snapshots/android/VerifyGridLayout_VerticalOptionsCenterWithHeightRequest.png
diff --git a/...stCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsEnd.png b/...stCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsEnd.png
diff --git a/...ests/snapshots/android/VerifyGridLayout_VerticalOptionsEndWithHeightRequest.png b/...ests/snapshots/android/VerifyGridLayout_VerticalOptionsEndWithHeightRequest.png
diff --git a/...tCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsFill.png b/...tCases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsFill.png
diff --git a/...sts/snapshots/android/VerifyGridLayout_VerticalOptionsFillWithHeightRequest.png b/...sts/snapshots/android/VerifyGridLayout_VerticalOptionsFillWithHeightRequest.png
diff --git a/...Cases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsStart.png b/...Cases.Android.Tests/snapshots/android/VerifyGridLayout_VerticalOptionsStart.png
diff --git a/...ts/snapshots/android/VerifyGridLayout_VerticalOptionsStartWithHeightRequest.png b/...ts/snapshots/android/VerifyGridLayout_VerticalOptionsStartWithHeightRequest.png
diff --git a/...ntrols/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorColor.png b/...ntrols/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorColor.png
diff --git a/...estCases.Android.Tests/snapshots/android/VerifyIndicatorColorWhenItemsAdded.png b/...estCases.Android.Tests/snapshots/android/VerifyIndicatorColorWhenItemsAdded.png
diff --git a/...Cases.Android.Tests/snapshots/android/VerifyIndicatorColorWithFlowDirection.png b/...Cases.Android.Tests/snapshots/android/VerifyIndicatorColorWithFlowDirection.png
diff --git a/...ases.Android.Tests/snapshots/android/VerifyIndicatorColorWithIndicatorShape.png b/...ases.Android.Tests/snapshots/android/VerifyIndicatorColorWithIndicatorShape.png
diff --git a/...Cases.Android.Tests/snapshots/android/VerifyIndicatorColorWithIndicatorSize.png b/...Cases.Android.Tests/snapshots/android/VerifyIndicatorColorWithIndicatorSize.png
diff --git a/.../TestCases.Android.Tests/snapshots/android/VerifyIndicatorHideSingleIsFalse.png b/.../TestCases.Android.Tests/snapshots/android/VerifyIndicatorHideSingleIsFalse.png
diff --git a/...napshots/android/VerifyIndicatorHideSingleIsFalseWithSelectedIndicatorColor.png b/...napshots/android/VerifyIndicatorHideSingleIsFalseWithSelectedIndicatorColor.png
diff --git a/....Android.Tests/snapshots/android/VerifyIndicatorHideSingleWithIndicatorSize.png b/....Android.Tests/snapshots/android/VerifyIndicatorHideSingleWithIndicatorSize.png
diff --git a/...ntrols/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorShape.png b/...ntrols/tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorShape.png
diff --git a/...Cases.Android.Tests/snapshots/android/VerifyIndicatorShapeWithFlowDirection.png b/...Cases.Android.Tests/snapshots/android/VerifyIndicatorShapeWithFlowDirection.png
diff --git a/...estCases.Android.Tests/snapshots/android/VerifyIndicatorShapeWithHideSingle.png b/...estCases.Android.Tests/snapshots/android/VerifyIndicatorShapeWithHideSingle.png
diff --git a/...ases.Android.Tests/snapshots/android/VerifyIndicatorShapeWithMaximumVisible.png b/...ases.Android.Tests/snapshots/android/VerifyIndicatorShapeWithMaximumVisible.png
diff --git a/...ts/TestCases.Android.Tests/snapshots/android/VerifyIndicatorShapeWithShadow.png b/...ts/TestCases.Android.Tests/snapshots/android/VerifyIndicatorShapeWithShadow.png
diff --git a/...tCases.Android.Tests/snapshots/android/VerifyIndicatorSizeWithFlowDirection.png b/...tCases.Android.Tests/snapshots/android/VerifyIndicatorSizeWithFlowDirection.png
diff --git a/...Cases.Android.Tests/snapshots/android/VerifyIndicatorSizeWithIndicatorShape.png b/...Cases.Android.Tests/snapshots/android/VerifyIndicatorSizeWithIndicatorShape.png
diff --git a/...Cases.Android.Tests/snapshots/android/VerifyIndicatorSizeWithMaximumVisible.png b/...Cases.Android.Tests/snapshots/android/VerifyIndicatorSizeWithMaximumVisible.png
diff --git a/...sts/TestCases.Android.Tests/snapshots/android/VerifyIndicatorSizeWithShadow.png b/...sts/TestCases.Android.Tests/snapshots/android/VerifyIndicatorSizeWithShadow.png
diff --git a/...droid.Tests/snapshots/android/VerifyIndicatorViewMaximumVisibleWithTemplate.png b/...droid.Tests/snapshots/android/VerifyIndicatorViewMaximumVisibleWithTemplate.png
diff --git a/...TestCases.Android.Tests/snapshots/android/VerifyIndicatorView_FlowDirection.png b/...TestCases.Android.Tests/snapshots/android/VerifyIndicatorView_FlowDirection.png
diff --git a/...ts/TestCases.Android.Tests/snapshots/android/VerifyIndicatorView_HideSingle.png b/...ts/TestCases.Android.Tests/snapshots/android/VerifyIndicatorView_HideSingle.png
diff --git a/...sts/TestCases.Android.Tests/snapshots/android/VerifyIndicatorView_IsVisible.png b/...sts/TestCases.Android.Tests/snapshots/android/VerifyIndicatorView_IsVisible.png
diff --git a/...estCases.Android.Tests/snapshots/android/VerifyIndicatorView_MaximumVisible.png b/...estCases.Android.Tests/snapshots/android/VerifyIndicatorView_MaximumVisible.png
diff --git a/.../tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorView_Shadow.png b/.../tests/TestCases.Android.Tests/snapshots/android/VerifyIndicatorView_Shadow.png
diff --git a/...shots/android/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsCenter.png b/...shots/android/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsCenter.png
diff --git a/...napshots/android/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsEnd.png b/...napshots/android/VerifyLayoutWithOrientationHorizontal_HorizontalOptionsEnd.png
diff --git a/...apshots/android/VerifyLayoutWithOrientationVertical_HorizontalOptionsCenter.png b/...apshots/android/VerifyLayoutWithOrientationVertical_HorizontalOptionsCenter.png
diff --git a/.../snapshots/android/VerifyLayoutWithOrientationVertical_HorizontalOptionsEnd.png b/.../snapshots/android/VerifyLayoutWithOrientationVertical_HorizontalOptionsEnd.png
diff --git a/...snapshots/android/VerifyLayoutWithOrientationVertical_HorizontalOptionsFill.png b/...snapshots/android/VerifyLayoutWithOrientationVertical_HorizontalOptionsFill.png
diff --git a/...snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsCenter.png b/...snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsCenter.png
diff --git a/.../VerifyLayoutWithOrientationVertical_VerticalOptionsCenterWithHeightRequest.png b/.../VerifyLayoutWithOrientationVertical_VerticalOptionsCenterWithHeightRequest.png
diff --git a/...ts/snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsEnd.png b/...ts/snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsEnd.png
diff --git a/...oid/VerifyLayoutWithOrientationVertical_VerticalOptionsEndWithHeightRequest.png b/...oid/VerifyLayoutWithOrientationVertical_VerticalOptionsEndWithHeightRequest.png
diff --git a/...s/snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsFill.png b/...s/snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsFill.png
diff --git a/...id/VerifyLayoutWithOrientationVertical_VerticalOptionsFillWithHeightRequest.png b/...id/VerifyLayoutWithOrientationVertical_VerticalOptionsFillWithHeightRequest.png
diff --git a/.../snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsStart.png b/.../snapshots/android/VerifyLayoutWithOrientationVertical_VerticalOptionsStart.png
diff --git a/...d/VerifyLayoutWithOrientationVertical_VerticalOptionsStartWithHeightRequest.png b/...d/VerifyLayoutWithOrientationVertical_VerticalOptionsStartWithHeightRequest.png
diff --git a/...ases.Android.Tests/snapshots/android/VerifyMeasureFirstItemsWithGroupedList.png b/...ases.Android.Tests/snapshots/android/VerifyMeasureFirstItemsWithGroupedList.png
diff --git a/...s/snapshots/android/VerifyModelItemsGroupedListWhenMultipleModePreSelection.png b/...s/snapshots/android/VerifyModelItemsGroupedListWhenMultipleModePreSelection.png
diff --git a/...sts/snapshots/android/VerifyModelItemsGroupedListWhenSingleModePreSelection.png b/...sts/snapshots/android/VerifyModelItemsGroupedListWhenSingleModePreSelection.png
diff --git a/...ts/android/VerifyModelItemsObservableCollectionWhenMultipleModePreSelection.png b/...ts/android/VerifyModelItemsObservableCollectionWhenMultipleModePreSelection.png
diff --git a/...hots/android/VerifyModelItemsObservableCollectionWhenSingleModePreSelection.png b/...hots/android/VerifyModelItemsObservableCollectionWhenSingleModePreSelection.png
diff --git a/...estCases.Android.Tests/snapshots/android/VerifyNavBarStatusAtInitialLoading.png b/...estCases.Android.Tests/snapshots/android/VerifyNavBarStatusAtInitialLoading.png
diff --git a/...tests/TestCases.Android.Tests/snapshots/android/VerifyNavBarStatusAtRuntime.png b/...tests/TestCases.Android.Tests/snapshots/android/VerifyNavBarStatusAtRuntime.png
diff --git a/...s/tests/TestCases.Android.Tests/snapshots/android/VerifySearchBarBackground.png b/...s/tests/TestCases.Android.Tests/snapshots/android/VerifySearchBarBackground.png
diff --git a/...ests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorColor.png b/...ests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorColor.png
diff --git a/...droid.Tests/snapshots/android/VerifySelectedIndicatorColorWithFlowDirection.png b/...droid.Tests/snapshots/android/VerifySelectedIndicatorColorWithFlowDirection.png
diff --git a/...roid.Tests/snapshots/android/VerifySelectedIndicatorColorWithIndicatorColor.png b/...roid.Tests/snapshots/android/VerifySelectedIndicatorColorWithIndicatorColor.png
diff --git a/...roid.Tests/snapshots/android/VerifySelectedIndicatorColorWithIndicatorShape.png b/...roid.Tests/snapshots/android/VerifySelectedIndicatorColorWithIndicatorShape.png
diff --git a/...droid.Tests/snapshots/android/VerifySelectedIndicatorColorWithIndicatorSize.png b/...droid.Tests/snapshots/android/VerifySelectedIndicatorColorWithIndicatorSize.png
diff --git a/...tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorSize.png b/...tests/TestCases.Android.Tests/snapshots/android/VerifySelectedIndicatorSize.png
diff --git a/...rifySelectionModeMultipleWhenProgrammaticSelectionWhithItemsSourceGroupList.png b/...rifySelectionModeMultipleWhenProgrammaticSelectionWhithItemsSourceGroupList.png
diff --git a/...d/VerifySelectionModeMultipleWhenProgrammaticSelectionWorksWithVerticalList.png b/...d/VerifySelectionModeMultipleWhenProgrammaticSelectionWorksWithVerticalList.png
diff --git a/...VerifySelectionModeSingleWhenProgrammaticSelectionWhithItemsSourceGroupList.png b/...VerifySelectionModeSingleWhenProgrammaticSelectionWhithItemsSourceGroupList.png
diff --git a/...oid/VerifySelectionModeSingleWhenProgrammaticSelectionWorksWithVerticalList.png b/...oid/VerifySelectionModeSingleWhenProgrammaticSelectionWorksWithVerticalList.png
diff --git a/...Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySliderColors.png b/...Controls/tests/TestCases.Android.Tests/snapshots/android/VerifySliderColors.png
diff --git a/.../snapshots/android/VerifyStringItemsGroupedListWhenMultipleModePreSelection.png b/.../snapshots/android/VerifyStringItemsGroupedListWhenMultipleModePreSelection.png
diff --git a/...s/android/VerifyStringItemsObservableCollectionWhenMultipleModePreSelection.png b/...s/android/VerifyStringItemsObservableCollectionWhenMultipleModePreSelection.png
diff --git a/...ots/android/VerifyStringItemsObservableCollectionWhenSingleModePreSelection.png b/...ots/android/VerifyStringItemsObservableCollectionWhenSingleModePreSelection.png
diff --git a/...ols/tests/TestCases.Android.Tests/snapshots/android/VerifySwitchControlSize.png b/...ols/tests/TestCases.Android.Tests/snapshots/android/VerifySwitchControlSize.png
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/CollectionViewViewModel.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/CollectionViewViewModel.cs
@@ -123,9 +123,9 @@ public class CollectionViewViewModel : INotifyPropertyChanged
 
 	public ICommand AddItemCommand { get; }
 
-	public CollectionViewViewModel()
+	public CollectionViewViewModel(bool isScrollingFeatureTest = false)
 	{
-		LoadItems();
+		LoadItems(isScrollingFeatureTest);
 
 		AddItemCommand = new Command(AddItem);
 
@@ -640,7 +640,7 @@ public bool IsItemTemplateSelected
 		}
 	}
 
-	private void LoadItems()
+	private void LoadItems(bool isScrollingFeatureTest = false)
 	{
 		_observableCollection = new ObservableCollection<CollectionViewTestItem>();
 		AddItems(_observableCollection, 7, "Fruits");
@@ -676,8 +676,8 @@ private void LoadItems()
 				new Grouping<string, CollectionViewTestItem>("Fruits", new List<CollectionViewTestItem>()),
 				new Grouping<string, CollectionViewTestItem>("Vegetables", new List<CollectionViewTestItem>())
 			};
-		AddItems(_groupedList[0], 20, "Fruits");
-		AddItems(_groupedList[1], 20, "Vegetables");
+		AddItems(_groupedList[0], isScrollingFeatureTest ? 20 : 4, "Fruits");
+		AddItems(_groupedList[1], isScrollingFeatureTest ? 20 : 4, "Vegetables");
 
 		_observableCollection3 = new ObservableCollection<CollectionViewTestItem>();
 		AddItems(_observableCollection3, 15, "Fruits");
@@ -689,8 +689,8 @@ private void LoadItems()
 				new Grouping<string, CollectionViewTestItem>("Vegetables", new List<CollectionViewTestItem>())
 
 			};
-		AddItems(_groupedList3[0], 25, "Fruits");
-		AddItems(_groupedList3[1], 25, "Vegetables");
+		AddItems(_groupedList3[0], isScrollingFeatureTest ? 25 : 12, "Fruits");
+		AddItems(_groupedList3[1], isScrollingFeatureTest ? 25 : 12, "Vegetables");
 
 		_groupedList2 = new List<Grouping<string, ItemModel>>
 			{

diff --git a/...es.HostApp/FeatureMatrix/CollectionView/ScrollingFeature/CollectionViewScrollPage.xaml.cs b/...es.HostApp/FeatureMatrix/CollectionView/ScrollingFeature/CollectionViewScrollPage.xaml.cs
@@ -8,14 +8,14 @@ public partial class CollectionViewScrollPage : ContentPage
 	public CollectionViewScrollPage()
 	{
 		InitializeComponent();
-		_viewModel = new CollectionViewViewModel();
+		_viewModel = new CollectionViewViewModel(isScrollingFeatureTest: true);
 		_viewModel.ItemsSourceType = ItemsSourceType.ObservableCollectionT3;
 		BindingContext = _viewModel;
 	}
 
 	private async void NavigateToOptionsPage_Clicked(object sender, EventArgs e)
 	{
-		BindingContext = _viewModel = new CollectionViewViewModel();
+		BindingContext = _viewModel = new CollectionViewViewModel(isScrollingFeatureTest: true);
 		_viewModel.ItemsSourceType = ItemsSourceType.ObservableCollectionT3;
 		_viewModel.ScrollToPosition = ScrollToPosition.MakeVisible;
 		ResetScrollEventLabels();

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue29484.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue29484.cs
@@ -10,7 +10,6 @@ protected override void Init()
 
 		Grid grid = new Grid
 		{
-			HorizontalOptions = LayoutOptions.Center,
 			RowDefinitions =
 				{
 					new RowDefinition { Height = GridLength.Auto },

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue33604.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue33604.cs
@@ -38,7 +38,7 @@ public Issue33604Page()
 		var topView = new ContentView { BackgroundColor = Colors.Plum, Content = topLabel };
 		topView.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
 
-		var collectionView = new CollectionView
+		var collectionView = new CollectionView2
 		{
 			AutomationId = "TestCollectionView",
 			BackgroundColor = Colors.Red,

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue34636.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue34636.cs
@@ -27,13 +27,13 @@ public class Issue34636 : ContentPage
 
     readonly ObservableCollection<MonkeyItem> _items = new(MonkeyData);
     readonly LinearItemsLayout _itemsLayout = new(ItemsLayoutOrientation.Vertical) { ItemSpacing = 0 };
-    CollectionView _collectionView;
+    CollectionView2 _collectionView;
 
     public Issue34636()
     {
         Title = "CollectionView ItemSpacing regression";
 
-        _collectionView = new CollectionView
+        _collectionView = new CollectionView2
         {
             AutomationId = "MonkeyCollectionView",
             ItemsSource = _items,

diff --git a/.../snapshots/mac/BackButtonBehavior_IsVisible_False_ProgrammaticNavStillWorks.png b/.../snapshots/mac/BackButtonBehavior_IsVisible_False_ProgrammaticNavStillWorks.png
diff --git a/...ests/TestCases.Mac.Tests/snapshots/mac/DarkTheme_CheckBox_VerifyVisualState.png b/...ests/TestCases.Mac.Tests/snapshots/mac/DarkTheme_CheckBox_VerifyVisualState.png
diff --git a/...ts/TestCases.Mac.Tests/snapshots/mac/DarkTheme_DatePicker_VerifyVisualState.png b/...ts/TestCases.Mac.Tests/snapshots/mac/DarkTheme_DatePicker_VerifyVisualState.png
diff --git a/...c.Tests/snapshots/mac/DarkTheme_EditorAndPlaceholderColor_VerifyVisualState.png b/...c.Tests/snapshots/mac/DarkTheme_EditorAndPlaceholderColor_VerifyVisualState.png
diff --git a/.../tests/TestCases.Mac.Tests/snapshots/mac/DarkTheme_Editor_VerifyVisualState.png b/.../tests/TestCases.Mac.Tests/snapshots/mac/DarkTheme_Editor_VerifyVisualState.png
diff --git a/...ac.Tests/snapshots/mac/DarkTheme_EntryAndPlaceholderColor_VerifyVisualState.png b/...ac.Tests/snapshots/mac/DarkTheme_EntryAndPlaceholderColor_VerifyVisualState.png
diff --git a/...s/TestCases.Mac.Tests/snapshots/mac/DarkTheme_RadioButton_VerifyVisualState.png b/...s/TestCases.Mac.Tests/snapshots/mac/DarkTheme_RadioButton_VerifyVisualState.png
diff --git a/...ests/snapshots/mac/DarkTheme_SearchBarAndPlaceholderColor_VerifyVisualState.png b/...ests/snapshots/mac/DarkTheme_SearchBarAndPlaceholderColor_VerifyVisualState.png
diff --git a/...sts/TestCases.Mac.Tests/snapshots/mac/DarkTheme_SearchBar_VerifyVisualState.png b/...sts/TestCases.Mac.Tests/snapshots/mac/DarkTheme_SearchBar_VerifyVisualState.png
diff --git a/.../tests/TestCases.Mac.Tests/snapshots/mac/DarkTheme_Slider_VerifyVisualState.png b/.../tests/TestCases.Mac.Tests/snapshots/mac/DarkTheme_Slider_VerifyVisualState.png
diff --git a/.../tests/TestCases.Mac.Tests/snapshots/mac/DarkTheme_Switch_VerifyVisualState.png b/.../tests/TestCases.Mac.Tests/snapshots/mac/DarkTheme_Switch_VerifyVisualState.png
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/EnabledTabWithNormalColor.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/EnabledTabWithNormalColor.png
diff --git a/...sts/TestCases.Mac.Tests/snapshots/mac/LightTheme_CheckBox_VerifyVisualState.png b/...sts/TestCases.Mac.Tests/snapshots/mac/LightTheme_CheckBox_VerifyVisualState.png
diff --git a/...s/TestCases.Mac.Tests/snapshots/mac/LightTheme_DatePicker_VerifyVisualState.png b/...s/TestCases.Mac.Tests/snapshots/mac/LightTheme_DatePicker_VerifyVisualState.png
diff --git a/....Tests/snapshots/mac/LightTheme_EditorAndPlaceholderColor_VerifyVisualState.png b/....Tests/snapshots/mac/LightTheme_EditorAndPlaceholderColor_VerifyVisualState.png
diff --git a/...tests/TestCases.Mac.Tests/snapshots/mac/LightTheme_Editor_VerifyVisualState.png b/...tests/TestCases.Mac.Tests/snapshots/mac/LightTheme_Editor_VerifyVisualState.png
diff --git a/...c.Tests/snapshots/mac/LightTheme_EntryAndPlaceholderColor_VerifyVisualState.png b/...c.Tests/snapshots/mac/LightTheme_EntryAndPlaceholderColor_VerifyVisualState.png
diff --git a/.../TestCases.Mac.Tests/snapshots/mac/LightTheme_RadioButton_VerifyVisualState.png b/.../TestCases.Mac.Tests/snapshots/mac/LightTheme_RadioButton_VerifyVisualState.png
diff --git a/...sts/snapshots/mac/LightTheme_SearchBarAndPlaceholderColor_VerifyVisualState.png b/...sts/snapshots/mac/LightTheme_SearchBarAndPlaceholderColor_VerifyVisualState.png
diff --git a/...ts/TestCases.Mac.Tests/snapshots/mac/LightTheme_SearchBar_VerifyVisualState.png b/...ts/TestCases.Mac.Tests/snapshots/mac/LightTheme_SearchBar_VerifyVisualState.png
diff --git a/...tests/TestCases.Mac.Tests/snapshots/mac/LightTheme_Slider_VerifyVisualState.png b/...tests/TestCases.Mac.Tests/snapshots/mac/LightTheme_Slider_VerifyVisualState.png
diff --git a/...tests/TestCases.Mac.Tests/snapshots/mac/LightTheme_Switch_VerifyVisualState.png b/...tests/TestCases.Mac.Tests/snapshots/mac/LightTheme_Switch_VerifyVisualState.png
diff --git a/...rols/tests/TestCases.Mac.Tests/snapshots/mac/VerifyDefaultScrollToRequested.png b/...rols/tests/TestCases.Mac.Tests/snapshots/mac/VerifyDefaultScrollToRequested.png
diff --git a/...Tests/snapshots/mac/VerifyFlowDirectionLTRAndMeasureAllItemsWithGroupedList.png b/...Tests/snapshots/mac/VerifyFlowDirectionLTRAndMeasureAllItemsWithGroupedList.png
diff --git a/...pshots/mac/VerifyFlowDirectionLTRAndMeasureAllItemsWithObservableCollection.png b/...pshots/mac/VerifyFlowDirectionLTRAndMeasureAllItemsWithObservableCollection.png
diff --git a/...Tests/snapshots/mac/VerifyFlowDirectionRTLAndMeasureAllItemsWithGroupedList.png b/...Tests/snapshots/mac/VerifyFlowDirectionRTLAndMeasureAllItemsWithGroupedList.png
diff --git a/...pshots/mac/VerifyFlowDirectionRTLAndMeasureAllItemsWithObservableCollection.png b/...pshots/mac/VerifyFlowDirectionRTLAndMeasureAllItemsWithObservableCollection.png
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifySearchBarBackground.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifySearchBarBackground.png
diff --git a/...Mac.Tests/snapshots/mac/VerticalItemsRemainFullyVisibleAfterChangingSpacing.png b/...Mac.Tests/snapshots/mac/VerticalItemsRemainFullyVisibleAfterChangingSpacing.png
diff --git a/.../tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CollectionView_ScrollingFeatureTests.cs b/.../tests/TestCases.Shared.Tests/Tests/FeatureMatrix/CollectionView_ScrollingFeatureTests.cs
@@ -1223,7 +1223,7 @@ public void VerifyKeepLastItemInViewWithGroupedListWhenHorizontalGrid()
 #endif
 #endif
 
-#if TEST_FAILS_ON_ANDROID
+#if TEST_FAILS_ON_ANDROID && TEST_FAILS_ON_WINDOWS // In windows, related issue: https://github.com/dotnet/maui/issues/34772
 	//[Android] KeepScrollOffset doesn't not works as expected when new items are added in CollectionView Issue Link:  https://github.com/dotnet/maui/issues/29131
 	[Test]
 	[Category(UITestCategories.CollectionView)]
@@ -1297,6 +1297,9 @@ public void VerifyFlowDirectionRTLAndKeepScrollOffsetWithGroupedList()
 		App.WaitForElement("CollectionViewControl");
 		App.ScrollDown("CollectionViewControl", ScrollStrategy.Gesture, 0.9, 500);
 		App.ScrollDown("CollectionViewControl", ScrollStrategy.Gesture, 0.9, 500);
+#if MACCATALYST
+		App.ScrollDown("CollectionViewControl", ScrollStrategy.Gesture, 0.9, 500);
+#endif
 		App.WaitForElement(AddButton);
 		App.Tap(AddButton);
 		App.WaitForNoElement("WaterMelon");
@@ -1574,6 +1577,7 @@ public void VerifyDefaultScrollToRequested()
 	}
 
 	// ScrollTo By Index Tests
+#if TEST_FAILS_ON_WINDOWS // Related issue: https://github.com/dotnet/maui/issues/34772
 	[Test]
 	[Category(UITestCategories.CollectionView)]
 	public void VerifyScrollToByIndexWithMakeVisiblePositionAndVerticalList_Carrot()
@@ -1786,6 +1790,7 @@ public void VerifyScrollToByItemWithEndPositionAndVerticalList_Carrot()
 		Assert.That(App.WaitForElement("ItemLabel").GetText(), Is.EqualTo("Carrot"));
 		VerifyScreenshot();
 	}
+#endif
 
 	// Grouped ScrollTo By Index Tests
 #if TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_WINDOWS && TEST_FAILS_ON_IOS // Issue - https://github.com/dotnet/maui/issues/17664

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ShellNavigationFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ShellNavigationFeatureTests.cs
@@ -883,6 +883,10 @@ public void BackButtonBehavior_CommandParameter_CommandFiresWithCorrectParameter
 	[Test, Order(50)]
 	public void BackButtonBehavior_IsEnabled_False_BackButtonDoesNotNavigate()
 	{
+		if (iOS26OrHigher)
+        {
+            Assert.Ignore("Fails on iOS 26 due to bug issue: https://github.com/dotnet/maui/issues/34771");
+        }
 		App.WaitForElement("MainPageIdentityLabel");
 		App.WaitForElement("IsEnabledButton");
 		App.Tap("IsEnabledButton");
@@ -905,6 +909,10 @@ public void BackButtonBehavior_IsEnabled_False_BackButtonDoesNotNavigate()
 	[Test, Order(51)]
 	public void BackButtonBehavior_IsVisible_False_ProgrammaticNavStillWorks()
 	{
+		if (iOS26OrHigher)
+        {
+            Assert.Ignore("Fails on iOS 26 due to bug issue: https://github.com/dotnet/maui/issues/34771");
+        }
 		App.WaitForElement("MainPageIdentityLabel");
 		App.WaitForElement("IsVisibleButton");
 		App.Tap("IsVisibleButton");
@@ -917,6 +925,10 @@ public void BackButtonBehavior_IsVisible_False_ProgrammaticNavStillWorks()
 	[Test, Order(52)]
 	public void BackButtonBehavior_IconOverride_CustomIconShownOnBackButton()
 	{
+		if (iOS26OrHigher)
+        {
+            NavigateToDetail1AndWait();
+        }
 		App.WaitForElement("Detail1GoBackButton");
 		App.Tap("Detail1GoBackButton");
 		App.WaitForElement("MainPageIdentityLabel");

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/StepperFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/StepperFeatureTests.cs
@@ -368,10 +368,12 @@ public void Stepper_ValueChanged_ShouldFire_WhenValueIsClampedToMinimum()
 		App.WaitForElement("Options");
 		App.Tap("Options");
 
+		App.WaitForElement("MinimumEntry");
 		App.ClearText("MinimumEntry");
 		App.EnterText("MinimumEntry", "5");
 		App.PressEnter();
 
+		App.WaitForElement("Apply");
 		App.Tap("Apply");
 		App.WaitForElement("Options");
 
@@ -385,14 +387,17 @@ public void Stepper_ValueChanged_ShouldFire_WhenValueIsClampedToMaximum()
 		App.WaitForElement("Options");
 		App.Tap("Options");
 
+		App.WaitForElement("MaximumEntry");
 		App.ClearText("MaximumEntry");
 		App.EnterText("MaximumEntry", "10");
 		App.PressEnter();
 
+		App.WaitForElement("ValueEntry");
 		App.ClearText("ValueEntry");
 		App.EnterText("ValueEntry", "50");
 		App.PressEnter();
 
+		App.WaitForElement("Apply");
 		App.Tap("Apply");
 		App.WaitForElement("Options");
 
@@ -408,6 +413,7 @@ public void Stepper_ValueChanged_Arguments_NotRaised_WhenDisabled()
 		App.Tap("Options");
 		App.WaitForElement("IsEnabledFalseRadio");
 		App.Tap("IsEnabledFalseRadio");
+		App.WaitForElement("Apply");
 		App.Tap("Apply");
 
 		App.WaitForElement("Options");

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/TabbedPageFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/TabbedPageFeatureTests.cs
@@ -319,6 +319,8 @@ public void TabbedPage_MoreButton_Verify()
 		VerifyScreenshot(TestContext.CurrentContext.Test.MethodName + "_2");
 	}
 #endif
+
+#if TEST_FAILS_ON_WINDOWS // Issue Link : https://github.com/dotnet/maui/issues/14572
 	[Test, Order(21)]
 	public void TabbedPage_AddTab_Verify()
 	{
@@ -345,6 +347,7 @@ public void TabbedPage_AddTab_Verify()
 		App.WaitForElement("Tab7Label");
 	}
 #endif
+#endif
 
 #if TEST_FAILS_ON_WINDOWS // Issue Link - https://github.com/dotnet/maui/issues/14572
 

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue12131.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue12131.cs
@@ -1,3 +1,6 @@
+// On Windows, AutomationId is not working for RefreshView (layout) used in this test
+// (https://github.com/dotnet/maui/issues/4715)
+#if TEST_FAILS_ON_WINDOWS
 using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
@@ -30,3 +33,4 @@ public void CollectionViewDoesNotExceedAvailableWidth()
 		}
 	}
 }
+#endif
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue13537.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue13537.cs
@@ -23,10 +23,11 @@ public void ApplyQueryAttributeShouldTriggerforPushAndPopButton()
 		{
 			App.WaitForElement("HomePageTestLabel");
 			App.Tap("PushAsyncButton");
-			App.WaitForElement("InnerPageTestLabel");
+			// Verify ApplyQueryAttributes triggers on InnerPage when navigating via PushAsync
+			var result = App.WaitForElement("InnerPageTestLabel").GetText();
+			Assert.That(result, Is.EqualTo("Issue13537InnerPage QueryAttribute is triggered"));
 			App.Tap("PopAsyncButton");
-			var result = App.WaitForElement("HomePageTestLabel").GetText();
-			Assert.That(result, Is.EqualTo("Issue13537HomePage QueryAttribute is triggered"));
+			App.WaitForElement("HomePageTestLabel");
 		}
 
 #if TEST_FAILS_ON_CATALYST
@@ -37,14 +38,15 @@ public void ApplyQueryAttributeShouldTriggerforPushAndBackButton()
 		{
 			App.WaitForElement("HomePageTestLabel");
 			App.Tap("PushAsyncButton");
-			App.WaitForElement("InnerPageTestLabel");
+			// Verify ApplyQueryAttributes triggers on InnerPage when navigating via PushAsync
+			var result = App.WaitForElement("InnerPageTestLabel").GetText();
+			Assert.That(result, Is.EqualTo("Issue13537InnerPage QueryAttribute is triggered"));
 #if IOS
 			App.Back();
 #else
 			App.TapBackArrow(backButtonIdentifier);
 #endif
-			var result = App.WaitForElement("HomePageTestLabel").GetText();
-			Assert.That(result, Is.EqualTo("Issue13537HomePage QueryAttribute is triggered"));
+			App.WaitForElement("HomePageTestLabel");
 		}
 #endif
 

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue16767_Resize.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue16767_Resize.cs
@@ -13,13 +13,15 @@ public Issue16767_Resize(TestDevice testDevice) : base(testDevice)
 	public override string Issue => "Resize function in W2DImage class";
 	protected override bool ResetAfterEachTest => true;
 
+#if TEST_FAILS_ON_IOS //Issue Link - https://github.com/dotnet/maui/issues/34755
 	[Test]
 	[Category(UITestCategories.GraphicsView)]
 	public void ImagePaintWithResizeModeFit()
 	{
 		App.WaitForElement("ResizeModeFit");
 		VerifyScreenshot();
 	}
+#endif
 
 	[Test]
 	[Category(UITestCategories.GraphicsView)]

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21240.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21240.cs
@@ -1,3 +1,6 @@
+// On Windows, the default FlyoutLayoutBehavior is Split mode, so the flyout is always visible and IsGestureEnabled has no effect.
+// Reference: https://learn.microsoft.com/en-us/dotnet/maui/user-interface/pages/flyoutpage?view=net-maui-10.0#layout-behavior
+#if TEST_FAILS_ON_WINDOWS
 using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
@@ -27,3 +30,4 @@ public void FlyoutPageIsGestureEnabledShouldPreventSwipeGesture()
 		}
 	}
 }
+#endif
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22060.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22060.cs
@@ -7,7 +7,7 @@ namespace Microsoft.Maui.TestCases.Tests.Issues;
 public class Issue22060 : _IssuesUITest
 {
 	public override string Issue => "Flyout icon and content page title disappeared after focusing on the search handler";
-
+	bool iOS26OrHigher => App is AppiumIOSApp iosApp && HelperExtensions.IsIOS26OrHigher(iosApp);
 	public Issue22060(TestDevice device) : base(device)
 	{
 	}
@@ -18,7 +18,14 @@ public void ShouldAppearFlyoutIconAndContentPageTitle()
 	{
 		App.EnterTextInShellSearchHandler("Hello");
 #if IOS // When the search handler is focused, the Cancel button is displayed on the right side of the search bar only on the iOS platform.
-		App.Tap("Cancel");
+		if(iOS26OrHigher)
+		{
+			App.Tap("Close");
+		}
+		else
+		{
+			App.Tap("Cancel");	
+		}
 #endif
 		VerifyScreenshot();
 	}

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue23377.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue23377.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+#if TEST_FAILS_ON_IOS && TEST_FAILS_ON_CATALYST // Issue link: https://github.com/dotnet/maui/issues/34785
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
@@ -20,3 +21,4 @@ public void Issue23377ItemSpacing()
 		VerifyScreenshot();
 	}
 }
+#endif
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28722.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28722.cs
@@ -16,11 +16,25 @@ public Issue28722(TestDevice testDevice) : base(testDevice)
 		[Category(UITestCategories.Shell)]
 		public void IsEnabledShouldWorkInBackButtonBehavior()
 		{
-			App.WaitForElement("Click");
-			App.Click("Click");
+			NavigateBack();
 			App.WaitForElement("HelloLabel");
-			App.Click("Click");
+
+			NavigateBack();
 			App.WaitForElement("HelloLabel");
 		}
+
+		// On Windows, BackButtonBehavior.TextOverride is not supported (https://github.com/dotnet/maui/issues/1625),
+		// so the "Click" element does not exist. Use TapBackArrow to navigate back instead.
+		void NavigateBack()
+		{
+#if WINDOWS
+			App.TapBackArrow();
+#elif ANDROID
+			App.TapBackArrow("Click");
+#else
+			App.WaitForElement("Click");
+			App.Click("Click");
+#endif
+		}
 	}
 }
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue31109.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue31109.cs
@@ -1,3 +1,5 @@
+// On Windows, AutomationId for Layout elements is not working (https://github.com/dotnet/maui/issues/4715)
+#if TEST_FAILS_ON_WINDOWS
 using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
@@ -71,3 +73,4 @@ public void DynamicWidthRequestUpdatesFlexLayoutItems()
 		}
 	}
 }
+#endif