Revert "Fixed CollectionViewHandler2 null reference exception if ItemsLayout is set for Tablet but not on mobile devices (dotnet#26152)"

This reverts commit 0ddc794.

Author: devanathan-vaithiyanathan

src/Controls/src/Core/Handlers/Items2/CollectionViewHandler2.iOS.cs

@@ -155,8 +155,21 @@ protected override UICollectionViewLayout SelectLayout()
 
 			var itemSizingStrategy = ItemsView.ItemSizingStrategy;
 			var itemsLayout = ItemsView.ItemsLayout;
-		
-			SubscribeToItemsLayoutPropertyChanged(itemsLayout);
+
+			//TODO: Find a better way to do this 
+			itemsLayout.PropertyChanged += (sender, args) =>
+			{
+				if (args.PropertyName == nameof(ItemsLayout.SnapPointsAlignment) ||
+					args.PropertyName == nameof(ItemsLayout.SnapPointsType) ||
+					args.PropertyName == nameof(GridItemsLayout.VerticalItemSpacing) ||
+					args.PropertyName == nameof(GridItemsLayout.HorizontalItemSpacing) ||
+					args.PropertyName == nameof(GridItemsLayout.Span) ||
+					args.PropertyName == nameof(LinearItemsLayout.ItemSpacing))
+
+				{
+					UpdateLayout();
+				}
+			};
 
 			if (itemsLayout is GridItemsLayout gridItemsLayout)
 			{
@@ -169,10 +182,7 @@ protected override UICollectionViewLayout SelectLayout()
 			}
 
 			// Fall back to vertical list
-			var fallbackItemsLayout = new LinearItemsLayout(ItemsLayoutOrientation.Vertical);
-			// Manually setting the value to ensure the property changed event is properly wired..
-			ItemsView.ItemsLayout = fallbackItemsLayout;
-			return LayoutFactory2.CreateList(fallbackItemsLayout, groupInfo, headerFooterInfo);
+			return LayoutFactory2.CreateList(new LinearItemsLayout(ItemsLayoutOrientation.Vertical), groupInfo, headerFooterInfo);
 		}
 
 		public static void MapHeaderTemplate(CollectionViewHandler2 handler, StructuredItemsView itemsView)
@@ -196,25 +206,5 @@ public static void MapItemSizingStrategy(CollectionViewHandler2 handler, Structu
 		{
 			handler.UpdateLayout();
 		}
-
-		void SubscribeToItemsLayoutPropertyChanged(IItemsLayout itemsLayout)
-		{
-			if(itemsLayout is not null)
-			{
-				itemsLayout.PropertyChanged += (sender, args) =>
-				{
-					if (args.PropertyName == nameof(ItemsLayout.SnapPointsAlignment) ||
-						args.PropertyName == nameof(ItemsLayout.SnapPointsType) ||
-						args.PropertyName == nameof(GridItemsLayout.VerticalItemSpacing) ||
-						args.PropertyName == nameof(GridItemsLayout.HorizontalItemSpacing) ||
-						args.PropertyName == nameof(GridItemsLayout.Span) ||
-						args.PropertyName == nameof(LinearItemsLayout.ItemSpacing))
-
-					{
-						UpdateLayout();
-					}
-				};
-			}
-		}
 	}
 }