diff --git a/NuGet.config b/NuGet.config
index d7fb073a2b47..131e022afa45 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -10,19 +10,15 @@
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="local" value="LOCAL_PLACEHOLDER" />
     <add key="nuget-only" value="NUGET_ONLY_PLACEHOLDER" />
-    <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" protocolVersion="3" />
-    <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" protocolVersion="3" />
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />
     <add key="benchmark-dotnet-prerelease" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/benchmark-dotnet-prerelease/nuget/v3/index.json" />
-    <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
-    <add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
-    <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
-    <add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
     <add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
     <add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
     <add key="skiasharp" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/SkiaSharp/nuget/v3/index.json" />
     <add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
     <add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
+    <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" protocolVersion="3" />
+    <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" protocolVersion="3" />
     <!-- Added manually for .NET 8 MAUI -->
     <add key="darc-pub-dotnet-maui-a33a875e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-maui-a33a875e/nuget/v3/index.json" />
     <!-- Added manually for dotnet/runtime 8.0.18 -->
@@ -35,6 +31,10 @@
     <add key="darc-pub-dotnet-android-cdb777a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-cdb777a0/nuget/v3/index.json" />
     <!-- Added manually for .NET 9 macios -->
     <add key="darc-pub-dotnet-macios-0e1a194" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-0e1a194f/nuget/v3/index.json" />
+    <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
+    <add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
+    <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
+    <add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
   </packageSources>
   <activePackageSource>
     <add key="All" value="(Aggregate source)" />
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/TitleBarPage.xaml b/src/Controls/samples/Controls.Sample/Pages/Controls/TitleBarPage.xaml
index 9a77c401124c..5f2a6c48f89c 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/TitleBarPage.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/TitleBarPage.xaml
@@ -2,16 +2,15 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Maui.Controls.Sample.Pages.TitleBarPage"
-             xmlns:ios="clr-namespace:Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;assembly=Microsoft.Maui.Controls"
-             ios:Page.UseSafeArea="False"
+             SafeAreaEdges="All"
              Shell.NavBarIsVisible="True"
              NavigationPage.HasNavigationBar="True"
              Title="TitleBarPage">
 
-    <Grid IgnoreSafeArea="True"
+    <Grid SafeAreaEdges="All"
           RowDefinitions="Auto,*"
         ColumnDefinitions="*,*">
-        <VerticalStackLayout IgnoreSafeArea="True"
+        <VerticalStackLayout SafeAreaEdges="All"
             Spacing="16"
             Margin="16"
             Grid.Column="0">
@@ -20,7 +19,7 @@
                 Text="Content Options"
                 FontSize="24"/>
 
-            <HorizontalStackLayout IgnoreSafeArea="True">
+            <HorizontalStackLayout SafeAreaEdges="All">
                 <CheckBox 
                     x:Name="SetIconCheckBox"
                     IsChecked="False"
diff --git a/src/Controls/samples/Controls.Sample/Pages/Others/LargeTitlesPageiOS.cs b/src/Controls/samples/Controls.Sample/Pages/Others/LargeTitlesPageiOS.cs
index 7b7fb2b22712..f4066c6fc93c 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Others/LargeTitlesPageiOS.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Others/LargeTitlesPageiOS.cs
@@ -57,7 +57,7 @@ public LargeTitlesPageiOS()
 							var navPage = (Parent as NavigationPage)!;
 							navPage.On<iOS>().SetPrefersLargeTitles(true);
 							var page = new ContentPage { Title = "New Title", BackgroundColor = Colors.Red };
-							page.On<iOS>().SetUseSafeArea(true);
+							page.SafeAreaEdges = Microsoft.Maui.SafeAreaEdges.All;
 							var listView = new ListView(ListViewCachingStrategy.RecycleElementAndDataTemplate)
 							{
 								HasUnevenRows = true,
diff --git a/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSSafeAreaPage.xaml b/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSSafeAreaPage.xaml
index 0a2a844fad9f..012f2d184663 100644
--- a/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSSafeAreaPage.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSSafeAreaPage.xaml
@@ -2,10 +2,9 @@
 <ContentPage 
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:ios="clr-namespace:Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;assembly=Microsoft.Maui.Controls"
     x:Class="Maui.Controls.Sample.Pages.iOSSafeAreaPage"
     Title="Safe Area"
-    ios:Page.UseSafeArea="True">
+    SafeAreaEdges="None">
     <StackLayout>
         <Label Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quis enim redargueret? At modo dixeras nihil in istis rebus esse, quod interesset. Et quidem, inquit, vehementer errat; Semper enim ex eo, quod maximas partes continet latissimeque funditur, tota res appellatur. Equidem, sed audistine modo de Carneade? Duo Reges: constructio interrete." />
         <Button Text="Disable Use Safe Area"
diff --git a/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSSafeAreaPage.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSSafeAreaPage.xaml.cs
index d78b3c03fb59..7eb309d2078d 100644
--- a/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSSafeAreaPage.xaml.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSSafeAreaPage.xaml.cs
@@ -1,7 +1,5 @@
 using System;
 using Microsoft.Maui.Controls;
-using Microsoft.Maui.Controls.PlatformConfiguration;
-using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
 
 namespace Maui.Controls.Sample.Pages
 {
@@ -14,7 +12,7 @@ public iOSSafeAreaPage()
 
 		void OnButtonClicked(object sender, EventArgs e)
 		{
-			On<iOS>().SetUseSafeArea(false);
+			this.SafeAreaEdges = Microsoft.Maui.SafeAreaEdges.None;
 			(sender as Button)!.IsEnabled = false;
 		}
 	}
diff --git a/src/Controls/src/Core.Design/SafeAreaEdgesTypeDesignConverter.cs b/src/Controls/src/Core.Design/SafeAreaEdgesTypeDesignConverter.cs
new file mode 100644
index 000000000000..dacef5c1ce4f
--- /dev/null
+++ b/src/Controls/src/Core.Design/SafeAreaEdgesTypeDesignConverter.cs
@@ -0,0 +1,41 @@
+using System;
+using System.ComponentModel;
+using Controls.Core.Design;
+using Microsoft.Maui;
+
+namespace Microsoft.Maui.Controls.Design
+{
+	public class SafeAreaEdgesTypeDesignConverter : StringConverter
+	{
+		public override bool IsValid(ITypeDescriptorContext context, object value)
+		{
+			// MUST MATCH SafeAreaEdgesTypeConverter.ConvertFrom
+			string strValue = value?.ToString()?.Trim();
+			if (string.IsNullOrEmpty(strValue))
+				return false;
+
+			// Split by comma and check each part
+			string[] parts = strValue.Split(',');
+			
+			// Must have 1, 2, or 4 parts
+			if (parts.Length != 1 && parts.Length != 2 && parts.Length != 4)
+				return false;
+
+			// Each part must be a valid SafeAreaRegions value
+			foreach (string part in parts)
+			{
+				string trimmedPart = part.Trim();
+				if (!string.Equals(trimmedPart, "All", StringComparison.OrdinalIgnoreCase) &&
+					!string.Equals(trimmedPart, "None", StringComparison.OrdinalIgnoreCase) &&
+					!string.Equals(trimmedPart, "Default", StringComparison.OrdinalIgnoreCase) &&
+					!string.Equals(trimmedPart, "SoftInput", StringComparison.OrdinalIgnoreCase) &&
+					!string.Equals(trimmedPart, "Container", StringComparison.OrdinalIgnoreCase))
+				{
+					return false;
+				}
+			}
+
+			return true;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/Border/Border.cs b/src/Controls/src/Core/Border/Border.cs
index f940f6422be5..b7f6b5804cfa 100644
--- a/src/Controls/src/Core/Border/Border.cs
+++ b/src/Controls/src/Core/Border/Border.cs
@@ -10,7 +10,7 @@
 namespace Microsoft.Maui.Controls
 {
 	[ContentProperty(nameof(Content))]
-	public class Border : View, IContentView, IBorderView, IPaddingElement
+	public class Border : View, IContentView, IBorderView, IPaddingElement, ISafeAreaElement, ISafeAreaView2
 	{
 		float[]? _strokeDashPattern;
 
@@ -32,6 +32,9 @@ public class Border : View, IContentView, IBorderView, IPaddingElement
 		/// <summary>Bindable property for <see cref="Padding"/>.</summary>
 		public static readonly BindableProperty PaddingProperty = PaddingElement.PaddingProperty;
 
+		/// <summary>Bindable property for <see cref="SafeAreaEdges"/>.</summary>
+		public static readonly BindableProperty SafeAreaEdgesProperty = SafeAreaElement.SafeAreaEdgesProperty;
+
 		public View? Content
 		{
 			get { return (View?)GetValue(ContentProperty); }
@@ -44,6 +47,21 @@ public Thickness Padding
 			set => SetValue(PaddingElement.PaddingProperty, value);
 		}
 
+		/// <summary>
+		/// Gets or sets the safe area edges to obey for this border.
+		/// The default value is SafeAreaEdges.Default (None - edge to edge).
+		/// </summary>
+		/// <remarks>
+		/// This property controls which edges of the border should obey safe area insets.
+		/// Use SafeAreaRegions.None for edge-to-edge content, SafeAreaRegions.All to obey all safe area insets, 
+		/// SafeAreaRegions.Container for content that flows under keyboard but stays out of bars/notch, or SafeAreaRegions.Keyboard for keyboard-aware behavior.
+		/// </remarks>
+		public SafeAreaEdges SafeAreaEdges
+		{
+			get => (SafeAreaEdges)GetValue(SafeAreaElement.SafeAreaEdgesProperty);
+			set => SetValue(SafeAreaElement.SafeAreaEdgesProperty, value);
+		}
+
 		/// <summary>Bindable property for <see cref="StrokeShape"/>.</summary>
 		public static readonly BindableProperty StrokeShapeProperty =
 			BindableProperty.Create(nameof(StrokeShape), typeof(IShape), typeof(Border), new Rectangle(),
@@ -332,5 +350,23 @@ void UpdateStrokeShape()
 				strokeShape.StrokeThickness = StrokeThickness;
 			}
 		}
+
+		/// <inheritdoc cref="ISafeAreaView2.GetSafeAreaRegionsForEdge"/>
+		SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
+		{
+			// Use direct property
+			var regionForEdge = SafeAreaEdges.GetEdge(edge);
+
+			// For Border, return as-is
+			return regionForEdge;
+		}
+
+		/// <inheritdoc cref="ISafeAreaView2.SafeAreaInsets"/>
+		Thickness ISafeAreaView2.SafeAreaInsets { set { } } // Default no-op implementation for borders
+
+		SafeAreaEdges ISafeAreaElement.SafeAreaEdgesDefaultValueCreator()
+		{
+			return SafeAreaEdges.None;
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/ContentPage/ContentPage.cs b/src/Controls/src/Core/ContentPage/ContentPage.cs
index e71bd13d22a0..8968f1a09c4d 100644
--- a/src/Controls/src/Core/ContentPage/ContentPage.cs
+++ b/src/Controls/src/Core/ContentPage/ContentPage.cs
@@ -12,7 +12,7 @@ namespace Microsoft.Maui.Controls
 	/// <include file="../../docs/Microsoft.Maui.Controls/ContentPage.xml" path="Type[@FullName='Microsoft.Maui.Controls.ContentPage']/Docs/*" />
 	[ContentProperty("Content")]
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	public partial class ContentPage : TemplatedPage, IContentView, HotReload.IHotReloadableView
+	public partial class ContentPage : TemplatedPage, IContentView, HotReload.IHotReloadableView, ISafeAreaElement, ISafeAreaView2
 	{
 		/// <summary>Bindable property for <see cref="Content"/>.</summary>
 		public static readonly BindableProperty ContentProperty = BindableProperty.Create(nameof(Content), typeof(View), typeof(ContentPage), null, propertyChanged: TemplateUtilities.OnContentChanged);
@@ -28,6 +28,9 @@ public View Content
 		public static readonly BindableProperty HideSoftInputOnTappedProperty
 			= BindableProperty.Create(nameof(HideSoftInputOnTapped), typeof(bool), typeof(ContentPage), false);
 
+		/// <summary>Bindable property for <see cref="SafeAreaEdges"/>.</summary>
+		public static readonly BindableProperty SafeAreaEdgesProperty = SafeAreaElement.SafeAreaEdgesProperty;
+
 		/// <summary>
 		/// Gets or sets a value that indicates whether tapping anywhere on the page will cause the soft input to hide.
 		/// </summary>
@@ -37,6 +40,21 @@ public bool HideSoftInputOnTapped
 			set { SetValue(HideSoftInputOnTappedProperty, value); }
 		}
 
+		/// <summary>
+		/// Gets or sets the safe area edges to obey for this content page.
+		/// The default value is SafeAreaEdges.Default (None - edge to edge).
+		/// </summary>
+		/// <remarks>
+		/// This property controls which edges of the content page should obey safe area insets.
+		/// Use SafeAreaRegions.None for edge-to-edge content, SafeAreaRegions.All to obey all safe area insets, 
+		/// SafeAreaRegions.Container for content that flows under keyboard but stays out of bars/notch, or SafeAreaRegions.SoftInput for keyboard-aware behavior.
+		/// </remarks>
+		public SafeAreaEdges SafeAreaEdges
+		{
+			get => (SafeAreaEdges)GetValue(SafeAreaElement.SafeAreaEdgesProperty);
+			set => SetValue(SafeAreaElement.SafeAreaEdgesProperty, value);
+		}
+
 		public ContentPage()
 		{
 			this.NavigatedTo += (_, _) => UpdateHideSoftInputOnTapped();
@@ -151,6 +169,33 @@ Size IContentView.CrossPlatformMeasure(double widthConstraint, double heightCons
 			return (this as ICrossPlatformLayout).CrossPlatformMeasure(widthConstraint, heightConstraint);
 		}
 
+		/// <inheritdoc cref="ISafeAreaView2.GetSafeAreaRegionsForEdge"/>
+		SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
+		{
+			// Check if the developer has explicitly set SafeAreaEdges
+			if (IsSet(SafeAreaEdgesProperty))
+			{
+				// Developer has explicitly set SafeAreaEdges, use it directly
+				return SafeAreaEdges.GetEdge(edge);
+			}
+
+			// Developer hasn't set SafeAreaEdges, fall back to legacy IgnoreSafeArea behavior
+			var ignoreSafeArea = ((ISafeAreaView)this).IgnoreSafeArea;
+			if (ignoreSafeArea)
+			{
+				return SafeAreaRegions.None; // If legacy says "ignore", return None (edge-to-edge)
+			}
+			else
+			{
+				return SafeAreaRegions.Container; // If legacy says "don't ignore", return Container
+			}
+		}
+
+		SafeAreaEdges ISafeAreaElement.SafeAreaEdgesDefaultValueCreator()
+		{
+			return SafeAreaEdges.None;
+		}
+
 		private protected override string GetDebuggerDisplay()
 		{
 			var contentText = DebuggerDisplayHelpers.GetDebugText(nameof(Content), Content);
diff --git a/src/Controls/src/Core/ContentView/ContentView.cs b/src/Controls/src/Core/ContentView/ContentView.cs
index b56663e0012b..7438c52d60cb 100644
--- a/src/Controls/src/Core/ContentView/ContentView.cs
+++ b/src/Controls/src/Core/ContentView/ContentView.cs
@@ -1,6 +1,6 @@
 #nullable disable
 using System.Diagnostics;
-
+using Microsoft.Maui;
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Layouts;
 
@@ -9,7 +9,7 @@ namespace Microsoft.Maui.Controls
 	/// <include file="../../docs/Microsoft.Maui.Controls/ContentView.xml" path="Type[@FullName='Microsoft.Maui.Controls.ContentView']/Docs/*" />
 	[ContentProperty("Content")]
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	public partial class ContentView : TemplatedView, IContentView
+	public partial class ContentView : TemplatedView, IContentView, ISafeAreaView2, ISafeAreaElement
 	{
 		/// <summary>Bindable property for <see cref="Content"/>.</summary>
 		public static readonly BindableProperty ContentProperty = BindableProperty.Create(nameof(Content), typeof(View), typeof(ContentView), null, propertyChanged: TemplateUtilities.OnContentChanged);
@@ -21,6 +21,24 @@ public View Content
 			set { SetValue(ContentProperty, value); }
 		}
 
+		/// <summary>Bindable property for <see cref="SafeAreaEdges"/>.</summary>
+		public static readonly BindableProperty SafeAreaEdgesProperty = SafeAreaElement.SafeAreaEdgesProperty;
+
+		/// <summary>
+		/// Gets or sets the safe area edges to obey for this content view.
+		/// The default value is SafeAreaEdges.Default (None - edge to edge).
+		/// </summary>
+		/// <remarks>
+		/// This property controls which edges of the content view should obey safe area insets.
+		/// Use SafeAreaRegions.None for edge-to-edge content, SafeAreaRegions.All to obey all safe area insets, 
+		/// SafeAreaRegions.Container for content that flows under keyboard but stays out of bars/notch, or SafeAreaRegions.Keyboard for keyboard-aware behavior.
+		/// </remarks>
+		public SafeAreaEdges SafeAreaEdges
+		{
+			get => (SafeAreaEdges)GetValue(SafeAreaElement.SafeAreaEdgesProperty);
+			set => SetValue(SafeAreaElement.SafeAreaEdgesProperty, value);
+		}
+
 		protected override void OnBindingContextChanged()
 		{
 			base.OnBindingContextChanged();
@@ -50,10 +68,28 @@ internal override void SetChildInheritedBindingContext(Element child, object con
 
 		IView IContentView.PresentedContent => ((this as IControlTemplated).TemplateRoot as IView) ?? Content;
 
+		SafeAreaEdges ISafeAreaElement.SafeAreaEdgesDefaultValueCreator()
+		{
+			return SafeAreaEdges.None;
+		}
+
 		private protected override string GetDebuggerDisplay()
 		{
 			var contentText = DebuggerDisplayHelpers.GetDebugText(nameof(Content), Content);
 			return $"{base.GetDebuggerDisplay()}, {contentText}";
 		}
+
+		/// <inheritdoc cref="ISafeAreaView2.SafeAreaInsets"/>
+		Thickness ISafeAreaView2.SafeAreaInsets { set { } } // Default no-op implementation for content views
+
+		/// <inheritdoc cref="ISafeAreaView2.GetSafeAreaRegionsForEdge"/>
+		SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
+		{
+			// Use direct property
+			var regionForEdge = SafeAreaEdges.GetEdge(edge);
+
+			// For ContentView, return the region directly
+			return regionForEdge;
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/Handlers/Items/CarouselViewHandler.iOS.cs b/src/Controls/src/Core/Handlers/Items/CarouselViewHandler.iOS.cs
index cb1cf79cedd3..6bb17affbccc 100644
--- a/src/Controls/src/Core/Handlers/Items/CarouselViewHandler.iOS.cs
+++ b/src/Controls/src/Core/Handlers/Items/CarouselViewHandler.iOS.cs
@@ -71,7 +71,37 @@ public static void MapLoop(CarouselViewHandler handler, CarouselView carouselVie
 			(handler.Controller as CarouselViewController)?.UpdateLoop();
 		}
 
-		public override Size GetDesiredSize(double widthConstraint, double heightConstraint) =>
-			this.GetDesiredSizeFromHandler(widthConstraint, heightConstraint);
+		public override Size GetDesiredSize(double widthConstraint, double heightConstraint)
+		{
+			var size = this.GetDesiredSizeFromHandler(widthConstraint, heightConstraint);
+
+			if (OperatingSystem.IsMacCatalystVersionAtLeast(11))
+			{
+				// Ensure size never exceeds constraints.
+				// In the 22417 test sample on Mac, if widthConstraint is 1085, it becomes 1512 after the SizeThatFits call 
+				// inside ViewHandlerExtensions.iOS. This causes the view's width to appear larger on Mac.
+				// On iOS, the value remains correct — for example, if widthConstraint is 375, SizeThatFits also returns 375.
+				// This issue happened on Main also.
+
+				if (!double.IsInfinity(widthConstraint) && size.Width > widthConstraint)
+				{
+					size.Width = (float)widthConstraint;
+				}
+
+				if (!double.IsInfinity(heightConstraint) && size.Height > heightConstraint)
+				{
+					size.Height = (float)heightConstraint;
+				}
+
+			}
+
+			return size;
+		}
+
+		public override void PlatformArrange(Rect rect)
+		{
+			(Controller.Layout as CarouselViewLayout)?.UpdateConstraints(rect.Size);
+			base.PlatformArrange(rect);
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/ISafeAreaElement.cs b/src/Controls/src/Core/ISafeAreaElement.cs
new file mode 100644
index 000000000000..d5fc3a009810
--- /dev/null
+++ b/src/Controls/src/Core/ISafeAreaElement.cs
@@ -0,0 +1,14 @@
+using System.ComponentModel;
+using Microsoft.Maui;
+
+namespace Microsoft.Maui.Controls
+{
+	[EditorBrowsable(EditorBrowsableState.Never)]
+	internal interface ISafeAreaElement
+	{
+		//note to implementor: implement this property publicly
+		SafeAreaEdges SafeAreaEdges { get; }
+
+		SafeAreaEdges SafeAreaEdgesDefaultValueCreator();
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/Layout/Layout.cs b/src/Controls/src/Core/Layout/Layout.cs
index b54652f79184..14e83aa3e1b9 100644
--- a/src/Controls/src/Core/Layout/Layout.cs
+++ b/src/Controls/src/Core/Layout/Layout.cs
@@ -5,6 +5,7 @@
 using System.Diagnostics;
 using System.Linq;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Maui;
 using Microsoft.Maui.Controls.Xaml.Diagnostics;
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Layouts;
@@ -16,7 +17,7 @@ namespace Microsoft.Maui.Controls
 	/// </summary>
 	[ContentProperty(nameof(Children))]
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	public abstract partial class Layout : View, Maui.ILayout, IList<IView>, IBindableLayout, IPaddingElement, IVisualTreeElement, ISafeAreaView, IInputTransparentContainerElement
+	public abstract partial class Layout : View, Maui.ILayout, IList<IView>, IBindableLayout, IPaddingElement, IVisualTreeElement, ISafeAreaView, IInputTransparentContainerElement, ISafeAreaView2, ISafeAreaElement
 	{
 		protected ILayoutManager _layoutManager;
 
@@ -122,7 +123,29 @@ public Thickness Padding
 			set => SetValue(PaddingElement.PaddingProperty, value);
 		}
 
+		/// <summary>Bindable property for <see cref="SafeAreaEdges"/>.</summary>
+		public static readonly BindableProperty SafeAreaEdgesProperty = SafeAreaElement.SafeAreaEdgesProperty;
+
+		/// <summary>
+		/// Gets or sets the safe area edges to obey for this layout.
+		/// The default value is SafeAreaEdges.Default (None - edge to edge).
+		/// </summary>
+		/// <remarks>
+		/// This property controls which edges of the layout should obey safe area insets.
+		/// Use SafeAreaRegions.None for edge-to-edge content, SafeAreaRegions.All to obey all safe area insets, 
+		/// SafeAreaRegions.Container for content that flows under keyboard but stays out of bars/notch, or SafeAreaRegions.SoftInput for keyboard-aware behavior.
+		/// </remarks>
+		public SafeAreaEdges SafeAreaEdges
+		{
+			get => (SafeAreaEdges)GetValue(SafeAreaElement.SafeAreaEdgesProperty);
+			set => SetValue(SafeAreaElement.SafeAreaEdgesProperty, value);
+		}
+
 		/// <inheritdoc cref="ISafeAreaView.IgnoreSafeArea"/>
+		/// <remarks>
+		/// This property is deprecated. Use SafeAreaElement.IgnoreSafeArea attached property instead for per-edge safe area control.
+		/// </remarks>
+		[System.Obsolete("Use SafeAreaElement.IgnoreSafeArea attached property instead for per-edge safe area control.")]
 		public bool IgnoreSafeArea { get; set; }
 
 		/// <summary>
@@ -346,6 +369,11 @@ Thickness IPaddingElement.PaddingDefaultValueCreator()
 			return new Thickness(0);
 		}
 
+		SafeAreaEdges ISafeAreaElement.SafeAreaEdgesDefaultValueCreator()
+		{
+			return SafeAreaEdges.Container;
+		}
+
 		public Graphics.Size CrossPlatformMeasure(double widthConstraint, double heightConstraint)
 		{
 			return LayoutManager.Measure(widthConstraint, heightConstraint);
@@ -378,5 +406,41 @@ private protected override string GetDebuggerDisplay()
 		{
 			return $"{base.GetDebuggerDisplay()}, ChildCount = {Count}";
 		}
+
+
+		/// <inheritdoc cref="ISafeAreaView2.SafeAreaInsets"/>
+		Thickness ISafeAreaView2.SafeAreaInsets { set { } } // Default no-op implementation for layouts
+
+		/// <inheritdoc cref="ISafeAreaView2.GetSafeAreaRegionsForEdge"/>
+		SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
+		{
+			// Use direct property first
+			var regionForEdge = SafeAreaEdges.GetEdge(edge);
+
+			if (regionForEdge == SafeAreaRegions.Default)
+			{
+#pragma warning disable CS0618 // Type or member is obsolete
+				if (IgnoreSafeArea)
+				{
+					return SafeAreaRegions.None;
+				}
+#pragma warning restore CS0618 // Type or member is obsolete
+
+				return SafeAreaRegions.Container;
+			}
+
+#pragma warning disable CS0618 // Type or member is obsolete
+			// By default this is false so if someone sets this to true, we return None for all edges
+			if (IgnoreSafeArea)
+			{
+				// If IgnoreSafeArea is set, we return None for all edges
+				return SafeAreaRegions.None;
+			}
+#pragma warning restore CS0618 // Type or member is obsolete
+
+			// For Layout views, never return the old Default - return None instead
+			// (since Default no longer exists in the new enum)
+			return regionForEdge;
+		}
 	}
 }
diff --git a/src/Controls/src/Core/Layout/LayoutExtensions.cs b/src/Controls/src/Core/Layout/LayoutExtensions.cs
index 88fb01166bf9..10a06a0b7323 100644
--- a/src/Controls/src/Core/Layout/LayoutExtensions.cs
+++ b/src/Controls/src/Core/Layout/LayoutExtensions.cs
@@ -4,7 +4,9 @@ internal static class LayoutExtensions
 {
 	internal static void IgnoreLayoutSafeArea(this Layout layout)
 	{
+#pragma warning disable CS0618 // Type or member is obsolete
 		layout.IgnoreSafeArea = true;
+#pragma warning restore CS0618 // Type or member is obsolete
 
 		foreach (var child in layout.Children)
 		{
diff --git a/src/Controls/src/Core/LegacyLayouts/Layout.cs b/src/Controls/src/Core/LegacyLayouts/Layout.cs
index 4acbda6e7b77..6f17715efe8a 100644
--- a/src/Controls/src/Core/LegacyLayouts/Layout.cs
+++ b/src/Controls/src/Core/LegacyLayouts/Layout.cs
@@ -105,7 +105,7 @@ public abstract class Layout : View, ILayout, ILayoutController, IPaddingElement
 		bool _hasDoneLayout;
 		Size _lastLayoutSize = new Size(-1, -1);
 
-		private protected bool UseCompatibilityMode {get; }
+		private protected bool UseCompatibilityMode { get; }
 
 		protected Layout()
 		{
@@ -223,7 +223,7 @@ public override SizeRequest Measure(double widthConstraint, double heightConstra
 		[Obsolete("Use the Arrange method on child instead.")]
 		public static void LayoutChildIntoBoundingRegion(VisualElement child, Rect region)
 		{
-			if(child?.Parent is Layout layout && !layout.UseCompatibilityMode)
+			if (child?.Parent is Layout layout && !layout.UseCompatibilityMode)
 			{
 				return;
 			}
@@ -298,7 +298,7 @@ public void LowerChild(View view)
 		{
 			if (!UseCompatibilityMode)
 				return;
-				
+
 			if (!InternalChildren.Contains(view) || InternalChildren.First() == view)
 			{
 				return;
@@ -474,7 +474,7 @@ protected void UpdateChildrenLayout()
 			{
 				return;
 			}
-			
+
 			_hasDoneLayout = true;
 
 			if (!ShouldLayoutChildren())
@@ -536,7 +536,7 @@ protected void UpdateChildrenLayout()
 		internal static void LayoutChildIntoBoundingRegion(View child, Rect region, SizeRequest childSizeRequest)
 #pragma warning restore CS0618 // Type or member is obsolete
 		{
-			if(child?.Parent is Layout layout && !layout.UseCompatibilityMode)
+			if (child?.Parent is Layout layout && !layout.UseCompatibilityMode)
 			{
 				return;
 			}
@@ -600,7 +600,7 @@ internal override void OnIsVisibleChanged(bool oldValue, bool newValue)
 		{
 			base.OnIsVisibleChanged(oldValue, newValue);
 
-			if(!UseCompatibilityMode)
+			if (!UseCompatibilityMode)
 			{
 				return;
 			}
@@ -616,7 +616,7 @@ internal override void OnIsVisibleChanged(bool oldValue, bool newValue)
 
 		void InternalChildrenOnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
 		{
-			if(!UseCompatibilityMode)
+			if (!UseCompatibilityMode)
 			{
 				return;
 			}
@@ -672,14 +672,14 @@ protected override void OnChildAdded(Element child)
 		protected override void OnChildRemoved(Element child, int oldLogicalIndex)
 		{
 			base.OnChildRemoved(child, oldLogicalIndex);
-			
+
 			if (!UseCompatibilityMode)
 				InternalChildren.Remove(child);
 		}
 
 		void OnInternalAdded(View view)
 		{
-			if(!UseCompatibilityMode)
+			if (!UseCompatibilityMode)
 			{
 				return;
 			}
@@ -696,7 +696,7 @@ void OnInternalAdded(View view)
 
 		void OnInternalRemoved(View view, int oldIndex)
 		{
-			if(!UseCompatibilityMode)
+			if (!UseCompatibilityMode)
 			{
 				return;
 			}
@@ -710,7 +710,7 @@ void OnInternalRemoved(View view, int oldIndex)
 
 		bool ShouldLayoutChildren()
 		{
-			if(!UseCompatibilityMode)
+			if (!UseCompatibilityMode)
 			{
 				return false;
 			}
diff --git a/src/Controls/src/Core/Page/Page.cs b/src/Controls/src/Core/Page/Page.cs
index d73749275fd8..be8b94dccbd8 100644
--- a/src/Controls/src/Core/Page/Page.cs
+++ b/src/Controls/src/Core/Page/Page.cs
@@ -8,9 +8,9 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Maui;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
-
 using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls
@@ -21,7 +21,7 @@ namespace Microsoft.Maui.Controls
 	/// <remarks><see cref = "Page" /> is primarily a base class for more useful derived types. Objects that are derived from the <see cref="Page"/> class are most prominently used as the top level UI element in .NET MAUI applications. In addition to their role as the main pages of applications, <see cref="Page"/> objects and their descendants can be used with navigation classes, such as <see cref="NavigationPage"/> or <see cref="FlyoutPage"/>, among others, to provide rich user experiences that conform to the expected behaviors on each platform.
 	/// </remarks>
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	public partial class Page : VisualElement, ILayout, IPageController, IElementConfiguration<Page>, IPaddingElement, ISafeAreaView, ISafeAreaView2, IView, ITitledElement, IToolbarElement, IConstrainedView
+	public partial class Page : VisualElement, ILayout, IPageController, IElementConfiguration<Page>, IPaddingElement, ISafeAreaView2, IView, ITitledElement, IToolbarElement, ISafeAreaView, IConstrainedView
 #if IOS
 	,IiOSPageSpecifics
 #endif
@@ -141,6 +141,7 @@ public Thickness Padding
 			set { SetValue(PaddingElement.PaddingProperty, value); }
 		}
 
+
 		Thickness IPaddingElement.PaddingDefaultValueCreator()
 		{
 			return default(Thickness);
@@ -151,6 +152,8 @@ void IPaddingElement.OnPaddingPropertyChanged(Thickness oldValue, Thickness newV
 			(this as IView).InvalidateMeasure();
 		}
 
+
+
 		/// <summary>
 		/// Gets or sets the page's title.
 		/// </summary>
@@ -206,7 +209,9 @@ public bool IgnoresContainerArea
 		public ObservableCollection<Element> InternalChildren { get; } = new ObservableCollection<Element>();
 
 		/// <inheritdoc/>
+#pragma warning disable CS0618 // Type or member is obsolete
 		bool ISafeAreaView.IgnoreSafeArea => !On<PlatformConfiguration.iOS>().UsingSafeArea();
+#pragma warning restore CS0618 // Type or member is obsolete
 
 		bool IConstrainedView.HasFixedConstraints => true;
 
@@ -257,6 +262,16 @@ Thickness ISafeAreaView2.SafeAreaInsets
 			}
 		}
 
+		/// <inheritdoc cref="ISafeAreaView2.GetSafeAreaRegionsForEdge"/>
+		SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
+		{
+			// Use new SafeAreaElement method
+			var regionForEdge = SafeAreaElement.GetEdgeValue(this, edge);
+
+			// For Page (but not ContentPage), return as-is
+			return regionForEdge;
+		}
+
 		/// <summary>
 		/// Raised when the children of this page, and thus potentially the layout, have changed.
 		/// </summary>
@@ -555,7 +570,7 @@ protected override void OnSizeAllocated(double width, double height)
 		[Obsolete("Use ArrangeOverride instead")]
 		protected void UpdateChildrenLayout()
 		{
-			
+
 		}
 
 		internal void OnAppearing(Action action)
diff --git a/src/Controls/src/Core/PlatformConfiguration/iOSSpecific/Page.cs b/src/Controls/src/Core/PlatformConfiguration/iOSSpecific/Page.cs
index a31f5f0f4910..e0fa4a23a2eb 100644
--- a/src/Controls/src/Core/PlatformConfiguration/iOSSpecific/Page.cs
+++ b/src/Controls/src/Core/PlatformConfiguration/iOSSpecific/Page.cs
@@ -114,6 +114,10 @@ public static IPlatformElementConfiguration<iOS, FormsElement> SetPreferredStatu
 		/// <summary>
 		/// This iOS platform-specific controls whether padding values are overridden with the safe area insets.
 		/// </summary>
+		/// <remarks>
+		/// This API is deprecated. Use SafeAreaEdges attached property instead for per-edge safe area control.
+		/// </remarks>
+		[System.Obsolete("Use SafeAreaEdges attached property instead for per-edge safe area control.")]
 #if MACCATALYST
 		public static readonly BindableProperty UseSafeAreaProperty = BindableProperty.Create("UseSafeArea", typeof(bool), typeof(Page), true);
 #else
@@ -125,6 +129,10 @@ public static IPlatformElementConfiguration<iOS, FormsElement> SetPreferredStatu
 		/// </summary>
 		/// <param name="element">The element to get the safe area behavior from.</param>
 		/// <returns><see langword="true"/> if the padding values are overridden; otherwise, <see langword="false"/>.</returns>
+		/// <remarks>
+		/// This API is deprecated. Use SafeAreaEdges attached property instead for per-edge safe area control.
+		/// </remarks>
+		[System.Obsolete("Use SafeAreaEdges attached property instead for per-edge safe area control.")]
 		public static bool GetUseSafeArea(BindableObject element)
 		{
 			return (bool)element.GetValue(UseSafeAreaProperty);
@@ -135,6 +143,10 @@ public static bool GetUseSafeArea(BindableObject element)
 		/// </summary>
 		/// <param name="element">The element whose safe area use behavior to set.</param>
 		/// <param name="value"><see langword="true"/> to use the safe area inset behavior; otherwise, <see langword="false"/>.</param>
+		/// <remarks>
+		/// This API is deprecated. Use SafeAreaEdges attached property instead for per-edge safe area control.
+		/// </remarks>
+		[System.Obsolete("Use SafeAreaEdges attached property instead for per-edge safe area control.")]
 		public static void SetUseSafeArea(BindableObject element, bool value)
 		{
 			element.SetValue(UseSafeAreaProperty, value);
@@ -146,6 +158,10 @@ public static void SetUseSafeArea(BindableObject element, bool value)
 		/// <param name="config">The element whose safe area behavior to get.</param>
 		/// <param name="value"><see langword="true"/> to use the safe area inset behavior; otherwise, <see langword="false"/>.</param>
 		/// <returns>The updated configuration object on which developers can make successive method calls.</returns>
+		/// <remarks>
+		/// This API is deprecated. Use SafeAreaEdges attached property instead for per-edge safe area control.
+		/// </remarks>
+		[System.Obsolete("Use SafeAreaEdges attached property instead for per-edge safe area control.")]
 		public static IPlatformElementConfiguration<iOS, FormsElement> SetUseSafeArea(this IPlatformElementConfiguration<iOS, FormsElement> config, bool value)
 		{
 			SetUseSafeArea(config.Element, value);
@@ -157,6 +173,10 @@ public static IPlatformElementConfiguration<iOS, FormsElement> SetUseSafeArea(th
 		/// </summary>
 		/// <param name="config">The element whose safe area behavior to get.</param>
 		/// <returns><see langword="true"/> if the padding is overridden with the safe area; otherwise, <see langword="false"/>.</returns>
+		/// <remarks>
+		/// This API is deprecated. Use SafeAreaEdges attached property instead for per-edge safe area control.
+		/// </remarks>
+		[System.Obsolete("Use SafeAreaEdges attached property instead for per-edge safe area control.")]
 		public static bool UsingSafeArea(this IPlatformElementConfiguration<iOS, FormsElement> config)
 		{
 			return GetUseSafeArea(config.Element);
diff --git a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 6af1276e70fd..82eb8ac184fc 100644
--- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -6,6 +6,8 @@
 *REMOVED*~Microsoft.Maui.Controls.Accelerator.Modifiers.set -> void
 *REMOVED*Microsoft.Maui.Controls.AcceleratorTypeConverter
 *REMOVED*Microsoft.Maui.Controls.AcceleratorTypeConverter.AcceleratorTypeConverter() -> void
+Microsoft.Maui.Controls.Border.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.Border.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.GradientBrushParser(Microsoft.Maui.Graphics.Converters.ColorTypeConverter? colorConverter = null) -> void
 Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.Parse(string? css) -> Microsoft.Maui.Controls.GradientBrush?
 *REMOVED*Microsoft.Maui.Controls.ClickGestureRecognizer
@@ -24,6 +26,8 @@ Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.Parse(string? css
 *REMOVED*Microsoft.Maui.Controls.ClickedEventArgs.Buttons.get -> Microsoft.Maui.Controls.ButtonsMask
 *REMOVED*~Microsoft.Maui.Controls.ClickedEventArgs.ClickedEventArgs(Microsoft.Maui.Controls.ButtonsMask buttons, object commandParameter) -> void
 *REMOVED*~Microsoft.Maui.Controls.ClickedEventArgs.Parameter.get -> object
+Microsoft.Maui.Controls.ContentPage.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ContentPage.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparent.get -> bool
 Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparent.set -> void
 ~Microsoft.Maui.Controls.ContentPresenter.Children.get -> System.Collections.Generic.IReadOnlyList<Microsoft.Maui.Controls.Element>
@@ -32,6 +36,8 @@ Microsoft.Maui.Controls.ContentPresenter.Padding.get -> Microsoft.Maui.Thickness
 Microsoft.Maui.Controls.ContentPresenter.Padding.set -> void
 ~Microsoft.Maui.Controls.ContentPresenter.RaiseChild(Microsoft.Maui.Controls.View view) -> void
 Microsoft.Maui.Controls.ContentPresenter.UpdateChildrenLayout() -> void
+Microsoft.Maui.Controls.ContentView.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ContentView.SafeAreaEdges.set -> void
 *REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime oldDate, System.DateTime newDate) -> void
 Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime? oldDate, System.DateTime? newDate) -> void
 *REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.NewDate.get -> System.DateTime
@@ -83,6 +89,8 @@ Microsoft.Maui.Controls.ITextElement.TextTransform.get -> Microsoft.Maui.TextTra
 Microsoft.Maui.Controls.ITextElement.TextTransform.set -> void
 ~Microsoft.Maui.Controls.ITextElement.UpdateFormsText(string original, Microsoft.Maui.TextTransform transform) -> string
 Microsoft.Maui.Controls.Internals.TextTransformUtilities
+Microsoft.Maui.Controls.Layout.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.Layout.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.LayoutConstraint
 Microsoft.Maui.Controls.LayoutConstraint.Fixed = Microsoft.Maui.Controls.LayoutConstraint.HorizontallyFixed | Microsoft.Maui.Controls.LayoutConstraint.VerticallyFixed -> Microsoft.Maui.Controls.LayoutConstraint
 Microsoft.Maui.Controls.LayoutConstraint.HorizontallyFixed = 1 -> Microsoft.Maui.Controls.LayoutConstraint
@@ -117,6 +125,8 @@ Microsoft.Maui.Controls.ScrollView.CascadeInputTransparent.set -> void
 Microsoft.Maui.Controls.ScrollView.Padding.get -> Microsoft.Maui.Thickness
 Microsoft.Maui.Controls.ScrollView.Padding.set -> void
 ~Microsoft.Maui.Controls.ScrollView.RaiseChild(Microsoft.Maui.Controls.View view) -> void
+Microsoft.Maui.Controls.ScrollView.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ScrollView.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.ScrollView.UpdateChildrenLayout() -> void
 Microsoft.Maui.Controls.SearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
 Microsoft.Maui.Controls.SearchBar.ReturnType.set -> void
@@ -380,13 +390,17 @@ static Microsoft.Maui.Controls.ViewExtensions.ScaleXToAsync(this Microsoft.Maui.
 static Microsoft.Maui.Controls.ViewExtensions.ScaleYToAsync(this Microsoft.Maui.Controls.VisualElement! view, double scale, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
 static Microsoft.Maui.Controls.ViewExtensions.TranslateToAsync(this Microsoft.Maui.Controls.VisualElement! view, double x, double y, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
 ~static Microsoft.Maui.Controls.WebView.MapJavaScriptEnabled(Microsoft.Maui.Handlers.IWebViewHandler handler, Microsoft.Maui.Controls.WebView webView) -> void
+static readonly Microsoft.Maui.Controls.Border.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty!
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.ButtonsProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.CommandParameterProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.CommandProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.NumberOfClicksRequiredProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ContentPage.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparentProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ContentPresenter.PaddingProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ContentView.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.DatePicker.IsOpenProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.Layout.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.MenuItem.AcceleratorProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.Picker.IsOpenProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.PlatformConfiguration.AndroidSpecific.Button.RippleColorProperty -> Microsoft.Maui.Controls.BindableProperty
@@ -396,6 +410,7 @@ static Microsoft.Maui.Controls.ViewExtensions.TranslateToAsync(this Microsoft.Ma
 ~static readonly Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.Page.ModalPopoverSourceViewProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ScrollView.CascadeInputTransparentProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ScrollView.PaddingProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ScrollView.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.SearchBar.ReturnTypeProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.SearchBar.SearchIconColorProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.Shell.NavBarVisibilityAnimationEnabledProperty -> Microsoft.Maui.Controls.BindableProperty
diff --git a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index 9d4c2571775a..fed5f5451149 100644
--- a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -6,6 +6,8 @@
 *REMOVED*~Microsoft.Maui.Controls.Accelerator.Modifiers.set -> void
 *REMOVED*Microsoft.Maui.Controls.AcceleratorTypeConverter
 *REMOVED*Microsoft.Maui.Controls.AcceleratorTypeConverter.AcceleratorTypeConverter() -> void
+Microsoft.Maui.Controls.Border.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.Border.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.GradientBrushParser(Microsoft.Maui.Graphics.Converters.ColorTypeConverter? colorConverter = null) -> void
 Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.Parse(string? css) -> Microsoft.Maui.Controls.GradientBrush?
 *REMOVED*Microsoft.Maui.Controls.ClickGestureRecognizer
@@ -24,6 +26,8 @@ Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.Parse(string? css
 *REMOVED*Microsoft.Maui.Controls.ClickedEventArgs.Buttons.get -> Microsoft.Maui.Controls.ButtonsMask
 *REMOVED*~Microsoft.Maui.Controls.ClickedEventArgs.ClickedEventArgs(Microsoft.Maui.Controls.ButtonsMask buttons, object commandParameter) -> void
 *REMOVED*~Microsoft.Maui.Controls.ClickedEventArgs.Parameter.get -> object
+Microsoft.Maui.Controls.ContentPage.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ContentPage.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparent.get -> bool
 Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparent.set -> void
 ~Microsoft.Maui.Controls.ContentPresenter.Children.get -> System.Collections.Generic.IReadOnlyList<Microsoft.Maui.Controls.Element>
@@ -32,6 +36,8 @@ Microsoft.Maui.Controls.ContentPresenter.Padding.get -> Microsoft.Maui.Thickness
 Microsoft.Maui.Controls.ContentPresenter.Padding.set -> void
 ~Microsoft.Maui.Controls.ContentPresenter.RaiseChild(Microsoft.Maui.Controls.View view) -> void
 Microsoft.Maui.Controls.ContentPresenter.UpdateChildrenLayout() -> void
+Microsoft.Maui.Controls.ContentView.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ContentView.SafeAreaEdges.set -> void
 *REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime oldDate, System.DateTime newDate) -> void
 Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime? oldDate, System.DateTime? newDate) -> void
 *REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.NewDate.get -> System.DateTime
@@ -85,6 +91,8 @@ Microsoft.Maui.Controls.ITextElement.TextTransform.get -> Microsoft.Maui.TextTra
 Microsoft.Maui.Controls.ITextElement.TextTransform.set -> void
 ~Microsoft.Maui.Controls.ITextElement.UpdateFormsText(string original, Microsoft.Maui.TextTransform transform) -> string
 Microsoft.Maui.Controls.Internals.TextTransformUtilities
+Microsoft.Maui.Controls.Layout.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.Layout.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.LayoutConstraint
 Microsoft.Maui.Controls.LayoutConstraint.Fixed = Microsoft.Maui.Controls.LayoutConstraint.HorizontallyFixed | Microsoft.Maui.Controls.LayoutConstraint.VerticallyFixed -> Microsoft.Maui.Controls.LayoutConstraint
 Microsoft.Maui.Controls.LayoutConstraint.HorizontallyFixed = 1 -> Microsoft.Maui.Controls.LayoutConstraint
@@ -118,6 +126,8 @@ Microsoft.Maui.Controls.ScrollView.CascadeInputTransparent.set -> void
 Microsoft.Maui.Controls.ScrollView.Padding.get -> Microsoft.Maui.Thickness
 Microsoft.Maui.Controls.ScrollView.Padding.set -> void
 ~Microsoft.Maui.Controls.ScrollView.RaiseChild(Microsoft.Maui.Controls.View view) -> void
+Microsoft.Maui.Controls.ScrollView.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ScrollView.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.ScrollView.UpdateChildrenLayout() -> void
 Microsoft.Maui.Controls.SearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
 Microsoft.Maui.Controls.SearchBar.ReturnType.set -> void
@@ -243,6 +253,7 @@ override Microsoft.Maui.Controls.GridLengthTypeConverter.CanConvertFrom(System.C
 override Microsoft.Maui.Controls.GridLengthTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Controls.GridLengthTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
 override Microsoft.Maui.Controls.GridLengthTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Controls.Handlers.Items.CarouselViewHandler.PlatformArrange(Microsoft.Maui.Graphics.Rect rect) -> void
 override Microsoft.Maui.Controls.Handlers.Items.MauiCollectionView.MovedToWindow() -> void
 override Microsoft.Maui.Controls.Handlers.Items.MauiCollectionView.ScrollRectToVisible(CoreGraphics.CGRect rect, bool animated) -> void
 ~override Microsoft.Maui.Controls.HorizontalStackLayout.ComputeConstraintForView(Microsoft.Maui.Controls.View view) -> void
@@ -382,13 +393,17 @@ static Microsoft.Maui.Controls.ViewExtensions.ScaleToAsync(this Microsoft.Maui.C
 static Microsoft.Maui.Controls.ViewExtensions.ScaleXToAsync(this Microsoft.Maui.Controls.VisualElement! view, double scale, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
 static Microsoft.Maui.Controls.ViewExtensions.ScaleYToAsync(this Microsoft.Maui.Controls.VisualElement! view, double scale, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
 static Microsoft.Maui.Controls.ViewExtensions.TranslateToAsync(this Microsoft.Maui.Controls.VisualElement! view, double x, double y, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
+static readonly Microsoft.Maui.Controls.Border.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty!
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.ButtonsProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.CommandParameterProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.CommandProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.NumberOfClicksRequiredProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ContentPage.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparentProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ContentPresenter.PaddingProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ContentView.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.DatePicker.IsOpenProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.Layout.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.MenuItem.AcceleratorProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.Picker.IsOpenProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.PlatformConfiguration.AndroidSpecific.Button.RippleColorProperty -> Microsoft.Maui.Controls.BindableProperty
@@ -398,6 +413,7 @@ static Microsoft.Maui.Controls.ViewExtensions.TranslateToAsync(this Microsoft.Ma
 ~static readonly Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.Page.ModalPopoverSourceViewProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ScrollView.CascadeInputTransparentProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ScrollView.PaddingProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ScrollView.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.SearchBar.ReturnTypeProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.SearchBar.SearchIconColorProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.Shell.NavBarVisibilityAnimationEnabledProperty -> Microsoft.Maui.Controls.BindableProperty
diff --git a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index 9d4c2571775a..fed5f5451149 100644
--- a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -6,6 +6,8 @@
 *REMOVED*~Microsoft.Maui.Controls.Accelerator.Modifiers.set -> void
 *REMOVED*Microsoft.Maui.Controls.AcceleratorTypeConverter
 *REMOVED*Microsoft.Maui.Controls.AcceleratorTypeConverter.AcceleratorTypeConverter() -> void
+Microsoft.Maui.Controls.Border.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.Border.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.GradientBrushParser(Microsoft.Maui.Graphics.Converters.ColorTypeConverter? colorConverter = null) -> void
 Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.Parse(string? css) -> Microsoft.Maui.Controls.GradientBrush?
 *REMOVED*Microsoft.Maui.Controls.ClickGestureRecognizer
@@ -24,6 +26,8 @@ Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.Parse(string? css
 *REMOVED*Microsoft.Maui.Controls.ClickedEventArgs.Buttons.get -> Microsoft.Maui.Controls.ButtonsMask
 *REMOVED*~Microsoft.Maui.Controls.ClickedEventArgs.ClickedEventArgs(Microsoft.Maui.Controls.ButtonsMask buttons, object commandParameter) -> void
 *REMOVED*~Microsoft.Maui.Controls.ClickedEventArgs.Parameter.get -> object
+Microsoft.Maui.Controls.ContentPage.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ContentPage.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparent.get -> bool
 Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparent.set -> void
 ~Microsoft.Maui.Controls.ContentPresenter.Children.get -> System.Collections.Generic.IReadOnlyList<Microsoft.Maui.Controls.Element>
@@ -32,6 +36,8 @@ Microsoft.Maui.Controls.ContentPresenter.Padding.get -> Microsoft.Maui.Thickness
 Microsoft.Maui.Controls.ContentPresenter.Padding.set -> void
 ~Microsoft.Maui.Controls.ContentPresenter.RaiseChild(Microsoft.Maui.Controls.View view) -> void
 Microsoft.Maui.Controls.ContentPresenter.UpdateChildrenLayout() -> void
+Microsoft.Maui.Controls.ContentView.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ContentView.SafeAreaEdges.set -> void
 *REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime oldDate, System.DateTime newDate) -> void
 Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime? oldDate, System.DateTime? newDate) -> void
 *REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.NewDate.get -> System.DateTime
@@ -85,6 +91,8 @@ Microsoft.Maui.Controls.ITextElement.TextTransform.get -> Microsoft.Maui.TextTra
 Microsoft.Maui.Controls.ITextElement.TextTransform.set -> void
 ~Microsoft.Maui.Controls.ITextElement.UpdateFormsText(string original, Microsoft.Maui.TextTransform transform) -> string
 Microsoft.Maui.Controls.Internals.TextTransformUtilities
+Microsoft.Maui.Controls.Layout.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.Layout.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.LayoutConstraint
 Microsoft.Maui.Controls.LayoutConstraint.Fixed = Microsoft.Maui.Controls.LayoutConstraint.HorizontallyFixed | Microsoft.Maui.Controls.LayoutConstraint.VerticallyFixed -> Microsoft.Maui.Controls.LayoutConstraint
 Microsoft.Maui.Controls.LayoutConstraint.HorizontallyFixed = 1 -> Microsoft.Maui.Controls.LayoutConstraint
@@ -118,6 +126,8 @@ Microsoft.Maui.Controls.ScrollView.CascadeInputTransparent.set -> void
 Microsoft.Maui.Controls.ScrollView.Padding.get -> Microsoft.Maui.Thickness
 Microsoft.Maui.Controls.ScrollView.Padding.set -> void
 ~Microsoft.Maui.Controls.ScrollView.RaiseChild(Microsoft.Maui.Controls.View view) -> void
+Microsoft.Maui.Controls.ScrollView.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ScrollView.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.ScrollView.UpdateChildrenLayout() -> void
 Microsoft.Maui.Controls.SearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
 Microsoft.Maui.Controls.SearchBar.ReturnType.set -> void
@@ -243,6 +253,7 @@ override Microsoft.Maui.Controls.GridLengthTypeConverter.CanConvertFrom(System.C
 override Microsoft.Maui.Controls.GridLengthTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Controls.GridLengthTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
 override Microsoft.Maui.Controls.GridLengthTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Controls.Handlers.Items.CarouselViewHandler.PlatformArrange(Microsoft.Maui.Graphics.Rect rect) -> void
 override Microsoft.Maui.Controls.Handlers.Items.MauiCollectionView.MovedToWindow() -> void
 override Microsoft.Maui.Controls.Handlers.Items.MauiCollectionView.ScrollRectToVisible(CoreGraphics.CGRect rect, bool animated) -> void
 ~override Microsoft.Maui.Controls.HorizontalStackLayout.ComputeConstraintForView(Microsoft.Maui.Controls.View view) -> void
@@ -382,13 +393,17 @@ static Microsoft.Maui.Controls.ViewExtensions.ScaleToAsync(this Microsoft.Maui.C
 static Microsoft.Maui.Controls.ViewExtensions.ScaleXToAsync(this Microsoft.Maui.Controls.VisualElement! view, double scale, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
 static Microsoft.Maui.Controls.ViewExtensions.ScaleYToAsync(this Microsoft.Maui.Controls.VisualElement! view, double scale, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
 static Microsoft.Maui.Controls.ViewExtensions.TranslateToAsync(this Microsoft.Maui.Controls.VisualElement! view, double x, double y, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
+static readonly Microsoft.Maui.Controls.Border.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty!
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.ButtonsProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.CommandParameterProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.CommandProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.NumberOfClicksRequiredProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ContentPage.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparentProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ContentPresenter.PaddingProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ContentView.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.DatePicker.IsOpenProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.Layout.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.MenuItem.AcceleratorProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.Picker.IsOpenProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.PlatformConfiguration.AndroidSpecific.Button.RippleColorProperty -> Microsoft.Maui.Controls.BindableProperty
@@ -398,6 +413,7 @@ static Microsoft.Maui.Controls.ViewExtensions.TranslateToAsync(this Microsoft.Ma
 ~static readonly Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.Page.ModalPopoverSourceViewProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ScrollView.CascadeInputTransparentProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ScrollView.PaddingProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ScrollView.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.SearchBar.ReturnTypeProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.SearchBar.SearchIconColorProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.Shell.NavBarVisibilityAnimationEnabledProperty -> Microsoft.Maui.Controls.BindableProperty
diff --git a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index 8680432ab60f..f2071345c830 100644
--- a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -6,6 +6,8 @@
 *REMOVED*~Microsoft.Maui.Controls.Accelerator.Modifiers.set -> void
 *REMOVED*Microsoft.Maui.Controls.AcceleratorTypeConverter
 *REMOVED*Microsoft.Maui.Controls.AcceleratorTypeConverter.AcceleratorTypeConverter() -> void
+Microsoft.Maui.Controls.Border.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.Border.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.GradientBrushParser(Microsoft.Maui.Graphics.Converters.ColorTypeConverter? colorConverter = null) -> void
 Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.Parse(string? css) -> Microsoft.Maui.Controls.GradientBrush?
 *REMOVED*Microsoft.Maui.Controls.ClickGestureRecognizer
@@ -24,6 +26,8 @@ Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.Parse(string? css
 *REMOVED*Microsoft.Maui.Controls.ClickedEventArgs.Buttons.get -> Microsoft.Maui.Controls.ButtonsMask
 *REMOVED*~Microsoft.Maui.Controls.ClickedEventArgs.ClickedEventArgs(Microsoft.Maui.Controls.ButtonsMask buttons, object commandParameter) -> void
 *REMOVED*~Microsoft.Maui.Controls.ClickedEventArgs.Parameter.get -> object
+Microsoft.Maui.Controls.ContentPage.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ContentPage.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparent.get -> bool
 Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparent.set -> void
 ~Microsoft.Maui.Controls.ContentPresenter.Children.get -> System.Collections.Generic.IReadOnlyList<Microsoft.Maui.Controls.Element>
@@ -32,6 +36,8 @@ Microsoft.Maui.Controls.ContentPresenter.Padding.get -> Microsoft.Maui.Thickness
 Microsoft.Maui.Controls.ContentPresenter.Padding.set -> void
 ~Microsoft.Maui.Controls.ContentPresenter.RaiseChild(Microsoft.Maui.Controls.View view) -> void
 Microsoft.Maui.Controls.ContentPresenter.UpdateChildrenLayout() -> void
+Microsoft.Maui.Controls.ContentView.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ContentView.SafeAreaEdges.set -> void
 *REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime oldDate, System.DateTime newDate) -> void
 Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime? oldDate, System.DateTime? newDate) -> void
 *REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.NewDate.get -> System.DateTime
@@ -83,6 +89,8 @@ Microsoft.Maui.Controls.ITextElement.TextTransform.get -> Microsoft.Maui.TextTra
 Microsoft.Maui.Controls.ITextElement.TextTransform.set -> void
 ~Microsoft.Maui.Controls.ITextElement.UpdateFormsText(string original, Microsoft.Maui.TextTransform transform) -> string
 Microsoft.Maui.Controls.Internals.TextTransformUtilities
+Microsoft.Maui.Controls.Layout.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.Layout.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.LayoutConstraint
 Microsoft.Maui.Controls.LayoutConstraint.Fixed = Microsoft.Maui.Controls.LayoutConstraint.HorizontallyFixed | Microsoft.Maui.Controls.LayoutConstraint.VerticallyFixed -> Microsoft.Maui.Controls.LayoutConstraint
 Microsoft.Maui.Controls.LayoutConstraint.HorizontallyFixed = 1 -> Microsoft.Maui.Controls.LayoutConstraint
@@ -116,6 +124,8 @@ Microsoft.Maui.Controls.ScrollView.CascadeInputTransparent.set -> void
 Microsoft.Maui.Controls.ScrollView.Padding.get -> Microsoft.Maui.Thickness
 Microsoft.Maui.Controls.ScrollView.Padding.set -> void
 ~Microsoft.Maui.Controls.ScrollView.RaiseChild(Microsoft.Maui.Controls.View view) -> void
+Microsoft.Maui.Controls.ScrollView.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ScrollView.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.ScrollView.UpdateChildrenLayout() -> void
 Microsoft.Maui.Controls.SearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
 Microsoft.Maui.Controls.SearchBar.ReturnType.set -> void
@@ -377,13 +387,17 @@ static Microsoft.Maui.Controls.ViewExtensions.ScaleToAsync(this Microsoft.Maui.C
 static Microsoft.Maui.Controls.ViewExtensions.ScaleXToAsync(this Microsoft.Maui.Controls.VisualElement! view, double scale, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
 static Microsoft.Maui.Controls.ViewExtensions.ScaleYToAsync(this Microsoft.Maui.Controls.VisualElement! view, double scale, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
 static Microsoft.Maui.Controls.ViewExtensions.TranslateToAsync(this Microsoft.Maui.Controls.VisualElement! view, double x, double y, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
+static readonly Microsoft.Maui.Controls.Border.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty!
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.ButtonsProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.CommandParameterProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.CommandProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.NumberOfClicksRequiredProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ContentPage.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparentProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ContentPresenter.PaddingProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ContentView.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.DatePicker.IsOpenProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.Layout.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.MenuItem.AcceleratorProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.Picker.IsOpenProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.PlatformConfiguration.AndroidSpecific.Button.RippleColorProperty -> Microsoft.Maui.Controls.BindableProperty
@@ -393,6 +407,7 @@ static Microsoft.Maui.Controls.ViewExtensions.TranslateToAsync(this Microsoft.Ma
 ~static readonly Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.Page.ModalPopoverSourceViewProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ScrollView.CascadeInputTransparentProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ScrollView.PaddingProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ScrollView.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.SearchBar.ReturnTypeProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.SearchBar.SearchIconColorProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.Shell.NavBarVisibilityAnimationEnabledProperty -> Microsoft.Maui.Controls.BindableProperty
diff --git a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
index 72ec40e113b7..e79bc61cc361 100644
--- a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -6,6 +6,8 @@
 *REMOVED*~Microsoft.Maui.Controls.Accelerator.Modifiers.set -> void
 *REMOVED*Microsoft.Maui.Controls.AcceleratorTypeConverter
 *REMOVED*Microsoft.Maui.Controls.AcceleratorTypeConverter.AcceleratorTypeConverter() -> void
+Microsoft.Maui.Controls.Border.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.Border.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.GradientBrushParser(Microsoft.Maui.Graphics.Converters.ColorTypeConverter? colorConverter = null) -> void
 Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.Parse(string? css) -> Microsoft.Maui.Controls.GradientBrush?
 *REMOVED*Microsoft.Maui.Controls.ClickGestureRecognizer
@@ -24,6 +26,8 @@ Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.Parse(string? css
 *REMOVED*Microsoft.Maui.Controls.ClickedEventArgs.Buttons.get -> Microsoft.Maui.Controls.ButtonsMask
 *REMOVED*~Microsoft.Maui.Controls.ClickedEventArgs.ClickedEventArgs(Microsoft.Maui.Controls.ButtonsMask buttons, object commandParameter) -> void
 *REMOVED*~Microsoft.Maui.Controls.ClickedEventArgs.Parameter.get -> object
+Microsoft.Maui.Controls.ContentPage.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ContentPage.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparent.get -> bool
 Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparent.set -> void
 ~Microsoft.Maui.Controls.ContentPresenter.Children.get -> System.Collections.Generic.IReadOnlyList<Microsoft.Maui.Controls.Element>
@@ -32,6 +36,8 @@ Microsoft.Maui.Controls.ContentPresenter.Padding.get -> Microsoft.Maui.Thickness
 Microsoft.Maui.Controls.ContentPresenter.Padding.set -> void
 ~Microsoft.Maui.Controls.ContentPresenter.RaiseChild(Microsoft.Maui.Controls.View view) -> void
 Microsoft.Maui.Controls.ContentPresenter.UpdateChildrenLayout() -> void
+Microsoft.Maui.Controls.ContentView.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ContentView.SafeAreaEdges.set -> void
 *REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime oldDate, System.DateTime newDate) -> void
 Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime? oldDate, System.DateTime? newDate) -> void
 *REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.NewDate.get -> System.DateTime
@@ -83,6 +89,8 @@ Microsoft.Maui.Controls.ITextElement.TextTransform.get -> Microsoft.Maui.TextTra
 Microsoft.Maui.Controls.ITextElement.TextTransform.set -> void
 ~Microsoft.Maui.Controls.ITextElement.UpdateFormsText(string original, Microsoft.Maui.TextTransform transform) -> string
 Microsoft.Maui.Controls.Internals.TextTransformUtilities
+Microsoft.Maui.Controls.Layout.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.Layout.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.LayoutConstraint
 Microsoft.Maui.Controls.LayoutConstraint.Fixed = Microsoft.Maui.Controls.LayoutConstraint.HorizontallyFixed | Microsoft.Maui.Controls.LayoutConstraint.VerticallyFixed -> Microsoft.Maui.Controls.LayoutConstraint
 Microsoft.Maui.Controls.LayoutConstraint.HorizontallyFixed = 1 -> Microsoft.Maui.Controls.LayoutConstraint
@@ -113,6 +121,8 @@ Microsoft.Maui.Controls.ScrollView.CascadeInputTransparent.set -> void
 Microsoft.Maui.Controls.ScrollView.Padding.get -> Microsoft.Maui.Thickness
 Microsoft.Maui.Controls.ScrollView.Padding.set -> void
 ~Microsoft.Maui.Controls.ScrollView.RaiseChild(Microsoft.Maui.Controls.View view) -> void
+Microsoft.Maui.Controls.ScrollView.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ScrollView.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.ScrollView.UpdateChildrenLayout() -> void
 Microsoft.Maui.Controls.SearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
 Microsoft.Maui.Controls.SearchBar.ReturnType.set -> void
@@ -370,13 +380,17 @@ static Microsoft.Maui.Controls.ViewExtensions.ScaleToAsync(this Microsoft.Maui.C
 static Microsoft.Maui.Controls.ViewExtensions.ScaleXToAsync(this Microsoft.Maui.Controls.VisualElement! view, double scale, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
 static Microsoft.Maui.Controls.ViewExtensions.ScaleYToAsync(this Microsoft.Maui.Controls.VisualElement! view, double scale, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
 static Microsoft.Maui.Controls.ViewExtensions.TranslateToAsync(this Microsoft.Maui.Controls.VisualElement! view, double x, double y, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
+static readonly Microsoft.Maui.Controls.Border.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty!
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.ButtonsProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.CommandParameterProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.CommandProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.NumberOfClicksRequiredProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ContentPage.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparentProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ContentPresenter.PaddingProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ContentView.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.DatePicker.IsOpenProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.Layout.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.MenuItem.AcceleratorProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.Picker.IsOpenProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.PlatformConfiguration.AndroidSpecific.Button.RippleColorProperty -> Microsoft.Maui.Controls.BindableProperty
@@ -386,6 +400,7 @@ static Microsoft.Maui.Controls.ViewExtensions.TranslateToAsync(this Microsoft.Ma
 ~static readonly Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.Page.ModalPopoverSourceViewProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ScrollView.CascadeInputTransparentProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ScrollView.PaddingProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ScrollView.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.SearchBar.ReturnTypeProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.SearchBar.SearchIconColorProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.Shell.NavBarVisibilityAnimationEnabledProperty -> Microsoft.Maui.Controls.BindableProperty
diff --git a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index 72ec40e113b7..e79bc61cc361 100644
--- a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -6,6 +6,8 @@
 *REMOVED*~Microsoft.Maui.Controls.Accelerator.Modifiers.set -> void
 *REMOVED*Microsoft.Maui.Controls.AcceleratorTypeConverter
 *REMOVED*Microsoft.Maui.Controls.AcceleratorTypeConverter.AcceleratorTypeConverter() -> void
+Microsoft.Maui.Controls.Border.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.Border.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.GradientBrushParser(Microsoft.Maui.Graphics.Converters.ColorTypeConverter? colorConverter = null) -> void
 Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.Parse(string? css) -> Microsoft.Maui.Controls.GradientBrush?
 *REMOVED*Microsoft.Maui.Controls.ClickGestureRecognizer
@@ -24,6 +26,8 @@ Microsoft.Maui.Controls.BrushTypeConverter.GradientBrushParser.Parse(string? css
 *REMOVED*Microsoft.Maui.Controls.ClickedEventArgs.Buttons.get -> Microsoft.Maui.Controls.ButtonsMask
 *REMOVED*~Microsoft.Maui.Controls.ClickedEventArgs.ClickedEventArgs(Microsoft.Maui.Controls.ButtonsMask buttons, object commandParameter) -> void
 *REMOVED*~Microsoft.Maui.Controls.ClickedEventArgs.Parameter.get -> object
+Microsoft.Maui.Controls.ContentPage.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ContentPage.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparent.get -> bool
 Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparent.set -> void
 ~Microsoft.Maui.Controls.ContentPresenter.Children.get -> System.Collections.Generic.IReadOnlyList<Microsoft.Maui.Controls.Element>
@@ -32,6 +36,8 @@ Microsoft.Maui.Controls.ContentPresenter.Padding.get -> Microsoft.Maui.Thickness
 Microsoft.Maui.Controls.ContentPresenter.Padding.set -> void
 ~Microsoft.Maui.Controls.ContentPresenter.RaiseChild(Microsoft.Maui.Controls.View view) -> void
 Microsoft.Maui.Controls.ContentPresenter.UpdateChildrenLayout() -> void
+Microsoft.Maui.Controls.ContentView.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ContentView.SafeAreaEdges.set -> void
 *REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime oldDate, System.DateTime newDate) -> void
 Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime? oldDate, System.DateTime? newDate) -> void
 *REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.NewDate.get -> System.DateTime
@@ -83,6 +89,8 @@ Microsoft.Maui.Controls.ITextElement.TextTransform.get -> Microsoft.Maui.TextTra
 Microsoft.Maui.Controls.ITextElement.TextTransform.set -> void
 ~Microsoft.Maui.Controls.ITextElement.UpdateFormsText(string original, Microsoft.Maui.TextTransform transform) -> string
 Microsoft.Maui.Controls.Internals.TextTransformUtilities
+Microsoft.Maui.Controls.Layout.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.Layout.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.LayoutConstraint
 Microsoft.Maui.Controls.LayoutConstraint.Fixed = Microsoft.Maui.Controls.LayoutConstraint.HorizontallyFixed | Microsoft.Maui.Controls.LayoutConstraint.VerticallyFixed -> Microsoft.Maui.Controls.LayoutConstraint
 Microsoft.Maui.Controls.LayoutConstraint.HorizontallyFixed = 1 -> Microsoft.Maui.Controls.LayoutConstraint
@@ -113,6 +121,8 @@ Microsoft.Maui.Controls.ScrollView.CascadeInputTransparent.set -> void
 Microsoft.Maui.Controls.ScrollView.Padding.get -> Microsoft.Maui.Thickness
 Microsoft.Maui.Controls.ScrollView.Padding.set -> void
 ~Microsoft.Maui.Controls.ScrollView.RaiseChild(Microsoft.Maui.Controls.View view) -> void
+Microsoft.Maui.Controls.ScrollView.SafeAreaEdges.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.Controls.ScrollView.SafeAreaEdges.set -> void
 Microsoft.Maui.Controls.ScrollView.UpdateChildrenLayout() -> void
 Microsoft.Maui.Controls.SearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
 Microsoft.Maui.Controls.SearchBar.ReturnType.set -> void
@@ -370,13 +380,17 @@ static Microsoft.Maui.Controls.ViewExtensions.ScaleToAsync(this Microsoft.Maui.C
 static Microsoft.Maui.Controls.ViewExtensions.ScaleXToAsync(this Microsoft.Maui.Controls.VisualElement! view, double scale, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
 static Microsoft.Maui.Controls.ViewExtensions.ScaleYToAsync(this Microsoft.Maui.Controls.VisualElement! view, double scale, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
 static Microsoft.Maui.Controls.ViewExtensions.TranslateToAsync(this Microsoft.Maui.Controls.VisualElement! view, double x, double y, uint length = 250, Microsoft.Maui.Easing? easing = null) -> System.Threading.Tasks.Task<bool>!
+static readonly Microsoft.Maui.Controls.Border.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty!
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.ButtonsProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.CommandParameterProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.CommandProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.ClickGestureRecognizer.NumberOfClicksRequiredProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ContentPage.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ContentPresenter.CascadeInputTransparentProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ContentPresenter.PaddingProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ContentView.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.DatePicker.IsOpenProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.Layout.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 *REMOVED*~static readonly Microsoft.Maui.Controls.MenuItem.AcceleratorProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.Picker.IsOpenProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.PlatformConfiguration.AndroidSpecific.Button.RippleColorProperty -> Microsoft.Maui.Controls.BindableProperty
@@ -386,6 +400,7 @@ static Microsoft.Maui.Controls.ViewExtensions.TranslateToAsync(this Microsoft.Ma
 ~static readonly Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.Page.ModalPopoverSourceViewProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ScrollView.CascadeInputTransparentProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.ScrollView.PaddingProperty -> Microsoft.Maui.Controls.BindableProperty
+~static readonly Microsoft.Maui.Controls.ScrollView.SafeAreaEdgesProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.SearchBar.ReturnTypeProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.SearchBar.SearchIconColorProperty -> Microsoft.Maui.Controls.BindableProperty
 ~static readonly Microsoft.Maui.Controls.Shell.NavBarVisibilityAnimationEnabledProperty -> Microsoft.Maui.Controls.BindableProperty
diff --git a/src/Controls/src/Core/SafeAreaElement.cs b/src/Controls/src/Core/SafeAreaElement.cs
new file mode 100644
index 000000000000..16f0d3cc1b17
--- /dev/null
+++ b/src/Controls/src/Core/SafeAreaElement.cs
@@ -0,0 +1,94 @@
+using System;
+using System.ComponentModel;
+using Microsoft.Maui;
+
+namespace Microsoft.Maui.Controls
+{
+	internal static class SafeAreaElement
+	{
+		/// <summary>
+		/// The backing store for the <see cref="ISafeAreaElement.SafeAreaEdges" /> bindable property.
+		/// </summary>
+		public static readonly BindableProperty SafeAreaEdgesProperty =
+			BindableProperty.Create("SafeAreaEdges", typeof(SafeAreaEdges), typeof(ISafeAreaElement), SafeAreaEdges.Default,
+									propertyChanged: OnSafeAreaEdgesChanged,
+									defaultValueCreator: SafeAreaEdgesDefaultValueCreator);
+		static void OnSafeAreaEdgesChanged(BindableObject bindable, object oldValue, object newValue)
+		{
+			// Centralized implementation - invalidate measure to trigger layout recalculation
+			if (bindable is IView view)
+			{
+				view.InvalidateMeasure();
+			}
+		}
+
+		static object SafeAreaEdgesDefaultValueCreator(BindableObject bindable)
+			=> ((ISafeAreaElement)bindable).SafeAreaEdgesDefaultValueCreator();
+
+		/// <summary>
+		/// Gets the effective safe area behavior for a specific edge.
+		/// </summary>
+		/// <param name="bindable">The bindable object to get the safe area behavior from.</param>
+		/// <param name="edge">The edge to get the behavior for (0=Left, 1=Top, 2=Right, 3=Bottom).</param>
+		/// <returns>The <see cref="SafeAreaRegions"/> for the specified edge.</returns>
+		internal static SafeAreaRegions GetEdgeValue(BindableObject bindable, int edge)
+		{
+			var edges = (SafeAreaEdges)bindable.GetValue(SafeAreaEdgesProperty);
+			return edges.GetEdge(edge);
+		}
+
+		/// <summary>
+		/// Gets the effective safe area behavior for a specific edge for elements that implement ISafeAreaView.
+		/// This method handles the logic for checking the new SafeAreaEdges property and falling back to legacy behavior.
+		/// </summary>
+		/// <param name="bindable">The bindable object that implements ISafeAreaView.</param>
+		/// <param name="edge">The edge to get the behavior for (0=Left, 1=Top, 2=Right, 3=Bottom).</param>
+		/// <returns>True if safe area should be obeyed for this edge, false otherwise.</returns>
+		internal static bool ShouldObeySafeAreaForEdge(BindableObject bindable, int edge)
+		{
+			// Check the SafeAreaEdges property
+			var regionForEdge = GetEdgeValue(bindable, edge);
+
+			// Handle the new SafeAreaRegions behavior (now obey-based instead of ignore-based)
+			if (regionForEdge == SafeAreaRegions.All)
+			{
+				return true; // Obey all safe area insets - content positioned only in safe area
+			}
+
+			if (regionForEdge == SafeAreaRegions.Container)
+			{
+				// Content flows under keyboard but stays out of top and bottom bars and notch
+				// For now, treat this as obeying safe area (can be enhanced later for keyboard-specific behavior)
+				return true;
+			}
+
+			if (regionForEdge == SafeAreaRegions.SoftInput)
+			{
+				// Always pad so content doesn't go under the keyboard
+				// For now, treat this as obeying safe area
+				return true;
+			}
+
+			if (regionForEdge == SafeAreaRegions.Default)
+			{
+				// Default behavior - apply platform safe area insets
+				return true;
+			}
+
+			if (regionForEdge == SafeAreaRegions.None)
+			{
+				// Content goes edge to edge with no safe area padding
+				return false;
+			}
+
+			// Fall back to legacy behavior if available (but invert the logic since we now return "should obey")
+			if (bindable is ISafeAreaView legacySafeAreaView)
+			{
+				return !legacySafeAreaView.IgnoreSafeArea; // Invert: if legacy says "ignore", we say "don't obey"
+			}
+
+			// Default to false (don't obey safe area) since the new default is SafeAreaRegions.None (edge to edge)
+			return false;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/ScrollView/ScrollView.cs b/src/Controls/src/Core/ScrollView/ScrollView.cs
index 78e41c89b1a8..cadd85438560 100644
--- a/src/Controls/src/Core/ScrollView/ScrollView.cs
+++ b/src/Controls/src/Core/ScrollView/ScrollView.cs
@@ -13,7 +13,7 @@ namespace Microsoft.Maui.Controls
 	[ContentProperty(nameof(Content))]
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
 #pragma warning disable CS0618 // Type or member is obsolete
-	public partial class ScrollView : Compatibility.Layout, ILayout, ILayoutController, IPaddingElement, IView, IVisualTreeElement, IInputTransparentContainerElement, IScrollViewController, IElementConfiguration<ScrollView>, IFlowDirectionController, IScrollView, IContentView
+	public partial class ScrollView : Compatibility.Layout, ILayout, ILayoutController, IPaddingElement, IView, IVisualTreeElement, IInputTransparentContainerElement, IScrollViewController, IElementConfiguration<ScrollView>, IFlowDirectionController, IScrollView, IContentView, ISafeAreaElement, ISafeAreaView2
 #pragma warning restore CS0618 // Type or member is obsolete
 	{
 		#region IScrollViewController
@@ -137,6 +137,9 @@ public void SetScrolledPosition(double x, double y)
 		/// <summary>Bindable property for <see cref="VerticalScrollBarVisibility"/>.</summary>
 		public static readonly BindableProperty VerticalScrollBarVisibilityProperty = BindableProperty.Create(nameof(VerticalScrollBarVisibility), typeof(ScrollBarVisibility), typeof(ScrollView), ScrollBarVisibility.Default);
 
+		/// <summary>Bindable property for <see cref="SafeAreaEdges"/>.</summary>
+		public static readonly BindableProperty SafeAreaEdgesProperty = SafeAreaElement.SafeAreaEdgesProperty;
+
 		View _content;
 		TaskCompletionSource<bool> _scrollCompletionSource;
 		Rect _layoutAreaOverride;
@@ -252,6 +255,21 @@ public ScrollBarVisibility VerticalScrollBarVisibility
 			set { SetValue(VerticalScrollBarVisibilityProperty, value); }
 		}
 
+		/// <summary>
+		/// Gets or sets the safe area edges to obey for this scroll view.
+		/// The default value is SafeAreaEdges.Default (None - edge to edge).
+		/// </summary>
+		/// <remarks>
+		/// This property controls which edges of the scroll view should obey safe area insets.
+		/// Use SafeAreaRegions.None for edge-to-edge content, SafeAreaRegions.All to obey all safe area insets, 
+		/// SafeAreaRegions.Container for content that flows under keyboard but stays out of bars/notch, or SafeAreaRegions.SoftInput for keyboard-aware behavior.
+		/// </remarks>
+		public SafeAreaEdges SafeAreaEdges
+		{
+			get => (SafeAreaEdges)GetValue(SafeAreaElement.SafeAreaEdgesProperty);
+			set => SetValue(SafeAreaElement.SafeAreaEdgesProperty, value);
+		}
+
 		/// <include file="../../docs/Microsoft.Maui.Controls/ScrollView.xml" path="//Member[@MemberName='.ctor']/Docs/*" />
 		public ScrollView()
 		{
@@ -494,6 +512,31 @@ Size ICrossPlatformLayout.CrossPlatformArrange(Rect bounds)
 		Size IContentView.CrossPlatformArrange(Rect bounds) =>
 			((ICrossPlatformLayout)this).CrossPlatformArrange(bounds);
 
+		SafeAreaEdges ISafeAreaElement.SafeAreaEdgesDefaultValueCreator()
+		{
+			return SafeAreaEdges.Default;
+		}
+
+		/// <inheritdoc cref="ISafeAreaView2.SafeAreaInsets"/>
+		Thickness ISafeAreaView2.SafeAreaInsets
+		{
+			set
+			{
+				// For ScrollView, we don't need to store the SafeAreaInsets
+				// The platform-specific MauiScrollView handles this
+			}
+		}
+
+		/// <inheritdoc cref="ISafeAreaView2.GetSafeAreaRegionsForEdge"/>
+		SafeAreaRegions ISafeAreaView2.GetSafeAreaRegionsForEdge(int edge)
+		{
+			// Use direct property 
+			var regionForEdge = SafeAreaEdges.GetEdge(edge);
+
+			// For ScrollView, return Default behavior as-is (it's special)
+			return regionForEdge;
+		}
+
 		private protected override string GetDebuggerDisplay()
 		{
 			var debugText = DebuggerDisplayHelpers.GetDebugText(nameof(Content), Content);
@@ -511,7 +554,7 @@ public override SizeRequest Measure(double widthConstraint, double heightConstra
 			return base.Measure(widthConstraint, heightConstraint);
 		}
 
-		
+
 		/// <summary>
 		/// Sends a child to the back of the visual stack.
 		/// </summary>
@@ -578,7 +621,7 @@ protected override void OnChildMeasureInvalidated()
 		protected new void UpdateChildrenLayout()
 		{
 		}
-		
+
 		[Obsolete("Use MeasureOverride instead")]
 		protected override SizeRequest OnMeasure(double widthConstraint, double heightConstraint)
 		{
diff --git a/src/Controls/src/Core/Shell/BaseShellItem.cs b/src/Controls/src/Core/Shell/BaseShellItem.cs
index 1e6977079a1b..74f003f0dba3 100644
--- a/src/Controls/src/Core/Shell/BaseShellItem.cs
+++ b/src/Controls/src/Core/Shell/BaseShellItem.cs
@@ -355,7 +355,9 @@ internal static DataTemplate CreateDefaultFlyoutItemCell(BindableObject bo)
 			{
 				var grid = new Grid()
 				{
+#pragma warning disable CS0618 // Type or member is obsolete
 					IgnoreSafeArea = true
+#pragma warning restore CS0618 // Type or member is obsolete
 				};
 
 				if (OperatingSystem.IsWindows())
diff --git a/src/Controls/src/Core/TitleBar/TitleBar.cs b/src/Controls/src/Core/TitleBar/TitleBar.cs
index 4dbdacee871e..37eb60c04266 100644
--- a/src/Controls/src/Core/TitleBar/TitleBar.cs
+++ b/src/Controls/src/Core/TitleBar/TitleBar.cs
@@ -363,7 +363,9 @@ static View BuildDefaultTemplate()
 					new ColumnDefinition(150),             // Min drag region + padding for system buttons
 #endif
 				},
+#pragma warning disable CS0618 // Type or member is obsolete
 				IgnoreSafeArea = true,
+#pragma warning restore CS0618 // Type or member is obsolete
 			};
 
 			contentGrid.SetBinding(
diff --git a/src/Controls/tests/Core.UnitTests/ContentViewUnitTest.cs b/src/Controls/tests/Core.UnitTests/ContentViewUnitTest.cs
index a054ce8c6c12..48746fad97e6 100644
--- a/src/Controls/tests/Core.UnitTests/ContentViewUnitTest.cs
+++ b/src/Controls/tests/Core.UnitTests/ContentViewUnitTest.cs
@@ -77,11 +77,12 @@ public void TestFrameLayout()
 			var mockViewHandler = Substitute.For<IViewHandler>();
 
 			// Set up the mock handler to properly participate in the layout system
-			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo => {
+			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo =>
+			{
 				// Extract the constraints passed to GetDesiredSize
 				var width = (double)callInfo[0];
 				var height = (double)callInfo[1];
-				
+
 				// Return the child's requested size (100x200)
 				return new Size(100, 200);
 			});
@@ -111,10 +112,10 @@ public void TestFrameLayout()
 			Assert.Equal(new Rect(100, 50, 100, 200), child.Bounds);
 
 			// Verify the PlatformArrange method was called on the handler with the correct frame
-			mockViewHandler.Received().PlatformArrange(Arg.Is<Rect>(r => 
-				Math.Abs(r.X - 100) < 0.001 && 
-				Math.Abs(r.Y - 50) < 0.001 && 
-				Math.Abs(r.Width - 100) < 0.001 && 
+			mockViewHandler.Received().PlatformArrange(Arg.Is<Rect>(r =>
+				Math.Abs(r.X - 100) < 0.001 &&
+				Math.Abs(r.Y - 50) < 0.001 &&
+				Math.Abs(r.Width - 100) < 0.001 &&
 				Math.Abs(r.Height - 200) < 0.001));
 		}
 
@@ -125,11 +126,12 @@ public void WidthRequest()
 			var mockViewHandler = Substitute.For<IViewHandler>();
 
 			// Set up the mock handler to properly participate in the layout system
-			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo => {
+			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo =>
+			{
 				// Extract the constraints passed to GetDesiredSize
 				var width = (double)callInfo[0];
 				var height = (double)callInfo[1];
-				
+
 				// Return the child's requested size
 				return new Size(100, 200);
 			});
@@ -150,7 +152,7 @@ public void WidthRequest()
 
 			// Get the ICrossPlatformLayout implementation
 			ICrossPlatformLayout crossPlatformLayout = contentView;
-			
+
 			// Test that the measure includes padding and respects the contentView's WidthRequest
 			var result = crossPlatformLayout.CrossPlatformMeasure(double.PositiveInfinity, double.PositiveInfinity);
 			Assert.Equal(new Size(120, 220), result);
@@ -163,11 +165,12 @@ public void HeightRequest()
 			var mockViewHandler = Substitute.For<IViewHandler>();
 
 			// Set up the mock handler to properly participate in the layout system
-			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo => {
+			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo =>
+			{
 				// Extract the constraints passed to GetDesiredSize
 				var width = (double)callInfo[0];
 				var height = (double)callInfo[1];
-				
+
 				// Return the child's requested size
 				return new Size(100, 200);
 			});
@@ -188,7 +191,7 @@ public void HeightRequest()
 
 			// Get the ICrossPlatformLayout implementation
 			ICrossPlatformLayout crossPlatformLayout = contentView;
-			
+
 			// Test that the measure includes padding and respects the contentView's HeightRequest
 			var result = crossPlatformLayout.CrossPlatformMeasure(double.PositiveInfinity, double.PositiveInfinity);
 			Assert.Equal(new Size(120, 220), result);
@@ -201,11 +204,12 @@ public void LayoutVerticallyCenter()
 			var mockViewHandler = Substitute.For<IViewHandler>();
 
 			// Set up the mock handler to properly participate in the layout system
-			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo => {
+			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo =>
+			{
 				// Extract the constraints passed to GetDesiredSize
 				var width = (double)callInfo[0];
 				var height = (double)callInfo[1];
-				
+
 				// Return the child's requested size
 				return new Size(100, 100);
 			});
@@ -230,10 +234,10 @@ public void LayoutVerticallyCenter()
 			Assert.Equal(new Rect(100, 100, 0, 0), child.Bounds);
 
 			// Verify the PlatformArrange method was called on the handler with the correct frame
-			mockViewHandler.Received().PlatformArrange(Arg.Is<Rect>(r => 
-				Math.Abs(r.X - 100) < 0.001 && 
-				Math.Abs(r.Y - 100) < 0.001 && 
-				Math.Abs(r.Width - 0) < 0.001 && 
+			mockViewHandler.Received().PlatformArrange(Arg.Is<Rect>(r =>
+				Math.Abs(r.X - 100) < 0.001 &&
+				Math.Abs(r.Y - 100) < 0.001 &&
+				Math.Abs(r.Width - 0) < 0.001 &&
 				Math.Abs(r.Height - 0) < 0.001));
 		}
 
@@ -244,11 +248,12 @@ public void LayoutVerticallyBegin()
 			var mockViewHandler = Substitute.For<IViewHandler>();
 
 			// Set up the mock handler to properly participate in the layout system
-			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo => {
+			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo =>
+			{
 				// Extract the constraints passed to GetDesiredSize
 				var width = (double)callInfo[0];
 				var height = (double)callInfo[1];
-				
+
 				// Return the child's requested size
 				return new Size(100, 100);
 			});
@@ -273,10 +278,10 @@ public void LayoutVerticallyBegin()
 			Assert.Equal(new Rect(100, 0, 0, 0), child.Bounds);
 
 			// Verify the PlatformArrange method was called on the handler with the correct frame
-			mockViewHandler.Received().PlatformArrange(Arg.Is<Rect>(r => 
-				Math.Abs(r.X - 100) < 0.001 && 
-				Math.Abs(r.Y - 0) < 0.001 && 
-				Math.Abs(r.Width - 0) < 0.001 && 
+			mockViewHandler.Received().PlatformArrange(Arg.Is<Rect>(r =>
+				Math.Abs(r.X - 100) < 0.001 &&
+				Math.Abs(r.Y - 0) < 0.001 &&
+				Math.Abs(r.Width - 0) < 0.001 &&
 				Math.Abs(r.Height - 0) < 0.001));
 		}
 
@@ -287,11 +292,12 @@ public void LayoutVerticallyEnd()
 			var mockViewHandler = Substitute.For<IViewHandler>();
 
 			// Set up the mock handler to properly participate in the layout system
-			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo => {
+			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo =>
+			{
 				// Extract the constraints passed to GetDesiredSize
 				var width = (double)callInfo[0];
 				var height = (double)callInfo[1];
-				
+
 				// Return the child's requested size
 				return new Size(100, 100);
 			});
@@ -316,10 +322,10 @@ public void LayoutVerticallyEnd()
 			Assert.Equal(new Rect(100, 200, 0, 0), child.Bounds);
 
 			// Verify the PlatformArrange method was called on the handler with the correct frame
-			mockViewHandler.Received().PlatformArrange(Arg.Is<Rect>(r => 
-				Math.Abs(r.X - 100) < 0.001 && 
-				Math.Abs(r.Y - 200) < 0.001 && 
-				Math.Abs(r.Width - 0) < 0.001 && 
+			mockViewHandler.Received().PlatformArrange(Arg.Is<Rect>(r =>
+				Math.Abs(r.X - 100) < 0.001 &&
+				Math.Abs(r.Y - 200) < 0.001 &&
+				Math.Abs(r.Width - 0) < 0.001 &&
 				Math.Abs(r.Height - 0) < 0.001));
 		}
 
@@ -330,11 +336,12 @@ public void LayoutHorizontallyCenter()
 			var mockViewHandler = Substitute.For<IViewHandler>();
 
 			// Set up the mock handler to properly participate in the layout system
-			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo => {
+			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo =>
+			{
 				// Extract the constraints passed to GetDesiredSize
 				var width = (double)callInfo[0];
 				var height = (double)callInfo[1];
-				
+
 				// Return the child's requested size
 				return new Size(100, 100);
 			});
@@ -359,10 +366,10 @@ public void LayoutHorizontallyCenter()
 			Assert.Equal(new Rect(100, 100, 0, 0), child.Bounds);
 
 			// Verify the PlatformArrange method was called on the handler with the correct frame
-			mockViewHandler.Received().PlatformArrange(Arg.Is<Rect>(r => 
-				Math.Abs(r.X - 100) < 0.001 && 
-				Math.Abs(r.Y - 100) < 0.001 && 
-				Math.Abs(r.Width - 0) < 0.001 && 
+			mockViewHandler.Received().PlatformArrange(Arg.Is<Rect>(r =>
+				Math.Abs(r.X - 100) < 0.001 &&
+				Math.Abs(r.Y - 100) < 0.001 &&
+				Math.Abs(r.Width - 0) < 0.001 &&
 				Math.Abs(r.Height - 0) < 0.001));
 		}
 
@@ -373,11 +380,12 @@ public void LayoutHorizontallyBegin()
 			var mockViewHandler = Substitute.For<IViewHandler>();
 
 			// Set up the mock handler to properly participate in the layout system
-			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo => {
+			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo =>
+			{
 				// Extract the constraints passed to GetDesiredSize
 				var width = (double)callInfo[0];
 				var height = (double)callInfo[1];
-				
+
 				// Return the child's requested size
 				return new Size(100, 100);
 			});
@@ -402,10 +410,10 @@ public void LayoutHorizontallyBegin()
 			Assert.Equal(new Rect(0, 100, 0, 0), child.Bounds);
 
 			// Verify the PlatformArrange method was called on the handler with the correct frame
-			mockViewHandler.Received().PlatformArrange(Arg.Is<Rect>(r => 
-				Math.Abs(r.X - 0) < 0.001 && 
-				Math.Abs(r.Y - 100) < 0.001 && 
-				Math.Abs(r.Width - 0) < 0.001 && 
+			mockViewHandler.Received().PlatformArrange(Arg.Is<Rect>(r =>
+				Math.Abs(r.X - 0) < 0.001 &&
+				Math.Abs(r.Y - 100) < 0.001 &&
+				Math.Abs(r.Width - 0) < 0.001 &&
 				Math.Abs(r.Height - 0) < 0.001));
 		}
 
@@ -416,11 +424,12 @@ public void LayoutHorizontallyEnd()
 			var mockViewHandler = Substitute.For<IViewHandler>();
 
 			// Set up the mock handler to properly participate in the layout system
-			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo => {
+			mockViewHandler.GetDesiredSize(Arg.Any<double>(), Arg.Any<double>()).Returns(callInfo =>
+			{
 				// Extract the constraints passed to GetDesiredSize
 				var width = (double)callInfo[0];
 				var height = (double)callInfo[1];
-				
+
 				// Return the child's requested size
 				return new Size(100, 100);
 			});
@@ -445,10 +454,10 @@ public void LayoutHorizontallyEnd()
 			Assert.Equal(new Rect(200, 100, 0, 0), child.Bounds);
 
 			// Verify the PlatformArrange method was called on the handler with the correct frame
-			mockViewHandler.Received().PlatformArrange(Arg.Is<Rect>(r => 
-				Math.Abs(r.X - 200) < 0.001 && 
-				Math.Abs(r.Y - 100) < 0.001 && 
-				Math.Abs(r.Width - 0) < 0.001 && 
+			mockViewHandler.Received().PlatformArrange(Arg.Is<Rect>(r =>
+				Math.Abs(r.X - 200) < 0.001 &&
+				Math.Abs(r.Y - 100) < 0.001 &&
+				Math.Abs(r.Width - 0) < 0.001 &&
 				Math.Abs(r.Height - 0) < 0.001));
 		}
 
diff --git a/src/Controls/tests/Core.UnitTests/SafeAreaTests.cs b/src/Controls/tests/Core.UnitTests/SafeAreaTests.cs
new file mode 100644
index 000000000000..50f13d9f91b3
--- /dev/null
+++ b/src/Controls/tests/Core.UnitTests/SafeAreaTests.cs
@@ -0,0 +1,631 @@
+using System;
+using Microsoft.Maui.Converters;
+using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Layouts;
+using Xunit;
+
+namespace Microsoft.Maui.Controls.Core.UnitTests
+{
+	public class SafeAreaTests : BaseTestFixture
+	{
+		[Fact]
+		public void GetEdges_DefaultValue_ReturnsDefault()
+		{
+			var layout = new Grid();
+
+			var result = layout.SafeAreaEdges;
+
+			Assert.Equal(SafeAreaEdges.Container, result);
+		}
+
+		[Fact]
+		public void SetEdges_SingleValue_AppliedCorrectly()
+		{
+			var layout = new Grid();
+			var value = SafeAreaEdges.All;
+
+			layout.SafeAreaEdges = value;
+			var result = layout.SafeAreaEdges;
+
+			Assert.Equal(value, result);
+		}
+
+		[Fact]
+		public void GetEdgeValue_UniformValue_AppliesAllEdges()
+		{
+			var layout = new Grid();
+			layout.SafeAreaEdges = SafeAreaEdges.All;
+
+			Assert.Equal(SafeAreaRegions.All, SafeAreaElement.GetEdgeValue(layout, 0)); // Left
+			Assert.Equal(SafeAreaRegions.All, SafeAreaElement.GetEdgeValue(layout, 1)); // Top
+			Assert.Equal(SafeAreaRegions.All, SafeAreaElement.GetEdgeValue(layout, 2)); // Right
+			Assert.Equal(SafeAreaRegions.All, SafeAreaElement.GetEdgeValue(layout, 3)); // Bottom
+		}
+
+		[Fact]
+		public void GetEdgeValue_TwoValues_AppliesCorrectly()
+		{
+			var layout = new Grid();
+			layout.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.All, SafeAreaRegions.None);
+
+			Assert.Equal(SafeAreaRegions.All, SafeAreaElement.GetEdgeValue(layout, 0)); // Left
+			Assert.Equal(SafeAreaRegions.None, SafeAreaElement.GetEdgeValue(layout, 1)); // Top
+			Assert.Equal(SafeAreaRegions.All, SafeAreaElement.GetEdgeValue(layout, 2)); // Right
+			Assert.Equal(SafeAreaRegions.None, SafeAreaElement.GetEdgeValue(layout, 3)); // Bottom
+		}
+
+		[Fact]
+		public void GetEdgeValue_FourValues_AppliesCorrectly()
+		{
+			var layout = new Grid();
+			layout.SafeAreaEdges = new SafeAreaEdges(
+				SafeAreaRegions.All,   // Left
+				SafeAreaRegions.None,  // Top
+				SafeAreaRegions.All,   // Right
+				SafeAreaRegions.None   // Bottom
+			);
+
+			Assert.Equal(SafeAreaRegions.All, SafeAreaElement.GetEdgeValue(layout, 0)); // Left
+			Assert.Equal(SafeAreaRegions.None, SafeAreaElement.GetEdgeValue(layout, 1)); // Top
+			Assert.Equal(SafeAreaRegions.All, SafeAreaElement.GetEdgeValue(layout, 2)); // Right
+			Assert.Equal(SafeAreaRegions.None, SafeAreaElement.GetEdgeValue(layout, 3)); // Bottom
+		}
+
+		[Fact]
+		public void GetEdgeValue_InvalidEdgeIndex_ReturnsNone()
+		{
+			var layout = new Grid();
+			layout.SafeAreaEdges = SafeAreaEdges.All;
+
+			Assert.Equal(SafeAreaRegions.None, SafeAreaElement.GetEdgeValue(layout, -1));
+			Assert.Equal(SafeAreaRegions.None, SafeAreaElement.GetEdgeValue(layout, 4));
+		}
+
+		[Fact]
+		public void SafeAreaEdges_DefaultConstructor_ReturnsNone()
+		{
+			var edges = new SafeAreaEdges();
+
+			Assert.Equal(SafeAreaRegions.None, edges.Left);
+			Assert.Equal(SafeAreaRegions.None, edges.Top);
+			Assert.Equal(SafeAreaRegions.None, edges.Right);
+			Assert.Equal(SafeAreaRegions.None, edges.Bottom);
+		}
+
+		[Fact]
+		public void SafeAreaEdges_UniformConstructor_AppliesAllEdges()
+		{
+			var edges = new SafeAreaEdges(SafeAreaRegions.All);
+
+			Assert.Equal(SafeAreaRegions.All, edges.Left);
+			Assert.Equal(SafeAreaRegions.All, edges.Top);
+			Assert.Equal(SafeAreaRegions.All, edges.Right);
+			Assert.Equal(SafeAreaRegions.All, edges.Bottom);
+		}
+
+		[Fact]
+		public void SafeAreaEdges_HorizontalVerticalConstructor_AppliesCorrectly()
+		{
+			var edges = new SafeAreaEdges(SafeAreaRegions.All, SafeAreaRegions.None);
+
+			Assert.Equal(SafeAreaRegions.All, edges.Left);   // horizontal
+			Assert.Equal(SafeAreaRegions.None, edges.Top);   // vertical
+			Assert.Equal(SafeAreaRegions.All, edges.Right);  // horizontal
+			Assert.Equal(SafeAreaRegions.None, edges.Bottom); // vertical
+		}
+
+		[Fact]
+		public void SafeAreaEdges_IndividualConstructor_AppliesCorrectly()
+		{
+			var edges = new SafeAreaEdges(
+				SafeAreaRegions.All,   // Left
+				SafeAreaRegions.None,  // Top
+				SafeAreaRegions.All,   // Right
+				SafeAreaRegions.None   // Bottom
+			);
+
+			Assert.Equal(SafeAreaRegions.All, edges.Left);
+			Assert.Equal(SafeAreaRegions.None, edges.Top);
+			Assert.Equal(SafeAreaRegions.All, edges.Right);
+			Assert.Equal(SafeAreaRegions.None, edges.Bottom);
+		}
+
+		[Fact]
+		public void SafeAreaEdges_GetEdge_ReturnsCorrectValues()
+		{
+			var edges = new SafeAreaEdges(
+				SafeAreaRegions.All,   // Left
+				SafeAreaRegions.None,  // Top
+				SafeAreaRegions.All,   // Right
+				SafeAreaRegions.None   // Bottom
+			);
+
+			Assert.Equal(SafeAreaRegions.All, edges.GetEdge(0));   // Left
+			Assert.Equal(SafeAreaRegions.None, edges.GetEdge(1));  // Top
+			Assert.Equal(SafeAreaRegions.All, edges.GetEdge(2));   // Right
+			Assert.Equal(SafeAreaRegions.None, edges.GetEdge(3));  // Bottom
+			Assert.Equal(SafeAreaRegions.None, edges.GetEdge(-1)); // Invalid
+			Assert.Equal(SafeAreaRegions.None, edges.GetEdge(4));  // Invalid
+		}
+
+		[Fact]
+		public void SafeAreaEdges_StaticProperties_ReturnCorrectValues()
+		{
+			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.None), SafeAreaEdges.None);
+			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.All), SafeAreaEdges.All);
+		}
+
+		[Fact]
+		public void SafeAreaEdges_Equality_WorksCorrectly()
+		{
+			var edges1 = new SafeAreaEdges(SafeAreaRegions.All, SafeAreaRegions.None, SafeAreaRegions.All, SafeAreaRegions.None);
+			var edges2 = new SafeAreaEdges(SafeAreaRegions.All, SafeAreaRegions.None, SafeAreaRegions.All, SafeAreaRegions.None);
+			var edges3 = new SafeAreaEdges(SafeAreaRegions.None);
+
+			Assert.True(edges1 == edges2);
+			Assert.False(edges1 == edges3);
+			Assert.True(edges1 != edges3);
+			Assert.True(edges1.Equals(edges2));
+			Assert.False(edges1.Equals(edges3));
+		}
+
+		[Fact]
+		public void SafeAreaEdges_ToString_FormatsCorrectly()
+		{
+			var uniform = new SafeAreaEdges(SafeAreaRegions.All);
+			var twoValue = new SafeAreaEdges(SafeAreaRegions.All, SafeAreaRegions.None);
+			var fourValue = new SafeAreaEdges(SafeAreaRegions.All, SafeAreaRegions.None, SafeAreaRegions.All, SafeAreaRegions.None);
+			var asymmetric = new SafeAreaEdges(SafeAreaRegions.All, SafeAreaRegions.None, SafeAreaRegions.None, SafeAreaRegions.All);
+
+			Assert.Equal("All, All, All, All", uniform.ToString());
+			Assert.Equal("All, None, All, None", twoValue.ToString());
+			Assert.Equal("All, None, All, None", fourValue.ToString()); // Optimized: Left==Right, Top==Bottom
+			Assert.Equal("All, None, None, All", asymmetric.ToString()); // No optimization possible
+		}
+
+		[Fact]
+		public void Layout_ImplementsISafeAreaView()
+		{
+			var layout = new Grid();
+
+			Assert.IsAssignableFrom<ISafeAreaView>(layout);
+			Assert.IsAssignableFrom<ISafeAreaView2>(layout);
+		}
+
+		[Fact]
+		public void Layout_GetSafeAreaRegionsForEdge_UsesDirectProperty()
+		{
+			var layout = new Grid();
+			layout.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.All, SafeAreaRegions.None, SafeAreaRegions.All);
+
+			// Test via ISafeAreaView2 interface - direct region values
+			var safeAreaView2 = (ISafeAreaView2)layout;
+
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left = None
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(1));  // Top = All
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right = None
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(3));  // Bottom = All
+		}
+
+		[Fact]
+		public void Layout_GetSafeAreaRegionsForEdge_FallsBackToLegacyProperty()
+		{
+			var layout = new Grid();
+			layout.IgnoreSafeArea = true; // Legacy property
+
+			// Should fall back to legacy property when no direct property is set
+			// IgnoreSafeArea = true should result in SafeAreaRegions.None (edge-to-edge)
+			var safeAreaView2 = (ISafeAreaView2)layout;
+
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0));
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(1));
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2));
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(3));
+		}
+
+		[Fact]
+		public void Page_ImplementsISafeAreaView()
+		{
+			var page = new ContentPage();
+
+			Assert.IsAssignableFrom<ISafeAreaView>(page);
+			Assert.IsAssignableFrom<ISafeAreaView2>(page);
+		}
+
+		[Fact]
+		public void ContentView_ImplementsISafeAreaView()
+		{
+			var contentView = new ContentView();
+
+			Assert.IsAssignableFrom<ISafeAreaView2>(contentView);
+		}
+
+		[Fact]
+		public void Page_GetSafeAreaRegionsForEdge_UsesDirectProperty()
+		{
+			var page = new ContentPage();
+			page.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.All, SafeAreaRegions.None, SafeAreaRegions.All);
+
+			// Test via ISafeAreaView2 interface - direct region values
+			var safeAreaView2 = (ISafeAreaView2)page;
+
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left = None
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(1));  // Top = All
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right = None
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(3));  // Bottom = All
+		}
+
+		[Fact]
+		public void ContentView_GetSafeAreaRegionsForEdge_DefaultsToNoneWhenNoPropertySet()
+		{
+			var contentView = new ContentView(); // ContentView implements ISafeAreaView2
+
+			// Should default to SafeAreaRegions.None when no property is set (edge-to-edge behavior)
+			var safeAreaView2 = (ISafeAreaView2)contentView;
+
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0));
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(1));
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2));
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(3));
+		}
+
+		[Fact]
+		public void Page_GetSafeAreaRegionsForEdge_DefaultsToNoneForContentPage()
+		{
+			var page = new ContentPage(); // ContentPage defaults to SafeAreaRegions.None on iOS (IgnoreSafeArea = true)
+
+			// ContentPage has special logic - defaults to SafeAreaRegions.None (edge-to-edge) on iOS
+			var safeAreaView2 = (ISafeAreaView2)page;
+
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0));
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(1));
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2));
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(3));
+		}
+
+		// Tests based on existing iOS safe area usage patterns
+		[Fact]
+		public void SafeArea_CanReplaceUseSafeAreaScenario()
+		{
+			// This test mimics the usage pattern from Issue3809 and ShellTests.iOS
+			var contentView = new ContentView()
+			{
+				Content = new Label() { Text = "Test Page" }
+			};
+
+			// Legacy approach: contentPage.On<iOS>().SetUseSafeArea(true);
+			// New approach: use SafeAreaEdges property to obey all safe areas
+			contentView.SafeAreaEdges = SafeAreaEdges.All; // Obey all safe areas
+
+			var safeAreaView2 = (ISafeAreaView2)contentView;
+
+			// All edges should obey safe area (return All region)
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(0));
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(1));
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(2));
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(3));
+		}
+
+		[Fact]
+		public void SafeArea_SupportsPerEdgeControl_IgnoreTopAndBottom()
+		{
+			// Common use case: ignore safe area for top and bottom edges only (e.g., for full-width background)
+			var stackLayout = new VerticalStackLayout();
+
+			// Edge-to-edge for top and bottom (None), obey for left and right (All)
+			stackLayout.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.All, SafeAreaRegions.None, SafeAreaRegions.All, SafeAreaRegions.None);
+
+			var safeAreaView2 = (ISafeAreaView2)stackLayout;
+
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(0));  // Left = All
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(1)); // Top = None
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(2));  // Right = All
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(3)); // Bottom = None
+		}
+
+		[Fact]
+		public void SafeArea_TwoValueShorthand_LeftRightTopBottom()
+		{
+			// Test two-value shorthand: first value for left/right, second for top/bottom
+			var grid = new Grid();
+
+			grid.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.All);
+
+			var safeAreaView2 = (ISafeAreaView2)grid;
+
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left = None
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(1));  // Top = All
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right = None
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(3));  // Bottom = All
+		}
+
+		[Fact]
+		public void SafeAreaEdgesTypeConverter_CanConvertFromString()
+		{
+			var converter = new SafeAreaEdgesTypeConverter();
+
+			Assert.True(converter.CanConvertFrom(null, typeof(string)));
+			Assert.False(converter.CanConvertFrom(null, typeof(int)));
+		}
+
+		[Fact]
+		public void SafeAreaEdgesTypeConverter_ConvertFromSingleValue()
+		{
+			var converter = new SafeAreaEdgesTypeConverter();
+
+			var result = (SafeAreaEdges)converter.ConvertFrom(null, null, "All");
+
+			Assert.Equal(SafeAreaEdges.All, result);
+		}
+
+		[Fact]
+		public void SafeAreaEdgesTypeConverter_ConvertFromTwoValues()
+		{
+			var converter = new SafeAreaEdgesTypeConverter();
+
+			var result = (SafeAreaEdges)converter.ConvertFrom(null, null, "None,Container");
+
+			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.Container), result);
+		}
+
+		[Fact]
+		public void SafeAreaEdgesTypeConverter_ConvertFromFourValues()
+		{
+			var converter = new SafeAreaEdgesTypeConverter();
+
+			var result = (SafeAreaEdges)converter.ConvertFrom(null, null, "None,All,Container,SoftInput");
+
+			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.All, SafeAreaRegions.Container, SafeAreaRegions.SoftInput), result);
+		}
+
+		[Fact]
+		public void SafeAreaEdgesTypeConverter_ConvertFromInvalidValue_ThrowsException()
+		{
+			var converter = new SafeAreaEdgesTypeConverter();
+
+			Assert.Throws<FormatException>(() =>
+				converter.ConvertFrom(null, null, "InvalidValue"));
+		}
+
+		[Fact]
+		public void SafeAreaEdgesTypeConverter_ConvertFromInvalidLength_ThrowsException()
+		{
+			var converter = new SafeAreaEdgesTypeConverter();
+
+			Assert.Throws<FormatException>(() =>
+				converter.ConvertFrom(null, null, "None,Container,All")); // 3 values not supported
+		}
+
+		[Fact]
+		public void SafeAreaEdgesTypeConverter_ConvertToString()
+		{
+			var converter = new SafeAreaEdgesTypeConverter();
+			var edges = new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.Container);
+
+			var result = converter.ConvertTo(null, null, edges, typeof(string));
+
+			Assert.Equal("None, Container, None, Container", result);
+		}
+
+		[Fact]
+		public void SafeAreaEdges_AllEnumValues_WorkCorrectly()
+		{
+			// Test all individual enum values can be used
+			var noneEdges = new SafeAreaEdges(SafeAreaRegions.None);
+			var softInputEdges = new SafeAreaEdges(SafeAreaRegions.SoftInput);
+			var containerEdges = new SafeAreaEdges(SafeAreaRegions.Container);
+			var defaultEdges = new SafeAreaEdges(SafeAreaRegions.Default);
+			var allEdges = new SafeAreaEdges(SafeAreaRegions.All);
+
+			Assert.Equal(SafeAreaRegions.None, noneEdges.Left);
+			Assert.Equal(SafeAreaRegions.SoftInput, softInputEdges.Left);
+			Assert.Equal(SafeAreaRegions.Container, containerEdges.Left);
+			Assert.Equal(SafeAreaRegions.Default, defaultEdges.Left);
+			Assert.Equal(SafeAreaRegions.All, allEdges.Left);
+		}
+
+		[Fact]
+		public void SafeAreaEdgesTypeConverter_AllEnumValues_ConvertCorrectly()
+		{
+			var converter = new SafeAreaEdgesTypeConverter();
+
+			// Test all individual enum values can be parsed
+			var noneResult = (SafeAreaEdges)converter.ConvertFrom(null, null, "None");
+			var softInputResult = (SafeAreaEdges)converter.ConvertFrom(null, null, "SoftInput");
+			var containerResult = (SafeAreaEdges)converter.ConvertFrom(null, null, "Container");
+			var defaultResult = (SafeAreaEdges)converter.ConvertFrom(null, null, "Default");
+			var allResult = (SafeAreaEdges)converter.ConvertFrom(null, null, "All");
+
+			Assert.Equal(SafeAreaEdges.None, noneResult);
+			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.SoftInput), softInputResult);
+			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.Container), containerResult);
+			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.Default), defaultResult);
+			Assert.Equal(SafeAreaEdges.All, allResult);
+		}
+
+		[Fact]
+		public void SafeAreaEdgesTypeConverter_MixedEnumValues_ConvertCorrectly()
+		{
+			var converter = new SafeAreaEdgesTypeConverter();
+
+			// Test mixed combinations of all enum values
+			var mixedTwoValues = (SafeAreaEdges)converter.ConvertFrom(null, null, "SoftInput,Container");
+			var mixedFourValues = (SafeAreaEdges)converter.ConvertFrom(null, null, "SoftInput,Default,Container,All");
+
+			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.SoftInput, SafeAreaRegions.Container), mixedTwoValues);
+			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.SoftInput, SafeAreaRegions.Default, SafeAreaRegions.Container, SafeAreaRegions.All), mixedFourValues);
+		}
+
+		[Fact]
+		public void SafeAreaEdges_EnumBitValues_AreUnique()
+		{
+			// Verify enum values use unique bit patterns
+			Assert.Equal(0, (int)SafeAreaRegions.None);
+			Assert.Equal(1, (int)SafeAreaRegions.SoftInput);
+			Assert.Equal(2, (int)SafeAreaRegions.Container);
+			Assert.Equal(-1, (int)SafeAreaRegions.Default);
+			Assert.Equal(32768, (int)SafeAreaRegions.All);
+		}
+
+		[Fact]
+		public void SafeAreaEdges_TypeConverterWithBinding_SimulatedConversion()
+		{
+			// Test that the type converter works as it would in a binding scenario
+			var converter = new SafeAreaEdgesTypeConverter();
+
+			// Simulate what happens when binding encounters a string value
+			// and needs to convert it to SafeAreaEdges
+
+			// Test single value conversion (what binding would do)
+			var allResult = converter.ConvertFrom(null, null, "All");
+			Assert.Equal(SafeAreaEdges.All, allResult);
+
+			// Test two values conversion
+			var twoValueResult = converter.ConvertFrom(null, null, "SoftInput,Container");
+			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.SoftInput, SafeAreaRegions.Container), twoValueResult);
+
+			// Test four values conversion
+			var fourValueResult = converter.ConvertFrom(null, null, "None,SoftInput,Container,All");
+			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.SoftInput, SafeAreaRegions.Container, SafeAreaRegions.All), fourValueResult);
+
+			// Test that conversion back to string works (for two-way binding)
+			var backToString = converter.ConvertTo(null, null, SafeAreaEdges.All, typeof(string));
+			Assert.Equal("All, All, All, All", backToString);
+		}
+
+		[Fact]
+		public void SafeAreaEdges_PropertyAssignment_WorksDirectly()
+		{
+			// Test direct property assignment (what would happen after successful binding conversion)
+			var layout = new Grid();
+
+			// Test setting from converted values (simulating what binding would do after conversion)
+			layout.SafeAreaEdges = SafeAreaEdges.All;
+			Assert.Equal(SafeAreaEdges.All, layout.SafeAreaEdges);
+
+			layout.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.SoftInput, SafeAreaRegions.Container);
+			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.SoftInput, SafeAreaRegions.Container), layout.SafeAreaEdges);
+
+			layout.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.SoftInput, SafeAreaRegions.Container, SafeAreaRegions.All);
+			Assert.Equal(new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.SoftInput, SafeAreaRegions.Container, SafeAreaRegions.All), layout.SafeAreaEdges);
+		}
+
+		#region Stack Layout Automatic Safe Area Tests
+
+		[Fact]
+		public void HorizontalStackLayout_BehavesLikeRegularLayout()
+		{
+			var stackLayout = new HorizontalStackLayout();
+
+			// Should behave like regular layout with default SafeAreaEdges.None (edge-to-edge)
+			var safeAreaView2 = (ISafeAreaView2)stackLayout;
+
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(1)); // Top
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(3)); // Bottom
+		}
+
+		[Fact]
+		public void HorizontalStackLayout_RespectsDirectProperty_RTL()
+		{
+			var stackLayout = new HorizontalStackLayout();
+			stackLayout.FlowDirection = FlowDirection.RightToLeft;
+			stackLayout.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.All, SafeAreaRegions.All, SafeAreaRegions.All);
+
+			// Should respect SafeAreaEdges direct property
+			var safeAreaView2 = (ISafeAreaView2)stackLayout;
+
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left (set to None)
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(1));  // Top (set to All)
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(2));  // Right (set to All)
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(3));  // Bottom (set to All)
+		}
+
+		[Fact]
+		public void VerticalStackLayout_BehavesLikeRegularLayout()
+		{
+			var stackLayout = new VerticalStackLayout();
+
+			// Should behave like regular layout with default SafeAreaEdges.None (edge-to-edge)
+			var safeAreaView2 = (ISafeAreaView2)stackLayout;
+
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(1)); // Top
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(3)); // Bottom
+		}
+
+		[Fact]
+		public void StackLayout_HorizontalOrientation_BehavesLikeRegularLayout_LTR()
+		{
+			var stackLayout = new StackLayout { Orientation = StackOrientation.Horizontal };
+
+			// Should behave like regular layout with default SafeAreaEdges.None (edge-to-edge)
+			var safeAreaView2 = (ISafeAreaView2)stackLayout;
+
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(1)); // Top
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(3)); // Bottom
+		}
+
+		[Fact]
+		public void StackLayout_HorizontalOrientation_RespectsDirectProperty_RTL()
+		{
+			var stackLayout = new StackLayout { Orientation = StackOrientation.Horizontal };
+			stackLayout.FlowDirection = FlowDirection.RightToLeft;
+			stackLayout.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.All, SafeAreaRegions.All, SafeAreaRegions.All);
+
+			// Should respect SafeAreaEdges direct property
+			var safeAreaView2 = (ISafeAreaView2)stackLayout;
+
+			Assert.Equal(SafeAreaRegions.None, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left (set to None)
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(1));  // Top (set to All)
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(2));  // Right (set to All)
+			Assert.Equal(SafeAreaRegions.All, safeAreaView2.GetSafeAreaRegionsForEdge(3));  // Bottom (set to All)
+		}
+
+		[Fact]
+		public void StackLayout_VerticalOrientation_BehavesLikeRegularLayout()
+		{
+			var stackLayout = new StackLayout { Orientation = StackOrientation.Vertical };
+
+			// Should behave like regular layout with default SafeAreaEdges.None (edge-to-edge)
+			var safeAreaView2 = (ISafeAreaView2)stackLayout;
+
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(1)); // Top
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right
+			Assert.Equal(SafeAreaRegions.Container, safeAreaView2.GetSafeAreaRegionsForEdge(3)); // Bottom
+		}
+
+		[Fact]
+		public void StackLayouts_RespectUserSettings()
+		{
+			var verticalStackLayout = new VerticalStackLayout();
+			var horizontalStackLayout = new HorizontalStackLayout();
+
+			// Set explicit SafeAreaEdges property - this should be respected
+			verticalStackLayout.SafeAreaEdges = SafeAreaEdges.All; // Obey all edges
+			horizontalStackLayout.SafeAreaEdges = SafeAreaEdges.None; // Edge-to-edge all edges
+
+			var verticalSafeAreaView2 = (ISafeAreaView2)verticalStackLayout;
+			var horizontalSafeAreaView2 = (ISafeAreaView2)horizontalStackLayout;
+
+			// VerticalStackLayout should respect user setting (All = obey safe area)
+			Assert.Equal(SafeAreaRegions.All, verticalSafeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left
+			Assert.Equal(SafeAreaRegions.All, verticalSafeAreaView2.GetSafeAreaRegionsForEdge(1)); // Top
+			Assert.Equal(SafeAreaRegions.All, verticalSafeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right
+			Assert.Equal(SafeAreaRegions.All, verticalSafeAreaView2.GetSafeAreaRegionsForEdge(3)); // Bottom
+
+			// HorizontalStackLayout should respect user setting (None = edge-to-edge)
+			Assert.Equal(SafeAreaRegions.None, horizontalSafeAreaView2.GetSafeAreaRegionsForEdge(0)); // Left
+			Assert.Equal(SafeAreaRegions.None, horizontalSafeAreaView2.GetSafeAreaRegionsForEdge(1)); // Top
+			Assert.Equal(SafeAreaRegions.None, horizontalSafeAreaView2.GetSafeAreaRegionsForEdge(2)); // Right
+			Assert.Equal(SafeAreaRegions.None, horizontalSafeAreaView2.GetSafeAreaRegionsForEdge(3)); // Bottom
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs
index a4d646438d67..822b6c4d8351 100644
--- a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.cs
@@ -369,7 +369,10 @@ public async Task CollectionViewCanSizeToContent(CollectionViewSizingTestCase te
 				collectionView.VerticalOptions = layoutOptions;
 			}
 
-			var layout = new Grid() { IgnoreSafeArea = true, HeightRequest = containerHeight, WidthRequest = containerWidth };
+			var layout = new Grid() { HeightRequest = containerHeight, WidthRequest = containerWidth };
+#pragma warning disable CS0618 // Type or member is obsolete
+			layout.IgnoreSafeArea = true;
+#pragma warning restore CS0618 // Type or member is obsolete
 			layout.Add(collectionView);
 
 			ObservableCollection<string> data = new();
@@ -443,7 +446,10 @@ public async Task CollectionViewStructuralItems(bool hasHeader, bool hasFooter,
 
 			double containerHeight = 500;
 			double containerWidth = 500;
-			var layout = new Grid() { IgnoreSafeArea = true, HeightRequest = containerHeight, WidthRequest = containerWidth };
+			var layout = new Grid() { HeightRequest = containerHeight, WidthRequest = containerWidth };
+#pragma warning disable CS0618 // Type or member is obsolete
+			layout.IgnoreSafeArea = true;
+#pragma warning restore CS0618 // Type or member is obsolete
 
 			Label headerLabel = hasHeader ? new Label { Text = "header" } : null;
 			Label footerLabel = hasFooter ? new Label { Text = "footer" } : null;
@@ -710,5 +716,47 @@ await vsl.AttachAndRun<LayoutHandler>(async (handler) =>
 				await WaitForUIUpdate(frame, collectionView);
 			}, MauiContext, (view) => CreateHandlerAsync<LayoutHandler>(view));
 		}
+
+		[Theory]
+		[InlineData(true)] // Use new SafeArea API
+		[InlineData(false)] // Use old IgnoreSafeArea API
+		public async Task SafeAreaBehaviorConsistency(bool useNewApi)
+		{
+			SetupBuilder();
+
+			double containerHeight = 500;
+			double containerWidth = 500;
+			var layout = new Grid() { HeightRequest = containerHeight, WidthRequest = containerWidth };
+
+			if (useNewApi)
+			{
+				layout.SafeAreaEdges = SafeAreaEdges.None;
+			}
+			else
+			{
+#pragma warning disable CS0618 // Type or member is obsolete
+				layout.IgnoreSafeArea = true;
+#pragma warning restore CS0618 // Type or member is obsolete
+			}
+
+			var collectionView = new CollectionView
+			{
+				ItemsLayout = LinearItemsLayout.Vertical,
+				ItemTemplate = new DataTemplate(() => new Label() { HeightRequest = 20, WidthRequest = 20 }),
+				ItemsSource = new ObservableCollection<string> { "Item 1", "Item 2", "Item 3" }
+			};
+
+			layout.Add(collectionView);
+
+			await CreateHandlerAndAddToWindow<LayoutHandler>(layout, async handler =>
+			{
+				await Task.Delay(100);
+
+				// Both APIs should result in the same layout behavior
+				// The layout should fill the container and ignore safe area
+				var layoutBounds = layout.GetPlatformViewBounds();
+				Assert.NotEqual(Rect.Zero, layoutBounds);
+			});
+		}
 	}
 }
diff --git a/src/Controls/tests/DeviceTests/Elements/Page/PageTests.iOS.cs b/src/Controls/tests/DeviceTests/Elements/Page/PageTests.iOS.cs
index b1f5f86f8c45..013bffe31e62 100644
--- a/src/Controls/tests/DeviceTests/Elements/Page/PageTests.iOS.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Page/PageTests.iOS.cs
@@ -45,6 +45,38 @@ await CreateHandlerAndAddToWindow<IWindowHandler>(shell, (handler) =>
 			});
 		}
 
+		[Theory("SafeArea behavior works with both old and new APIs")]
+		[InlineData(true)] // Use new SafeArea API
+		[InlineData(false)] // Use old UseSafeArea API
+		public async Task SafeAreaBehaviorConsistency(bool useNewApi)
+		{
+			SetupBuilder();
+
+			var page = new ContentPage { Background = Colors.Blue };
+
+			if (useNewApi)
+			{
+				page.SafeAreaEdges = SafeAreaEdges.All;
+			}
+			else
+			{
+#pragma warning disable CS0618 // Type or member is obsolete
+				page.On<iOS>().SetUseSafeArea(true);
+#pragma warning restore CS0618 // Type or member is obsolete
+			}
+
+			var shell = new Shell() { CurrentItem = page };
+
+			await CreateHandlerAndAddToWindow<IWindowHandler>(shell, (handler) =>
+			{
+				if (handler.VirtualView is Window window && window.Page is Shell shellPage)
+				{
+					// Both APIs should result in safe area being respected (non-zero insets)
+					Assert.NotEqual(shellPage.CurrentPage.On<iOS>().SafeAreaInsets(), Thickness.Zero);
+				}
+			});
+		}
+
 		//src/Compatibility/Core/tests/iOS/EmbeddingTests.cs
 		[Fact(DisplayName = "Can Create Platform View From ContentPage")]
 		public async Task CanCreateViewControllerFromContentPage()
diff --git a/src/Controls/tests/DeviceTests/Elements/ScrollView/ScrollViewTests.iOS.cs b/src/Controls/tests/DeviceTests/Elements/ScrollView/ScrollViewTests.iOS.cs
index 8495f10ccdd3..63d45547bf8d 100644
--- a/src/Controls/tests/DeviceTests/Elements/ScrollView/ScrollViewTests.iOS.cs
+++ b/src/Controls/tests/DeviceTests/Elements/ScrollView/ScrollViewTests.iOS.cs
@@ -19,7 +19,9 @@ public async Task ScrollViewContentSizeSet()
 		{
 			EnsureHandlerCreated(builder => { builder.ConfigureMauiHandlers(handlers => { handlers.AddHandler<Entry, EntryHandler>(); }); });
 
-			var scrollView = new ScrollView();
+			// we set this to none because if it's set to automatic it should become scrollable
+			// so the bottom content doesn't go off the screen
+			var scrollView = new ScrollView() { SafeAreaEdges = SafeAreaEdges.None };
 			var entry = new Entry() { Text = "In a ScrollView", HeightRequest = 10000 };
 			scrollView.Content = entry;
 			await AttachAndRun<ScrollViewHandler>(scrollView, handler =>
@@ -33,17 +35,13 @@ public async Task ContentSizeExpandsToViewport()
 		{
 			EnsureHandlerCreated(builder => { builder.ConfigureMauiHandlers(handlers => { handlers.AddHandler<Entry, EntryHandler>(); }); });
 
-			var scrollView = new ScrollView();
+			var scrollView = new ScrollView()
+			{
+				SafeAreaEdges = SafeAreaEdges.Container
+			};
 
 			var entry = new Entry() { Text = "In a ScrollView", HeightRequest = 10 };
 
-
-			static CoreGraphics.CGSize getViewportSize(UIScrollView scrollView)
-			{
-				return scrollView.AdjustedContentInset.InsetRect(scrollView.Bounds).Size;
-			}
-			;
-
 			var scrollViewHandler = await InvokeOnMainThreadAsync(() =>
 			{
 				return CreateHandlerAsync<ScrollViewHandler>(scrollView);
@@ -55,7 +53,6 @@ await scrollViewHandler.PlatformView.AttachAndRun(async () =>
 				{
 					var uiScrollView = scrollViewHandler.PlatformView;
 
-					uiScrollView.ContentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentBehavior.Always;
 					var parent = uiScrollView.Superview;
 					uiScrollView.Bounds = parent.Bounds;
 					uiScrollView.Center = parent.Center;
@@ -67,8 +64,13 @@ await scrollViewHandler.PlatformView.AttachAndRun(async () =>
 
 					await Task.Yield();
 
-					var contentSize = uiScrollView.ContentSize;
-					var viewportSize = getViewportSize(uiScrollView);
+					// When the scroll view is set to SafeAreaEdges.Container, the uiScrollView 
+					// ContentAdjustmentInsetBehavior is set to Always
+					// This means we should always inset the content by the safe area insets
+					// This way the content doesn't go under the top and bottom bars and notch
+					var contentRect = new CoreGraphics.CGRect(0, 0, uiScrollView.ContentSize.Width, uiScrollView.ContentSize.Height);
+					var contentSize = uiScrollView.SafeAreaInsets.InsetRect(contentRect).Size;
+					var viewportSize = uiScrollView.AdjustedContentInset.InsetRect(uiScrollView.Bounds).Size;
 
 					Assert.Equal(viewportSize.Height, contentSize.Height);
 					Assert.Equal(viewportSize.Width, contentSize.Width);
diff --git a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.iOS.cs b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.iOS.cs
index cf22edfab972..7c06a5a0350f 100644
--- a/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.iOS.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Shell/ShellTests.iOS.cs
@@ -35,8 +35,10 @@ public async Task PageAdjustsWhenTopTabsArePresent()
 			var pageWithTopTabs = new ContentPage() { Content = new Label() { Text = "Page With Top Tabs" } };
 			var pageWithoutTopTabs = new ContentPage() { Content = new Label() { Text = "Page With Bottom Tabs" } };
 
+#pragma warning disable CS0618 // Type or member is obsolete
 			pageWithTopTabs.On<iOS>().SetUseSafeArea(true);
 			pageWithoutTopTabs.On<iOS>().SetUseSafeArea(true);
+#pragma warning restore CS0618 // Type or member is obsolete
 
 			var mainTab1 = new Tab()
 			{
@@ -77,6 +79,69 @@ await CreateHandlerAndAddToWindow<ShellRenderer>(shell, async (handler) =>
 			});
 		}
 
+		[Theory(DisplayName = "SafeArea works with both old and new APIs")]
+		[InlineData(true)] // Use new SafeArea API
+		[InlineData(false)] // Use old UseSafeArea API
+		public async Task SafeAreaBehaviorConsistency(bool useNewApi)
+		{
+			SetupBuilder();
+			var pageWithTopTabs = new ContentPage() { Content = new Label() { Text = "Page With Top Tabs" } };
+			var pageWithoutTopTabs = new ContentPage() { Content = new Label() { Text = "Page With Bottom Tabs" } };
+
+			if (useNewApi)
+			{
+				pageWithTopTabs.SafeAreaEdges = SafeAreaEdges.Container;
+				pageWithoutTopTabs.SafeAreaEdges = SafeAreaEdges.Container;
+			}
+			else
+			{
+#pragma warning disable CS0618 // Type or member is obsolete
+				pageWithTopTabs.On<iOS>().SetUseSafeArea(true);
+				pageWithoutTopTabs.On<iOS>().SetUseSafeArea(true);
+#pragma warning restore CS0618 // Type or member is obsolete
+			}
+
+			var mainTab1 = new Tab()
+			{
+				Items =
+				{
+					new ShellContent() { Content = pageWithTopTabs, Title = "tab 1" },
+					new ShellContent() { Content = new ContentPage(), Title = "tab 2" }
+				}
+			};
+
+			var mainTab2 = new Tab()
+			{
+				Items =
+				{
+					new ShellContent() { Content = pageWithoutTopTabs, Title = "tab 3"  }
+				}
+			};
+
+			var shell = new Shell()
+			{
+				Items = { mainTab1, mainTab2 }
+			};
+
+			await CreateHandlerAndAddToWindow<ShellRenderer>(shell, async (handler) =>
+			{
+				await OnFrameSetToNotEmpty(pageWithTopTabs.Content);
+				var boundsWithTopTabs = pageWithTopTabs.Content.GetPlatformViewBounds();
+				shell.CurrentItem = mainTab2;
+				await OnFrameSetToNotEmpty(pageWithoutTopTabs.Content);
+				var boundsWithoutTopTabs = pageWithoutTopTabs.Content.GetPlatformViewBounds();
+				
+				// Both APIs should produce consistent results
+				Assert.Equal(ShellSectionRootRenderer.HeaderHeight, (boundsWithTopTabs.Top - boundsWithoutTopTabs.Top), 1);
+
+				shell.CurrentItem = mainTab1;
+				await OnFrameSetToNotEmpty(pageWithTopTabs.Content);
+
+				var boundsWithTopTabsNavigatedBack = pageWithTopTabs.Content.GetPlatformViewBounds();
+				Assert.Equal(boundsWithTopTabsNavigatedBack, boundsWithTopTabs);
+			});
+		}
+
 		[Fact(DisplayName = "Swiping Away Modal Propagates to Shell")]
 		public async Task SwipingAwayModalPropagatesToShell()
 		{
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue21325.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue21325.xaml
index 6f18f8b4d68a..52c3cc44ea25 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue21325.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue21325.xaml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:ios="clr-namespace:Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;assembly=Microsoft.Maui.Controls"
-             ios:Page.UseSafeArea="True"
              x:Class="Maui.Controls.Sample.Issues.Issue21325">
 
     <Label Background="SlateGrey" AutomationId="greyShades" Text="Microsoft Label"/>
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue21325.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue21325.xaml.cs
index 32d32544b8fe..80b6f57b210c 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue21325.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue21325.xaml.cs
@@ -7,6 +7,8 @@ public partial class Issue21325 : ContentPage
 		public Issue21325()
 		{
 			InitializeComponent();
+
+			Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.Page.SetUseSafeArea(this, true);
 		}
 	}
 }
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28051.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28051.cs
index e2f7f9127442..de4101d98ced 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue28051.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28051.cs
@@ -139,14 +139,14 @@ protected override void OnDetachedFrom(Element bindable, Microsoft.UI.Xaml.Frame
 #else
 public class LongPressBehavior : PlatformBehavior<Element, object>
 {
-    protected override void OnAttachedTo(Element bindable, object platformView)
-    {
-        BindingContext = bindable.BindingContext;
-    }
- 
-    protected override void OnDetachedFrom(Element bindable, object platformView)
-    {
-        BindingContext = null;
-    }
+	protected override void OnAttachedTo(Element bindable, object platformView)
+	{
+		BindingContext = bindable.BindingContext;
+	}
+
+	protected override void OnDetachedFrom(Element bindable, object platformView)
+	{
+		BindingContext = null;
+	}
 }
 #endif
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml
new file mode 100644
index 000000000000..37b4948e7b0b
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Maui.Controls.Sample.Issues.Issue28986"
+             x:Name="TestPage"
+             Title="SafeArea Test">
+    
+    <Grid x:Name="MainGrid" BackgroundColor="Red" SafeAreaEdges="All" AutomationId="MainGrid">
+        <!-- Single content grid that spans the entire screen -->
+        <Grid x:Name="ContentGrid" SafeAreaEdges="None" AutomationId="ContentGrid">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            
+            <!-- Top test area - should move in/out of notch area -->
+            <Border Grid.Row="0" BackgroundColor="Yellow" Stroke="Orange" StrokeThickness="3" Padding="10" SafeAreaEdges="None">
+                <Label Text="TOP TEST AREA: This should move in/out of notch/status bar area when safe area is toggled"
+                       FontSize="14"
+                       FontAttributes="Bold"
+                       HorizontalOptions="Center"
+                       TextColor="DarkOrange" />
+            </Border>
+            
+            <!-- Middle content area with control panel -->
+            <ScrollView Grid.Row="1">
+                <StackLayout Spacing="20" Padding="20" VerticalOptions="Center">
+                    <Label Text="SafeArea Test Page" 
+                           FontSize="24" 
+                           FontAttributes="Bold"
+                           HorizontalOptions="Center"
+                           TextColor="White" />
+                    
+                    <Label Text="The red background shows areas outside safe area. Watch the yellow areas at top/bottom move when you toggle MainGrid safe area settings."
+                           FontSize="14"
+                           HorizontalOptions="Center"
+                           TextColor="White" />
+                    
+                    <Label x:Name="CurrentSettingsLabel"
+                           Text="Current MainGrid SafeAreaEdges: All"
+                           FontSize="16"
+                           FontAttributes="Bold"
+                           HorizontalOptions="Center"
+                           TextColor="White"
+                           AutomationId="CurrentSettings" />
+                    
+                    <!-- Simple button controls for MainGrid -->
+                    <Border BackgroundColor="White" Stroke="Gray" StrokeThickness="2" Padding="20" Margin="10">
+                        <VerticalStackLayout Spacing="15">
+                            <Label Text="MainGrid Safe Area Control:" 
+                                   FontSize="18" 
+                                   FontAttributes="Bold"
+                                   HorizontalOptions="Center" />
+                            
+                            <Button Text="Set MainGrid to None (Edge-to-edge)"
+                                    Clicked="OnGridSetNoneClicked"
+                                    BackgroundColor="LightBlue"
+                                    AutomationId="GridResetNoneButton" />
+                            
+                            <Button Text="Set MainGrid to Container (Respect notches/bars)"
+                                    Clicked="OnGridSetContainerClicked"
+                                    BackgroundColor="LightGreen"
+                                    AutomationId="GridSetContainerButton" />
+                            
+                            <Button Text="Set MainGrid to All (Full safe area)"
+                                    Clicked="OnGridSetAllClicked"
+                                    BackgroundColor="LightCoral"
+                                    AutomationId="GridResetAllButton" />
+                            
+                            <!-- Entry for testing SoftInput behavior -->
+                            
+                            <Entry Placeholder="Focus me to test SoftInput behavior"
+                                   BackgroundColor="White"
+                                   AutomationId="SoftInputTestEntry" />
+                            
+                            <!-- Per-edge controls for specific scenarios -->
+                            <Label Text="Per-Edge Controls:" 
+                                   FontSize="16" 
+                                   FontAttributes="Bold"
+                                   HorizontalOptions="Center"
+                                   Margin="0,10,0,0" />
+                            
+                            <Button Text="Set Bottom Edge to SoftInput"
+                                    Clicked="OnGridSetBottomSoftInputClicked"
+                                    BackgroundColor="LightYellow"
+                                    AutomationId="GridSetBottomSoftInputButton" />
+                            
+                            <Button Text="Set Top Edge to Container"
+                                    Clicked="OnGridSetTopContainerClicked"
+                                    BackgroundColor="LightPink"
+                                    AutomationId="GridSetTopContainerButton" />
+                            
+                            <Button Text="Set Top Edge to None"
+                                    Clicked="OnGridSetTopNoneClicked"
+                                    BackgroundColor="LightGray"
+                                    AutomationId="GridSetTopNoneButton" />
+                            
+                            <!-- Legend -->
+                            <StackLayout Spacing="5" Margin="0,10,0,0">
+                                <Label Text="None = Edge-to-edge content (no safe area padding)" 
+                                       FontSize="10" 
+                                       TextColor="Blue"
+                                       HorizontalOptions="Center" />
+                                <Label Text="Container = Flow under keyboard, stay out of bars/notch" 
+                                       FontSize="10" 
+                                       TextColor="Green"
+                                       HorizontalOptions="Center" />
+                                <Label Text="All = Obey all safe area insets" 
+                                       FontSize="10" 
+                                       TextColor="Red"
+                                       HorizontalOptions="Center" />
+                            </StackLayout>
+                        </VerticalStackLayout>
+                    </Border>
+                </StackLayout>
+            </ScrollView>
+            
+            <!-- Bottom test area - should move in/out of home indicator area -->
+            <Border Grid.Row="2" BackgroundColor="Yellow" Stroke="Orange" StrokeThickness="3" Padding="10">
+                <Label Text="BOTTOM TEST AREA: This should move in/out of home indicator/toolbar area when safe area is toggled"
+                       FontSize="14"
+                       FontAttributes="Bold"
+                       HorizontalOptions="Center"
+                       TextColor="DarkOrange" />
+            </Border>
+        </Grid>
+    </Grid>
+</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml.cs
new file mode 100644
index 000000000000..c3cdc25b113d
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml.cs
@@ -0,0 +1,97 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 28986, "Test SafeArea attached property for per-edge safe area control", PlatformAffected.All, issueTestNumber: 0)]
+public partial class Issue28986 : ContentPage
+{
+	public Issue28986()
+	{
+		InitializeComponent();
+		UpdateCurrentSettingsLabel();
+	}
+
+	private void OnGridSetNoneClicked(object sender, EventArgs e)
+	{
+		MainGrid.SafeAreaEdges = SafeAreaEdges.None;
+		UpdateCurrentSettingsLabel();
+	}
+
+	private void OnGridSetContainerClicked(object sender, EventArgs e)
+	{
+		MainGrid.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
+		UpdateCurrentSettingsLabel();
+	}
+
+	private void OnGridSetAllClicked(object sender, EventArgs e)
+	{
+		MainGrid.SafeAreaEdges = SafeAreaEdges.All;
+		UpdateCurrentSettingsLabel();
+	}
+
+	private void OnGridSetBottomSoftInputClicked(object sender, EventArgs e)
+	{
+		var current = MainGrid.SafeAreaEdges;
+		MainGrid.SafeAreaEdges = new SafeAreaEdges(
+			current.Left,     // Left
+			current.Top,     // Top
+			current.Right,   // Right
+			SafeAreaRegions.SoftInput       // Bottom
+		);
+		UpdateCurrentSettingsLabel();
+	}
+
+	private void OnGridSetTopContainerClicked(object sender, EventArgs e)
+	{
+		var current = MainGrid.SafeAreaEdges;
+		MainGrid.SafeAreaEdges = new SafeAreaEdges(
+			current.Left,              // Left (keep current)
+			SafeAreaRegions.Container, // Top
+			current.Right,             // Right (keep current)
+			current.Bottom             // Bottom (keep current)
+		);
+		UpdateCurrentSettingsLabel();
+	}
+
+	private void OnGridSetTopNoneClicked(object sender, EventArgs e)
+	{
+		var current = MainGrid.SafeAreaEdges;
+		MainGrid.SafeAreaEdges = new SafeAreaEdges(
+			current.Left,         // Left (keep current)
+			SafeAreaRegions.None, // Top
+			current.Right,        // Right (keep current)
+			current.Bottom        // Bottom (keep current)
+		);
+		UpdateCurrentSettingsLabel();
+	}
+
+	private void UpdateCurrentSettingsLabel()
+	{
+		var edges = MainGrid.SafeAreaEdges;
+		var settingText = GetSafeAreaEdgesDescription(edges);
+		CurrentSettingsLabel.Text = $"Current MainGrid SafeAreaEdges: {settingText}";
+	}
+
+	private string GetSafeAreaEdgesDescription(SafeAreaEdges edges)
+	{
+		// Check for common patterns
+		if (edges.Left == SafeAreaRegions.None && edges.Top == SafeAreaRegions.None && 
+		    edges.Right == SafeAreaRegions.None && edges.Bottom == SafeAreaRegions.None)
+		{
+			return "None (Edge-to-edge)";
+		}
+		
+		if (edges.Left == SafeAreaRegions.All && edges.Top == SafeAreaRegions.All && 
+		    edges.Right == SafeAreaRegions.All && edges.Bottom == SafeAreaRegions.All)
+		{
+			return "All (Full safe area)";
+		}
+		
+		if (edges.Left == SafeAreaRegions.Container && edges.Top == SafeAreaRegions.Container && 
+		    edges.Right == SafeAreaRegions.Container && edges.Bottom == SafeAreaRegions.Container)
+		{
+			return "Container (Respect notches/bars)";
+		}
+
+		// For mixed values, show individual edges
+		return $"Left:{edges.Left}, Top:{edges.Top}, Right:{edges.Right}, Bottom:{edges.Bottom}";
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_Border.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_Border.xaml
new file mode 100644
index 000000000000..158e187d1403
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_Border.xaml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Maui.Controls.Sample.Issues.Issue28986_Border"
+             Title="SafeArea Border Test">
+    
+    <Grid BackgroundColor="Red">
+        <!-- Border with SafeAreaEdges property -->
+        <Border x:Name="TestBorder" SafeAreaEdges="All" BackgroundColor="LightPink" Stroke="Purple" StrokeThickness="5">
+            <ScrollView>
+                <StackLayout Spacing="20" Padding="20">
+                    <Label Text="SafeArea Border Test" 
+                           FontSize="24" 
+                           FontAttributes="Bold"
+                           HorizontalOptions="Center" />
+                    
+                    <Label Text="This Border has SafeAreaEdges='All' and should extend behind system UI areas. The red background shows areas outside safe area."
+                           FontSize="14"
+                           HorizontalOptions="Center" />
+                    
+                    <Label x:Name="CurrentSettingsLabel"
+                           Text="Current Border SafeAreaEdges: All"
+                           FontSize="16"
+                           FontAttributes="Bold"
+                           HorizontalOptions="Center"
+                           AutomationId="CurrentSettings" />
+                    
+                    <!-- Control panel for Border SafeAreaEdges -->
+                    <Border BackgroundColor="White" Stroke="Gray" StrokeThickness="2" Padding="15">
+                        <VerticalStackLayout Spacing="15">
+                            <Label Text="Border SafeAreaEdges Control:" 
+                                   FontSize="18" 
+                                   FontAttributes="Bold"
+                                   HorizontalOptions="Center" />
+                            
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                </Grid.RowDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                
+                                <!-- Top -->
+                                <StackLayout Grid.Row="0" Grid.Column="1" Orientation="Horizontal" HorizontalOptions="Center">
+                                    <Label Text="Top:" VerticalOptions="Center" />
+                                    <Picker x:Name="TopPicker" 
+                                            SelectedIndex="0" 
+                                            SelectedIndexChanged="OnEdgePickerChanged"
+                                            AutomationId="TopPicker">
+                                        <Picker.Items>
+                                            <x:String>None</x:String>
+                                            <x:String>SoftInput</x:String>
+                                            <x:String>Container</x:String>
+                                            <x:String>Default</x:String>
+                                            <x:String>All</x:String>
+                                        </Picker.Items>
+                                    </Picker>
+                                </StackLayout>
+                                
+                                <!-- Left and Right -->
+                                <StackLayout Grid.Row="1" Grid.Column="0" Orientation="Horizontal" HorizontalOptions="Center">
+                                    <Label Text="Left:" VerticalOptions="Center" />
+                                    <Picker x:Name="LeftPicker" 
+                                            SelectedIndex="0" 
+                                            SelectedIndexChanged="OnEdgePickerChanged"
+                                            AutomationId="LeftPicker">
+                                        <Picker.Items>
+                                            <x:String>None</x:String>
+                                            <x:String>SoftInput</x:String>
+                                            <x:String>Container</x:String>
+                                            <x:String>Default</x:String>
+                                            <x:String>All</x:String>
+                                        </Picker.Items>
+                                    </Picker>
+                                </StackLayout>
+                                
+                                <StackLayout Grid.Row="1" Grid.Column="2" Orientation="Horizontal" HorizontalOptions="Center">
+                                    <Label Text="Right:" VerticalOptions="Center" />
+                                    <Picker x:Name="RightPicker" 
+                                            SelectedIndex="0" 
+                                            SelectedIndexChanged="OnEdgePickerChanged"
+                                            AutomationId="RightPicker">
+                                        <Picker.Items>
+                                            <x:String>None</x:String>
+                                            <x:String>SoftInput</x:String>
+                                            <x:String>Container</x:String>
+                                            <x:String>Default</x:String>
+                                            <x:String>All</x:String>
+                                        </Picker.Items>
+                                    </Picker>
+                                </StackLayout>
+                                
+                                <!-- Bottom -->
+                                <StackLayout Grid.Row="2" Grid.Column="1" Orientation="Horizontal" HorizontalOptions="Center">
+                                    <Label Text="Bottom:" VerticalOptions="Center" />
+                                    <Picker x:Name="BottomPicker" 
+                                            SelectedIndex="0" 
+                                            SelectedIndexChanged="OnEdgePickerChanged"
+                                            AutomationId="BottomPicker">
+                                        <Picker.Items>
+                                            <x:String>None</x:String>
+                                            <x:String>SoftInput</x:String>
+                                            <x:String>Container</x:String>
+                                            <x:String>Default</x:String>
+                                            <x:String>All</x:String>
+                                        </Picker.Items>
+                                    </Picker>
+                                </StackLayout>
+                                
+                                <!-- SoftInput test area -->
+                                <StackLayout Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="3" Orientation="Horizontal" HorizontalOptions="Center">
+                                    <Label Text="SoftInput Test:" VerticalOptions="Center" />
+                                    <Entry x:Name="SoftInputTestEntry" 
+                                           Placeholder="Tap to show keyboard" 
+                                           WidthRequest="200"
+                                           AutomationId="SoftInputTestEntry" />
+                                </StackLayout>
+                            </Grid>
+                            
+                            <Button Text="Reset All to Default" 
+                                    Clicked="OnResetDefaultClicked"
+                                    AutomationId="ResetDefaultButton" />
+                            <Button Text="Reset All to None" 
+                                    Clicked="OnResetNoneClicked"
+                                    AutomationId="ResetNoneButton" />
+                            <Button Text="Reset All to All" 
+                                    Clicked="OnResetAllClicked"
+                                    AutomationId="ResetAllButton" />
+                        </VerticalStackLayout>
+                    </Border>
+                    
+                    <!-- Sample content -->
+                    <Label Text="Border Sample Content" FontSize="18" FontAttributes="Bold" />
+                    <Label Text="This content is inside the Border that has SafeAreaEdges settings." />
+                    <Label Text="The Border should respect the SafeAreaEdges settings on each edge." />
+                    <Label Text="Notice the purple border around the entire content area." />
+                    <Label Text="Line 1" />
+                    <Label Text="Line 2" />
+                    <Label Text="Line 3" />
+                    <Label Text="Line 4" />
+                    <Label Text="Line 5" />
+                    <Label Text="Line 6" />
+                    <Label Text="Line 7" />
+                    <Label Text="Line 8" />
+                    <Label Text="Line 9" />
+                    <Label Text="Line 10" />
+                    <Label Text="End of Border Content" FontSize="18" FontAttributes="Bold" />
+                </StackLayout>
+            </ScrollView>
+        </Border>
+    </Grid>
+</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_Border.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_Border.xaml.cs
new file mode 100644
index 000000000000..ff66829c5007
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_Border.xaml.cs
@@ -0,0 +1,84 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 28986, "Test SafeArea Border for per-edge safe area control", PlatformAffected.All, issueTestNumber: 1)]
+public partial class Issue28986_Border : ContentPage
+{
+	public Issue28986_Border()
+	{
+		InitializeComponent();
+		// Initialize controls (start with all All)
+		LeftPicker.SelectedIndex = 3;   // All
+		TopPicker.SelectedIndex = 3;    // All
+		RightPicker.SelectedIndex = 3;  // All
+		BottomPicker.SelectedIndex = 3; // All
+
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnEdgePickerChanged(object sender, EventArgs e)
+	{
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnResetDefaultClicked(object sender, EventArgs e)
+	{
+		LeftPicker.SelectedIndex = 3;   // Default
+		TopPicker.SelectedIndex = 3;    // Default
+		RightPicker.SelectedIndex = 3;  // Default
+		BottomPicker.SelectedIndex = 3; // Default
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnResetNoneClicked(object sender, EventArgs e)
+	{
+		LeftPicker.SelectedIndex = 0;   // None
+		TopPicker.SelectedIndex = 0;    // None
+		RightPicker.SelectedIndex = 0;  // None
+		BottomPicker.SelectedIndex = 0; // None
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnResetAllClicked(object sender, EventArgs e)
+	{
+		LeftPicker.SelectedIndex = 4;   // All
+		TopPicker.SelectedIndex = 4;    // All
+		RightPicker.SelectedIndex = 4;  // All
+		BottomPicker.SelectedIndex = 4; // All
+		UpdateSafeAreaSettings();
+	}
+
+	private SafeAreaRegions GetSafeAreaRegionsFromPickerIndex(int index)
+	{
+		return index switch
+		{
+			0 => SafeAreaRegions.None,
+			1 => SafeAreaRegions.SoftInput,
+			2 => SafeAreaRegions.Container,
+			3 => SafeAreaRegions.Default,
+			4 => SafeAreaRegions.All,
+			_ => SafeAreaRegions.None
+		};
+	}
+
+	private void UpdateSafeAreaSettings()
+	{
+		// Create SafeAreaEdges for Border settings
+		var safeAreaSettings = new SafeAreaEdges(
+			GetSafeAreaRegionsFromPickerIndex(LeftPicker.SelectedIndex),   // Left
+			GetSafeAreaRegionsFromPickerIndex(TopPicker.SelectedIndex),    // Top  
+			GetSafeAreaRegionsFromPickerIndex(RightPicker.SelectedIndex),  // Right
+			GetSafeAreaRegionsFromPickerIndex(BottomPicker.SelectedIndex)  // Bottom
+		);
+
+		// Apply SafeAreaEdges to the Border
+		TestBorder.SafeAreaEdges = safeAreaSettings;
+
+		// Update the display label
+		var settingsText = $"Left: {GetSafeAreaRegionsFromPickerIndex(LeftPicker.SelectedIndex)}, " +
+						  $"Top: {GetSafeAreaRegionsFromPickerIndex(TopPicker.SelectedIndex)}, " +
+						  $"Right: {GetSafeAreaRegionsFromPickerIndex(RightPicker.SelectedIndex)}, " +
+						  $"Bottom: {GetSafeAreaRegionsFromPickerIndex(BottomPicker.SelectedIndex)}";
+
+		CurrentSettingsLabel.Text = $"Current Border SafeAreaEdges: {settingsText}";
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentPage.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentPage.xaml
new file mode 100644
index 000000000000..ca3e9bef5860
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentPage.xaml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Maui.Controls.Sample.Issues.Issue28986_ContentPage"
+             x:Name="TestContentPage"
+             Title="SafeArea ContentPage Test"
+             SafeAreaEdges="All">
+    
+    <Grid BackgroundColor="Red">
+        <!-- Content that fills the entire ContentPage -->
+        <ScrollView BackgroundColor="LightYellow">
+            <StackLayout Spacing="20" Padding="20">
+                <Label Text="SafeArea ContentPage Test" 
+                       FontSize="24" 
+                       FontAttributes="Bold"
+                       HorizontalOptions="Center" />
+                
+                <Label Text="This ContentPage itself has SafeAreaEdges='All' and should extend behind system UI areas. The red background shows areas outside safe area."
+                       FontSize="14"
+                       HorizontalOptions="Center" />
+                
+                <Label x:Name="CurrentSettingsLabel"
+                       Text="Current ContentPage SafeAreaEdges: All"
+                       FontSize="16"
+                       FontAttributes="Bold"
+                       HorizontalOptions="Center"
+                       AutomationId="CurrentSettings" />
+                
+                <!-- Control panel for ContentPage SafeAreaEdges -->
+                <Border BackgroundColor="White" Stroke="Gray" StrokeThickness="2" Padding="15">
+                    <VerticalStackLayout Spacing="15">
+                        <Label Text="ContentPage SafeAreaEdges Control:" 
+                               FontSize="18" 
+                               FontAttributes="Bold"
+                               HorizontalOptions="Center" />
+                        
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                            </Grid.RowDefinitions>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            
+                            <!-- Top -->
+                            <StackLayout Grid.Row="0" Grid.Column="1" Orientation="Horizontal" HorizontalOptions="Center">
+                                <Label Text="Top:" VerticalOptions="Center" />
+                                <Picker x:Name="TopPicker" 
+                                        SelectedIndex="0" 
+                                        SelectedIndexChanged="OnEdgePickerChanged"
+                                        AutomationId="TopPicker">
+                                    <Picker.Items>
+                                        <x:String>None</x:String>
+                                        <x:String>SoftInput</x:String>
+                                        <x:String>Container</x:String>
+                                        <x:String>Default</x:String>
+                                        <x:String>All</x:String>
+                                    </Picker.Items>
+                                </Picker>
+                            </StackLayout>
+                            
+                            <!-- Left and Right -->
+                            <StackLayout Grid.Row="1" Grid.Column="0" Orientation="Horizontal" HorizontalOptions="Center">
+                                <Label Text="Left:" VerticalOptions="Center" />
+                                <Picker x:Name="LeftPicker" 
+                                        SelectedIndex="0" 
+                                        SelectedIndexChanged="OnEdgePickerChanged"
+                                        AutomationId="LeftPicker">
+                                    <Picker.Items>
+                                        <x:String>None</x:String>
+                                        <x:String>SoftInput</x:String>
+                                        <x:String>Container</x:String>
+                                        <x:String>Default</x:String>
+                                        <x:String>All</x:String>
+                                    </Picker.Items>
+                                </Picker>
+                            </StackLayout>
+                            
+                            <StackLayout Grid.Row="1" Grid.Column="2" Orientation="Horizontal" HorizontalOptions="Center">
+                                <Label Text="Right:" VerticalOptions="Center" />
+                                <Picker x:Name="RightPicker" 
+                                        SelectedIndex="0" 
+                                        SelectedIndexChanged="OnEdgePickerChanged"
+                                        AutomationId="RightPicker">
+                                    <Picker.Items>
+                                        <x:String>None</x:String>
+                                        <x:String>SoftInput</x:String>
+                                        <x:String>Container</x:String>
+                                        <x:String>Default</x:String>
+                                        <x:String>All</x:String>
+                                    </Picker.Items>
+                                </Picker>
+                            </StackLayout>
+                            
+                            <!-- Bottom -->
+                            <StackLayout Grid.Row="2" Grid.Column="1" Orientation="Horizontal" HorizontalOptions="Center">
+                                <Label Text="Bottom:" VerticalOptions="Center" />
+                                <Picker x:Name="BottomPicker" 
+                                        SelectedIndex="0" 
+                                        SelectedIndexChanged="OnEdgePickerChanged"
+                                        AutomationId="BottomPicker">
+                                    <Picker.Items>
+                                        <x:String>None</x:String>
+                                        <x:String>SoftInput</x:String>
+                                        <x:String>Container</x:String>
+                                        <x:String>Default</x:String>
+                                        <x:String>All</x:String>
+                                    </Picker.Items>
+                                </Picker>
+                            </StackLayout>
+                            
+                            <!-- SoftInput test area -->
+                            <StackLayout Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="3" Orientation="Horizontal" HorizontalOptions="Center">
+                                <Label Text="SoftInput Test:" VerticalOptions="Center" />
+                                <Entry x:Name="SoftInputTestEntry" 
+                                       Placeholder="Tap to show keyboard" 
+                                       WidthRequest="200"
+                                       AutomationId="SoftInputTestEntry" />
+                            </StackLayout>
+                        </Grid>
+                        
+                        <Button Text="Reset All to Default" 
+                                Clicked="OnResetDefaultClicked"
+                                AutomationId="ResetDefaultButton" />
+                        <Button Text="Reset All to None" 
+                                Clicked="OnResetNoneClicked"
+                                AutomationId="ResetNoneButton" />
+                        <Button Text="Reset All to All" 
+                                Clicked="OnResetAllClicked"
+                                AutomationId="ResetAllButton" />
+                    </VerticalStackLayout>
+                </Border>
+                
+                <!-- Sample content -->
+                <Label Text="ContentPage Sample Content" FontSize="18" FontAttributes="Bold" />
+                <Label Text="This content is directly in the ContentPage that has SafeAreaEdges settings." />
+                <Label Text="The ContentPage itself should respect the SafeAreaEdges settings on each edge." />
+                <Label Text="The entire page content should move based on the SafeAreaEdges settings." />
+                <Label Text="Line 1" />
+                <Label Text="Line 2" />
+                <Label Text="Line 3" />
+                <Label Text="Line 4" />
+                <Label Text="Line 5" />
+                <Label Text="Line 6" />
+                <Label Text="Line 7" />
+                <Label Text="Line 8" />
+                <Label Text="Line 9" />
+                <Label Text="Line 10" />
+                <Label Text="End of ContentPage Content" FontSize="18" FontAttributes="Bold" />
+            </StackLayout>
+        </ScrollView>
+    </Grid>
+</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentPage.xaml.cs
new file mode 100644
index 000000000000..2b11eb4fd037
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentPage.xaml.cs
@@ -0,0 +1,84 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 28986, "Test SafeArea ContentPage for per-edge safe area control", PlatformAffected.All, issueTestNumber: 2)]
+public partial class Issue28986_ContentPage : ContentPage
+{
+	public Issue28986_ContentPage()
+	{
+		InitializeComponent();
+		// Initialize controls (start with all All)
+		LeftPicker.SelectedIndex = 3;   // All
+		TopPicker.SelectedIndex = 3;    // All
+		RightPicker.SelectedIndex = 3;  // All
+		BottomPicker.SelectedIndex = 3; // All
+
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnEdgePickerChanged(object sender, EventArgs e)
+	{
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnResetDefaultClicked(object sender, EventArgs e)
+	{
+		LeftPicker.SelectedIndex = 3;   // Default
+		TopPicker.SelectedIndex = 3;    // Default
+		RightPicker.SelectedIndex = 3;  // Default
+		BottomPicker.SelectedIndex = 3; // Default
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnResetNoneClicked(object sender, EventArgs e)
+	{
+		LeftPicker.SelectedIndex = 0;   // None
+		TopPicker.SelectedIndex = 0;    // None
+		RightPicker.SelectedIndex = 0;  // None
+		BottomPicker.SelectedIndex = 0; // None
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnResetAllClicked(object sender, EventArgs e)
+	{
+		LeftPicker.SelectedIndex = 4;   // All
+		TopPicker.SelectedIndex = 4;    // All
+		RightPicker.SelectedIndex = 4;  // All
+		BottomPicker.SelectedIndex = 4; // All
+		UpdateSafeAreaSettings();
+	}
+
+	private SafeAreaRegions GetSafeAreaRegionsFromPickerIndex(int index)
+	{
+		return index switch
+		{
+			0 => SafeAreaRegions.None,
+			1 => SafeAreaRegions.SoftInput,
+			2 => SafeAreaRegions.Container,
+			3 => SafeAreaRegions.Default,
+			4 => SafeAreaRegions.All,
+			_ => SafeAreaRegions.None
+		};
+	}
+
+	private void UpdateSafeAreaSettings()
+	{
+		// Create SafeAreaEdges for ContentPage settings
+		var safeAreaSettings = new SafeAreaEdges(
+			GetSafeAreaRegionsFromPickerIndex(LeftPicker.SelectedIndex),   // Left
+			GetSafeAreaRegionsFromPickerIndex(TopPicker.SelectedIndex),    // Top  
+			GetSafeAreaRegionsFromPickerIndex(RightPicker.SelectedIndex),  // Right
+			GetSafeAreaRegionsFromPickerIndex(BottomPicker.SelectedIndex)  // Bottom
+		);
+
+		// Apply SafeAreaEdges to the ContentPage itself
+		this.SafeAreaEdges = safeAreaSettings;
+
+		// Update the display label
+		var settingsText = $"Left: {GetSafeAreaRegionsFromPickerIndex(LeftPicker.SelectedIndex)}, " +
+						  $"Top: {GetSafeAreaRegionsFromPickerIndex(TopPicker.SelectedIndex)}, " +
+						  $"Right: {GetSafeAreaRegionsFromPickerIndex(RightPicker.SelectedIndex)}, " +
+						  $"Bottom: {GetSafeAreaRegionsFromPickerIndex(BottomPicker.SelectedIndex)}";
+
+		CurrentSettingsLabel.Text = $"Current ContentPage SafeAreaEdges: {settingsText}";
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentView.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentView.xaml
new file mode 100644
index 000000000000..8a772d7312c8
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentView.xaml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Maui.Controls.Sample.Issues.Issue28986_ContentView"
+             Title="SafeArea ContentView Test">
+    
+    <Grid BackgroundColor="Red">
+        <!-- ContentView with SafeAreaEdges property -->
+        <ContentView x:Name="TestContentView" SafeAreaEdges="All" BackgroundColor="LightGreen">
+            <ScrollView>
+                <StackLayout Spacing="20" Padding="20">
+                    <Label Text="SafeArea ContentView Test" 
+                           FontSize="24" 
+                           FontAttributes="Bold"
+                           HorizontalOptions="Center" />
+                    
+                    <Label Text="This ContentView has SafeAreaEdges='All' and should extend behind system UI areas. The red background shows areas outside safe area."
+                           FontSize="14"
+                           HorizontalOptions="Center" />
+                    
+                    <Label x:Name="CurrentSettingsLabel"
+                           Text="Current ContentView SafeAreaEdges: All"
+                           FontSize="16"
+                           FontAttributes="Bold"
+                           HorizontalOptions="Center"
+                           AutomationId="CurrentSettings" />
+                    
+                    <!-- Control panel for ContentView SafeAreaEdges -->
+                    <Border BackgroundColor="White" Stroke="Gray" StrokeThickness="2" Padding="15">
+                        <VerticalStackLayout Spacing="15">
+                            <Label Text="ContentView SafeAreaEdges Control:" 
+                                   FontSize="18" 
+                                   FontAttributes="Bold"
+                                   HorizontalOptions="Center" />
+                            
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                </Grid.RowDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                
+                                <!-- Top -->
+                                <StackLayout Grid.Row="0" Grid.Column="1" Orientation="Horizontal" HorizontalOptions="Center">
+                                    <Label Text="Top:" VerticalOptions="Center" />
+                                    <Picker x:Name="TopPicker" 
+                                            SelectedIndex="0" 
+                                            SelectedIndexChanged="OnEdgePickerChanged"
+                                            AutomationId="TopPicker">
+                                        <Picker.Items>
+                                            <x:String>None</x:String>
+                                            <x:String>SoftInput</x:String>
+                                            <x:String>Container</x:String>
+                                            <x:String>Default</x:String>
+                                            <x:String>All</x:String>
+                                        </Picker.Items>
+                                    </Picker>
+                                </StackLayout>
+                                
+                                <!-- Left and Right -->
+                                <StackLayout Grid.Row="1" Grid.Column="0" Orientation="Horizontal" HorizontalOptions="Center">
+                                    <Label Text="Left:" VerticalOptions="Center" />
+                                    <Picker x:Name="LeftPicker" 
+                                            SelectedIndex="0" 
+                                            SelectedIndexChanged="OnEdgePickerChanged"
+                                            AutomationId="LeftPicker">
+                                        <Picker.Items>
+                                            <x:String>None</x:String>
+                                            <x:String>SoftInput</x:String>
+                                            <x:String>Container</x:String>
+                                            <x:String>Default</x:String>
+                                            <x:String>All</x:String>
+                                        </Picker.Items>
+                                    </Picker>
+                                </StackLayout>
+                                
+                                <StackLayout Grid.Row="1" Grid.Column="2" Orientation="Horizontal" HorizontalOptions="Center">
+                                    <Label Text="Right:" VerticalOptions="Center" />
+                                    <Picker x:Name="RightPicker" 
+                                            SelectedIndex="0" 
+                                            SelectedIndexChanged="OnEdgePickerChanged"
+                                            AutomationId="RightPicker">
+                                        <Picker.Items>
+                                            <x:String>None</x:String>
+                                            <x:String>SoftInput</x:String>
+                                            <x:String>Container</x:String>
+                                            <x:String>Default</x:String>
+                                            <x:String>All</x:String>
+                                        </Picker.Items>
+                                    </Picker>
+                                </StackLayout>
+                                
+                                <!-- Bottom -->
+                                <StackLayout Grid.Row="2" Grid.Column="1" Orientation="Horizontal" HorizontalOptions="Center">
+                                    <Label Text="Bottom:" VerticalOptions="Center" />
+                                    <Picker x:Name="BottomPicker" 
+                                            SelectedIndex="0" 
+                                            SelectedIndexChanged="OnEdgePickerChanged"
+                                            AutomationId="BottomPicker">
+                                        <Picker.Items>
+                                            <x:String>None</x:String>
+                                            <x:String>SoftInput</x:String>
+                                            <x:String>Container</x:String>
+                                            <x:String>Default</x:String>
+                                            <x:String>All</x:String>
+                                        </Picker.Items>
+                                    </Picker>
+                                </StackLayout>
+                                
+                                <!-- SoftInput test area -->
+                                <StackLayout Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="3" Orientation="Horizontal" HorizontalOptions="Center">
+                                    <Label Text="SoftInput Test:" VerticalOptions="Center" />
+                                    <Entry x:Name="SoftInputTestEntry" 
+                                           Placeholder="Tap to show keyboard" 
+                                           WidthRequest="200"
+                                           AutomationId="SoftInputTestEntry" />
+                                </StackLayout>
+                            </Grid>
+                            
+                            <Button Text="Reset All to Default" 
+                                    Clicked="OnResetDefaultClicked"
+                                    AutomationId="ResetDefaultButton" />
+                            <Button Text="Reset All to None" 
+                                    Clicked="OnResetNoneClicked"
+                                    AutomationId="ResetNoneButton" />
+                            <Button Text="Reset All to All" 
+                                    Clicked="OnResetAllClicked"
+                                    AutomationId="ResetAllButton" />
+                        </VerticalStackLayout>
+                    </Border>
+                    
+                    <!-- Sample content -->
+                    <Label Text="ContentView Sample Content" FontSize="18" FontAttributes="Bold" />
+                    <Label Text="This content is inside the ContentView that has SafeAreaEdges settings." />
+                    <Label Text="The ContentView should respect the SafeAreaEdges settings on each edge." />
+                    <Label Text="Line 1" />
+                    <Label Text="Line 2" />
+                    <Label Text="Line 3" />
+                    <Label Text="Line 4" />
+                    <Label Text="Line 5" />
+                    <Label Text="Line 6" />
+                    <Label Text="Line 7" />
+                    <Label Text="Line 8" />
+                    <Label Text="Line 9" />
+                    <Label Text="Line 10" />
+                    <Label Text="End of ContentView Content" FontSize="18" FontAttributes="Bold" />
+                </StackLayout>
+            </ScrollView>
+        </ContentView>
+    </Grid>
+</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentView.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentView.xaml.cs
new file mode 100644
index 000000000000..89a4066ad923
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ContentView.xaml.cs
@@ -0,0 +1,84 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 28986, "Test SafeArea ContentView for per-edge safe area control", PlatformAffected.All, issueTestNumber: 3)]
+public partial class Issue28986_ContentView : ContentPage
+{
+	public Issue28986_ContentView()
+	{
+		InitializeComponent();
+		// Initialize controls (start with all All)
+		LeftPicker.SelectedIndex = 3;   // All
+		TopPicker.SelectedIndex = 3;    // All
+		RightPicker.SelectedIndex = 3;  // All
+		BottomPicker.SelectedIndex = 3; // All
+
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnEdgePickerChanged(object sender, EventArgs e)
+	{
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnResetDefaultClicked(object sender, EventArgs e)
+	{
+		LeftPicker.SelectedIndex = 3;   // Default
+		TopPicker.SelectedIndex = 3;    // Default
+		RightPicker.SelectedIndex = 3;  // Default
+		BottomPicker.SelectedIndex = 3; // Default
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnResetNoneClicked(object sender, EventArgs e)
+	{
+		LeftPicker.SelectedIndex = 0;   // None
+		TopPicker.SelectedIndex = 0;    // None
+		RightPicker.SelectedIndex = 0;  // None
+		BottomPicker.SelectedIndex = 0; // None
+		UpdateSafeAreaSettings();
+	}
+
+	private void OnResetAllClicked(object sender, EventArgs e)
+	{
+		LeftPicker.SelectedIndex = 4;   // All
+		TopPicker.SelectedIndex = 4;    // All
+		RightPicker.SelectedIndex = 4;  // All
+		BottomPicker.SelectedIndex = 4; // All
+		UpdateSafeAreaSettings();
+	}
+
+	private SafeAreaRegions GetSafeAreaRegionsFromPickerIndex(int index)
+	{
+		return index switch
+		{
+			0 => SafeAreaRegions.None,
+			1 => SafeAreaRegions.SoftInput,
+			2 => SafeAreaRegions.Container,
+			3 => SafeAreaRegions.Default,
+			4 => SafeAreaRegions.All,
+			_ => SafeAreaRegions.None
+		};
+	}
+
+	private void UpdateSafeAreaSettings()
+	{
+		// Create SafeAreaEdges for ContentView settings
+		var safeAreaSettings = new SafeAreaEdges(
+			GetSafeAreaRegionsFromPickerIndex(LeftPicker.SelectedIndex),   // Left
+			GetSafeAreaRegionsFromPickerIndex(TopPicker.SelectedIndex),    // Top  
+			GetSafeAreaRegionsFromPickerIndex(RightPicker.SelectedIndex),  // Right
+			GetSafeAreaRegionsFromPickerIndex(BottomPicker.SelectedIndex)  // Bottom
+		);
+
+		// Apply SafeAreaEdges to the ContentView
+		TestContentView.SafeAreaEdges = safeAreaSettings;
+
+		// Update the display label
+		var settingsText = $"Left: {GetSafeAreaRegionsFromPickerIndex(LeftPicker.SelectedIndex)}, " +
+						  $"Top: {GetSafeAreaRegionsFromPickerIndex(TopPicker.SelectedIndex)}, " +
+						  $"Right: {GetSafeAreaRegionsFromPickerIndex(RightPicker.SelectedIndex)}, " +
+						  $"Bottom: {GetSafeAreaRegionsFromPickerIndex(BottomPicker.SelectedIndex)}";
+
+		CurrentSettingsLabel.Text = $"Current ContentView SafeAreaEdges: {settingsText}";
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml
new file mode 100644
index 000000000000..24bb716fb8be
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Maui.Controls.Sample.Issues.Issue28986_ScrollView"
+             x:Name="TestPage"
+             Title="SafeArea ScrollView Test">
+    
+    <Grid x:Name="MainGrid" BackgroundColor="Blue" SafeAreaEdges="None">
+        <!-- ScrollView that spans the entire screen -->
+        <ScrollView x:Name="TestScrollView" SafeAreaEdges="All" AutomationId="TestScrollView" BackgroundColor="White">
+            <StackLayout Spacing="20" Padding="20,0,20,20" AutomationId="ScrollViewContent">
+                <Label Text="SafeArea ScrollView Test Page" 
+                       FontSize="24" 
+                       FontAttributes="Bold"
+                       HorizontalOptions="Center"
+                       TextColor="DarkBlue" />
+                
+                <Label Text="This page tests ScrollView SafeAreaEdges behavior. The blue background shows areas outside safe area."
+                       FontSize="14"
+                       HorizontalOptions="Center"
+                       TextColor="DarkBlue" />
+                
+                <Label x:Name="CurrentSettingsLabel"
+                       Text="Current ScrollView SafeAreaEdges: All"
+                       FontSize="16"
+                       FontAttributes="Bold"
+                       HorizontalOptions="Center"
+                       TextColor="DarkBlue"
+                       AutomationId="CurrentSettings" />
+                
+                <!-- ScrollView SafeArea Control -->
+                <Border BackgroundColor="LightBlue" Stroke="DarkBlue" StrokeThickness="2" Padding="20" Margin="10">
+                    <VerticalStackLayout Spacing="15">
+                        <Label Text="ScrollView Safe Area Control:" 
+                               FontSize="18" 
+                               FontAttributes="Bold"
+                               HorizontalOptions="Center" />
+                        
+                        <Label Text="Test different SafeAreaEdges values on the ScrollView"
+                               FontSize="12"
+                               HorizontalOptions="Center"
+                               TextColor="Gray" />
+                        
+                        <Button Text="Set ScrollView to None (Edge-to-edge)"
+                                Clicked="OnScrollViewSetNoneClicked"
+                                BackgroundColor="LightBlue"
+                                AutomationId="ScrollViewResetNoneButton" />
+                        
+                        <Button Text="Set ScrollView to Container"
+                                Clicked="OnScrollViewSetContainerClicked"
+                                BackgroundColor="LightGreen"
+                                AutomationId="ScrollViewSetContainerButton" />
+                        
+                        <Button Text="Set ScrollView to All (Full safe area)"
+                                Clicked="OnScrollViewSetAllClicked"
+                                BackgroundColor="LightCoral"
+                                AutomationId="ScrollViewResetAllButton" />
+                        
+                        <Button Text="Set ScrollView to SoftInput"
+                                Clicked="OnScrollViewSetSoftInputClicked"
+                                BackgroundColor="LightYellow"
+                                AutomationId="ScrollViewSetSoftInputButton" />
+                    </VerticalStackLayout>
+                </Border>
+
+                <!-- Test content to enable scrolling -->
+                <Label Text="--- SCROLLABLE CONTENT BELOW ---" 
+                       FontSize="16" 
+                       FontAttributes="Bold"
+                       HorizontalOptions="Center"
+                       TextColor="Red" />
+
+                <!-- Add enough content to make scrolling possible -->
+                <StackLayout Spacing="20">
+                    <Label Text="Test Item 1" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 2" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 3" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 4" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 5" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 6" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 7" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 8" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 9" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 10" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 11" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 12" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 13" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 14" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 15" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 16" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 17" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 18" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 19" FontSize="18" BackgroundColor="LightGray" Padding="10" />
+                    <Label Text="Test Item 20 - BOTTOM" FontSize="18" BackgroundColor="Red" Padding="10" />
+                </StackLayout>
+            </StackLayout>
+        </ScrollView>
+    </Grid>
+</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml.cs
new file mode 100644
index 000000000000..96c99e87d4c2
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28986_ScrollView.xaml.cs
@@ -0,0 +1,73 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 28986, "Test SafeArea ScrollView for per-edge safe area control", PlatformAffected.All, issueTestNumber: 4)]
+public partial class Issue28986_ScrollView : ContentPage
+{
+	public Issue28986_ScrollView()
+	{
+		InitializeComponent();
+		UpdateCurrentSettingsLabel();
+	}
+
+	private void OnScrollViewSetNoneClicked(object sender, EventArgs e)
+	{
+		TestScrollView.SafeAreaEdges = SafeAreaEdges.None;
+		UpdateCurrentSettingsLabel();
+	}
+
+	private void OnScrollViewSetContainerClicked(object sender, EventArgs e)
+	{
+		TestScrollView.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.Container);
+		UpdateCurrentSettingsLabel();
+	}
+
+	private void OnScrollViewSetAllClicked(object sender, EventArgs e)
+	{
+		TestScrollView.SafeAreaEdges = SafeAreaEdges.All;
+		UpdateCurrentSettingsLabel();
+	}
+
+	private void OnScrollViewSetSoftInputClicked(object sender, EventArgs e)
+	{
+		TestScrollView.SafeAreaEdges = new SafeAreaEdges(SafeAreaRegions.SoftInput);
+		UpdateCurrentSettingsLabel();
+	}
+
+	private void UpdateCurrentSettingsLabel()
+	{
+		var edges = TestScrollView.SafeAreaEdges;
+		var settingText = GetSafeAreaEdgesDescription(edges);
+		CurrentSettingsLabel.Text = $"Current ScrollView SafeAreaEdges: {settingText}";
+	}
+
+	private string GetSafeAreaEdgesDescription(SafeAreaEdges edges)
+	{
+		// Check for common patterns
+		if (edges.Left == SafeAreaRegions.None && edges.Top == SafeAreaRegions.None && 
+		    edges.Right == SafeAreaRegions.None && edges.Bottom == SafeAreaRegions.None)
+		{
+			return "None (Edge-to-edge)";
+		}
+		
+		if (edges.Left == SafeAreaRegions.All && edges.Top == SafeAreaRegions.All && 
+		    edges.Right == SafeAreaRegions.All && edges.Bottom == SafeAreaRegions.All)
+		{
+			return "All (Full safe area)";
+		}
+		
+		if (edges.Left == SafeAreaRegions.Container && edges.Top == SafeAreaRegions.Container && 
+		    edges.Right == SafeAreaRegions.Container && edges.Bottom == SafeAreaRegions.Container)
+		{
+			return "Container (Respect notches/bars)";
+		}
+
+		if (edges.Left == SafeAreaRegions.SoftInput && edges.Top == SafeAreaRegions.SoftInput && 
+		    edges.Right == SafeAreaRegions.SoftInput && edges.Bottom == SafeAreaRegions.SoftInput)
+		{
+			return "SoftInput (Avoid keyboard only)";
+		}
+
+		// For mixed values, show individual edges
+		return $"Left:{edges.Left}, Top:{edges.Top}, Right:{edges.Right}, Bottom:{edges.Bottom}";
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue8945.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue8945.xaml.cs
index 6b37238ef76a..a13321d479bb 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue8945.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue8945.xaml.cs
@@ -10,7 +10,7 @@ public partial class Issue8945 : TestContentPage
 		bool _timePickerClosed;
 		bool _pickerOpened;
 		bool _pickerClosed;
-		
+
 		public Issue8945()
 		{
 			InitializeComponent();
@@ -113,8 +113,8 @@ void IsOpenPickerClosed(object sender, PickerClosedEventArgs e)
 		{
 			_pickerClosed = true;
 			UpdatePickerStatus();
-		}  
-		
+		}
+
 		void UpdateDatePickerStatus()
 		{
 			if (_datePickerOpened && _datePickerClosed)
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue8945DatePicker.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue8945DatePicker.xaml.cs
index 3a7cb28cbe05..44553a565e92 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue8945DatePicker.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue8945DatePicker.xaml.cs
@@ -2,9 +2,9 @@
 {
 	[Issue(IssueTracker.Github, "8945DatePicker", "Add Open/Close API to picker controls (DatePicker)", PlatformAffected.All)]
 	public partial class Issue8945DatePicker : TestContentPage
-	{	
+	{
 		bool _datePickerOpened;
-		
+
 		public Issue8945DatePicker()
 		{
 			InitializeComponent();
@@ -16,20 +16,20 @@ protected override void Init()
 		{
 
 		}
-		
+
 		protected override void OnDisappearing()
 		{
 			base.OnDisappearing();
 
 			IsOpenDatePicker.Opened -= IsOpenPickerOpened;
-		}	
-		
+		}
+
 		void IsOpenPickerOpened(object sender, DatePickerOpenedEventArgs e)
 		{
 			_datePickerOpened = true;
 			UpdateDatePickerStatus();
 		}
-		
+
 		void UpdateDatePickerStatus()
 		{
 			if (_datePickerOpened)
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue8945Picker.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue8945Picker.xaml.cs
index db6b7b8df1b6..2622704afc5b 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue8945Picker.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue8945Picker.xaml.cs
@@ -2,9 +2,9 @@
 {
 	[Issue(IssueTracker.Github, "8945Picker", "Add Open/Close API to picker controls (Picker)", PlatformAffected.All)]
 	public partial class Issue8945Picker : TestContentPage
-	{	
+	{
 		bool _pickerOpened;
-		
+
 		public Issue8945Picker()
 		{
 			InitializeComponent();
@@ -16,20 +16,20 @@ protected override void Init()
 		{
 
 		}
-		
+
 		protected override void OnDisappearing()
 		{
 			base.OnDisappearing();
 
 			IsOpenPicker.Opened -= IsOpenPickerOpened;
-		}	
-		
+		}
+
 		void IsOpenPickerOpened(object sender, PickerOpenedEventArgs e)
 		{
 			_pickerOpened = true;
 			UpdatePickerStatus();
 		}
-		
+
 		void UpdatePickerStatus()
 		{
 			if (_pickerOpened)
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue8945TimePicker.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue8945TimePicker.xaml.cs
index 58d410a37819..e20fc857ce44 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue8945TimePicker.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue8945TimePicker.xaml.cs
@@ -2,9 +2,9 @@
 {
 	[Issue(IssueTracker.Github, "8945TimePicker", "Add Open/Close API to picker controls (TimePicker)", PlatformAffected.All)]
 	public partial class Issue8945TimePicker : TestContentPage
-	{	
+	{
 		bool _timePickerOpened;
-		
+
 		public Issue8945TimePicker()
 		{
 			InitializeComponent();
@@ -16,20 +16,20 @@ protected override void Init()
 		{
 
 		}
-		
+
 		protected override void OnDisappearing()
 		{
 			base.OnDisappearing();
 
 			IsOpenTimePicker.Opened -= IsOpenPickerOpened;
-		}	
-		
+		}
+
 		void IsOpenPickerOpened(object sender, TimePickerOpenedEventArgs e)
 		{
 			_timePickerOpened = true;
 			UpdateDatePickerStatus();
 		}
-		
+
 		void UpdateDatePickerStatus()
 		{
 			if (_timePickerOpened)
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/AddItemsToCarouselViewWorks.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/AddItemsToCarouselViewWorks.png
new file mode 100644
index 000000000000..43bb7c65e32f
Binary files /dev/null and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/AddItemsToCarouselViewWorks.png differ
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22417.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22417.cs
index c613ea3f759d..d47e0ee8447b 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22417.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22417.cs
@@ -1,4 +1,4 @@
-#if TEST_FAILS_ON_WINDOWS && TEST_FAILS_ON_CATALYST //This test is failing, likely due to product issue, for more information: https://github.com/dotnet/maui/issues/27059
+#if TEST_FAILS_ON_WINDOWS //This test is failing, likely due to product issue, for more information: https://github.com/dotnet/maui/issues/27059
 using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue27715.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue27715.cs
index 2f5bb06d238f..015457fe5de2 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue27715.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue27715.cs
@@ -19,7 +19,7 @@ public Issue27715(TestDevice testDevice) : base(testDevice)
 		public void ScrollViewShouldRenderWithinBounds()
 		{
 			App.WaitForElement("WaitForStubControl");
-			VerifyScreenshot();	
+			VerifyScreenshot();
 		}
 	}
 }
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986.cs
new file mode 100644
index 000000000000..cd2584841b83
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986.cs
@@ -0,0 +1,126 @@
+#if IOS
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues
+{
+	public class Issue28986 : _IssuesUITest
+	{
+		public override string Issue => "Test SafeArea attached property for per-edge safe area control";
+
+		public Issue28986(TestDevice device) : base(device)
+		{
+		}
+
+		[Test]
+		[Category(UITestCategories.Layout)]
+		public void SafeAreaMainGridBasicFunctionality()
+		{
+			// 1. Test loads - verify essential elements are present
+			App.WaitForElement("ContentGrid");
+
+			// 2. Verify initial state - MainGrid should start with All (offset by safe area)
+			var initialSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(initialSettings, Does.Contain("All (Full safe area)"));
+
+
+			var safePosition = App.WaitForElement("ContentGrid").GetRect();
+			// 3. Click button to set SafeAreaEdge to "None" on the MainGrid
+			App.Tap("GridResetNoneButton");
+
+			var unSafePosition = App.WaitForElement("ContentGrid").GetRect();
+
+			Assert.That(unSafePosition.Y, Is.EqualTo(0), "ContentGrid Y position should be 0 when SafeAreaEdges is set to None");
+			Assert.That(safePosition.Y, Is.Not.EqualTo(0), "ContentGrid Y position should not be 0 when SafeAreaEdges is set to All");
+		}
+
+		[Test]
+		[Category(UITestCategories.Layout)]
+		public void SafeAreaMainGridAllButtonFunctionality()
+		{
+			App.WaitForElement("GridResetAllButton");
+			App.WaitForElement("ContentGrid");
+
+			// First set to None to establish baseline position
+			App.Tap("GridResetNoneButton");
+			var nonePosition = App.WaitForElement("ContentGrid").GetRect();
+
+			// Test "All" button functionality
+			App.Tap("GridResetAllButton");
+			var allPosition = App.WaitForElement("ContentGrid").GetRect();
+
+			// Verify MainGrid is set to All
+			var allSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(allSettings, Does.Contain("All (Full safe area)"));
+
+			// Verify position changes - All should offset content away from screen edges
+			Assert.That(allPosition.Y, Is.Not.EqualTo(0), "ContentGrid Y position should not be 0 when SafeAreaEdges is set to All");
+			Assert.That(allPosition.Y, Is.GreaterThan(nonePosition.Y), "ContentGrid should be positioned lower when SafeAreaEdges is All vs None");
+		}
+
+		[Test]
+		[Category(UITestCategories.Layout)]
+		public void SafeAreaMainGridSequentialButtonTesting()
+		{
+			App.WaitForElement("ContentGrid");
+			App.WaitForElement("CurrentSettings");
+
+			// Test sequence: All -> None -> Container -> All with position validation
+			
+			// 1. Set to All and capture position
+			App.Tap("GridResetAllButton");
+			var allPosition = App.WaitForElement("ContentGrid").GetRect();
+			var allSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(allSettings, Does.Contain("All (Full safe area)"));
+
+			// 2. Set to None and verify position changes
+			App.Tap("GridResetNoneButton");
+			var nonePosition = App.WaitForElement("ContentGrid").GetRect();
+			var noneSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(noneSettings, Does.Contain("None (Edge-to-edge)"));
+			Assert.That(nonePosition.Y, Is.EqualTo(0), "ContentGrid Y position should be 0 when SafeAreaEdges is None (edge-to-edge)");
+			Assert.That(allPosition.Y, Is.GreaterThan(nonePosition.Y), "All position should be lower than None position");
+
+			// 3. Set to Container and verify position changes
+			App.Tap("GridSetContainerButton");
+			var containerPosition = App.WaitForElement("ContentGrid").GetRect();
+			var containerSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(containerSettings, Does.Contain("Container (Respect notches/bars)"));
+			Assert.That(containerPosition.Y, Is.GreaterThan(nonePosition.Y), "Container position should be lower than None position");
+
+			// 4. Return to All and verify position matches original
+			App.Tap("GridResetAllButton");
+			var finalAllPosition = App.WaitForElement("ContentGrid").GetRect();
+			var finalAllSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(finalAllSettings, Does.Contain("All (Full safe area)"));
+			Assert.That(finalAllPosition.Y, Is.EqualTo(allPosition.Y), "Final All position should match initial All position");
+		}
+
+		[Test]
+		[Category(UITestCategories.Layout)]
+		public void SafeAreaPerEdgeValidation()
+		{
+			App.WaitForElement("ContentGrid");
+
+			// Set all 4 edges to Container
+			App.Tap("GridSetContainerButton");
+			App.Tap("GridSetBottomSoftInputButton");
+			
+			var containerPosition = App.WaitForElement("ContentGrid").GetRect();
+
+			// Open Soft Input test entry
+			App.Tap("SoftInputTestEntry");
+			var containerPositionWithSoftInput = App.WaitForElement("ContentGrid").GetRect();
+
+			Assert.That(containerPositionWithSoftInput.Height, Is.LessThan(containerPosition.Height), "ContentGrid height should be less when Soft Input is shown with Container edges");
+
+			App.DismissKeyboard();
+
+			var containerPositionWithoutSoftInput = App.WaitForElement("ContentGrid").GetRect();
+
+			Assert.That(containerPositionWithoutSoftInput.Height, Is.EqualTo(containerPosition.Height), "ContentGrid height should return to original when Soft Input is dismissed with Container edges");
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986_ScrollView.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986_ScrollView.cs
new file mode 100644
index 000000000000..f161707e080c
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986_ScrollView.cs
@@ -0,0 +1,71 @@
+#if IOS
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues
+{
+	public class Issue28986_ScrollView : _IssuesUITest
+	{
+		public override string Issue => "Test SafeArea ScrollView for per-edge safe area control";
+
+		public Issue28986_ScrollView(TestDevice device) : base(device)
+		{
+		}
+
+		[Test]
+		[Category(UITestCategories.ScrollView)]
+		public void SafeAreaScrollViewBasicFunctionality()
+		{
+			// 1. Test loads - verify essential elements are present
+			App.WaitForElement("TestScrollView");
+
+			// 2. Verify initial state - ScrollView should start with All (full safe area)
+			var initialSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(initialSettings, Does.Contain("All (Full safe area)"));
+
+			// 3. Get initial ScrollView position when SafeAreaEdges is All
+			var scrollViewWithSafeArea = App.WaitForElement("ScrollViewContent").GetRect();
+
+			// 4. Set ScrollView SafeAreaEdges to None (edge-to-edge)
+			App.Tap("ScrollViewResetNoneButton");
+			var noneSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(noneSettings, Does.Contain("None (Edge-to-edge)"));
+
+			// 5. Get ScrollView position after setting to None
+			var scrollViewEdgeToEdge = App.WaitForElement("ScrollViewContent").GetRect();
+
+			// 6. Verify that ScrollView position/size changes when SafeAreaEdges changes
+			// When ScrollView has SafeAreaEdges.All, it respects safe area insets
+			// When ScrollView has SafeAreaEdges.None, it goes edge-to-edge
+			Assert.That(scrollViewEdgeToEdge.Y, Is.LessThan(scrollViewWithSafeArea.Y), 
+				"ScrollView should move up (smaller Y position) when SafeAreaEdges changes from All to None");
+		}
+
+		[Test]
+		[Category(UITestCategories.ScrollView)]
+		public void SafeAreaScrollViewContainerFunctionality()
+		{
+			App.WaitForElement("TestScrollView");
+
+			// Start with None to establish baseline
+			App.Tap("ScrollViewResetNoneButton");
+			var nonePosition = App.WaitForElement("ScrollViewContent").GetRect();
+
+			// Test Container button functionality
+			App.Tap("ScrollViewSetContainerButton");
+			var containerSettings = App.FindElement("CurrentSettings").GetText();
+			Assert.That(containerSettings, Does.Contain("Container (Respect notches/bars)"));
+
+			// When you change from none back to container
+			// the scrollview will just stay scrolled up at this point
+			// it doesn't reset to zero
+			App.ScrollUp("CurrentSettings");
+
+			var containerPosition = App.WaitForElement("ScrollViewContent").GetRect();
+			Assert.That(containerPosition.Y, Is.GreaterThan(nonePosition.Y), 
+				"ScrollView should move down when SafeAreaEdges changes from None to Container");
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945.cs
index a9f30ab4a12b..5bebef53246a 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945.cs
@@ -19,7 +19,7 @@ public Issue8945(TestDevice testDevice) : base(testDevice)
 		[Test, Order(1)]
 		[Category(UITestCategories.DatePicker)]
 		public void OpenCloseDatePicker()
-		{ 
+		{
 			App.WaitForElement("OpenDatePickerButton");
 			App.Tap("OpenDatePickerButton");
 #if ANDROID
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945DatePicker.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945DatePicker.cs
index e5cd9a0e3190..a9cfe4704784 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945DatePicker.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945DatePicker.cs
@@ -10,7 +10,7 @@ public class Issue8945DatePicker : _IssuesUITest
 #if ANDROID
 	const string CancelBtn = "Cancel";
 #endif
-	
+
 	public Issue8945DatePicker(TestDevice testDevice) : base(testDevice)
 	{
 	}
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945Picker.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945Picker.cs
index ee404729ab2e..ac59b1a92b15 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945Picker.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945Picker.cs
@@ -10,7 +10,7 @@ public class Issue8945Picker : _IssuesUITest
 #if ANDROID
 	const string CancelBtn = "Cancel";
 #endif
-	
+
 	public Issue8945Picker(TestDevice testDevice) : base(testDevice)
 	{
 	}
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945TimePicker.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945TimePicker.cs
index 97b88934c912..611eecdeaeb7 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945TimePicker.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue8945TimePicker.cs
@@ -10,7 +10,7 @@ public class Issue8945TimePicker : _IssuesUITest
 #if ANDROID
 	const string CancelBtn = "Cancel";
 #endif
-	
+
 	public Issue8945TimePicker(TestDevice testDevice) : base(testDevice)
 	{
 	}
diff --git a/src/Controls/tests/Xaml.UnitTests/Issues/Maui17222.xaml.cs b/src/Controls/tests/Xaml.UnitTests/Issues/Maui17222.xaml.cs
index c105b82ddee0..f04c0320232f 100644
--- a/src/Controls/tests/Xaml.UnitTests/Issues/Maui17222.xaml.cs
+++ b/src/Controls/tests/Xaml.UnitTests/Issues/Maui17222.xaml.cs
@@ -23,7 +23,7 @@ class Test
 	{
 #if DEBUG
 		bool enableDiagnosticsInitialState;
-		
+
 		[SetUp]
 		public void Setup()
 		{
@@ -35,7 +35,7 @@ public void Setup()
 		[TearDown]
 		public void TearDown()
 		{
-			RuntimeFeature.EnableMauiDiagnostics = enableDiagnosticsInitialState;			
+			RuntimeFeature.EnableMauiDiagnostics = enableDiagnosticsInitialState;
 			AppInfo.SetCurrent(null);
 		}
 
diff --git a/src/Controls/tests/Xaml.UnitTests/SafeAreaEdgesTests.xaml b/src/Controls/tests/Xaml.UnitTests/SafeAreaEdgesTests.xaml
new file mode 100644
index 000000000000..d8c51604a0a4
--- /dev/null
+++ b/src/Controls/tests/Xaml.UnitTests/SafeAreaEdgesTests.xaml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+			 xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+			 x:Class="Microsoft.Maui.Controls.Xaml.UnitTests.SafeAreaEdgesTests">
+	<Grid>
+		<!-- Test single value -->
+		<Grid x:Name="singleValueNone" SafeAreaEdges="None" />
+		<Grid x:Name="singleValueAll" SafeAreaEdges="All" />
+		<Grid x:Name="singleValueSoftInput" SafeAreaEdges="SoftInput" />
+		<Grid x:Name="singleValueContainer" SafeAreaEdges="Container" />
+		<Grid x:Name="singleValueDefault" SafeAreaEdges="Default" />
+		
+		<!-- Test two values -->
+		<Grid x:Name="twoValueHorVert" SafeAreaEdges="SoftInput,Container" />
+		<Grid x:Name="twoValueMixed" SafeAreaEdges="None,All" />
+		
+		<!-- Test four values -->
+		<Grid x:Name="fourValueMixed" SafeAreaEdges="None,SoftInput,Container,All" />
+		<Grid x:Name="fourValueDefault" SafeAreaEdges="Default,None,Default,All" />
+		
+		<!-- Test ContentView -->
+		<ContentView x:Name="contentViewTest" SafeAreaEdges="Container,SoftInput" />
+		
+		<!-- Test Border -->
+		<Border x:Name="borderTest" SafeAreaEdges="SoftInput" />
+		
+		<!-- Test ScrollView -->
+		<ScrollView x:Name="scrollViewTest" SafeAreaEdges="Container,Default,All,None" />
+	</Grid>
+</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/Xaml.UnitTests/SafeAreaEdgesTests.xaml.cs b/src/Controls/tests/Xaml.UnitTests/SafeAreaEdgesTests.xaml.cs
new file mode 100644
index 000000000000..efc8717b7c0d
--- /dev/null
+++ b/src/Controls/tests/Xaml.UnitTests/SafeAreaEdgesTests.xaml.cs
@@ -0,0 +1,74 @@
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Core.UnitTests;
+using NUnit.Framework;
+
+namespace Microsoft.Maui.Controls.Xaml.UnitTests;
+
+	[XamlProcessing(XamlInflator.Default, true)]
+	public partial class SafeAreaEdgesTests : ContentPage
+	{
+		public SafeAreaEdgesTests() => InitializeComponent();
+
+		[TestFixture]
+		public class Tests
+		{
+			[Test]
+			public void SingleValueConversions([Values] XamlInflator inflator)
+			{
+				var layout = new SafeAreaEdgesTests(inflator);
+
+				Assert.AreEqual(SafeAreaEdges.None, layout.singleValueNone.SafeAreaEdges);
+				Assert.AreEqual(SafeAreaEdges.All, layout.singleValueAll.SafeAreaEdges);
+				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.SoftInput), layout.singleValueSoftInput.SafeAreaEdges);
+				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.Container), layout.singleValueContainer.SafeAreaEdges);
+				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.Default), layout.singleValueDefault.SafeAreaEdges);
+			}
+
+			[Test]
+			public void TwoValueConversions([Values] XamlInflator inflator)
+			{
+				var layout = new SafeAreaEdgesTests(inflator);
+
+				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.SoftInput, SafeAreaRegions.Container), layout.twoValueHorVert.SafeAreaEdges);
+				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.All), layout.twoValueMixed.SafeAreaEdges);
+			}
+
+			[Test]
+			public void FourValueConversions([Values] XamlInflator inflator)
+			{
+				var layout = new SafeAreaEdgesTests(inflator);
+
+				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.None, SafeAreaRegions.SoftInput, SafeAreaRegions.Container, SafeAreaRegions.All), layout.fourValueMixed.SafeAreaEdges);
+				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.Default, SafeAreaRegions.None, SafeAreaRegions.Default, SafeAreaRegions.All), layout.fourValueDefault.SafeAreaEdges);
+			}
+
+			[Test]
+			public void ControlSpecificProperties([Values] XamlInflator inflator)
+			{
+				var layout = new SafeAreaEdgesTests(inflator);
+
+				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.Container, SafeAreaRegions.SoftInput), layout.contentViewTest.SafeAreaEdges);
+				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.SoftInput), layout.borderTest.SafeAreaEdges);
+				Assert.AreEqual(new SafeAreaEdges(SafeAreaRegions.Container, SafeAreaRegions.Default, SafeAreaRegions.All, SafeAreaRegions.None), layout.scrollViewTest.SafeAreaEdges);
+			}
+
+			[Test]
+			public void PropertyInflation_WorksWithAllEnumValues([Values] XamlInflator inflator)
+			{
+				var layout = new SafeAreaEdgesTests(inflator);
+
+				// Verify all enum values are properly inflated from XAML strings
+				var noneGrid = layout.singleValueNone;
+				var allGrid = layout.singleValueAll;
+				var softInputGrid = layout.singleValueSoftInput;
+				var containerGrid = layout.singleValueContainer;
+				var defaultGrid = layout.singleValueDefault;
+
+				Assert.AreEqual(SafeAreaRegions.None, noneGrid.SafeAreaEdges.Left);
+				Assert.AreEqual(SafeAreaRegions.All, allGrid.SafeAreaEdges.Left);
+				Assert.AreEqual(SafeAreaRegions.SoftInput, softInputGrid.SafeAreaEdges.Left);
+				Assert.AreEqual(SafeAreaRegions.Container, containerGrid.SafeAreaEdges.Left);
+				Assert.AreEqual(SafeAreaRegions.Default, defaultGrid.SafeAreaEdges.Left);
+			}
+		}
+	}
diff --git a/src/Core/src/Converters/SafeAreaEdgesTypeConverter.cs b/src/Core/src/Converters/SafeAreaEdgesTypeConverter.cs
new file mode 100644
index 000000000000..e376510636ff
--- /dev/null
+++ b/src/Core/src/Converters/SafeAreaEdgesTypeConverter.cs
@@ -0,0 +1,85 @@
+using System;
+using System.ComponentModel;
+using System.Globalization;
+
+namespace Microsoft.Maui.Converters
+{
+	/// <summary>
+	/// Type converter for SafeAreaEdges struct, supporting XAML parsing of 
+	/// SafeArea.Ignore attached property values.
+	/// </summary>
+	public class SafeAreaEdgesTypeConverter : TypeConverter
+	{
+		public override bool CanConvertFrom(ITypeDescriptorContext? context, Type sourceType)
+			=> sourceType == typeof(string);
+
+		public override bool CanConvertTo(ITypeDescriptorContext? context, Type? destinationType)
+			=> destinationType == typeof(string);
+
+		public override object ConvertFrom(ITypeDescriptorContext? context, CultureInfo? culture, object? value)
+		{
+			// IMPORTANT! Update SafeAreaEdgesTypeDesignConverter.IsValid if making changes here
+			var strValue = value?.ToString();
+
+			if (strValue != null)
+			{
+				strValue = strValue.Trim();
+
+				// Split by comma - if no comma, we get array with single element
+				var parts = strValue.Split(',');
+				var regions = new SafeAreaRegions[parts.Length];
+
+				for (int i = 0; i < parts.Length; i++)
+				{
+					var part = parts[i].Trim();
+
+					// Performance optimization: use string comparison instead of Enum.TryParse
+					// since SafeAreaRegions has specific values
+					if (string.Equals(part, "All", StringComparison.OrdinalIgnoreCase))
+					{
+						regions[i] = SafeAreaRegions.All;
+					}
+					else if (string.Equals(part, "None", StringComparison.OrdinalIgnoreCase))
+					{
+						regions[i] = SafeAreaRegions.None;
+					}
+					else if (string.Equals(part, "Container", StringComparison.OrdinalIgnoreCase))
+					{
+						regions[i] = SafeAreaRegions.Container;
+					}
+					else if (string.Equals(part, "SoftInput", StringComparison.OrdinalIgnoreCase))
+					{
+						regions[i] = SafeAreaRegions.SoftInput;
+					}
+					else if (string.Equals(part, "Default", StringComparison.OrdinalIgnoreCase))
+					{
+						regions[i] = SafeAreaRegions.Default;
+					}
+					else
+					{
+						throw new FormatException($"Cannot convert \"{part}\" into {typeof(SafeAreaRegions)}");
+					}
+				}
+
+				// Convert array to SafeAreaEdges using the same logic as before
+				return regions.Length switch
+				{
+					1 => new SafeAreaEdges(regions[0]),
+					2 => new SafeAreaEdges(regions[0], regions[1]), // horizontal, vertical
+					4 => new SafeAreaEdges(regions[0], regions[1], regions[2], regions[3]), // left, top, right, bottom
+					_ => throw new FormatException($"SafeAreaEdges must have 1, 2, or 4 values, but got {regions.Length}")
+				};
+			}
+
+			throw new FormatException($"Cannot convert \"{strValue}\" into {typeof(SafeAreaEdges)}");
+		}
+
+		public override object ConvertTo(ITypeDescriptorContext? context, CultureInfo? culture, object? value, Type destinationType)
+		{
+			if (value is not SafeAreaEdges edges)
+				throw new NotSupportedException();
+
+			return edges.ToString();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Core/ISafeAreaView2.cs b/src/Core/src/Core/ISafeAreaView2.cs
index e0f0fb9ec757..6ded20b81480 100644
--- a/src/Core/src/Core/ISafeAreaView2.cs
+++ b/src/Core/src/Core/ISafeAreaView2.cs
@@ -12,5 +12,12 @@ internal interface ISafeAreaView2
 		/// Internal property for the Page's SafeAreaInsets Thickness that may be changed in the future.
 		/// </summary>
 		internal Thickness SafeAreaInsets { set; }
+
+		/// <summary>
+		/// Gets the safe area regions for the specified edge (0=Left, 1=Top, 2=Right, 3=Bottom).
+		/// </summary>
+		/// <param name="edge">The edge to get the behavior for (0=Left, 1=Top, 2=Right, 3=Bottom).</param>
+		/// <returns>The SafeAreaRegions behavior for this edge.</returns>
+		SafeAreaRegions GetSafeAreaRegionsForEdge(int edge);
 	}
 }
diff --git a/src/Core/src/Handlers/ScrollView/ScrollViewHandler.iOS.cs b/src/Core/src/Handlers/ScrollView/ScrollViewHandler.iOS.cs
index 0183dcecad50..9561c9f423ca 100644
--- a/src/Core/src/Handlers/ScrollView/ScrollViewHandler.iOS.cs
+++ b/src/Core/src/Handlers/ScrollView/ScrollViewHandler.iOS.cs
@@ -18,6 +18,15 @@ protected override UIScrollView CreatePlatformView()
 			return new MauiScrollView();
 		}
 
+		public override void SetVirtualView(IView view)
+		{
+			base.SetVirtualView(view);
+			
+			if (PlatformView is MauiScrollView mauiScrollView)
+				mauiScrollView.View = view;
+				
+		}
+
 		protected override void ConnectHandler(UIScrollView platformView)
 		{
 			base.ConnectHandler(platformView);
diff --git a/src/Core/src/Handlers/SwipeItemView/SwipeItemViewHandler.iOS.cs b/src/Core/src/Handlers/SwipeItemView/SwipeItemViewHandler.iOS.cs
index 747a390f1f69..4d0dc435bfca 100644
--- a/src/Core/src/Handlers/SwipeItemView/SwipeItemViewHandler.iOS.cs
+++ b/src/Core/src/Handlers/SwipeItemView/SwipeItemViewHandler.iOS.cs
@@ -20,6 +20,7 @@ public override void SetVirtualView(IView view)
 			_ = PlatformView ?? throw new InvalidOperationException($"{nameof(PlatformView)} should have been set by base class.");
 
 			PlatformView.CrossPlatformLayout = VirtualView;
+			PlatformView.View = VirtualView;
 		}
 
 		void UpdateContent()
diff --git a/src/Core/src/Handlers/SwipeView/SwipeViewHandler.iOS.cs b/src/Core/src/Handlers/SwipeView/SwipeViewHandler.iOS.cs
index b76ec173d5b3..3dd5b216a5a3 100644
--- a/src/Core/src/Handlers/SwipeView/SwipeViewHandler.iOS.cs
+++ b/src/Core/src/Handlers/SwipeView/SwipeViewHandler.iOS.cs
@@ -12,6 +12,7 @@ public override void SetVirtualView(IView view)
 			_ = PlatformView ?? throw new InvalidOperationException($"{nameof(PlatformView)} should have been set by base class.");
 
 			PlatformView.CrossPlatformLayout = VirtualView;
+			PlatformView.View = VirtualView;
 		}
 
 		public static void MapContent(ISwipeViewHandler handler, ISwipeView view)
diff --git a/src/Core/src/Platform/iOS/MauiScrollView.cs b/src/Core/src/Platform/iOS/MauiScrollView.cs
index 61489965edfa..83c02b0b2d37 100644
--- a/src/Core/src/Platform/iOS/MauiScrollView.cs
+++ b/src/Core/src/Platform/iOS/MauiScrollView.cs
@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using CoreGraphics;
+using Foundation;
 using Microsoft.Maui.Graphics;
 using UIKit;
 
@@ -79,11 +80,14 @@ public class MauiScrollView : UIScrollView, IUIViewLifeCycleEvents, ICrossPlatfo
 		/// </summary>
 		UIUserInterfaceLayoutDirection? _previousEffectiveUserInterfaceLayoutDirection;
 
+		WeakReference<ICrossPlatformLayout>? _crossPlatformLayoutReference;
+
+
 		/// <summary>
 		/// Weak reference to the cross-platform layout that manages the content of this scroll view.
 		/// Weak reference prevents circular references and allows proper garbage collection.
 		/// </summary>
-		WeakReference<ICrossPlatformLayout>? _crossPlatformLayoutReference;
+		WeakReference<IView>? _reference;
 
 		/// <summary>
 		/// Gets or sets the cross-platform layout that manages the content of this scroll view.
@@ -153,6 +157,93 @@ public override void SafeAreaInsetsDidChange()
 		/// This method handles safe area validation, measures and arranges content, and manages RTL layout adjustments.
 		/// It's called by iOS whenever the view needs to be laid out, including during scrolling operations.
 		/// </summary>
+		internal IView? View
+		{
+			get => _reference != null && _reference.TryGetTarget(out var v) ? v : null;
+			set => _reference = value == null ? null : new(value);
+		}
+
+		SafeAreaRegions GetSafeAreaRegionForEdge(int edge)
+		{
+			if (View is ISafeAreaView2 safeAreaPage)
+			{
+				return safeAreaPage.GetSafeAreaRegionsForEdge(edge);
+			}
+			
+			return SafeAreaRegions.None; // Default: edge-to-edge content
+		}
+
+		SafeAreaEdges? _previousEdges;
+
+		UIEdgeInsets GetInset()
+		{
+			var leftRegion = GetSafeAreaRegionForEdge(0);
+			var topRegion = GetSafeAreaRegionForEdge(1);
+			var rightRegion = GetSafeAreaRegionForEdge(2);
+			var bottomRegion = GetSafeAreaRegionForEdge(3);
+
+			var safeAreaInsets = SafeAreaInsets;
+
+			var manualInset = new UIEdgeInsets(
+					top: GetManualInsetForEdge(topRegion, safeAreaInsets.Top),
+					left: GetManualInsetForEdge(leftRegion, safeAreaInsets.Left),
+					bottom: GetManualInsetForEdge(bottomRegion, safeAreaInsets.Bottom),
+					right: GetManualInsetForEdge(rightRegion, safeAreaInsets.Right)
+				);
+
+			return manualInset;
+		}
+
+		bool UpdateContentInsetAdjustmentBehavior()
+		{
+			// Get SafeAreaRegions for all edges
+			var leftRegion = GetSafeAreaRegionForEdge(0);
+			var topRegion = GetSafeAreaRegionForEdge(1);
+			var rightRegion = GetSafeAreaRegionForEdge(2);
+			var bottomRegion = GetSafeAreaRegionForEdge(3);
+
+			SafeAreaEdges safeAreaEdges = new SafeAreaEdges(leftRegion, topRegion, rightRegion, bottomRegion);
+
+			if (_previousEdges is not null && _previousEdges.Equals(safeAreaEdges))
+				return false;
+
+			_previousEdges = safeAreaEdges;
+
+			// Check if all edges have the same SafeAreaRegions value
+			if (leftRegion == topRegion && topRegion == rightRegion && rightRegion == bottomRegion)
+			{
+				// All edges have the same value, use built-in iOS behavior
+				// Cache the region value to avoid redundant comparisons
+				var region = leftRegion;
+				
+				ContentInsetAdjustmentBehavior = region switch
+				{
+					SafeAreaRegions.Default => UIScrollViewContentInsetAdjustmentBehavior.Automatic, // Default behavior
+					SafeAreaRegions.None => UIScrollViewContentInsetAdjustmentBehavior.Never, // Edge-to-edge content
+					SafeAreaRegions.All => UIScrollViewContentInsetAdjustmentBehavior.Never, // We calculate insets ourselves and include keyboard
+					_ when SafeAreaEdges.IsContainer(region) => UIScrollViewContentInsetAdjustmentBehavior.Always, // Content flows under keyboard but stays out of bars/notch
+					_ when SafeAreaEdges.IsSoftInput(region) => UIScrollViewContentInsetAdjustmentBehavior.Never, // We calculate insets ourselves and include keyboard
+					_ => UIScrollViewContentInsetAdjustmentBehavior.Never // Default: edge-to-edge
+				};
+			}
+			else
+			{
+				// Mixed edges - use manual calculation
+				ContentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentBehavior.Never;
+			}
+
+			return true;
+		}
+
+		static nfloat GetManualInsetForEdge(SafeAreaRegions safeAreaRegion, nfloat safeAreaInset)
+		{
+			// Edge-to-edge content - no safe area padding
+			if (safeAreaRegion == SafeAreaRegions.None)
+				return 0;
+
+			return safeAreaInset;
+		}
+
 		public override void LayoutSubviews()
 		{
 			// If there's no cross-platform layout, fall back to default UIScrollView behavior
@@ -174,6 +265,7 @@ public override void LayoutSubviews()
 			var bounds = Bounds;
 			var widthConstraint = (double)bounds.Width;
 			var heightConstraint = (double)bounds.Height;
+			ValidateSafeArea();
 			var frameChanged = _lastArrangeWidth != widthConstraint || _lastArrangeHeight != heightConstraint;
 
 			// If the frame changed, we need to arrange (and potentially measure) the content again
@@ -189,30 +281,7 @@ public override void LayoutSubviews()
 					CacheMeasureConstraints(widthConstraint, heightConstraint);
 				}
 
-				Size crossPlatformBounds;
-				// Account for safe area adjustments automatically added by iOS
-				var contentSize = CrossPlatformArrange(Bounds, out crossPlatformBounds).ToCGSize();
-
-				// For Right-To-Left (RTL) layouts, we need to adjust the content arrangement and offset
-				// to ensure the content is correctly aligned and scrolled. This involves a second layout
-				// arrangement with an adjusted starting point and recalculating the content offset.
-				if (_previousEffectiveUserInterfaceLayoutDirection is not null && _previousEffectiveUserInterfaceLayoutDirection != EffectiveUserInterfaceLayoutDirection)
-				{
-					if (EffectiveUserInterfaceLayoutDirection == UIUserInterfaceLayoutDirection.RightToLeft)
-					{
-						var horizontalOffset = contentSize.Width - crossPlatformBounds.Width;
-						CrossPlatformArrange(new Rect(new Point(-horizontalOffset, 0), crossPlatformBounds), out _);
-						ContentOffset = new CGPoint(horizontalOffset, 0);
-					}
-					else
-					{
-						ContentOffset = new CGPoint(0, ContentOffset.Y);
-					}
-				}
-
-				// When switching between LTR and RTL, we need to re-arrange and offset content exactly once
-				// to avoid cumulative shifts or incorrect offsets on subsequent layouts.
-				_previousEffectiveUserInterfaceLayoutDirection = EffectiveUserInterfaceLayoutDirection;
+				var contentSize = CrossPlatformArrange(Bounds).ToCGSize();
 
 				// When the content size changes, we need to adjust the scrollable area size so that the content can fit in it.
 				if (ContentSize != contentSize)
@@ -229,6 +298,7 @@ public override void LayoutSubviews()
 			base.LayoutSubviews();
 		}
 
+
 		/// <summary>
 		/// Validates and updates the safe area configuration. This method checks if the safe area
 		/// has changed and updates the internal state accordingly.
@@ -236,14 +306,22 @@ public override void LayoutSubviews()
 		/// <returns>True if the safe area configuration hasn't changed in a way that affects layout, false otherwise.</returns>
 		bool ValidateSafeArea()
 		{
+			//UpdateKeyboardSubscription();
 			// If nothing changed, we don't need to do anything
+
+			if (!UpdateContentInsetAdjustmentBehavior())
+			{
+				InvalidateConstraintsCache();
+				_safeAreaInvalidated = true;
+			}
+
 			if (!_safeAreaInvalidated)
 			{
 				return true;
 			}
 
 			// Mark the safe area as validated given that we're about to check it
-			_safeAreaInvalidated = false;
+			_safeAreaInvalidated = true;
 
 			var oldSafeArea = _safeArea;
 
@@ -253,8 +331,8 @@ bool ValidateSafeArea()
 			// it can push ContentSize over the Bounds, causing AdjustedContentInset to become non-zero and SafeAreaInsets on the child to reset to zero.
 			// This can result in a loop of invalidations as the layout toggles between these states.
 			// To prevent this, we ignore safe area calculations on child views when they are inside a scroll view.
-			if (SystemAdjustedContentInset == UIEdgeInsets.Zero)
-				_safeArea = SafeAreaInsets.ToSafeAreaInsets();
+			if (SystemAdjustedContentInset == UIEdgeInsets.Zero || ContentInsetAdjustmentBehavior == UIScrollViewContentInsetAdjustmentBehavior.Never)
+				_safeArea = GetInset().ToSafeAreaInsets();
 			else
 				_safeArea = SystemAdjustedContentInset.ToSafeAreaInsets();
 
@@ -263,13 +341,19 @@ bool ValidateSafeArea()
 
 			if (_systemAdjustedContentInset != SystemAdjustedContentInset)
 			{
+				InvalidateConstraintsCache();
 				_systemAdjustedContentInset = SystemAdjustedContentInset;
 				return false;
 			}
 
+			if (!oldSafeArea.Equals(_safeArea))
+			{
+				InvalidateConstraintsCache();
+			}
+
 			// Return whether the way safe area interacts with our view has changed
 			return oldApplyingSafeAreaAdjustments == _appliesSafeAreaAdjustments &&
-			       (oldSafeArea == _safeArea || !_appliesSafeAreaAdjustments);
+				   (oldSafeArea == _safeArea || !_appliesSafeAreaAdjustments);
 		}
 
 		UIEdgeInsets SystemAdjustedContentInset
@@ -293,9 +377,8 @@ UIEdgeInsets SystemAdjustedContentInset
 		/// This method applies safe area insets to the bounds before arranging the content.
 		/// </summary>
 		/// <param name="bounds">The bounds within which to arrange the content.</param>
-		/// <param name="adjustedBounds">The bounds after safe area adjustments have been applied.</param>
 		/// <returns>The size of the arranged content.</returns>
-		Size CrossPlatformArrange(CGRect bounds, out Size adjustedBounds)
+		Size CrossPlatformArrange(CGRect bounds)
 		{
 			bounds = new Rect(new Point(), bounds.Size.ToSize());
 			// Apply safe area adjustments to the bounds if this scroll view responds to safe area
@@ -304,20 +387,98 @@ Size CrossPlatformArrange(CGRect bounds, out Size adjustedBounds)
 				bounds = _safeArea.InsetRect(bounds);
 			}
 
-			adjustedBounds = bounds.Size.ToSize();
+			Size contentSize;
 
-			Size size;
 
-			if (SystemAdjustedContentInset == UIEdgeInsets.Zero)
+			double width;
+			double height;
+			if (SystemAdjustedContentInset == UIEdgeInsets.Zero || ContentInsetAdjustmentBehavior == UIScrollViewContentInsetAdjustmentBehavior.Never)
 			{
-				size = CrossPlatformLayout?.CrossPlatformArrange(bounds.ToRectangle()) ?? Size.Zero;
+				contentSize = CrossPlatformLayout?.CrossPlatformArrange(bounds.ToRectangle()) ?? Size.Zero;
+
+				width = contentSize.Width;
+				height = contentSize.Height;
 			}
 			else
 			{
-				size = CrossPlatformLayout?.CrossPlatformArrange(new Rect(new Point(), bounds.Size.ToSize())) ?? Size.Zero;
+				contentSize = CrossPlatformLayout?.CrossPlatformArrange(new Rect(new Point(), bounds.Size.ToSize())) ?? Size.Zero;
+
+				width = contentSize.Width;
+				height = contentSize.Height;
 			}
 
-			return size;
+
+			// When using ContentInsetAdjustmentBehavior.Automatic, UIKit dynamically decides whether to apply 
+			// safe area insets to the scroll view (via AdjustedContentInset) or to push them into the child view's SafeAreaInsets.
+			// This decision depends on whether the scroll view is considered "scrollable"—i.e., whether the contentSize 
+			// is larger than the visible bounds (after accounting for safe areas).
+			//
+			// If the content size is *just* smaller than or equal to the scroll view’s bounds, UIKit may decide that
+			// scrolling isn’t needed and push the safe area insets into the child instead. This can cause:
+			//   - content centering to behave incorrectly (e.g., not respecting safe areas),
+			//   - layout loops where the child resizes in response to changing safe area insets,
+			//   - instability when transitioning between scrollable and non-scrollable states.
+			//
+			// This logic adds safe area padding to the contentSize *only if* the content is nearly large enough to require scrolling,
+			// ensuring the scroll view remains in "scrollable mode" and keeps safe area insets at the scroll view level.
+			// This avoids inset flip-flopping and keeps layout behavior stable and predictable.
+			if (ContentInsetAdjustmentBehavior == UIScrollViewContentInsetAdjustmentBehavior.Automatic)
+			{
+				// We do this to keep the content scrollable
+				// if we don't do this the ContentAdjustedInset + contentSize will cause the content to go off the screen and not be scrollable
+				// So the bottom content will just go off the screen until the contentsize triggers the scrollable area
+				if (width <= Bounds.Width &&
+					(_safeArea.HorizontalThickness + width) > Bounds.Width)
+				{
+					width += Bounds.Width + 1;
+				}
+
+				if (height <= Bounds.Height &&
+					(_safeArea.VerticalThickness + height) > Bounds.Height)
+				{
+					height = Bounds.Height + 1;
+				}
+
+				contentSize = new Size(width, height);
+			}
+			else if (ContentInsetAdjustmentBehavior != UIScrollViewContentInsetAdjustmentBehavior.Automatic)
+			{
+				width += _safeArea.HorizontalThickness;
+				height += _safeArea.VerticalThickness;
+			}
+
+			contentSize = new Size(width, height);
+
+			// For Right-To-Left (RTL) layouts, we need to adjust the content arrangement and offset
+			// to ensure the content is correctly aligned and scrolled. This involves a second layout
+			// arrangement with an adjusted starting point and recalculating the content offset.
+			if (_previousEffectiveUserInterfaceLayoutDirection is not null && _previousEffectiveUserInterfaceLayoutDirection != EffectiveUserInterfaceLayoutDirection)
+			{
+				if (EffectiveUserInterfaceLayoutDirection == UIUserInterfaceLayoutDirection.RightToLeft)
+				{
+					var horizontalOffset = contentSize.Width - contentSize.Width;
+					if (ContentInsetAdjustmentBehavior == UIScrollViewContentInsetAdjustmentBehavior.Never)
+					{
+						CrossPlatformArrange(new Rect(new Point(-horizontalOffset, bounds.Y), contentSize));
+					}
+					else
+					{
+						CrossPlatformArrange(new Rect(new Point(-horizontalOffset, 0), contentSize));
+					}
+
+					ContentOffset = new CGPoint(horizontalOffset, 0);
+				}
+				else
+				{
+					ContentOffset = new CGPoint(0, ContentOffset.Y);
+				}
+			}
+
+			// When switching between LTR and RTL, we need to re-arrange and offset content exactly once
+			// to avoid cumulative shifts or incorrect offsets on subsequent layouts.
+			_previousEffectiveUserInterfaceLayoutDirection = EffectiveUserInterfaceLayoutDirection;
+
+			return contentSize;
 		}
 
 		/// <summary>
@@ -354,6 +515,7 @@ Size CrossPlatformMeasure(double widthConstraint, double heightConstraint)
 		/// </summary>
 		/// <param name="size">The available size constraints.</param>
 		/// <returns>The size that fits within the constraints.</returns>
+		
 		public override CGSize SizeThatFits(CGSize size)
 		{
 			if (CrossPlatformLayout is null)
@@ -388,6 +550,7 @@ void IPlatformMeasureInvalidationController.InvalidateAncestorsMeasuresWhenMoved
 		/// <returns>True if the invalidation should stop propagating, false otherwise.</returns>
 		bool IPlatformMeasureInvalidationController.InvalidateMeasure(bool isPropagating)
 		{
+			ValidateSafeArea();
 			SetNeedsLayout();
 			InvalidateConstraintsCache();
 
diff --git a/src/Core/src/Platform/iOS/MauiView.cs b/src/Core/src/Platform/iOS/MauiView.cs
index d81e64640033..aced70d496ff 100644
--- a/src/Core/src/Platform/iOS/MauiView.cs
+++ b/src/Core/src/Platform/iOS/MauiView.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using CoreGraphics;
+using Foundation;
 using Microsoft.Maui.Graphics;
 using ObjCRuntime;
 using UIKit;
@@ -59,7 +60,12 @@ public abstract class MauiView : UIView, ICrossPlatformLayoutBacking, IVisualTre
 		// True if the view is an ISafeAreaView, does not ignore safe area, and is not inside a UIScrollView;
 		// otherwise, false. Null means not yet determined.
 		bool? _scrollViewDescendant;
-
+		
+		// Keyboard tracking
+		CGRect _keyboardFrame = CGRect.Empty;
+		bool _isKeyboardShowing;
+		WeakReference<NSObject>? _keyboardWillShowObserver;
+		WeakReference<NSObject>? _keyboardWillHideObserver;
 
 		/// <summary>
 		/// Weak reference to the cross-platform IView that this native view represents.
@@ -96,14 +102,8 @@ public IView? View
 		/// </summary>
 		bool RespondsToSafeArea()
 		{
-			if (View is not ISafeAreaView sav || sav.IgnoreSafeArea)
-			{
-				_scrollViewDescendant = false;
-				return false;
-			}
-
 			if (_scrollViewDescendant.HasValue)
-				return _scrollViewDescendant.Value;				
+				return !_scrollViewDescendant.Value;
 
 			// iOS sets AdjustedContentInset on UIScrollView only when the ContentSize exceeds the ScrollView's Bounds.
 			// If ContentSize is smaller, AdjustedContentInset is zero, and SafeAreaInsets are applied to child views instead.
@@ -116,8 +116,40 @@ bool RespondsToSafeArea()
 			//
 			// For more details and implementation specifics, see MauiScrollView.cs, which contains the logic for safe area management
 			// within scroll views and explains how this interacts with the overall layout system.
-			_scrollViewDescendant = Superview.GetParentOfType<UIScrollView>() is null;
-			return _scrollViewDescendant.Value;
+			_scrollViewDescendant = this.GetParentOfType<UIScrollView>() is not null;
+			return !_scrollViewDescendant.Value;
+		}
+
+		SafeAreaRegions GetSafeAreaRegionForEdge(int edge)
+		{
+			if (View is ISafeAreaView2 safeAreaPage)
+			{
+				return safeAreaPage.GetSafeAreaRegionsForEdge(edge);
+			}
+			
+			// Fallback to legacy ISafeAreaView behavior
+			if (View is ISafeAreaView sav)
+			{
+				return sav.IgnoreSafeArea ? SafeAreaRegions.None : SafeAreaRegions.Container;
+			}
+			
+			return SafeAreaRegions.None;
+		}
+
+		static double GetSafeAreaForEdge(SafeAreaRegions safeAreaRegion, double originalSafeArea)
+		{
+			// Edge-to-edge content - no safe area padding
+			if (safeAreaRegion == SafeAreaRegions.None)
+				return 0;
+			
+			// All other regions respect safe area in some form
+			// This includes:
+			// - Default: Platform default behavior
+			// - All: Obey all safe area insets  
+			// - SoftInput: Always pad for keyboard/soft input
+			// - Container: Content flows under keyboard but stays out of bars/notch
+			// - Any combination of the above flags
+			return originalSafeArea;
 		}
 
 
@@ -135,10 +167,178 @@ protected CGRect AdjustForSafeArea(CGRect bounds)
 			{
 				KeyboardAutoManagerScroll.ShouldScrollAgain = true;
 			}
-
+			
+			ValidateSafeArea();
 			return _safeArea.InsetRect(bounds);
 		}
 
+		bool ShouldSubscribeToKeyboardNotifications()
+		{
+			// Only subscribe if any edge has All or SoftInput regions
+			if (View is ISafeAreaView2 safeAreaPage)
+			{
+				for (int edge = 0; edge < 4; edge++)
+				{
+					var region = safeAreaPage.GetSafeAreaRegionsForEdge(edge);
+					if (SafeAreaEdges.IsSoftInput(region))
+					{
+						return true;
+					}
+				}
+			}
+			return false;
+		}
+
+		void SubscribeToKeyboardNotifications()
+		{
+			if (_keyboardWillShowObserver != null || _keyboardWillHideObserver != null)
+			{
+				// Already subscribed, no need to re-subscribe
+				return;
+			}
+
+			var showObserver = NSNotificationCenter.DefaultCenter.AddObserver(
+				UIKeyboard.WillShowNotification,
+				OnKeyboardWillShow);
+			_keyboardWillShowObserver = new WeakReference<NSObject>(showObserver);
+
+			var hideObserver = NSNotificationCenter.DefaultCenter.AddObserver(
+				UIKeyboard.WillHideNotification,
+				OnKeyboardWillHide);
+			_keyboardWillHideObserver = new WeakReference<NSObject>(hideObserver);
+		}
+
+		void UnsubscribeFromKeyboardNotifications()
+		{
+			if (_keyboardWillShowObserver?.TryGetTarget(out var showObserver) == true)
+			{
+				NSNotificationCenter.DefaultCenter.RemoveObserver(showObserver);
+				_keyboardWillShowObserver = null;
+			}
+			
+			if (_keyboardWillHideObserver?.TryGetTarget(out var hideObserver) == true)
+			{
+				NSNotificationCenter.DefaultCenter.RemoveObserver(hideObserver);
+				_keyboardWillHideObserver = null;
+			}
+		}
+
+		void UpdateKeyboardSubscription()
+		{
+			// Update keyboard subscription based on current SafeAreaEdges settings
+			if (Window != null)
+			{
+				if (ShouldSubscribeToKeyboardNotifications())
+				{
+					SubscribeToKeyboardNotifications();
+				}
+				else
+				{
+					UnsubscribeFromKeyboardNotifications();
+				}
+			}
+		}
+
+		void OnKeyboardWillShow(NSNotification notification)
+		{
+			_safeAreaInvalidated = true;
+			var keyboardFrame = GetKeyboardFrame(notification);
+			if (keyboardFrame.HasValue)
+			{
+				_keyboardFrame = keyboardFrame.Value;
+				_isKeyboardShowing = true;
+				SetNeedsLayout();
+			}
+		}
+
+		void OnKeyboardWillHide(NSNotification notification)
+		{
+			_safeAreaInvalidated = true;
+			_keyboardFrame = CGRect.Empty;
+			_isKeyboardShowing = false;
+			SetNeedsLayout();
+		}
+
+		static CGRect? GetKeyboardFrame(NSNotification notification)
+		{
+			if (notification.UserInfo?[UIKeyboard.FrameEndUserInfoKey] is NSValue frameValue)
+			{
+				return frameValue.CGRectValue;
+			}
+			return null;
+		}
+		
+		SafeAreaPadding GetAdjustedSafeAreaInsets()
+		{
+			var baseSafeArea = SafeAreaInsets.ToSafeAreaInsets();
+
+			// Check if keyboard-aware safe area adjustments are needed
+			if (View is ISafeAreaView2 safeAreaPage && _isKeyboardShowing)
+			{
+				// Check if any edge has SafeAreaRegions.SoftInput set
+				var needsKeyboardAdjustment = false;
+				for (int edge = 0; edge < 4; edge++)
+				{
+
+					var safeAreaRegion = safeAreaPage.GetSafeAreaRegionsForEdge(edge);
+					if (SafeAreaEdges.IsSoftInput(safeAreaRegion))
+					{
+						needsKeyboardAdjustment = true;
+						break;
+					}
+				}
+
+				if (needsKeyboardAdjustment)
+				{
+					// Get the keyboard frame and calculate its intersection with the current window
+					var window = this.Window;
+					
+					if (window != null && !_keyboardFrame.IsEmpty)
+					{
+						var windowFrame = window.Frame;
+						var keyboardIntersection = CGRect.Intersect(_keyboardFrame, windowFrame);
+						
+						// If keyboard is visible and intersects with window
+						if (!keyboardIntersection.IsEmpty)
+						{
+							// Calculate keyboard height in the window's coordinate system
+							var keyboardHeight = keyboardIntersection.Height;
+							
+							// For SafeAreaRegions.SoftInput: Always pad so content doesn't go under the keyboard
+							
+							// Bottom edge is most commonly affected by keyboard
+							var bottomEdgeRegion = safeAreaPage.GetSafeAreaRegionsForEdge(3); // 3 = bottom edge
+							if (SafeAreaEdges.IsSoftInput(bottomEdgeRegion))
+							{
+								// Use the larger of the current bottom safe area or the keyboard height
+								var adjustedBottom = Math.Max(baseSafeArea.Bottom, keyboardHeight);
+								baseSafeArea = new SafeAreaPadding(baseSafeArea.Left, baseSafeArea.Right, baseSafeArea.Top, adjustedBottom);
+							}
+						}
+					}
+				}
+			}
+
+			if (View is ISafeAreaView2)
+			{
+				// Apply safe area selectively per edge based on SafeAreaRegions
+				var left = GetSafeAreaForEdge(GetSafeAreaRegionForEdge(0), baseSafeArea.Left);
+				var top = GetSafeAreaForEdge(GetSafeAreaRegionForEdge(1), baseSafeArea.Top);
+				var right = GetSafeAreaForEdge(GetSafeAreaRegionForEdge(2), baseSafeArea.Right);
+				var bottom = GetSafeAreaForEdge(GetSafeAreaRegionForEdge(3), baseSafeArea.Bottom);
+
+				return new SafeAreaPadding(left, right, top, bottom);
+			}
+
+			// Fallback to legacy behavior
+			if (View is ISafeAreaView sav && sav.IgnoreSafeArea)
+			{
+				return SafeAreaPadding.Empty;
+			}
+
+			return baseSafeArea;
+		}
+
 		/// <summary>
 		/// Checks if the current measure information is still valid for the given constraints.
 		/// This optimization avoids redundant measure operations when constraints haven't changed.
@@ -148,9 +348,15 @@ protected CGRect AdjustForSafeArea(CGRect bounds)
 		/// <returns>True if the cached measure is still valid, false otherwise</returns>
 		protected bool IsMeasureValid(double widthConstraint, double heightConstraint)
 		{
-			// Check the last constraints this View was measured with; if they're the same,
-			// then the current measure info is already correct and we don't need to repeat it
-			return heightConstraint == _lastMeasureHeight && widthConstraint == _lastMeasureWidth;
+			return !HasFixedConstraints
+				&& widthConstraint == _lastMeasureWidth
+				&& heightConstraint == _lastMeasureHeight;
+		}
+
+		protected void CacheMeasureConstraints(double widthConstraint, double heightConstraint)
+		{
+			_lastMeasureWidth = widthConstraint;
+			_lastMeasureHeight = heightConstraint;
 		}
 
 		/// <summary>
@@ -174,38 +380,6 @@ protected void InvalidateConstraintsCache()
 			_lastMeasureHeight = double.NaN;
 		}
 
-		/// <summary>
-		/// Caches the measure constraints for future comparison.
-		/// This optimization prevents redundant measure operations when
-		/// the same constraints are applied repeatedly.
-		/// </summary>
-		/// <param name="widthConstraint">The width constraint to cache</param>
-		/// <param name="heightConstraint">The height constraint to cache</param>
-		protected void CacheMeasureConstraints(double widthConstraint, double heightConstraint)
-		{
-			_lastMeasureWidth = widthConstraint;
-			_lastMeasureHeight = heightConstraint;
-		}
-
-		/// <summary>
-		/// Called by iOS when the safe area insets change (e.g., device rotation, status bar changes).
-		/// We can't perform full safe area processing here because this method is called multiple times
-		/// during the layout process with different values, so we just mark the safe area as invalidated.
-		/// </summary>
-		public override void SafeAreaInsetsDidChange()
-		{
-			base.SafeAreaInsetsDidChange();
-
-			// We can't do anything more than this here because `SafeAreaInsetsDidChange()` is triggered twice with
-			// different values when setting the frame via `Center` and `Bounds` in `PlatformArrangeHandler`.
-			_safeAreaInvalidated = true;
-		}
-
-		/// <summary>
-		/// Gets or sets the cross-platform layout manager for this view.
-		/// This delegates measure and arrange operations to the MAUI layout system
-		/// rather than handling them natively.
-		/// </summary>
 		public ICrossPlatformLayout? CrossPlatformLayout
 		{
 			get => _crossPlatformLayoutReference != null && _crossPlatformLayoutReference.TryGetTarget(out var v) ? v : null;
@@ -342,6 +516,8 @@ public override void LayoutSubviews()
 		/// <returns>True if the safe area interaction hasn't changed, false if it has changed and requires layout updates</returns>
 		bool ValidateSafeArea()
 		{
+			UpdateKeyboardSubscription();
+
 			// If nothing changed, we don't need to do anything
 			if (!_safeAreaInvalidated)
 			{
@@ -358,7 +534,7 @@ bool ValidateSafeArea()
 			}
 
 			var oldSafeArea = _safeArea;
-			_safeArea = SafeAreaInsets.ToSafeAreaInsets();
+			_safeArea = GetAdjustedSafeAreaInsets();
 
 			var oldApplyingSafeAreaAdjustments = _appliesSafeAreaAdjustments;
 			_appliesSafeAreaAdjustments = RespondsToSafeArea() && !_safeArea.IsEmpty;
@@ -409,6 +585,7 @@ void IPlatformMeasureInvalidationController.InvalidateAncestorsMeasuresWhenMoved
 		/// <returns>True if the invalidation should continue propagating to ancestors, false to stop propagation</returns>
 		bool IPlatformMeasureInvalidationController.InvalidateMeasure(bool isPropagating)
 		{
+			_safeAreaInvalidated = true;
 			InvalidateConstraintsCache();
 			SetNeedsLayout();
 
@@ -448,6 +625,13 @@ event EventHandler? IUIViewLifeCycleEvents.MovedToWindow
 			remove => _movedToWindow -= value;
 		}
 
+
+		public override void SafeAreaInsetsDidChange()
+		{
+			_safeAreaInvalidated = true;
+			base.SafeAreaInsetsDidChange();
+		}
+
 		/// <summary>
 		/// Called when this view is moved to a window (added to or removed from the view hierarchy).
 		/// This triggers safe area invalidation and any pending ancestor measure invalidations.
@@ -455,7 +639,7 @@ event EventHandler? IUIViewLifeCycleEvents.MovedToWindow
 		public override void MovedToWindow()
 		{
 			base.MovedToWindow();
-			
+
 			_scrollViewDescendant = null;
 
 			// Notify any subscribers that this view has been moved to a window
@@ -470,6 +654,8 @@ public override void MovedToWindow()
 				_invalidateParentWhenMovedToWindow = false;
 				this.InvalidateAncestorsMeasures();
 			}
+
+			UpdateKeyboardSubscription();
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Platform/iOS/SafeAreaPadding.cs b/src/Core/src/Platform/iOS/SafeAreaPadding.cs
index 9c2c8aae338b..da23e4c1d6be 100644
--- a/src/Core/src/Platform/iOS/SafeAreaPadding.cs
+++ b/src/Core/src/Platform/iOS/SafeAreaPadding.cs
@@ -25,6 +25,9 @@ public CGRect InsetRect(CGRect bounds)
 			bounds.Width - HorizontalThickness,
 			bounds.Height - VerticalThickness);
 	}
+
+	public CGRect ToCGRect() =>
+		new((nfloat)Top, (nfloat)Left, (nfloat)Bottom, (nfloat)Right);
 }
 
 internal static class SafeAreaInsetsExtensions
diff --git a/src/Core/src/Primitives/SafeAreaEdges.cs b/src/Core/src/Primitives/SafeAreaEdges.cs
new file mode 100644
index 000000000000..0f231e249ee7
--- /dev/null
+++ b/src/Core/src/Primitives/SafeAreaEdges.cs
@@ -0,0 +1,166 @@
+using System;
+using System.ComponentModel;
+
+namespace Microsoft.Maui
+{
+	/// <summary>
+	/// Represents safe area settings for each edge of a layout or visual element.
+	/// </summary>
+	[TypeConverter(typeof(Converters.SafeAreaEdgesTypeConverter))]
+	public readonly struct SafeAreaEdges : IEquatable<SafeAreaEdges>
+	{
+		/// <summary>
+		/// Gets the safe area behavior for the left edge.
+		/// </summary>
+		public SafeAreaRegions Left { get; }
+
+		/// <summary>
+		/// Gets the safe area behavior for the top edge.
+		/// </summary>
+		public SafeAreaRegions Top { get; }
+
+		/// <summary>
+		/// Gets the safe area behavior for the right edge.
+		/// </summary>
+		public SafeAreaRegions Right { get; }
+
+		/// <summary>
+		/// Gets the safe area behavior for the bottom edge.
+		/// </summary>
+		public SafeAreaRegions Bottom { get; }
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="SafeAreaEdges"/> struct with the same value for all edges.
+		/// </summary>
+		/// <param name="uniformValue">The value to apply to all edges.</param>
+		public SafeAreaEdges(SafeAreaRegions uniformValue)
+		{
+			Left = uniformValue;
+			Top = uniformValue;
+			Right = uniformValue;
+			Bottom = uniformValue;
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="SafeAreaEdges"/> struct with horizontal and vertical values.
+		/// </summary>
+		/// <param name="horizontal">The value to apply to left and right edges.</param>
+		/// <param name="vertical">The value to apply to top and bottom edges.</param>
+		public SafeAreaEdges(SafeAreaRegions horizontal, SafeAreaRegions vertical)
+		{
+			Left = horizontal;
+			Right = horizontal;
+			Top = vertical;
+			Bottom = vertical;
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="SafeAreaEdges"/> struct with individual values for each edge.
+		/// </summary>
+		/// <param name="left">The value for the left edge.</param>
+		/// <param name="top">The value for the top edge.</param>
+		/// <param name="right">The value for the right edge.</param>
+		/// <param name="bottom">The value for the bottom edge.</param>
+		public SafeAreaEdges(SafeAreaRegions left, SafeAreaRegions top, SafeAreaRegions right, SafeAreaRegions bottom)
+		{
+			Left = left;
+			Top = top;
+			Right = right;
+			Bottom = bottom;
+		}
+
+		internal static bool IsSoftInput(SafeAreaRegions region)
+		{
+			if (region == SafeAreaRegions.Default)
+				return false;
+			if (region == SafeAreaRegions.All)
+				return true;
+			return (region & SafeAreaRegions.SoftInput) == SafeAreaRegions.SoftInput;
+		}
+
+		internal static bool IsContainer(SafeAreaRegions region)
+		{
+			if (region == SafeAreaRegions.Default)
+				return false;
+			if (region == SafeAreaRegions.All)
+				return true;
+			return (region & SafeAreaRegions.Container) == SafeAreaRegions.Container;	
+		}
+
+		/// <summary>
+		/// Gets the safe area behavior for the specified edge.
+		/// </summary>
+		/// <param name="edge">The edge index (0=Left, 1=Top, 2=Right, 3=Bottom).</param>
+		/// <returns>The <see cref="SafeAreaRegions"/> for the specified edge.</returns>
+		internal SafeAreaRegions GetEdge(int edge)
+		{
+			return edge switch
+			{
+				0 => Left,
+				1 => Top,
+				2 => Right,
+				3 => Bottom,
+				_ => SafeAreaRegions.None
+			};
+		}
+
+		/// <summary>
+		/// A <see cref="SafeAreaEdges"/> with all edges set to <see cref="SafeAreaRegions.None"/>.
+		/// </summary>
+		public static SafeAreaEdges Default { get; } = new(SafeAreaRegions.Default);
+
+		/// <summary>
+		/// A <see cref="SafeAreaEdges"/> with all edges set to <see cref="SafeAreaRegions.None"/>.
+		/// </summary>
+		public static SafeAreaEdges None { get; } = new(SafeAreaRegions.None);
+
+		/// <summary>
+		/// A <see cref="SafeAreaEdges"/> with all edges set to <see cref="SafeAreaRegions.All"/>.
+		/// </summary>
+		public static SafeAreaEdges All { get; } = new(SafeAreaRegions.All);
+
+		/// <summary>
+		/// A <see cref="SafeAreaEdges"/> with all edges set to <see cref="SafeAreaRegions.All"/>.
+		/// </summary>
+		internal static SafeAreaEdges Container { get; } = new(SafeAreaRegions.Container);
+
+		public static bool operator ==(SafeAreaEdges left, SafeAreaEdges right)
+		{
+			return left.Equals(right);
+		}
+
+		public static bool operator !=(SafeAreaEdges left, SafeAreaEdges right)
+		{
+			return !left.Equals(right);
+		}
+
+		public bool Equals(SafeAreaEdges other)
+		{
+			return Left == other.Left && Top == other.Top && Right == other.Right && Bottom == other.Bottom;
+		}
+
+		public override bool Equals(object? obj)
+		{
+			return obj is SafeAreaEdges other && Equals(other);
+		}
+
+#if NETSTANDARD2_0
+	public override int GetHashCode()
+	{
+		unchecked
+		{
+			int hashCode = Left.GetHashCode();
+			hashCode = (hashCode * 397) ^ Top.GetHashCode();
+			hashCode = (hashCode * 397) ^ Right.GetHashCode();
+			hashCode = (hashCode * 397) ^ Bottom.GetHashCode();
+			return hashCode;
+		}
+	}
+#else
+		public override int GetHashCode() =>
+			HashCode.Combine(Left, Top, Right, Bottom);
+#endif
+		public override string ToString() =>
+			$"{Left}, {Top}, {Right}, {Bottom}";
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Primitives/SafeAreaRegions.cs b/src/Core/src/Primitives/SafeAreaRegions.cs
new file mode 100644
index 000000000000..a5c26222713d
--- /dev/null
+++ b/src/Core/src/Primitives/SafeAreaRegions.cs
@@ -0,0 +1,37 @@
+using System;
+
+namespace Microsoft.Maui
+{
+	/// <summary>
+	/// Specifies which platform safe area edges to obey for a layout or visual element.
+	/// </summary>
+	[Flags]
+	public enum SafeAreaRegions
+	{
+		/// <summary>
+		/// Content goes edge to edge with no safe area padding.
+		/// </summary>
+		None = 0,
+
+		/// <summary>
+		/// Always pad so content doesn't go under the soft input/keyboard.
+		/// </summary>
+		SoftInput = 1 << 0,
+
+		/// <summary>
+		/// Content flows under keyboard but stays out of top and bottom bars and notch.
+		/// </summary>
+		Container = 1 << 1,
+
+		/// <summary>
+		/// Default behavior - apply platform defaults.
+		/// </summary>
+		Default = -1,
+
+		/// <summary>
+		/// Obey all safe area insets - content will be positioned only in the safe area.
+		/// This includes top and bottom bars, notch, and keyboard.
+		/// </summary>
+		All = 1 << 15
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index d9ce2d6fd17f..c9245fcd263b 100644
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -1,4 +1,6 @@
 #nullable enable
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.SafeAreaEdgesTypeConverter() -> void
 Microsoft.Maui.Graphics.MauiDrawable.SetEmptyBorderBrush() -> void
 Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ContextFlyoutItemHandlerUpdate(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate! original) -> void
 Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
@@ -50,6 +52,22 @@ Microsoft.Maui.IWebRequestInterceptingWebView.WebResourceRequested(Microsoft.Mau
 Microsoft.Maui.Platform.MauiSwipeRefreshLayout.CrossPlatformLayout.get -> Microsoft.Maui.ICrossPlatformLayout?
 Microsoft.Maui.Platform.MauiSwipeRefreshLayout.CrossPlatformLayout.set -> void
 *REMOVED*Microsoft.Maui.PlatformWrapperView.SetHasShadow(bool hasShadow) -> void
+Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
+Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
+Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = 32768 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Default = -1 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
 Microsoft.Maui.ScrollToRequest.ScrollToRequest(Microsoft.Maui.ScrollToRequest! original) -> void
 Microsoft.Maui.SwipeViewCloseRequest.Deconstruct(out bool Animated) -> void
@@ -102,6 +120,10 @@ override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertFrom(System.C
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value) -> object!
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object!
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
@@ -148,6 +170,9 @@ override Microsoft.Maui.Platform.MauiSwipeRefreshLayout.OnMeasure(int widthMeasu
 override Microsoft.Maui.Platform.MauiTimePicker.DefaultMovementMethod.get -> Android.Text.Method.IMovementMethod?
 override Microsoft.Maui.Platform.MauiWebChromeClient.OnHideCustomView() -> void
 ~override Microsoft.Maui.Platform.MauiWebChromeClient.OnShowCustomView(Android.Views.View view, Android.Webkit.WebChromeClient.ICustomViewCallback callback) -> void
+override Microsoft.Maui.SafeAreaEdges.Equals(object? obj) -> bool
+override Microsoft.Maui.SafeAreaEdges.GetHashCode() -> int
+override Microsoft.Maui.SafeAreaEdges.ToString() -> string!
 override Microsoft.Maui.ScrollToRequest.Equals(object? obj) -> bool
 override Microsoft.Maui.ScrollToRequest.GetHashCode() -> int
 override Microsoft.Maui.ScrollToRequest.ToString() -> string!
@@ -193,6 +218,11 @@ static Microsoft.Maui.Platform.ImageButtonExtensions.UpdateButtonBackground(this
 static Microsoft.Maui.Platform.ImageButtonExtensions.UpdateButtonStroke(this Google.Android.Material.ImageView.ShapeableImageView! platformView, Microsoft.Maui.IButtonStroke! button) -> void
 static Microsoft.Maui.Platform.ImageButtonExtensions.UpdateRippleColor(this Google.Android.Material.ImageView.ShapeableImageView! platformView, Microsoft.Maui.Graphics.Color! rippleColor) -> void
 static Microsoft.Maui.Platform.SearchViewExtensions.UpdateReturnType(this AndroidX.AppCompat.Widget.SearchView! searchView, Microsoft.Maui.ISearchBar! searchBar) -> void
+static Microsoft.Maui.SafeAreaEdges.All.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.Default.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.None.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.operator !=(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
+static Microsoft.Maui.SafeAreaEdges.operator ==(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
 static Microsoft.Maui.ScrollToRequest.operator !=(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
 static Microsoft.Maui.ScrollToRequest.operator ==(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
 static Microsoft.Maui.SwipeViewCloseRequest.operator !=(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index 27d4fc40886f..8595edaf47de 100644
--- a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -1,4 +1,6 @@
 #nullable enable
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.SafeAreaEdgesTypeConverter() -> void
 Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ContextFlyoutItemHandlerUpdate(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate! original) -> void
 Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
 Microsoft.Maui.Handlers.DataFlowDirection
@@ -54,6 +56,22 @@ Microsoft.Maui.Platform.MauiTimePicker.UpdateTime(System.TimeSpan? time) -> void
 *REMOVED*Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DidFinishNavigation(WebKit.WKWebView! webView, WebKit.WKNavigation! navigation) -> void
 Microsoft.Maui.Platform.TextInputExtensions
 Microsoft.Maui.Platform.UIApplicationExtensions
+Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
+Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
+Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = 32768 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Default = -1 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
 Microsoft.Maui.ScrollToRequest.ScrollToRequest(Microsoft.Maui.ScrollToRequest! original) -> void
 Microsoft.Maui.SwipeViewCloseRequest.Deconstruct(out bool Animated) -> void
@@ -104,6 +122,10 @@ override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertFrom(System.C
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value) -> object!
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object!
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
@@ -126,8 +148,12 @@ override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.ToString() -> st
 override Microsoft.Maui.Handlers.OpenWindowRequest.Equals(object? obj) -> bool
 override Microsoft.Maui.Handlers.OpenWindowRequest.GetHashCode() -> int
 override Microsoft.Maui.Handlers.OpenWindowRequest.ToString() -> string!
+override Microsoft.Maui.Handlers.ScrollViewHandler.SetVirtualView(Microsoft.Maui.IView! view) -> void
 override Microsoft.Maui.Platform.MauiScrollView.AdjustedContentInsetDidChange() -> void
 override Microsoft.Maui.Platform.MauiScrollView.SafeAreaInsetsDidChange() -> void
+override Microsoft.Maui.SafeAreaEdges.Equals(object? obj) -> bool
+override Microsoft.Maui.SafeAreaEdges.GetHashCode() -> int
+override Microsoft.Maui.SafeAreaEdges.ToString() -> string!
 override Microsoft.Maui.ScrollToRequest.Equals(object? obj) -> bool
 override Microsoft.Maui.ScrollToRequest.GetHashCode() -> int
 override Microsoft.Maui.ScrollToRequest.ToString() -> string!
@@ -170,6 +196,11 @@ static Microsoft.Maui.Platform.TextInputExtensions.GetSelectedTextLength(this UI
 static Microsoft.Maui.Platform.TextInputExtensions.SetTextRange(this UIKit.IUITextInput! platformView, int start, int selectedTextLength) -> void
 static Microsoft.Maui.Platform.UIApplicationExtensions.GetKeyWindow(this UIKit.UIApplication! application) -> UIKit.UIWindow?
 static Microsoft.Maui.Platform.UIApplicationExtensions.GetWindow(this UIKit.UIApplication! application) -> Microsoft.Maui.IWindow?
+static Microsoft.Maui.SafeAreaEdges.All.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.Default.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.None.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.operator !=(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
+static Microsoft.Maui.SafeAreaEdges.operator ==(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
 static Microsoft.Maui.ScrollToRequest.operator !=(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
 static Microsoft.Maui.ScrollToRequest.operator ==(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
 static Microsoft.Maui.SwipeViewCloseRequest.operator !=(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index 63642795bccc..951bab10faa1 100644
--- a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -1,4 +1,6 @@
 #nullable enable
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.SafeAreaEdgesTypeConverter() -> void
 Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ContextFlyoutItemHandlerUpdate(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate! original) -> void
 Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
 Microsoft.Maui.Handlers.DataFlowDirection
@@ -56,6 +58,22 @@ Microsoft.Maui.Platform.MauiTimePicker.UpdateTime(System.TimeSpan? time) -> void
 *REMOVED*Microsoft.Maui.Platform.MauiWebViewNavigationDelegate.DidFinishNavigation(WebKit.WKWebView! webView, WebKit.WKNavigation! navigation) -> void
 Microsoft.Maui.Platform.TextInputExtensions
 Microsoft.Maui.Platform.UIApplicationExtensions
+Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
+Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
+Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = 32768 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Default = -1 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
 Microsoft.Maui.ScrollToRequest.ScrollToRequest(Microsoft.Maui.ScrollToRequest! original) -> void
 Microsoft.Maui.SwipeViewCloseRequest.Deconstruct(out bool Animated) -> void
@@ -106,6 +124,10 @@ override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertFrom(System.C
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value) -> object!
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object!
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
@@ -128,8 +150,12 @@ override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.ToString() -> st
 override Microsoft.Maui.Handlers.OpenWindowRequest.Equals(object? obj) -> bool
 override Microsoft.Maui.Handlers.OpenWindowRequest.GetHashCode() -> int
 override Microsoft.Maui.Handlers.OpenWindowRequest.ToString() -> string!
+override Microsoft.Maui.Handlers.ScrollViewHandler.SetVirtualView(Microsoft.Maui.IView! view) -> void
 override Microsoft.Maui.Platform.MauiScrollView.AdjustedContentInsetDidChange() -> void
 override Microsoft.Maui.Platform.MauiScrollView.SafeAreaInsetsDidChange() -> void
+override Microsoft.Maui.SafeAreaEdges.Equals(object? obj) -> bool
+override Microsoft.Maui.SafeAreaEdges.GetHashCode() -> int
+override Microsoft.Maui.SafeAreaEdges.ToString() -> string!
 override Microsoft.Maui.ScrollToRequest.Equals(object? obj) -> bool
 override Microsoft.Maui.ScrollToRequest.GetHashCode() -> int
 override Microsoft.Maui.ScrollToRequest.ToString() -> string!
@@ -173,6 +199,11 @@ static Microsoft.Maui.Platform.TextInputExtensions.GetSelectedTextLength(this UI
 static Microsoft.Maui.Platform.TextInputExtensions.SetTextRange(this UIKit.IUITextInput! platformView, int start, int selectedTextLength) -> void
 static Microsoft.Maui.Platform.UIApplicationExtensions.GetKeyWindow(this UIKit.UIApplication! application) -> UIKit.UIWindow?
 static Microsoft.Maui.Platform.UIApplicationExtensions.GetWindow(this UIKit.UIApplication! application) -> Microsoft.Maui.IWindow?
+static Microsoft.Maui.SafeAreaEdges.All.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.Default.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.None.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.operator !=(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
+static Microsoft.Maui.SafeAreaEdges.operator ==(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
 static Microsoft.Maui.ScrollToRequest.operator !=(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
 static Microsoft.Maui.ScrollToRequest.operator ==(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
 static Microsoft.Maui.SwipeViewCloseRequest.operator !=(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
diff --git a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index 7b2d84daaaa1..e7572c1b3e2b 100644
--- a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -1,4 +1,6 @@
 #nullable enable
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.SafeAreaEdgesTypeConverter() -> void
 Microsoft.Maui.FontManager.GetFontFamily(string? fontFamily) -> string!
 *REMOVED*Microsoft.Maui.FontManager.GetFontFamily(string? fontFamliy) -> string!
 Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ContextFlyoutItemHandlerUpdate(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate! original) -> void
@@ -85,6 +87,10 @@ override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertFrom(System.C
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value) -> object!
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object!
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index 911613fbe02a..7923c02cdc15 100644
--- a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -1,4 +1,6 @@
 #nullable enable
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.SafeAreaEdgesTypeConverter() -> void
 Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ContextFlyoutItemHandlerUpdate(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate! original) -> void
 Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
 Microsoft.Maui.Handlers.DataFlowDirection
@@ -47,6 +49,22 @@ Microsoft.Maui.IWebRequestInterceptingWebView.WebResourceRequested(Microsoft.Mau
 Microsoft.Maui.IWindow.IsMaximizable.get -> bool
 Microsoft.Maui.IWindow.IsMinimizable.get -> bool
 Microsoft.Maui.Platform.CalendarDatePickerExtensions
+Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
+Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
+Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = 32768 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Default = -1 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
 Microsoft.Maui.ScrollToRequest.ScrollToRequest(Microsoft.Maui.ScrollToRequest! original) -> void
 Microsoft.Maui.SwipeViewCloseRequest.Deconstruct(out bool Animated) -> void
@@ -97,6 +115,10 @@ override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertFrom(System.C
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value) -> object!
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object!
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
@@ -119,6 +141,9 @@ override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.ToString() -> st
 override Microsoft.Maui.Handlers.OpenWindowRequest.Equals(object? obj) -> bool
 override Microsoft.Maui.Handlers.OpenWindowRequest.GetHashCode() -> int
 override Microsoft.Maui.Handlers.OpenWindowRequest.ToString() -> string!
+override Microsoft.Maui.SafeAreaEdges.Equals(object? obj) -> bool
+override Microsoft.Maui.SafeAreaEdges.GetHashCode() -> int
+override Microsoft.Maui.SafeAreaEdges.ToString() -> string!
 override Microsoft.Maui.ScrollToRequest.Equals(object? obj) -> bool
 override Microsoft.Maui.ScrollToRequest.GetHashCode() -> int
 override Microsoft.Maui.ScrollToRequest.ToString() -> string!
@@ -163,6 +188,11 @@ static Microsoft.Maui.Platform.ScrollViewerExtensions.UpdateScrollBarVisibility(
 static Microsoft.Maui.Platform.SearchBarExtensions.UpdateReturnType(this Microsoft.UI.Xaml.Controls.AutoSuggestBox! platformControl, Microsoft.Maui.ISearchBar! searchBar) -> void
 static Microsoft.Maui.Platform.TextBoxExtensions.GetCursorPosition(this Microsoft.UI.Xaml.Controls.TextBox! textBox, int cursorOffset = 0) -> int
 static Microsoft.Maui.Platform.TimePickerExtensions.UpdateBackground(this Microsoft.UI.Xaml.Controls.TimePicker! platformTimePicker, Microsoft.Maui.ITimePicker! timePicker) -> void
+static Microsoft.Maui.SafeAreaEdges.All.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.Default.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.None.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.operator !=(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
+static Microsoft.Maui.SafeAreaEdges.operator ==(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
 static Microsoft.Maui.ScrollToRequest.operator !=(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
 static Microsoft.Maui.ScrollToRequest.operator ==(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
 static Microsoft.Maui.SwipeViewCloseRequest.operator !=(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
diff --git a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
index ef8f9c1591ac..8a7da5a7b3b5 100644
--- a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -1,4 +1,6 @@
 #nullable enable
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.SafeAreaEdgesTypeConverter() -> void
 Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ContextFlyoutItemHandlerUpdate(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate! original) -> void
 Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
 Microsoft.Maui.Handlers.DataFlowDirection
@@ -44,6 +46,22 @@ Microsoft.Maui.ITimePicker.IsOpen.set -> void
 Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan?
 Microsoft.Maui.IWebRequestInterceptingWebView
 Microsoft.Maui.IWebRequestInterceptingWebView.WebResourceRequested(Microsoft.Maui.WebResourceRequestedEventArgs! args) -> bool
+Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
+Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
+Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = 32768 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Default = -1 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
 Microsoft.Maui.ScrollToRequest.ScrollToRequest(Microsoft.Maui.ScrollToRequest! original) -> void
 Microsoft.Maui.SwipeViewCloseRequest.Deconstruct(out bool Animated) -> void
@@ -92,6 +110,10 @@ override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertFrom(System.C
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value) -> object!
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object!
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
@@ -114,6 +136,9 @@ override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.ToString() -> st
 override Microsoft.Maui.Handlers.OpenWindowRequest.Equals(object? obj) -> bool
 override Microsoft.Maui.Handlers.OpenWindowRequest.GetHashCode() -> int
 override Microsoft.Maui.Handlers.OpenWindowRequest.ToString() -> string!
+override Microsoft.Maui.SafeAreaEdges.Equals(object? obj) -> bool
+override Microsoft.Maui.SafeAreaEdges.GetHashCode() -> int
+override Microsoft.Maui.SafeAreaEdges.ToString() -> string!
 override Microsoft.Maui.ScrollToRequest.Equals(object? obj) -> bool
 override Microsoft.Maui.ScrollToRequest.GetHashCode() -> int
 override Microsoft.Maui.ScrollToRequest.ToString() -> string!
@@ -147,6 +172,11 @@ static Microsoft.Maui.Handlers.OpenWindowRequest.operator !=(Microsoft.Maui.Hand
 static Microsoft.Maui.Handlers.OpenWindowRequest.operator ==(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
 static Microsoft.Maui.Handlers.SearchBarHandler.MapReturnType(Microsoft.Maui.IViewHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
 static Microsoft.Maui.Hosting.AppHostBuilderExtensions.ConfigureEnvironmentVariables(this Microsoft.Maui.Hosting.MauiAppBuilder! builder) -> Microsoft.Maui.Hosting.MauiAppBuilder!
+static Microsoft.Maui.SafeAreaEdges.All.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.Default.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.None.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.operator !=(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
+static Microsoft.Maui.SafeAreaEdges.operator ==(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
 static Microsoft.Maui.ScrollToRequest.operator !=(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
 static Microsoft.Maui.ScrollToRequest.operator ==(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
 static Microsoft.Maui.SwipeViewCloseRequest.operator !=(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
diff --git a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index ef8f9c1591ac..8a7da5a7b3b5 100644
--- a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -1,4 +1,6 @@
 #nullable enable
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.SafeAreaEdgesTypeConverter() -> void
 Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ContextFlyoutItemHandlerUpdate(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate! original) -> void
 Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
 Microsoft.Maui.Handlers.DataFlowDirection
@@ -44,6 +46,22 @@ Microsoft.Maui.ITimePicker.IsOpen.set -> void
 Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan?
 Microsoft.Maui.IWebRequestInterceptingWebView
 Microsoft.Maui.IWebRequestInterceptingWebView.WebResourceRequested(Microsoft.Maui.WebResourceRequestedEventArgs! args) -> bool
+Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
+Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
+Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = 32768 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Default = -1 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
 Microsoft.Maui.ScrollToRequest.ScrollToRequest(Microsoft.Maui.ScrollToRequest! original) -> void
 Microsoft.Maui.SwipeViewCloseRequest.Deconstruct(out bool Animated) -> void
@@ -92,6 +110,10 @@ override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertFrom(System.C
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value) -> object!
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object!
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
@@ -114,6 +136,9 @@ override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.ToString() -> st
 override Microsoft.Maui.Handlers.OpenWindowRequest.Equals(object? obj) -> bool
 override Microsoft.Maui.Handlers.OpenWindowRequest.GetHashCode() -> int
 override Microsoft.Maui.Handlers.OpenWindowRequest.ToString() -> string!
+override Microsoft.Maui.SafeAreaEdges.Equals(object? obj) -> bool
+override Microsoft.Maui.SafeAreaEdges.GetHashCode() -> int
+override Microsoft.Maui.SafeAreaEdges.ToString() -> string!
 override Microsoft.Maui.ScrollToRequest.Equals(object? obj) -> bool
 override Microsoft.Maui.ScrollToRequest.GetHashCode() -> int
 override Microsoft.Maui.ScrollToRequest.ToString() -> string!
@@ -147,6 +172,11 @@ static Microsoft.Maui.Handlers.OpenWindowRequest.operator !=(Microsoft.Maui.Hand
 static Microsoft.Maui.Handlers.OpenWindowRequest.operator ==(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
 static Microsoft.Maui.Handlers.SearchBarHandler.MapReturnType(Microsoft.Maui.IViewHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
 static Microsoft.Maui.Hosting.AppHostBuilderExtensions.ConfigureEnvironmentVariables(this Microsoft.Maui.Hosting.MauiAppBuilder! builder) -> Microsoft.Maui.Hosting.MauiAppBuilder!
+static Microsoft.Maui.SafeAreaEdges.All.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.Default.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.None.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.operator !=(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
+static Microsoft.Maui.SafeAreaEdges.operator ==(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
 static Microsoft.Maui.ScrollToRequest.operator !=(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
 static Microsoft.Maui.ScrollToRequest.operator ==(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
 static Microsoft.Maui.SwipeViewCloseRequest.operator !=(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool
diff --git a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
index ef8f9c1591ac..8a7da5a7b3b5 100644
--- a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -1,4 +1,6 @@
 #nullable enable
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter
+Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.SafeAreaEdgesTypeConverter() -> void
 Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.ContextFlyoutItemHandlerUpdate(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate! original) -> void
 Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.Deconstruct(out int Index, out Microsoft.Maui.IMenuElement! MenuElement) -> void
 Microsoft.Maui.Handlers.DataFlowDirection
@@ -44,6 +46,22 @@ Microsoft.Maui.ITimePicker.IsOpen.set -> void
 Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan?
 Microsoft.Maui.IWebRequestInterceptingWebView
 Microsoft.Maui.IWebRequestInterceptingWebView.WebResourceRequested(Microsoft.Maui.WebResourceRequestedEventArgs! args) -> bool
+Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.SafeAreaEdges.Bottom.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Equals(Microsoft.Maui.SafeAreaEdges other) -> bool
+Microsoft.Maui.SafeAreaEdges.Left.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.Right.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges() -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions horizontal, Microsoft.Maui.SafeAreaRegions vertical) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions left, Microsoft.Maui.SafeAreaRegions top, Microsoft.Maui.SafeAreaRegions right, Microsoft.Maui.SafeAreaRegions bottom) -> void
+Microsoft.Maui.SafeAreaEdges.SafeAreaEdges(Microsoft.Maui.SafeAreaRegions uniformValue) -> void
+Microsoft.Maui.SafeAreaEdges.Top.get -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.All = 32768 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Container = 2 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.Default = -1 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.None = 0 -> Microsoft.Maui.SafeAreaRegions
+Microsoft.Maui.SafeAreaRegions.SoftInput = 1 -> Microsoft.Maui.SafeAreaRegions
 Microsoft.Maui.ScrollToRequest.Deconstruct(out double HorizontalOffset, out double VerticalOffset, out bool Instant) -> void
 Microsoft.Maui.ScrollToRequest.ScrollToRequest(Microsoft.Maui.ScrollToRequest! original) -> void
 Microsoft.Maui.SwipeViewCloseRequest.Deconstruct(out bool Animated) -> void
@@ -92,6 +110,10 @@ override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertFrom(System.C
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
 override Microsoft.Maui.Converters.FlexWrapTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value) -> object!
+override Microsoft.Maui.Converters.SafeAreaEdgesTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object!
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Converters.ThicknessTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
@@ -114,6 +136,9 @@ override Microsoft.Maui.Handlers.MenuFlyoutSubItemHandlerUpdate.ToString() -> st
 override Microsoft.Maui.Handlers.OpenWindowRequest.Equals(object? obj) -> bool
 override Microsoft.Maui.Handlers.OpenWindowRequest.GetHashCode() -> int
 override Microsoft.Maui.Handlers.OpenWindowRequest.ToString() -> string!
+override Microsoft.Maui.SafeAreaEdges.Equals(object? obj) -> bool
+override Microsoft.Maui.SafeAreaEdges.GetHashCode() -> int
+override Microsoft.Maui.SafeAreaEdges.ToString() -> string!
 override Microsoft.Maui.ScrollToRequest.Equals(object? obj) -> bool
 override Microsoft.Maui.ScrollToRequest.GetHashCode() -> int
 override Microsoft.Maui.ScrollToRequest.ToString() -> string!
@@ -147,6 +172,11 @@ static Microsoft.Maui.Handlers.OpenWindowRequest.operator !=(Microsoft.Maui.Hand
 static Microsoft.Maui.Handlers.OpenWindowRequest.operator ==(Microsoft.Maui.Handlers.OpenWindowRequest? left, Microsoft.Maui.Handlers.OpenWindowRequest? right) -> bool
 static Microsoft.Maui.Handlers.SearchBarHandler.MapReturnType(Microsoft.Maui.IViewHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
 static Microsoft.Maui.Hosting.AppHostBuilderExtensions.ConfigureEnvironmentVariables(this Microsoft.Maui.Hosting.MauiAppBuilder! builder) -> Microsoft.Maui.Hosting.MauiAppBuilder!
+static Microsoft.Maui.SafeAreaEdges.All.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.Default.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.None.get -> Microsoft.Maui.SafeAreaEdges
+static Microsoft.Maui.SafeAreaEdges.operator !=(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
+static Microsoft.Maui.SafeAreaEdges.operator ==(Microsoft.Maui.SafeAreaEdges left, Microsoft.Maui.SafeAreaEdges right) -> bool
 static Microsoft.Maui.ScrollToRequest.operator !=(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
 static Microsoft.Maui.ScrollToRequest.operator ==(Microsoft.Maui.ScrollToRequest? left, Microsoft.Maui.ScrollToRequest? right) -> bool
 static Microsoft.Maui.SwipeViewCloseRequest.operator !=(Microsoft.Maui.SwipeViewCloseRequest? left, Microsoft.Maui.SwipeViewCloseRequest? right) -> bool