diff --git a/src/Controls/src/Core/Button/Button.Mapper.cs b/src/Controls/src/Core/Button/Button.Mapper.cs
index 53bbdb65d5e9..dd646238f709 100644
--- a/src/Controls/src/Core/Button/Button.Mapper.cs
+++ b/src/Controls/src/Core/Button/Button.Mapper.cs
@@ -28,7 +28,7 @@ public partial class Button
 #endif
 			ButtonHandler.Mapper.ReplaceMapping<Button, IButtonHandler>(nameof(Text), MapText);
 
-			ButtonHandler.Mapper.ReplaceMapping<Button, IButtonHandler>(nameof(TextTransform), MapText);
+			ButtonHandler.Mapper.ReplaceMapping<Button, IButtonHandler>(nameof(TextTransform), MapTextTransform);
 			ButtonHandler.Mapper.ReplaceMapping<Button, IButtonHandler>(nameof(Button.LineBreakMode), MapLineBreakMode);
 		}
 
@@ -44,5 +44,16 @@ public static void MapContentLayout(IButtonHandler handler, Button button)
 
 		public static void MapContentLayout(ButtonHandler handler, Button button) =>
 			MapContentLayout((IButtonHandler)handler, button);
+
+		static void MapTextTransform(IButtonHandler handler, Button button)
+		{
+			if (button.IsConnectingHandler())
+			{
+				// If we're connecting the handler, we don't want to map the text multiple times.
+				return;
+			}
+
+			MapText(handler, button);
+		}
 	}
 }
diff --git a/src/Controls/src/Core/Button/Button.iOS.cs b/src/Controls/src/Core/Button/Button.iOS.cs
index 61aacab8929d..fca110ac609a 100644
--- a/src/Controls/src/Core/Button/Button.iOS.cs
+++ b/src/Controls/src/Core/Button/Button.iOS.cs
@@ -447,6 +447,12 @@ private static void MapPadding(IButtonHandler handler, Button button)
 		public static void MapText(IButtonHandler handler, Button button)
 		{
 			handler.PlatformView?.UpdateText(button);
+
+			if (!handler.IsConnectingHandler())
+			{
+				// Any text update requires that we update any attributed string formatting
+				ButtonHandler.MapFormatting(handler, button);
+			}
 		}
 
 		internal static void MapBorderWidth(IButtonHandler handler, Button button)
diff --git a/src/Controls/src/Core/Editor/Editor.Android.cs b/src/Controls/src/Core/Editor/Editor.Android.cs
index ad20b36d33e4..3c2ea82658a5 100644
--- a/src/Controls/src/Core/Editor/Editor.Android.cs
+++ b/src/Controls/src/Core/Editor/Editor.Android.cs
@@ -34,5 +34,17 @@ public static void MapText(EditorHandler2 handler, Editor editor)
 
 			Platform.EditTextExtensions.UpdateText(handler.PlatformView, editor);
 		}
+
+		// Material3 specific overload for EditorHandler2
+		internal static void MapTextTransform(EditorHandler2 handler, Editor editor)
+		{
+			if (editor.IsConnectingHandler())
+			{
+				// If we're connecting the handler, we don't want to map the text multiple times.
+				return;
+			}
+
+			MapText(handler, editor);
+		}
 	}
 }
diff --git a/src/Controls/src/Core/Editor/Editor.Mapper.cs b/src/Controls/src/Core/Editor/Editor.Mapper.cs
index e76abb40f447..a41a5b1252b8 100644
--- a/src/Controls/src/Core/Editor/Editor.Mapper.cs
+++ b/src/Controls/src/Core/Editor/Editor.Mapper.cs
@@ -13,13 +13,13 @@ public partial class Editor
 			EditorHandler.Mapper.ReplaceMapping<Editor, IEditorHandler>(PlatformConfiguration.WindowsSpecific.InputView.DetectReadingOrderFromContentProperty.PropertyName, MapDetectReadingOrderFromContent);
 #endif
 			EditorHandler.Mapper.ReplaceMapping<Editor, IEditorHandler>(nameof(Text), MapText);
-			EditorHandler.Mapper.ReplaceMapping<Editor, IEditorHandler>(nameof(TextTransform), MapText);
+			EditorHandler.Mapper.ReplaceMapping<Editor, IEditorHandler>(nameof(TextTransform), MapTextTransform);
 
 #if ANDROID
 			if (RuntimeFeature.IsMaterial3Enabled)
 			{
 				EditorHandler2.Mapper.ReplaceMapping<Editor, EditorHandler2>(nameof(Text), MapText);
-				EditorHandler2.Mapper.ReplaceMapping<Editor, EditorHandler2>(nameof(TextTransform), MapText);
+				EditorHandler2.Mapper.ReplaceMapping<Editor, EditorHandler2>(nameof(TextTransform), MapTextTransform);
 				EditorHandler2.Mapper.AppendToMapping<Editor, EditorHandler2>(nameof(VisualElement.IsFocused), InputView.MapIsFocused);
 				EditorHandler2.CommandMapper.PrependToMapping<Editor, EditorHandler2>(nameof(IEditor.Focus), InputView.MapFocus);
 			}
@@ -38,5 +38,16 @@ public partial class Editor
 			EditorHandler.CommandMapper.PrependToMapping(nameof(IEditor.Focus), InputView.MapFocus);
 #endif
 		}
+
+		static void MapTextTransform(IEditorHandler handler, Editor editor)
+		{
+			if (editor.IsConnectingHandler())
+			{
+				// If we're connecting the handler, we don't want to map the text multiple times.
+				return;
+			}
+
+			MapText(handler, editor);
+		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/Editor/Editor.iOS.cs b/src/Controls/src/Core/Editor/Editor.iOS.cs
index 93b1319df8f3..19f05321a85f 100644
--- a/src/Controls/src/Core/Editor/Editor.iOS.cs
+++ b/src/Controls/src/Core/Editor/Editor.iOS.cs
@@ -19,8 +19,11 @@ public static void MapText(IEditorHandler handler, Editor editor)
 		{
 			Platform.TextExtensions.UpdateText(handler.PlatformView, editor);
 
-			// Any text changes in the editor field require recalculating the CharacterSpacing by regenerating the attributed string to properly apply the spacing and override the current text formatting.
-			handler?.UpdateValue(nameof(CharacterSpacing));
+			if (!handler.IsConnectingHandler())
+			{
+				// Any text changes in the editor field require recalculating the CharacterSpacing by regenerating the attributed string to properly apply the spacing and override the current text formatting.
+				handler?.UpdateValue(nameof(CharacterSpacing));
+			}
 		}
 	}
 }
diff --git a/src/Controls/src/Core/Entry/Entry.Android.cs b/src/Controls/src/Core/Entry/Entry.Android.cs
index a37ffeebfee0..7757f73b206d 100644
--- a/src/Controls/src/Core/Entry/Entry.Android.cs
+++ b/src/Controls/src/Core/Entry/Entry.Android.cs
@@ -56,5 +56,17 @@ public static void MapText(EntryHandler2 handler, Entry entry)
 
 			Platform.EditTextExtensions.UpdateText(handler.PlatformView.EditText, entry);
 		}
+
+		// Material3 specific overload for EntryHandler2
+		internal static void MapTextTransform(EntryHandler2 handler, Entry entry)
+		{
+			if (entry.IsConnectingHandler())
+			{
+				// If we're connecting the handler, we don't want to map the text multiple times.
+				return;
+			}
+
+			MapText(handler, entry);
+		}
 	}
 }
diff --git a/src/Controls/src/Core/Entry/Entry.Mapper.cs b/src/Controls/src/Core/Entry/Entry.Mapper.cs
index 1d3d9285c740..fbb3a35bf679 100644
--- a/src/Controls/src/Core/Entry/Entry.Mapper.cs
+++ b/src/Controls/src/Core/Entry/Entry.Mapper.cs
@@ -18,7 +18,7 @@ public partial class Entry
 			EntryHandler.Mapper.ReplaceMapping<Entry, IEntryHandler>(PlatformConfiguration.iOSSpecific.Entry.AdjustsFontSizeToFitWidthProperty.PropertyName, MapAdjustsFontSizeToFitWidth);
 #endif
 			EntryHandler.Mapper.ReplaceMapping<Entry, IEntryHandler>(nameof(Text), MapText);
-			EntryHandler.Mapper.ReplaceMapping<Entry, IEntryHandler>(nameof(TextTransform), MapText);
+			EntryHandler.Mapper.ReplaceMapping<Entry, IEntryHandler>(nameof(TextTransform), MapTextTransform);
 
 			// Material3 Entry Handler mappings
 #if ANDROID
@@ -26,7 +26,7 @@ public partial class Entry
 			{
 				EntryHandler2.Mapper.ReplaceMapping<Entry, EntryHandler2>(PlatformConfiguration.AndroidSpecific.Entry.ImeOptionsProperty.PropertyName, MapImeOptions);
 				EntryHandler2.Mapper.ReplaceMapping<Entry, EntryHandler2>(nameof(Text), MapText);
-				EntryHandler2.Mapper.ReplaceMapping<Entry, EntryHandler2>(nameof(TextTransform), MapText);
+				EntryHandler2.Mapper.ReplaceMapping<Entry, EntryHandler2>(nameof(TextTransform), MapTextTransform);
 				EntryHandler2.Mapper.AppendToMapping(nameof(VisualElement.IsFocused), InputView.MapIsFocused);
 				EntryHandler2.Mapper.AppendToMapping(nameof(VisualElement.IsVisible), InputView.MapIsVisible);
 				EntryHandler2.CommandMapper.PrependToMapping(nameof(IEntry.Focus), InputView.MapFocus);
@@ -42,5 +42,16 @@ public partial class Entry
 			EntryHandler.CommandMapper.PrependToMapping(nameof(IEntry.Focus), InputView.MapFocus);
 #endif
 		}
+
+		static void MapTextTransform(IEntryHandler handler, Entry entry)
+		{
+			if (entry.IsConnectingHandler())
+			{
+				// If we're connecting the handler, we don't want to map the text multiple times.
+				return;
+			}
+
+			MapText(handler, entry);
+		}
 	}
 }
diff --git a/src/Controls/src/Core/Entry/Entry.iOS.cs b/src/Controls/src/Core/Entry/Entry.iOS.cs
index 25a6281483a1..20407ae151b3 100644
--- a/src/Controls/src/Core/Entry/Entry.iOS.cs
+++ b/src/Controls/src/Core/Entry/Entry.iOS.cs
@@ -16,7 +16,14 @@ public static void MapAdjustsFontSizeToFitWidth(IEntryHandler handler, Entry ent
 		public static void MapText(IEntryHandler handler, Entry entry)
 		{
 			Platform.TextExtensions.UpdateText(handler.PlatformView, entry);
-			EntryHandler.MapFormatting(handler, entry);
+
+			if (!handler.IsConnectingHandler())
+			{
+				// If we're not connecting the handler, we need to update the text formatting
+				// This is because the text may have changed, and we need to ensure that
+				// any attributed string formatting is applied correctly.
+				EntryHandler.MapFormatting(handler, entry);
+			}
 		}
 
 		public static void MapCursorColor(EntryHandler handler, Entry entry) =>
diff --git a/src/Controls/src/Core/Label/Label.Mapper.cs b/src/Controls/src/Core/Label/Label.Mapper.cs
index eeaeff7464a1..3f116231a103 100644
--- a/src/Controls/src/Core/Label/Label.Mapper.cs
+++ b/src/Controls/src/Core/Label/Label.Mapper.cs
@@ -61,7 +61,10 @@ static void MapTextTransform(ILabelHandler handler, Label label) =>
 		static void MapFormattedText(ILabelHandler handler, Label label)
 		{
 			if (label.IsConnectingHandler())
+			{
+				// If we're connecting the handler, we don't want to map the text multiple times.
 				return;
+			}
 
 			MapText(handler, label);
 		}
@@ -167,7 +170,10 @@ static void MapTextColor(ILabelHandler handler, Label label, Action<IElementHand
 			{
 				// if there is formatted text,
 				// then we re-apply the whole formatted text
-				handler.UpdateValue(nameof(FormattedText));
+				if (!handler.IsConnectingHandler())
+				{
+					handler.UpdateValue(nameof(FormattedText));
+				}
 			}
 			else if (label.TextType == TextType.Text || !label.TextColor.IsDefault())
 			{
diff --git a/src/Controls/src/Core/Label/Label.iOS.cs b/src/Controls/src/Core/Label/Label.iOS.cs
index 1ad5c69abed3..3463430f7d49 100644
--- a/src/Controls/src/Core/Label/Label.iOS.cs
+++ b/src/Controls/src/Core/Label/Label.iOS.cs
@@ -1,5 +1,4 @@
 #nullable disable
-using System;
 using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using UIKit;
@@ -23,7 +22,11 @@ public static void MapText(ILabelHandler handler, Label label)
 		{
 			Platform.LabelExtensions.UpdateText(handler.PlatformView, label);
 
-			MapFormatting(handler, label);
+			if (!handler.IsConnectingHandler())
+			{
+				// Any text update requires that we update any attributed string formatting
+				MapFormatting(handler, label);
+			}
 		}
 
 		public static void MapLineBreakMode(ILabelHandler handler, Label label)
diff --git a/src/Controls/src/Core/Platform/iOS/Extensions/FormattedStringExtensions.cs b/src/Controls/src/Core/Platform/iOS/Extensions/FormattedStringExtensions.cs
index 22c370c9474a..048853a25ccc 100644
--- a/src/Controls/src/Core/Platform/iOS/Extensions/FormattedStringExtensions.cs
+++ b/src/Controls/src/Core/Platform/iOS/Extensions/FormattedStringExtensions.cs
@@ -40,7 +40,18 @@ public static NSAttributedString ToNSAttributedString(
 			Font? defaultFont = null,
 			Color? defaultColor = null,
 			TextTransform defaultTextTransform = TextTransform.Default)
-			=> formattedString.ToNSAttributedString(fontManager, defaultLineHeight, defaultHorizontalAlignment, defaultFont, defaultColor, defaultTextTransform, LineBreakMode.WordWrap, defaultCharacterSpacing: 0d);
+			=> formattedString.ToNSAttributedString(fontManager, LineBreakMode.WordWrap, defaultLineHeight, defaultHorizontalAlignment, defaultFont, defaultColor, defaultTextTransform);
+
+		internal static NSAttributedString ToNSAttributedString(
+			this FormattedString formattedString,
+			IFontManager fontManager,
+			LineBreakMode defaultLineBreakMode,
+			double defaultLineHeight = -1,
+			TextAlignment defaultHorizontalAlignment = TextAlignment.Start,
+			Font? defaultFont = null,
+			Color? defaultColor = null,
+			TextTransform defaultTextTransform = TextTransform.Default)
+			=> formattedString.ToNSAttributedString(fontManager, defaultLineHeight, defaultHorizontalAlignment, defaultFont, defaultColor, defaultTextTransform, defaultLineBreakMode, defaultCharacterSpacing: 0d);
 
 		internal static NSAttributedString ToNSAttributedString(
 			this FormattedString formattedString,
@@ -82,7 +93,18 @@ public static NSAttributedString ToNSAttributedString(
 			Font? defaultFont = null,
 			Color? defaultColor = null,
 			TextTransform defaultTextTransform = TextTransform.Default)
-			=> span.ToNSAttributedString(fontManager, defaultLineHeight, defaultHorizontalAlignment, defaultFont, defaultColor, defaultTextTransform, LineBreakMode.WordWrap, defaultCharacterSpacing: 0d);
+			=> span.ToNSAttributedString(fontManager, defaultLineHeight, defaultHorizontalAlignment, defaultFont, defaultColor, defaultTextTransform, defaultLineBreakMode: LineBreakMode.WordWrap);
+
+		internal static NSAttributedString ToNSAttributedString(
+			this Span span,
+			IFontManager fontManager,
+			LineBreakMode defaultLineBreakMode,
+			double defaultLineHeight = -1,
+			TextAlignment defaultHorizontalAlignment = TextAlignment.Start,
+			Font? defaultFont = null,
+			Color? defaultColor = null,
+			TextTransform defaultTextTransform = TextTransform.Default)
+			=> span.ToNSAttributedString(fontManager, defaultLineHeight, defaultHorizontalAlignment, defaultFont, defaultColor, defaultTextTransform, defaultLineBreakMode, defaultCharacterSpacing: 0d);
 
 		internal static NSAttributedString ToNSAttributedString(
 			this Span span,
@@ -92,7 +114,7 @@ internal static NSAttributedString ToNSAttributedString(
 			Font? defaultFont,
 			Color? defaultColor,
 			TextTransform defaultTextTransform,
-			LineBreakMode lineBreakMode,
+			LineBreakMode defaultLineBreakMode,
 			double defaultCharacterSpacing = 0d)
 		{
 			var defaultFontSize = defaultFont?.Size ?? fontManager.DefaultFontSize;
@@ -123,14 +145,13 @@ internal static NSAttributedString ToNSAttributedString(
 				_ => UITextAlignment.Left
 			};
 
-			style.LineBreakMode = lineBreakMode switch
+			style.LineBreakMode = defaultLineBreakMode switch
 			{
 				LineBreakMode.NoWrap => UILineBreakMode.Clip,
-				LineBreakMode.WordWrap => UILineBreakMode.WordWrap,
 				LineBreakMode.CharacterWrap => UILineBreakMode.CharacterWrap,
 				LineBreakMode.HeadTruncation => UILineBreakMode.HeadTruncation,
-				LineBreakMode.TailTruncation => UILineBreakMode.TailTruncation,
 				LineBreakMode.MiddleTruncation => UILineBreakMode.MiddleTruncation,
+				LineBreakMode.TailTruncation => UILineBreakMode.TailTruncation,
 				_ => UILineBreakMode.WordWrap
 			};
 
diff --git a/src/Controls/src/Core/SearchBar/SearchBar.Android.cs b/src/Controls/src/Core/SearchBar/SearchBar.Android.cs
index 69b58ab1e216..ceecffdc069d 100644
--- a/src/Controls/src/Core/SearchBar/SearchBar.Android.cs
+++ b/src/Controls/src/Core/SearchBar/SearchBar.Android.cs
@@ -23,5 +23,17 @@ public static void MapText(SearchBarHandler2 handler, SearchBar searchBar)
 
 			Platform.EditTextExtensions.UpdateText(handler.PlatformView.EditText, searchBar);
 		}
+
+		// Material3 specific overload for SearchBarHandler2
+		internal static void MapTextTransform(SearchBarHandler2 handler, SearchBar searchBar)
+		{
+			if (searchBar.IsConnectingHandler())
+			{
+				// If we're connecting the handler, we don't want to map the text multiple times.
+				return;
+			}
+
+			MapText(handler, searchBar);
+		}
 	}
 }
diff --git a/src/Controls/src/Core/SearchBar/SearchBar.Mapper.cs b/src/Controls/src/Core/SearchBar/SearchBar.Mapper.cs
index d05efd265ec8..d07705d9b029 100644
--- a/src/Controls/src/Core/SearchBar/SearchBar.Mapper.cs
+++ b/src/Controls/src/Core/SearchBar/SearchBar.Mapper.cs
@@ -27,16 +27,16 @@ static SearchBar()
 			{
 				// Material3 SearchBar handler mappings
 				SearchBarHandler2.Mapper.ReplaceMapping<SearchBar, SearchBarHandler2>(nameof(Text), MapText);
-				SearchBarHandler2.Mapper.ReplaceMapping<SearchBar, SearchBarHandler2>(nameof(TextTransform), MapText);
+				SearchBarHandler2.Mapper.ReplaceMapping<SearchBar, SearchBarHandler2>(nameof(TextTransform), MapTextTransform);
 			}
 			else
 			{
 				SearchBarHandler.Mapper.ReplaceMapping<SearchBar, ISearchBarHandler>(nameof(Text), MapText);
-				SearchBarHandler.Mapper.ReplaceMapping<SearchBar, ISearchBarHandler>(nameof(TextTransform), MapText);
+				SearchBarHandler.Mapper.ReplaceMapping<SearchBar, ISearchBarHandler>(nameof(TextTransform), MapTextTransform);
 			}
 #else
 			SearchBarHandler.Mapper.ReplaceMapping<SearchBar, ISearchBarHandler>(nameof(Text), MapText);
-			SearchBarHandler.Mapper.ReplaceMapping<SearchBar, ISearchBarHandler>(nameof(TextTransform), MapText);
+			SearchBarHandler.Mapper.ReplaceMapping<SearchBar, ISearchBarHandler>(nameof(TextTransform), MapTextTransform);
 #endif
 
 #if IOS || ANDROID
@@ -47,5 +47,16 @@ static SearchBar()
 			SearchBarHandler.CommandMapper.PrependToMapping(nameof(ISearchBar.Focus), InputView.MapFocus);
 #endif
 		}
+
+		static void MapTextTransform(ISearchBarHandler handler, SearchBar searchBar)
+		{
+			if (searchBar.IsConnectingHandler())
+			{
+				// If we're connecting the handler, we don't want to map the text multiple times.
+				return;
+			}
+
+			MapText(handler, searchBar);
+		}
 	}
 }
diff --git a/src/Controls/src/Core/SearchBar/SearchBar.iOS.cs b/src/Controls/src/Core/SearchBar/SearchBar.iOS.cs
index d140cae18130..dce3376bedf4 100644
--- a/src/Controls/src/Core/SearchBar/SearchBar.iOS.cs
+++ b/src/Controls/src/Core/SearchBar/SearchBar.iOS.cs
@@ -17,7 +17,13 @@ public static void MapSearchBarStyle(ISearchBarHandler handler, SearchBar search
 		public static void MapText(ISearchBarHandler handler, SearchBar searchBar)
 		{
 			Platform.SearchBarExtensions.UpdateText(handler.PlatformView, searchBar);
-			SearchBarHandler.MapFormatting(handler, searchBar);
+
+			// Any text update requires that we update any attributed string formatting.
+			// During handler connection these properties are applied by the normal mapper sweep after Text.
+			if (!handler.IsConnectingHandler())
+			{
+				SearchBarHandler.MapFormatting(handler, searchBar);
+			}
 		}
 
 		internal static void MapUserInteraction(ISearchBarHandler handler, SearchBar searchBar)
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Entry_HorizontalAlignmentWithCharacterSpacing_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Entry_HorizontalAlignmentWithCharacterSpacing_VerifyVisualState.png
index 833ca775a366..a5fbb8310252 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Entry_HorizontalAlignmentWithCharacterSpacing_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Entry_HorizontalAlignmentWithCharacterSpacing_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Entry_HorizontalAndVerticalAlignment_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Entry_HorizontalAndVerticalAlignment_VerifyVisualState.png
index bea5c0c9f3df..13b78b3593c4 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Entry_HorizontalAndVerticalAlignment_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Entry_HorizontalAndVerticalAlignment_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Entry_IsPasswordWithHorizontalAlignment_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Entry_IsPasswordWithHorizontalAlignment_VerifyVisualState.png
index 66a89847c7ce..e39a76abea31 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Entry_IsPasswordWithHorizontalAlignment_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Entry_IsPasswordWithHorizontalAlignment_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Entry_TextWithHorizontalAlignment_VerifyVisualState.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Entry_TextWithHorizontalAlignment_VerifyVisualState.png
index dd7834817299..548bd360975e 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Entry_TextWithHorizontalAlignment_VerifyVisualState.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Entry_TextWithHorizontalAlignment_VerifyVisualState.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Label_VerifyLabelWithFormattedTextWhenLineBreakModeHeadTruncation.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Label_VerifyLabelWithFormattedTextWhenLineBreakModeHeadTruncation.png
index 61f931fd9827..7f52e4244cf7 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Label_VerifyLabelWithFormattedTextWhenLineBreakModeHeadTruncation.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Label_VerifyLabelWithFormattedTextWhenLineBreakModeHeadTruncation.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Label_VerifyLabelWithFormattedTextWhenLineBreakModeTailTruncation.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Label_VerifyLabelWithFormattedTextWhenLineBreakModeTailTruncation.png
index d8a5b3288460..55bc6c377136 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Label_VerifyLabelWithFormattedTextWhenLineBreakModeTailTruncation.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Label_VerifyLabelWithFormattedTextWhenLineBreakModeTailTruncation.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Label_VerifyLabelWithTextAndFontSize.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Label_VerifyLabelWithTextAndFontSize.png
index a5b3a0f176d3..d5916b7e6019 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Label_VerifyLabelWithTextAndFontSize.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android-notch-36/Material3Label_VerifyLabelWithTextAndFontSize.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLabelWithFormattedTextWhenLineBreakModeHeadTruncation.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLabelWithFormattedTextWhenLineBreakModeHeadTruncation.png
index f91c145b6ad2..532816cabe9d 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLabelWithFormattedTextWhenLineBreakModeHeadTruncation.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLabelWithFormattedTextWhenLineBreakModeHeadTruncation.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLabelWithFormattedTextWhenLineBreakModeMiddleTruncation.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLabelWithFormattedTextWhenLineBreakModeMiddleTruncation.png
index 7331ddcf7eee..364591ddb4e7 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLabelWithFormattedTextWhenLineBreakModeMiddleTruncation.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLabelWithFormattedTextWhenLineBreakModeMiddleTruncation.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLabelWithFormattedTextWhenLineBreakModeTailTruncation.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLabelWithFormattedTextWhenLineBreakModeTailTruncation.png
index b65379f5e1d2..8d380c79e0e9 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLabelWithFormattedTextWhenLineBreakModeTailTruncation.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyLabelWithFormattedTextWhenLineBreakModeTailTruncation.png differ
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Button/ButtonControlPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Button/ButtonControlPage.xaml
index e2ee55b2a38e..eccbb39ee844 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Button/ButtonControlPage.xaml
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Button/ButtonControlPage.xaml
@@ -55,7 +55,12 @@
               </Button>
 
               <Label Grid.Row="1"
-                     Text="Clicked Event: "/>
+                     Text="Clicked Event: "
+                     AutomationId="MainLabel">
+                     <Label.GestureRecognizers>
+                            <TapGestureRecognizer Tapped="MainLabel_Tapped"/>
+                     </Label.GestureRecognizers>
+              </Label>
               <Label Grid.Row="1"
                      Grid.Column="1"
                      x:Name="ClickedEventLabel"
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Button/ButtonControlPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Button/ButtonControlPage.xaml.cs
index 2a537a15497b..5c9a120587fb 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Button/ButtonControlPage.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Button/ButtonControlPage.xaml.cs
@@ -1,3 +1,5 @@
+using Microsoft.Maui.Controls.Internals;
+
 namespace Maui.Controls.Sample;
 
 public class ButtonControlPage : NavigationPage
@@ -52,4 +54,17 @@ public void OnButtonReleased(object sender, EventArgs e)
 			ReleasedEventLabel.Text = "Released Event Executed";
 		}
 	}
+
+	void MainLabel_Tapped(object sender, TappedEventArgs e)
+	{
+		// Recreate the page to verify initial mappers
+		ToolbarItems.Clear();
+		Content = new ContentView();
+		INameScope scope = this;
+		scope.UnregisterName("ClickedEventLabel");
+		scope.UnregisterName("ReleasedEventLabel");
+		scope.UnregisterName("PressedEventLabel");
+		scope.UnregisterName("ButtonShadow");
+		InitializeComponent();
+	}
 }
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryControlPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryControlPage.xaml
index 51a8c5332d41..f05f6c914b85 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryControlPage.xaml
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryControlPage.xaml
@@ -7,10 +7,14 @@
        <VerticalStackLayout Padding="20"
                             Spacing="8">
               <Label Text="Entry Control"
+                     AutomationId="MainLabel"
                      FontSize="20"
                      Margin="0,0,0,50"
-                     HorizontalOptions="Center"/>
-
+                     HorizontalOptions="Center">
+                     <Label.GestureRecognizers>
+                            <TapGestureRecognizer Tapped="MainLabel_Tapped"/>
+                     </Label.GestureRecognizers>
+              </Label>
               <local:UITestEntry x:Name="EntryControl"
                                  IsCursorVisible="False"
                                  Text="{Binding Text}"
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryControlPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryControlPage.xaml.cs
index 17c836bb6851..42db2b79e55f 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryControlPage.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryControlPage.xaml.cs
@@ -1,5 +1,6 @@
 using System.ComponentModel;
 using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Internals;
 
 namespace Maui.Controls.Sample;
 
@@ -130,4 +131,38 @@ private void EntryControl_Unfocused(object sender, FocusEventArgs e)
 			vm.UnfocusedText = eventInfo;
 		}
 	}
+
+	void MainLabel_Tapped(object sender, TappedEventArgs e)
+	{
+		// Recreate the page to verify initial mappers
+		EntryControl.PropertyChanged -= UpdateEntryControl;
+		ToolbarItems.Clear();
+		Content = new ContentView();
+		INameScope scope = this;
+		scope.UnregisterName("EntryControl");
+		scope.UnregisterName("TextChangedLabel");
+		scope.UnregisterName("SelectionLengthEntry");
+		scope.UnregisterName("CursorPositionEntry");
+		scope.UnregisterName("CompletedLabel");
+		scope.UnregisterName("FocusedLabel");
+		scope.UnregisterName("UnfocusedLabel");
+		scope.UnregisterName("grid");
+		InitializeComponent();
+
+		if (OperatingSystem.IsIOSVersionAtLeast(26))
+		{
+			grid.HeightRequest = 100;
+		}
+		else
+		{
+			grid.HeightRequest = 130;
+		}
+
+		// Reattach the PropertyChanged event handler after reinitialization
+		EntryControl.PropertyChanged += UpdateEntryControl;
+
+		// Update the entry fields to reflect current values
+		CursorPositionEntry.Text = EntryControl.CursorPosition.ToString();
+		SelectionLengthEntry.Text = EntryControl.SelectionLength.ToString();
+	}
 }
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryOptionsPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryOptionsPage.xaml
index d2e5c2838de4..e2c93ff09f92 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryOptionsPage.xaml
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryControl/EntryOptionsPage.xaml
@@ -45,6 +45,7 @@
                                     Clicked="HorizontalAlignmentButton_Clicked"/>
                             <Button Text="End"
                                     AutomationId="HEnd"
+                                    FontSize="10"
                                     Clicked="HorizontalAlignmentButton_Clicked"/>
                      </HorizontalStackLayout>
                      <!-- Vertical Alignment -->
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Label/LabelControlPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Label/LabelControlPage.xaml
index 985bcfa1fa21..a3a513c6ee7b 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Label/LabelControlPage.xaml
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Label/LabelControlPage.xaml
@@ -5,31 +5,35 @@
              Title="LabelControlPage">
   <ContentPage.ToolbarItems>
     <ToolbarItem Text="Options"
-        Clicked="NavigateToOptionsPage_Clicked"
-        AutomationId="Options"/>
+                 Clicked="NavigateToOptionsPage_Clicked"
+                 AutomationId="Options"/>
   </ContentPage.ToolbarItems>
 
-    <VerticalStackLayout>
-      <Label
-        HeightRequest="600"
-        Text="{Binding Text , Mode=TwoWay}"
-        CharacterSpacing="{Binding CharacterSpacing}"
-        FontAttributes="{Binding FontAttributes}"
-        FontAutoScalingEnabled="{Binding FontAutoScalingEnabled}"
-        FontFamily="{Binding FontFamily}"
-        FontSize="{Binding FontSize}"
-        FormattedText="{Binding FormattedText}"
-        HorizontalTextAlignment="{Binding HorizontalTextAlignment}"
-        LineBreakMode="{Binding LineBreakMode}"
-        LineHeight="{Binding LineHeight}"
-        MaxLines="{Binding MaxLines}"
-        Padding="{Binding Padding}"
-        TextColor="{Binding TextColor}"
-        TextDecorations="{Binding TextDecorations}"
-        TextTransform="{Binding TextTransform}"
-        TextType="{Binding TextType}"
-        VerticalTextAlignment="{Binding VerticalTextAlignment}"
-        BackgroundColor="LightGray"
-        AutomationId="MainLabel"/>
-    </VerticalStackLayout>
+  <VerticalStackLayout>
+    <Label
+      HeightRequest="600"
+      Text="{Binding Text , Mode=TwoWay}"
+      CharacterSpacing="{Binding CharacterSpacing}"
+      FontAttributes="{Binding FontAttributes}"
+      FontAutoScalingEnabled="{Binding FontAutoScalingEnabled}"
+      FontFamily="{Binding FontFamily}"
+      FontSize="{Binding FontSize}"
+      FormattedText="{Binding FormattedText}"
+      HorizontalTextAlignment="{Binding HorizontalTextAlignment}"
+      LineBreakMode="{Binding LineBreakMode}"
+      LineHeight="{Binding LineHeight}"
+      MaxLines="{Binding MaxLines}"
+      Padding="{Binding Padding}"
+      TextColor="{Binding TextColor}"
+      TextDecorations="{Binding TextDecorations}"
+      TextTransform="{Binding TextTransform}"
+      TextType="{Binding TextType}"
+      VerticalTextAlignment="{Binding VerticalTextAlignment}"
+      BackgroundColor="LightGray"
+      AutomationId="MainLabel">
+      <Label.GestureRecognizers>
+        <TapGestureRecognizer Tapped="MainLabel_Tapped"/>
+      </Label.GestureRecognizers>
+    </Label>
+  </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Label/LabelControlPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Label/LabelControlPage.xaml.cs
index b55530683fd3..117bd1522b71 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Label/LabelControlPage.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Label/LabelControlPage.xaml.cs
@@ -30,4 +30,16 @@ private async void NavigateToOptionsPage_Clicked(object sender, EventArgs e)
 		BindingContext = _viewModel = new LabelViewModel();
 		await Navigation.PushAsync(new LabelOptionsPage(_viewModel));
 	}
+
+	void MainLabel_Tapped(object sender, TappedEventArgs e)
+	{
+		// Recreate the page to verify initial mappers
+		// Clear BindingContext first so old Label properly detaches the FormattedString
+		// (triggers propertyChanging which unsubscribes events and calls RemoveSpans)
+		ToolbarItems.Clear();
+		BindingContext = null;
+		Content = new ContentView();
+		InitializeComponent();
+		BindingContext = _viewModel;
+	}
 }
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Label/LabelOptionsPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Label/LabelOptionsPage.xaml
index ca01107922d7..89201d1280c3 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Label/LabelOptionsPage.xaml
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Label/LabelOptionsPage.xaml
@@ -284,6 +284,13 @@
                                  CheckedChanged="OnLineBreakModeChanged"
                                  AutomationId="LineBreakModeTailTruncation"/>
                 </HorizontalStackLayout>
+                <HorizontalStackLayout>
+                    <Label Text="Single Line Formatted Text"
+                           VerticalOptions="Center"/>
+                    <CheckBox x:Name="SimpleFormattedTextCheckBox"
+                              CheckedChanged="SimpleFormattedTextCheckBox_CheckedChanged"
+                              AutomationId="SimpleFormattedText"/>
+                </HorizontalStackLayout>
             </VerticalStackLayout>
         </Grid>
     </VerticalStackLayout>
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Label/LabelOptionsPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Label/LabelOptionsPage.xaml.cs
index eafa032eba42..fec90e2c9d81 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Label/LabelOptionsPage.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Label/LabelOptionsPage.xaml.cs
@@ -239,4 +239,15 @@ private void OnFormattedTextChanged(object sender, CheckedChangedEventArgs e)
 		}
 	}
 
+	private void SimpleFormattedTextCheckBox_CheckedChanged(object sender, CheckedChangedEventArgs e)
+	{
+		if (e.Value)
+		{
+			_viewModel.FormattedText = new FormattedString
+			{
+				Spans = { new Span { Text = "This is a Basic Label" } }
+			};
+			_viewModel.Text = null;
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Label/LabelViewModel.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Label/LabelViewModel.cs
index b25fca5c14f4..484d1df9a229 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Label/LabelViewModel.cs
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Label/LabelViewModel.cs
@@ -7,16 +7,7 @@ public class LabelViewModel : INotifyPropertyChanged
 {
 
 	public LabelViewModel()
-	{
-
-		FormattedText = new FormattedString
-		{
-			Spans =
-		   {
-			   new Span { Text = "This is a Basic Label"},
-		   }
-		};
-	}
+	{ }
 	private string _text;
 	public string Text
 	{
@@ -59,7 +50,7 @@ public double CharacterSpacing
 		set { characterSpacing = value; OnPropertyChanged(); }
 	}
 
-	private double lineHeight;
+	private double lineHeight = -1;
 	public double LineHeight
 	{
 		get => lineHeight;
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png
index c5f5456ff6b1..62f4670555d4 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyIsPasswordWhenMaxLenghtSetValue.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyIsPasswordWhenMaxLenghtSetValue.png
index cfed820ae64d..23cf2b348837 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyIsPasswordWhenMaxLenghtSetValue.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyIsPasswordWhenMaxLenghtSetValue.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithFontFamily.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithFontFamily.png
index 912165f60a37..ff74094deae6 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithFontFamily.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithFontFamily.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithFontSize.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithFontSize.png
index 0a10ea63f0ad..a9743096d13f 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithFontSize.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyPlaceholderWithFontSize.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenAlingnedHorizontally.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenAlingnedHorizontally.png
index 023eefdc5b66..8558682450de 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenAlingnedHorizontally.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenAlingnedHorizontally.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenAlingnedVertically.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenAlingnedVertically.png
index 2fc16402250d..4913c29c163c 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenAlingnedVertically.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenAlingnedVertically.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenFontAttributesSet.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenFontAttributesSet.png
index c8eecb6fefef..be1a98486d3e 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenFontAttributesSet.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenFontAttributesSet.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenFontFamilySetValue.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenFontFamilySetValue.png
index 0a47395b7f02..f14a661cda03 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenFontFamilySetValue.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenFontFamilySetValue.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenFontSizeSetCorrectly.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenFontSizeSetCorrectly.png
index 67f146c9571e..735f1aa2ed3b 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenFontSizeSetCorrectly.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTextWhenFontSizeSetCorrectly.png differ
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ButtonFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ButtonFeatureTests.cs
index d7a0701ecb20..e8cae192c823 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ButtonFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/ButtonFeatureTests.cs
@@ -8,6 +8,7 @@ namespace Microsoft.Maui.TestCases.Tests;
 
 public class ButtonFeatureTests : _GalleryUITest
 {
+	const string MainLabel = "MainLabel";
 	public const string ButtonFeatureMatrix = "Button Feature Matrix";
 
 	public override string GalleryPageName => ButtonFeatureMatrix;
@@ -35,6 +36,8 @@ public void Button_SetBorderColorAndTextColor_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test]
@@ -55,6 +58,8 @@ public void Button_SetBorderWidthEntryAndLineBreakMode_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 #if TEST_FAILS_ON_IOS && TEST_FAILS_ON_CATALYST //CharacterSpacingEntry property not working on iOS and Catalyst, Issue: https://github.com/dotnet/maui/issues/21488
@@ -75,6 +80,8 @@ public void Button_SetCharacterSpacingAndText_VerifyVisualState()
 		App.WaitForElement("ClickedEventLabel");
 		App.Tap("ClickedEventLabel");
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 #endif
 
@@ -117,6 +124,8 @@ public void Button_SetCornerRadiusAndBorderWidth_VerifyVisualState()
 		App.WaitForElement("ClickedEventLabel");
 		App.Tap("ClickedEventLabel");
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test]
@@ -146,6 +155,8 @@ public void Button_setFontAttributesAndFontFamily_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test]
@@ -162,6 +173,8 @@ public void Button_setFontAttributesAndText_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test]
@@ -180,6 +193,8 @@ public void Button_setFontAttributesAndTextTransform_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test]
@@ -196,6 +211,8 @@ public void Button_setFontFamilyAndText_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test]
@@ -214,6 +231,8 @@ public void Button_setFontFamilyAndTextTransform_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test]
@@ -234,6 +253,8 @@ public void Button_setFontSizeAndLineBreakMode_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test]
@@ -253,6 +274,8 @@ public void Button_setFontSizeAndText_VerifyVisualState()
 		App.WaitForElement("ClickedEventLabel");
 		App.Tap("ClickedEventLabel");
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test]
@@ -272,6 +295,8 @@ public void Button_setFontSizeAndTextTransform_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test]
@@ -318,6 +343,8 @@ public void Button_SetLineBreakModeCharacterWrap_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test]
@@ -335,6 +362,8 @@ public void Button_SetLineBreakModeHeadTruncation_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test]
@@ -352,6 +381,8 @@ public void Button_SetLineBreakModeMiddleTruncation_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test]
@@ -369,6 +400,8 @@ public void Button_SetLineBreakModeTailTruncation_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test]
@@ -386,6 +419,8 @@ public void Button_SetLineBreakModeWordWrap_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test]
@@ -408,6 +443,8 @@ public void Button_setPaddingAndText_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test]
@@ -424,6 +461,8 @@ public void Button_setShadowAndText_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test]
@@ -440,6 +479,8 @@ public void Button_setTextAndTextColor_VerifyVisualState()
 		App.Tap("Apply");
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test]
@@ -457,4 +498,4 @@ public void Button_setTextAndTextTransform_VerifyVisualState()
 		App.WaitForElementTillPageNavigationSettled("ButtonControl");
 		Assert.That(App.FindElement("ButtonControl").GetText(), Is.EqualTo("BUTTONTEXT"));
 	}
-}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/EntryFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/EntryFeatureTests.cs
index 6b1d1405587e..ba6339428a9a 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/EntryFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/EntryFeatureTests.cs
@@ -8,6 +8,7 @@ namespace Microsoft.Maui.TestCases.Tests;
 public class EntryFeatureTests : _GalleryUITest
 {
 	public const string EntryFeatureMatrix = "Entry Feature Matrix";
+	public const string MainLabel = "MainLabel";
 
 	public override string GalleryPageName => EntryFeatureMatrix;
 
@@ -78,6 +79,8 @@ public void VerifyEntryUnfocusedEvent()
 	{
 		App.WaitForElement("TestEntry");
 		App.WaitForElement("SelectionLengthEntry");
+		App.Tap(MainLabel);
+		App.WaitForElement("SelectionLengthEntry");
 		App.Tap("SelectionLengthEntry");
 		App.DismissKeyboard();
 		Assert.That(App.WaitForElement("UnfocusedLabel").GetText(), Is.EqualTo("Unfocused: Event Triggered"));
@@ -123,6 +126,9 @@ public void VerifyClearButtonVisiblityWhenTextAlignedHorizontally()
 		Assert.That(App.WaitForElement("FocusedLabel").GetText(), Is.EqualTo("Focused: Event Triggered"));
 #endif
 		VerifyScreenshotWithKeyboardHandling();
+		App.Tap(MainLabel);
+		App.Tap("TestEntry");
+		VerifyScreenshotWithKeyboardHandling();
 	}
 
 	[Test]
@@ -136,6 +142,8 @@ public void VerifyClearButtonVisiblityWhenTextAlignedVertically()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		App.Tap("TestEntry");
+		App.Tap(MainLabel);
+		App.Tap("TestEntry");
 		VerifyScreenshotWithKeyboardHandling();
 	}
 
@@ -151,6 +159,8 @@ public void VerifyClearButtonVisiblityWhenIsPasswordTrueOrFalse()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		App.Tap("TestEntry");
+		App.Tap(MainLabel);
+		App.Tap("TestEntry");
 		VerifyScreenshotWithKeyboardHandling();
 	}
 #endif
@@ -167,6 +177,8 @@ public void VerifyClearButtonVisibilityWhenIsReadOnlyTrue()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		App.Tap("TestEntry");
+		App.Tap(MainLabel);
+		App.Tap("TestEntry");
 		VerifyScreenshotWithKeyboardHandling();
 	}
 #endif
@@ -182,6 +194,10 @@ public void VerifyClearVisiblityButtonWhenTextColorChanged()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		App.Tap("TestEntry");
+		//VerifyScreenshotWithKeyboardHandling(); // Refer to issue https://github.com/dotnet/maui/issues/31326
+		App.Tap(MainLabel);
+		App.WaitForElement("TestEntry");
+		App.Tap("TestEntry");
 		VerifyScreenshotWithKeyboardHandling();
 	}
 
@@ -210,6 +226,9 @@ public void VerifyTextWhenAlingnedHorizontally()
 		App.WaitForElement("Apply");
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
+		ClearEntryFocusIfItIsWindowsPlatform();
+		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
 		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
@@ -222,6 +241,9 @@ public void VerifyTextWhenAlingnedVertically()
 		App.WaitForElement("Apply");
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
+		ClearEntryFocusIfItIsWindowsPlatform();
+		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
 		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
@@ -237,6 +259,8 @@ public void VerifyTextEntryWhenSetAsReadOnly()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		// On Android, using App.EnterText in UI tests (e.g., with Appium UITest) can programmatically enter text into an Entry control even if its IsReadOnly property is set to true.
+		App.Tap(MainLabel);
+		// On Android, using App.EnterText in UI tests (e.g., with Appium UITest) can programmatically enter text into an Entry control even if its IsReadOnly property is set to true.
 		App.EnterText("TestEntry", "123");
 		Assert.That(App.WaitForElement("TestEntry").GetText(), Is.EqualTo("Test Entry"));
 	}
@@ -252,6 +276,9 @@ public void VerifyTextWhenFontFamilySetValue()
 		App.WaitForElement("Apply");
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
+		ClearEntryFocusIfItIsWindowsPlatform();
+		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
 		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
@@ -266,6 +293,9 @@ public void VerifyTextWhenCharacterSpacingSetValues()
 		App.WaitForElement("Apply");
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
+		ClearEntryFocusIfItIsWindowsPlatform();
+		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
 		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
@@ -282,6 +312,9 @@ public void VerifyHorizontalTextAlignmentBasedOnCharacterSpacing()
 		App.WaitForElement("Apply");
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
+		ClearEntryFocusIfItIsWindowsPlatform();
+		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
 		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
@@ -303,6 +336,8 @@ public void VerifyVerticalTextAlignmentBasedOnCharacterSpacing()
 		App.Tap("TextChangedLabel");
 #endif
 		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
+		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
 #if TEST_FAILS_ON_IOS // When taking a screenshot of a password field (<Entry IsPassword="true" />), iOS hides the password text for security reasons.
@@ -319,6 +354,9 @@ public void VerifyIsPasswordBasedOnCharacterSpacing()
 		App.WaitForElement("Apply");
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
+		ClearEntryFocusIfItIsWindowsPlatform();
+		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
 		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 #endif
@@ -336,6 +374,9 @@ public void VerifyCharacterSpacingWhenFontFamily()
 		App.WaitForElement("Apply");
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
+		ClearEntryFocusIfItIsWindowsPlatform();
+		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
 		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
@@ -350,6 +391,9 @@ public void VerifyTextWhenIsPasswordTrueOrFalse()
 		App.WaitForElement("Apply");
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
+		ClearEntryFocusIfItIsWindowsPlatform();
+		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
 		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
@@ -363,6 +407,9 @@ public void VerifyIsPasswordBasedOnVerticalTextAlignment()
 		App.WaitForElement("Apply");
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
+		ClearEntryFocusIfItIsWindowsPlatform();
+		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
 		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
@@ -378,6 +425,9 @@ public void VerifyIsPasswordBasedOnHorizontalTextAlignment()
 		App.WaitForElement("Apply");
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
+		ClearEntryFocusIfItIsWindowsPlatform();
+		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
 		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
@@ -415,6 +465,9 @@ public void VerifyCharacterSpacingWhenMaxLengthSet()
 		App.WaitForElement("Apply");
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
+		ClearEntryFocusIfItIsWindowsPlatform();
+		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
 		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
@@ -433,6 +486,8 @@ public void VerifyTextWhenMaxLengthSetValue()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		Assert.That(App.WaitForElement("TestEntry").GetText(), Is.EqualTo("Test E"));
+		App.Tap(MainLabel);
+		Assert.That(App.WaitForElement("TestEntry").GetText(), Is.EqualTo("Test E"));
 	}
 
 #if TEST_FAILS_ON_ANDROID //After setting IsReadOnly to true, the Cursor remains visible on Android even when IsCursorVisible is set to false, which is not the expected behavior.
@@ -453,13 +508,15 @@ public void VerifyMaxLengthWhenIsReadOnlyTrue()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		// On Android, using App.EnterText in UI tests (e.g., with Appium UITest) can programmatically enter text into an Entry control even if its IsReadOnly property is set to true.
+		App.Tap(MainLabel);
+		// On Android, using App.EnterText in UI tests (e.g., with Appium UITest) can programmatically enter text into an Entry control even if its IsReadOnly property is set to true.
 		App.EnterText("TestEntry", "123");
 		Assert.That(App.WaitForElement("TestEntry").GetText(), Is.EqualTo("Test E"));
 
 	}
 #endif
 
-	[Test]
+	[Test, Order(13)]
 	public void VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet()
 	{
 		App.WaitForElement("Options");
@@ -471,6 +528,7 @@ public void VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet()
 		App.WaitForElement("Apply");
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
+		ClearEntryFocusIfItIsWindowsPlatform();
 		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
@@ -484,6 +542,9 @@ public void VerifyTextWhenTextColorSetCorrectly()
 		App.WaitForElement("Apply");
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
+		ClearEntryFocusIfItIsWindowsPlatform();
+		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
 		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
@@ -498,6 +559,9 @@ public void VerifyTextWhenFontSizeSetCorrectly()
 		App.WaitForElement("Apply");
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
+		ClearEntryFocusIfItIsWindowsPlatform();
+		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
 		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
@@ -513,6 +577,9 @@ public void VerifyIsPasswordWhenFontSizeSet()
 		App.EnterText("FontSizeEntry", "20");
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
+		ClearEntryFocusIfItIsWindowsPlatform();
+		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
 		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 #endif
@@ -529,6 +596,8 @@ public void VerifyTextWhenIsTextPredictionEnabledTrueOrFalse()
 			App.Tap("Apply");
 			App.WaitForElement("TestEntry");
 			App.ClearText("TestEntry");
+			App.Tap(MainLabel);
+			App.ClearText("TestEntry");
 			App.EnterText("TestEntry", "Testig");
 			App.EnterText("TestEntry", " ");
 			Assert.That(App.WaitForElement("TestEntry").GetText(), Is.EqualTo("Testing "));
@@ -545,6 +614,8 @@ public void VerifyTextWhenIsSpellCheckEnabledTrueOrFalse()
 			App.Tap("Apply");
 			App.WaitForElement("TestEntry");
 			App.ClearText("TestEntry");
+			App.Tap(MainLabel);
+			App.ClearText("TestEntry");
 			App.EnterText("TestEntry", "Testig");
 			App.EnterText("TestEntry", " ");
 			VerifyScreenshotWithKeyboardHandling();
@@ -585,6 +656,8 @@ public void VerifyTextWhenCursorPositionValueSet()
 		App.Tap("UpdateCursorAndSelectionButton");
 		App.WaitForElement("TestEntry");
 		App.Tap("TestEntry");
+		App.Tap(MainLabel);
+		App.Tap("TestEntry");
 		App.DismissKeyboard();
 		Assert.That(App.WaitForElement("CursorPositionEntry").GetText(), Is.EqualTo("10"));
 	}
@@ -607,6 +680,8 @@ public void VerifyIsPasswordWhenCursorPositionValueSet()
 		App.Tap("UpdateCursorAndSelectionButton");
 		App.WaitForElement("TestEntry");
 		App.Tap("TestEntry");
+		App.Tap(MainLabel);
+		App.Tap("TestEntry");
 		App.DismissKeyboard();
 		Assert.That(App.WaitForElement("CursorPositionEntry").GetText(), Is.EqualTo("10"));
 	}
@@ -648,6 +723,8 @@ public void VerifyCursorPositionWhenIsReadOnlyTrue()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		App.Tap("TestEntry");
+		App.Tap(MainLabel);
+		App.Tap("TestEntry");
 		Assert.That(App.WaitForElement("CursorPositionEntry").GetText(), Is.EqualTo("0"));
 	}
 
@@ -680,6 +757,8 @@ public void VerifyTextWhenReturmCommandAndReturnCommandParameter()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		App.ClearText("TestEntry");
+		App.Tap(MainLabel);
+		App.ClearText("TestEntry");
 		App.EnterText("TestEntry", "Test");
 		App.Tap("TestEntry");
 		App.PressEnter();
@@ -730,6 +809,8 @@ public void VerifyEntryControlWhenIsEnabledTrueOrFalse()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		App.ClearText("TestEntry");
+		App.Tap(MainLabel);
+		App.ClearText("TestEntry");
 		App.EnterText("TestEntry", "123");
 		Assert.That(App.WaitForElement("TestEntry").GetText(), Is.EqualTo("123"));
 		App.WaitForElement("Options");
@@ -740,6 +821,8 @@ public void VerifyEntryControlWhenIsEnabledTrueOrFalse()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		App.EnterText("TestEntry", "123");
+		App.Tap(MainLabel);
+		App.EnterText("TestEntry", "123");
 		Assert.That(App.WaitForElement("TestEntry").GetText(), Is.EqualTo("Test Entry"));
 
 	}
@@ -754,6 +837,8 @@ public void VerifyEntryControlWhenIsVisibleTrueOrFalse()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		App.WaitForElement("Options");
+		App.Tap(MainLabel);
+		App.WaitForElement("Options");
 		App.Tap("Options");
 		App.WaitForElement("VisibleFalse");
 		App.Tap("VisibleFalse");
@@ -772,6 +857,9 @@ public void VerifyEntryControlWhenFlowDirectionSet()
 		App.WaitForElement("Apply");
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
+		ClearEntryFocusIfItIsWindowsPlatform();
+		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
 		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
@@ -787,6 +875,9 @@ public void VerifyPlaceholderWhenFlowDirectionSet()
 		App.WaitForElement("Apply");
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
+		ClearEntryFocusIfItIsWindowsPlatform();
+		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
 		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
@@ -803,6 +894,10 @@ public void VerifyEntryControlWhenPlaceholderTextSet()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		App.ClearText("TestEntry");
+		App.Tap(MainLabel);
+		App.ClearText("TestEntry");
+		App.Tap(MainLabel);
+		App.ClearText("TestEntry");
 		App.DismissKeyboard();
 		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
@@ -845,6 +940,9 @@ public void VerifyTextWhenFontAttributesSet()
 		App.WaitForElement("Apply");
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
+		ClearEntryFocusIfItIsWindowsPlatform();
+		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
 		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
@@ -859,6 +957,8 @@ public void VerifyTextWhenTextTransFormSet()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		Assert.That(App.WaitForElement("TestEntry").GetText(), Is.EqualTo("TEST ENTRY"));
+		App.Tap(MainLabel);
+		Assert.That(App.WaitForElement("TestEntry").GetText(), Is.EqualTo("TEST ENTRY"));
 	}
 
 #if TEST_FAILS_ON_WINDOWS //related issue link: https://github.com/dotnet/maui/issues/29812
@@ -877,7 +977,7 @@ public void VerifyEntry_WithShadow()
 		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
-	[Test]
+	[Test, Order(14)]
 	public void VerifyPlaceholderWithShadow()
 	{
 		App.WaitForElement("Options");
@@ -890,10 +990,12 @@ public void VerifyPlaceholderWithShadow()
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
 		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
+		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 #endif
 
-	[Test]
+	[Test, Order(10)]
 	public void VerifyPlaceholderWithClearButtonVisible()
 	{
 		App.WaitForElement("Options");
@@ -907,7 +1009,7 @@ public void VerifyPlaceholderWithClearButtonVisible()
 		VerifyScreenshotWithKeyboardHandling("PlaceholderWithClearButtonVisible");
 	}
 
-	[Test]
+	[Test, Order(12)]
 	public void VerifyPlaceholderWithPasswordTrue()
 	{
 		App.WaitForElement("Options");
@@ -925,7 +1027,7 @@ public void VerifyPlaceholderWithPasswordTrue()
 		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
-	[Test]
+	[Test, Order(8)]
 	public void VerifyPlaceholderWithHorizontalAlignment()
 	{
 		App.WaitForElement("Options");
@@ -937,10 +1039,13 @@ public void VerifyPlaceholderWithHorizontalAlignment()
 		App.WaitForElement("Apply");
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
+		ClearEntryFocusIfItIsWindowsPlatform();
+		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
 		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
-	[Test]
+	[Test, Order(9)]
 	public void VerifyPlaceholderWithVerticalAlignment()
 	{
 		App.WaitForElement("Options");
@@ -952,11 +1057,14 @@ public void VerifyPlaceholderWithVerticalAlignment()
 		App.WaitForElement("Apply");
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
+		ClearEntryFocusIfItIsWindowsPlatform();
+		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
 		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
 #if TEST_FAILS_ON_WINDOWS //related issue link: https://github.com/dotnet/maui/issues/30071
-	[Test]
+	[Test, Order(11)]
 	public void VerifyPlaceholderWithCharacterSpacing()
 	{
 		App.WaitForElement("Options");
@@ -973,7 +1081,7 @@ public void VerifyPlaceholderWithCharacterSpacing()
 	}
 #endif
 
-	[Test]
+	[Test, Order(7)]
 	public void VerifyPlaceholderWithFontFamily()
 	{
 		App.WaitForElement("Options");
@@ -985,10 +1093,13 @@ public void VerifyPlaceholderWithFontFamily()
 		App.WaitForElement("Apply");
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
+		ClearEntryFocusIfItIsWindowsPlatform();
+		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
 		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
-	[Test]
+	[Test, Order(6)]
 	public void VerifyPlaceholderWithFontSize()
 	{
 		App.WaitForElement("Options");
@@ -1004,7 +1115,7 @@ public void VerifyPlaceholderWithFontSize()
 		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
-	[Test]
+	[Test, Order(5)]
 	public void VerifyPlaceholderWithFontAttributes()
 	{
 		App.WaitForElement("Options");
@@ -1016,6 +1127,9 @@ public void VerifyPlaceholderWithFontAttributes()
 		App.WaitForElement("Apply");
 		App.Tap("Apply");
 		App.WaitForElement("TestEntry");
+		ClearEntryFocusIfItIsWindowsPlatform();
+		VerifyScreenshot(cropBottom: CropBottomValue);
+		App.Tap(MainLabel);
 		VerifyScreenshot(cropBottom: CropBottomValue);
 	}
 
@@ -1051,4 +1165,15 @@ private void VerifyScreenshotWithKeyboardHandlingOrSetException(ref Exception? e
 		VerifyScreenshotOrSetException(ref exception, screenshotName, cropBottom: CropBottomValue);
 
 	}
+
+	/// <summary>
+	/// On Windows, to hide the cursor in the Entry control, we need to focus out of the Entry.
+	/// This method taps on coordinates (50,50) to achieve that.
+	/// </summary>
+	void ClearEntryFocusIfItIsWindowsPlatform()
+	{
+#if WINDOWS
+		App.TapCoordinates(50, 50); // To focus out of the Entry and hide the cursor
+#endif
+	}
 }
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/LabelFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/LabelFeatureTests.cs
index 3bbc6fb84eed..555f99e02313 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/LabelFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/LabelFeatureTests.cs
@@ -47,6 +47,8 @@ public class LabelFeatureTests : _GalleryUITest
 	public const string MainLabel = "MainLabel";
 
 	public override string GalleryPageName => LabelFeatureMatrix;
+	public const string SimpleFormattedText = "SimpleFormattedText";
+
 
 	public LabelFeatureTests(TestDevice device)
 		: base(device)
@@ -57,7 +59,6 @@ public LabelFeatureTests(TestDevice device)
 	[Category(UITestCategories.Label)]
 	public void VerifyLabelWithFormattedText()
 	{
-		App.WaitForElement("This is a Basic Label");
 		App.WaitForElement(Options);
 		App.Tap(Options);
 		App.WaitForElement(FormattedText);
@@ -66,6 +67,8 @@ public void VerifyLabelWithFormattedText()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(2)]
@@ -74,6 +77,8 @@ public void VerifyLabelWhenFormattedTextWithHorizontalAndVerticalAlignmentStart(
 	{
 		App.WaitForElement(Options);
 		App.Tap(Options);
+		App.WaitForElement(SimpleFormattedText);
+		App.Tap(SimpleFormattedText);
 		App.WaitForElement(HorizontalTextStart);
 		App.Tap(HorizontalTextStart);
 		App.WaitForElement(VerticalTextStart);
@@ -82,6 +87,8 @@ public void VerifyLabelWhenFormattedTextWithHorizontalAndVerticalAlignmentStart(
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(3)]
@@ -90,6 +97,8 @@ public void VerifyLabelWithFormattedTextWhenHorizontalAndVerticalAlignmentCenter
 	{
 		App.WaitForElement(Options);
 		App.Tap(Options);
+		App.WaitForElement(SimpleFormattedText);
+		App.Tap(SimpleFormattedText);
 		App.WaitForElement(HorizontalTextCenter);
 		App.Tap(HorizontalTextCenter);
 		App.WaitForElement(VerticalTextCenter);
@@ -98,6 +107,8 @@ public void VerifyLabelWithFormattedTextWhenHorizontalAndVerticalAlignmentCenter
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(4)]
@@ -106,6 +117,8 @@ public void VerifyLabelWithFormattedTextWhenHorizontalAndVerticalAlignmentEnd()
 	{
 		App.WaitForElement(Options);
 		App.Tap(Options);
+		App.WaitForElement(SimpleFormattedText);
+		App.Tap(SimpleFormattedText);
 		App.WaitForElement(HorizontalTextEnd);
 		App.Tap(HorizontalTextEnd);
 		App.WaitForElement(VerticalTextEnd);
@@ -114,6 +127,8 @@ public void VerifyLabelWithFormattedTextWhenHorizontalAndVerticalAlignmentEnd()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(5)]
@@ -130,6 +145,8 @@ public void VerifyLabelWithFormattedTextAndTextTransformLower()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(6)]
@@ -146,6 +163,8 @@ public void VerifyLabelWithFormattedTextWhenTextTransformUpper()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(7)]
@@ -162,6 +181,8 @@ public void VerifyLabelWithFormattedTextWhenTextColor()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(8)]
@@ -183,6 +204,8 @@ public void VerifyLabelWhenFormattedTextWithPadding()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 
@@ -201,6 +224,8 @@ public void VerifyLabelWithFormattedTextWhenMaxLines()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 #if TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_IOS && TEST_FAILS_ON_ANDROID // Issue Link: https://github.com/dotnet/maui/issues/27828
@@ -219,6 +244,8 @@ public void VerifyLabelWithFormattedTextAndLineHeight()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(11)]
@@ -269,6 +296,8 @@ public void VerifyLabelWithFormattedTextAndCharacterSpacing()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(14)]
@@ -285,6 +314,8 @@ public void VerifyLabelWithFormattedTextWhenFontAttributesBold()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(15)]
@@ -301,6 +332,8 @@ public void VerifyLabelWithFormattedTextWhenFontAttributesItalic()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(16)]
@@ -317,6 +350,8 @@ public void VerifyLabelWithFormattedTextWhenFontFamilyDokdo()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(17)]
@@ -333,6 +368,8 @@ public void VerifyLabelWithFormattedTextWhenFontFamilyMonserratBold()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 #endif
 #endif
@@ -353,6 +390,8 @@ public void VerifyLabelWithFormattedTextWhenFontSize()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 #endif
 
@@ -371,6 +410,8 @@ public void VerifyLabelWithFormattedTextAndLineBreakModeCharacterWrap()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(42)]
@@ -387,6 +428,8 @@ public void VerifyLabelWithTextAndLineBreakModeCharacterWrap()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 #endif
@@ -422,6 +465,8 @@ public void VerifyLabelWithTextAndLineBreakModeTailTruncation()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 #endif
 
@@ -472,6 +517,8 @@ public void VerifyLabelWithFormattedTextWhenLineBreakModeHeadTruncation()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(24)]
@@ -488,6 +535,8 @@ public void VerifyLabelWithFormattedTextWhenLineBreakModeMiddleTruncation()
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 #endif
 
@@ -520,7 +569,6 @@ public void VerifyLabelWithTextAndFontSize()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
-		App.Tap(MainLabel);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
@@ -538,6 +586,8 @@ public void VerifyLabelWithTextAndFontColor()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(28)]
@@ -554,6 +604,8 @@ public void VerifyLabelWithTextAndTextTransform()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(29)]
@@ -571,6 +623,7 @@ public void VerifyLabelWithTextAndCharacterSpacing()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 		App.Tap(MainLabel);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
@@ -589,6 +642,8 @@ public void VerifyLabelWithTextAndTextDecorations()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(31)]
@@ -605,6 +660,8 @@ public void VerifyLabelWithTextAndFontFamily()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(32)]
@@ -621,6 +678,8 @@ public void VerifyLabelWithTextAndFontAttributes()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(33)]
@@ -639,6 +698,8 @@ public void VerifyLabelWithTextWhenVerticalAndHorizontalAlignmentStart()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(34)]
@@ -657,6 +718,8 @@ public void VerifyLabelWithTextWhenVerticalAndHorizontalAlignmentCenter()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(35)]
@@ -675,6 +738,8 @@ public void VerifyLabelWithTextWhenVerticalAndHorizontalAlignmentEnd()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(36)]
@@ -696,6 +761,8 @@ public void VerifyLabelWithTextWhenPaddingApplied()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(37)]
@@ -713,6 +780,7 @@ public void VerifyLabelWithTextAndMaxlines()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 		App.Tap(MainLabel);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
@@ -732,7 +800,6 @@ public void VerifyLabelWithTextWhenLineHeight()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		App.WaitForElement(MainLabel);
-		App.Tap(MainLabel);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
@@ -750,6 +817,8 @@ public void VerifyLabelWithTextAndLineBreakModeNoWrap()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 #if TEST_FAILS_ON_WINDOWS // Issue Link: https://github.com/dotnet/maui/issues/21294
@@ -767,6 +836,8 @@ public void VerifyLabelWithTextAndLineBreakModeHeadTruncation()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(40)]
@@ -783,6 +854,8 @@ public void VerifyLabelWithTextAndLineBreakModeMiddleTruncation()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 #endif
 
@@ -802,6 +875,8 @@ public void VerifyLabelWithFontAttributesAndFontFamily()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(46)]
@@ -821,6 +896,8 @@ public void VerifyLabelWithFontAttributesAndFontSize()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(47)]
@@ -839,6 +916,8 @@ public void VerifyLabelWithFontAttributesAndTextColor()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(48)]
@@ -857,6 +936,8 @@ public void VerifyLabelWithFontAttributesAndTextTransform()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(49)]
@@ -875,6 +956,8 @@ public void VerifyLabelWithFontAttributesAndTextDecorations()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 #if TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_IOS // Issue Link: https://github.com/dotnet/maui/issues/20372,  https://github.com/dotnet/maui/issues/29672, https://github.com/dotnet/maui/issues/29668 
@@ -892,6 +975,8 @@ public void VerifyLabelWithTextAndTextType()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(50)]
@@ -910,6 +995,8 @@ public void VerifyLabelWithFontAttributesAndTextType()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(56)]
@@ -928,6 +1015,8 @@ public void VerifyLabelWithTextTypeAndTextColor()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(57)]
@@ -947,6 +1036,8 @@ public void VerifyLabelWithTextTypeAndFontSize()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(58)]
@@ -965,6 +1056,8 @@ public void VerifyLabelWithTextTypeAndLineBreakModeNoWrap()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(43)]
@@ -983,6 +1076,8 @@ public void VerifyLabelWithTextTypeAndLineBreakModeWordWrap()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(60)]
@@ -1001,6 +1096,8 @@ public void VerifyLabelWithFontFamilyAndTextType()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 #if TEST_FAILS_ON_ANDROID// Issue Link:  https://github.com/dotnet/maui/issues/29672, https://github.com/dotnet/maui/issues/29668, https://github.com/dotnet/maui/issues/22594
@@ -1021,6 +1118,8 @@ public void VerifyLabelWithTextTypeAndLineHeight()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(68)]
@@ -1059,6 +1158,8 @@ public void VerifyLabelWithTextTypeAndLineBreakModeCharacterWrap()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 #endif
 #endif
@@ -1080,6 +1181,8 @@ public void VerifyLabelWithFontFamilyAndFontColor()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(52)]
@@ -1099,6 +1202,8 @@ public void VerifyLabelWithFontFamilyAndFontSize()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(53)]
@@ -1117,6 +1222,8 @@ public void VerifyLabelWithFontFamilyAndTextDecorations()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(54)]
@@ -1135,6 +1242,8 @@ public void VerifyLabelWithFontFamilyAndTextTransform()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(55)]
@@ -1153,10 +1262,12 @@ public void VerifyLabelWithTextDecorationsAndTextTransform()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 #if TEST_FAILS_ON_ANDROID && TEST_FAILS_ON_CATALYST && TEST_FAILS_ON_IOS // Issue Link: https://github.com/dotnet/maui/issues/24298 , https://github.com/dotnet/maui/issues/29673, https://github.com/dotnet/maui/issues/29674
-    [Test, Order(61)]
+	[Test, Order(61)]
 	[Category(UITestCategories.Label)]
 	public void VerifyLabelWithTextTypeAndLineBreakModeTailTruncation()
 	{
@@ -1209,6 +1320,8 @@ public void VerifyLabelWithTextTypeAndLineBreakModeHeadTruncation()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(64)]
@@ -1227,6 +1340,8 @@ public void VerifyLabelWithTextTypeAndLineBreakModeMiddleTruncation()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
 	[Test, Order(65)]
@@ -1245,6 +1360,8 @@ public void VerifyLabelWithTextTypeAndTextTransform()
 		App.WaitForElement(Apply);
 		App.Tap(Apply);
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
+		App.Tap(MainLabel);
+		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 #endif
 #endif
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/Material3LabelFeatureTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/Material3LabelFeatureTests.cs
index 97ae8005b778..2c45e4edaa2a 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/Material3LabelFeatureTests.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/FeatureMatrix/Material3LabelFeatureTests.cs
@@ -13,6 +13,8 @@ public class Material3LabelFeatureTests : _GalleryUITest
 {
 	public override string GalleryPageName => "Label Feature Matrix";
 
+	public const string SimpleFormattedText = "SimpleFormattedText";
+
 	public Material3LabelFeatureTests(TestDevice device)
 		: base(device)
 	{
@@ -22,6 +24,12 @@ public Material3LabelFeatureTests(TestDevice device)
 	[Category(UITestCategories.Material3)]
 	public void Material3Label_VerifyLabelWithFormattedText()
 	{
+		App.WaitForElement("Options");
+		App.Tap("Options");
+		App.WaitForElement(SimpleFormattedText);
+		App.Tap(SimpleFormattedText);
+		App.WaitForElement("Apply");
+		App.Tap("Apply");
 		App.WaitForElement("This is a Basic Label");
 		App.WaitForElement("Options");
 		App.Tap("Options");
@@ -39,6 +47,8 @@ public void Material3Label_VerifyLabelWhenFormattedTextWithHorizontalAndVertical
 	{
 		App.WaitForElement("Options");
 		App.Tap("Options");
+		App.WaitForElement(SimpleFormattedText);
+		App.Tap(SimpleFormattedText);
 		App.WaitForElement("HorizontalTextStart");
 		App.Tap("HorizontalTextStart");
 		App.WaitForElement("VerticalTextStart");
@@ -55,6 +65,8 @@ public void Material3Label_VerifyLabelWithFormattedTextWhenHorizontalAndVertical
 	{
 		App.WaitForElement("Options");
 		App.Tap("Options");
+		App.WaitForElement(SimpleFormattedText);
+		App.Tap(SimpleFormattedText);
 		App.WaitForElement("HorizontalTextCenter");
 		App.Tap("HorizontalTextCenter");
 		App.WaitForElement("VerticalTextCenter");
@@ -71,6 +83,8 @@ public void Material3Label_VerifyLabelWithFormattedTextWhenHorizontalAndVertical
 	{
 		App.WaitForElement("Options");
 		App.Tap("Options");
+		App.WaitForElement(SimpleFormattedText);
+		App.Tap(SimpleFormattedText);
 		App.WaitForElement("HorizontalTextEnd");
 		App.Tap("HorizontalTextEnd");
 		App.WaitForElement("VerticalTextEnd");
@@ -461,7 +475,6 @@ public void Material3Label_VerifyLabelWithTextAndFontSize()
 		App.WaitForElement("Apply");
 		App.Tap("Apply");
 		App.WaitForElement("MainLabel");
-		App.Tap("MainLabel");
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
@@ -673,7 +686,6 @@ public void Material3Label_VerifyLabelWithTextWhenLineHeight()
 		App.WaitForElement("Apply");
 		App.Tap("Apply");
 		App.WaitForElement("MainLabel");
-		App.Tap("MainLabel");
 		VerifyScreenshot(tolerance: 0.5, retryTimeout: TimeSpan.FromSeconds(2));
 	}
 
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyCharacterSpacingWhenFontFamily.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyCharacterSpacingWhenFontFamily.png
index efac7d909516..2d8ec5c84e0b 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyCharacterSpacingWhenFontFamily.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyCharacterSpacingWhenFontFamily.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyCharacterSpacingWhenMaxLengthSet.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyCharacterSpacingWhenMaxLengthSet.png
index 1f35f6816d56..4d0c6e2e0eae 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyCharacterSpacingWhenMaxLengthSet.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyCharacterSpacingWhenMaxLengthSet.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyEntryControlWhenFlowDirectionSet.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyEntryControlWhenFlowDirectionSet.png
index 6a0a16a7c6cf..c76dd52d0c54 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyEntryControlWhenFlowDirectionSet.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyEntryControlWhenFlowDirectionSet.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyHorizontalTextAlignmentBasedOnCharacterSpacing.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyHorizontalTextAlignmentBasedOnCharacterSpacing.png
index 4ff30427bec5..531c1a4f5f2e 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyHorizontalTextAlignmentBasedOnCharacterSpacing.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyHorizontalTextAlignmentBasedOnCharacterSpacing.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png
index a2ef5f8faa5c..4cbfe74c2471 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordBasedOnCharacterSpacing.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordBasedOnCharacterSpacing.png
index a2d4ada30a2b..0f5f296790e1 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordBasedOnCharacterSpacing.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordBasedOnCharacterSpacing.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordBasedOnHorizontalTextAlignment.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordBasedOnHorizontalTextAlignment.png
index ae4bc9372eb5..2975abc445dd 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordBasedOnHorizontalTextAlignment.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordBasedOnHorizontalTextAlignment.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordBasedOnVerticalTextAlignment.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordBasedOnVerticalTextAlignment.png
index de9c113467b9..dd45a227b40e 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordBasedOnVerticalTextAlignment.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordBasedOnVerticalTextAlignment.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordWhenFontSizeSet.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordWhenFontSizeSet.png
index b2cdfb62c78b..4977dd91fe75 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordWhenFontSizeSet.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyIsPasswordWhenFontSizeSet.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFontAttributesAndFontFamily.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFontAttributesAndFontFamily.png
index 87cadf350db2..ed01d43ae9ec 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFontAttributesAndFontFamily.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFontAttributesAndFontFamily.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFontAttributesAndFontSize.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFontAttributesAndFontSize.png
index 5aa4c1d9b4ad..b91b2128d2b2 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFontAttributesAndFontSize.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFontAttributesAndFontSize.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFontFamilyAndTextType.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFontFamilyAndTextType.png
index 2ccd4ec6633f..20931bfbf618 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFontFamilyAndTextType.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFontFamilyAndTextType.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFormattedTextAndLineBreakModeNoWrap.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFormattedTextAndLineBreakModeNoWrap.png
index 5c28409eb1d8..4a3e1a3871cb 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFormattedTextAndLineBreakModeNoWrap.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFormattedTextAndLineBreakModeNoWrap.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFormattedTextWhenLineBreakModeTailTruncation.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFormattedTextWhenLineBreakModeTailTruncation.png
index ccf2cce53f3c..f0f79d1c4023 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFormattedTextWhenLineBreakModeTailTruncation.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFormattedTextWhenLineBreakModeTailTruncation.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFormattedTextWhenLineBreakModeWordWrap.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFormattedTextWhenLineBreakModeWordWrap.png
index b5fe59055b52..ea561136e5f0 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFormattedTextWhenLineBreakModeWordWrap.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFormattedTextWhenLineBreakModeWordWrap.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFormattedTextWhenTextDecorationsStrikethrough.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFormattedTextWhenTextDecorationsStrikethrough.png
index b146971d2959..b825371842de 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFormattedTextWhenTextDecorationsStrikethrough.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFormattedTextWhenTextDecorationsStrikethrough.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFormattedTextWhenTextDecorationsUnderLine.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFormattedTextWhenTextDecorationsUnderLine.png
index d10a752976de..8ea519ada2ce 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFormattedTextWhenTextDecorationsUnderLine.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithFormattedTextWhenTextDecorationsUnderLine.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndCharacterSpacing.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndCharacterSpacing.png
index 47fbbaecef62..01aacb539b1b 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndCharacterSpacing.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndCharacterSpacing.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndFontAttributes.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndFontAttributes.png
index aa740a5b3f59..7592fa7787ba 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndFontAttributes.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndFontAttributes.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndFontColor.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndFontColor.png
index c061aab60032..837d0666961d 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndFontColor.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndFontColor.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndFontFamily.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndFontFamily.png
index 389c8fa3ff5f..613edb84d99e 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndFontFamily.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndFontFamily.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndFontSize.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndFontSize.png
index 3ee44da8e880..b350e655065c 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndFontSize.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndFontSize.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndLineBreakModeNoWrap.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndLineBreakModeNoWrap.png
index 8c1f0d92a074..cd81289044a7 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndLineBreakModeNoWrap.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndLineBreakModeNoWrap.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndLineBreakModeTailTruncation.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndLineBreakModeTailTruncation.png
index 5a3e30c8cd56..72c43fe35537 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndLineBreakModeTailTruncation.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndLineBreakModeTailTruncation.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndMaxlines.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndMaxlines.png
index 1400bd7c9fe2..1b26ccd12088 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndMaxlines.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndMaxlines.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndTextDecorations.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndTextDecorations.png
index b9a40b6ad7bf..08685b0e18ce 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndTextDecorations.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndTextDecorations.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndTextTransform.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndTextTransform.png
index 916f3a808535..2137476fd33c 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndTextTransform.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndTextTransform.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndTextType.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndTextType.png
index f0e5a1fb9c11..e03c95fb4746 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndTextType.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextAndTextType.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextTypeAndCharacterSpacing.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextTypeAndCharacterSpacing.png
index 522c25e8bfac..5360700f0ff6 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextTypeAndCharacterSpacing.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextTypeAndCharacterSpacing.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextTypeAndLineBreakModeWordWrap.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextTypeAndLineBreakModeWordWrap.png
index 5cf6281365f2..b5527ea5540c 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextTypeAndLineBreakModeWordWrap.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextTypeAndLineBreakModeWordWrap.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextWhenPaddingApplied.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextWhenPaddingApplied.png
index 2401af82c386..c77a0bf921c6 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextWhenPaddingApplied.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextWhenPaddingApplied.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextWhenVerticalAndHorizontalAlignmentCenter.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextWhenVerticalAndHorizontalAlignmentCenter.png
index a382e8e56066..641d9b3aac90 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextWhenVerticalAndHorizontalAlignmentCenter.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextWhenVerticalAndHorizontalAlignmentCenter.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextWhenVerticalAndHorizontalAlignmentEnd.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextWhenVerticalAndHorizontalAlignmentEnd.png
index ea3187f6f6c1..c108cd957c3a 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextWhenVerticalAndHorizontalAlignmentEnd.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextWhenVerticalAndHorizontalAlignmentEnd.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextWhenVerticalAndHorizontalAlignmentStart.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextWhenVerticalAndHorizontalAlignmentStart.png
index 2a21fe618b69..549e65d8701b 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextWhenVerticalAndHorizontalAlignmentStart.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyLabelWithTextWhenVerticalAndHorizontalAlignmentStart.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWhenFlowDirectionSet.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWhenFlowDirectionSet.png
index 05cad1751248..d191ce0195a4 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWhenFlowDirectionSet.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWhenFlowDirectionSet.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithFontAttributes.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithFontAttributes.png
index 97a06ce24646..fb61668c5373 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithFontAttributes.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithFontAttributes.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithFontFamily.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithFontFamily.png
index aa8adb4e3407..4fdaff7b40d3 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithFontFamily.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithFontFamily.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithFontSize.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithFontSize.png
index 09d5d11caa21..f779aee623da 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithFontSize.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithFontSize.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithHorizontalAlignment.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithHorizontalAlignment.png
index b3b42c367dc0..e1a91c0702f2 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithHorizontalAlignment.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithHorizontalAlignment.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithVerticalAlignment.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithVerticalAlignment.png
index 04ac1aa916bd..c76bcf29097c 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithVerticalAlignment.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyPlaceholderWithVerticalAlignment.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenAlingnedHorizontally.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenAlingnedHorizontally.png
index c25fba536e9f..9252b3fe530f 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenAlingnedHorizontally.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenAlingnedHorizontally.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenAlingnedVertically.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenAlingnedVertically.png
index 52311a816c14..be8e78d7655d 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenAlingnedVertically.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenAlingnedVertically.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenCharacterSpacingSetValues.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenCharacterSpacingSetValues.png
index a4f60f42a875..de25c4dceab0 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenCharacterSpacingSetValues.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenCharacterSpacingSetValues.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenFontAttributesSet.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenFontAttributesSet.png
index c2cfbcb40322..e2e7d92e7035 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenFontAttributesSet.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenFontAttributesSet.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenFontFamilySetValue.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenFontFamilySetValue.png
index db39fc48c774..960c212e77ea 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenFontFamilySetValue.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenFontFamilySetValue.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenFontSizeSetCorrectly.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenFontSizeSetCorrectly.png
index 46e1ef9e4178..93aeb6fe71d8 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenFontSizeSetCorrectly.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenFontSizeSetCorrectly.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenIsPasswordTrueOrFalse.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenIsPasswordTrueOrFalse.png
index e6fcd8d302eb..cf6bbc28d5b8 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenIsPasswordTrueOrFalse.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenIsPasswordTrueOrFalse.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenTextColorSetCorrectly.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenTextColorSetCorrectly.png
index e0a1271163d2..e705b5ffe910 100644
Binary files a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenTextColorSetCorrectly.png and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTextWhenTextColorSetCorrectly.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ClearButtonVisiblityButton_TextEmpty.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ClearButtonVisiblityButton_TextEmpty.png
index 5a03a3efbf5e..1ca127e0b45d 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ClearButtonVisiblityButton_TextEmpty.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/ClearButtonVisiblityButton_TextEmpty.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/PlaceholderWithClearButtonVisible.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/PlaceholderWithClearButtonVisible.png
index 8cdcbe372aaa..6a84a668ca49 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/PlaceholderWithClearButtonVisible.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/PlaceholderWithClearButtonVisible.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png
index c9ba8145803c..78244fad36db 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyPlaceholderWhenFlowDirectionSet.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyPlaceholderWhenFlowDirectionSet.png
index 7a97f5342c2f..4ea537ac66ed 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyPlaceholderWhenFlowDirectionSet.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyPlaceholderWhenFlowDirectionSet.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyPlaceholderWithFontAttributes.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyPlaceholderWithFontAttributes.png
index 71fbb2bcea48..4ccf69aaad3c 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyPlaceholderWithFontAttributes.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyPlaceholderWithFontAttributes.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyPlaceholderWithFontFamily.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyPlaceholderWithFontFamily.png
index ff028040947c..465e00250fff 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyPlaceholderWithFontFamily.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyPlaceholderWithFontFamily.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyPlaceholderWithFontSize.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyPlaceholderWithFontSize.png
index 814b073ed32a..6ef5aaffaa5e 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyPlaceholderWithFontSize.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyPlaceholderWithFontSize.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyPlaceholderWithHorizontalAlignment.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyPlaceholderWithHorizontalAlignment.png
index 4fdbd1ddfc2a..1b1d9d7ab418 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyPlaceholderWithHorizontalAlignment.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyPlaceholderWithHorizontalAlignment.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyTextWhenFontAttributesSet.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyTextWhenFontAttributesSet.png
index 468b4ff02c83..be6b9b64802d 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyTextWhenFontAttributesSet.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyTextWhenFontAttributesSet.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyTextWhenFontFamilySetValue.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyTextWhenFontFamilySetValue.png
index 601d0441c22b..3d5d797f0f04 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyTextWhenFontFamilySetValue.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyTextWhenFontFamilySetValue.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyTextWhenFontSizeSetCorrectly.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyTextWhenFontSizeSetCorrectly.png
index 54d2fa8fbf97..70a77804799c 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyTextWhenFontSizeSetCorrectly.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyTextWhenFontSizeSetCorrectly.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyTextWhenKeyboardTypeSet.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyTextWhenKeyboardTypeSet.png
index 32e91cf48a98..3155c011ecb0 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyTextWhenKeyboardTypeSet.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyTextWhenKeyboardTypeSet.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyTextWhenReturnTypeSet.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyTextWhenReturnTypeSet.png
index 3c5e7d1ec2d2..d92eadfecfbd 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyTextWhenReturnTypeSet.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-26/VerifyTextWhenReturnTypeSet.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ClearButtonVisiblityButton_TextEmpty.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ClearButtonVisiblityButton_TextEmpty.png
index f0188bcb6bbd..c65925ad328f 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ClearButtonVisiblityButton_TextEmpty.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ClearButtonVisiblityButton_TextEmpty.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/PlaceholderWithClearButtonVisible.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/PlaceholderWithClearButtonVisible.png
index cfb877e9d67f..60e9011e2c90 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/PlaceholderWithClearButtonVisible.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/PlaceholderWithClearButtonVisible.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyClearVisiblityButtonWhenTextColorChanged.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyClearVisiblityButtonWhenTextColorChanged.png
index 3399eb244c1e..5b8f2aa9bdf4 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyClearVisiblityButtonWhenTextColorChanged.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyClearVisiblityButtonWhenTextColorChanged.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png
index 0eaffb29fbbc..5a16ddaa3fc5 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyHorizontalTextAlignmentWhenVerticalTextAlignmentSet.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWhenFlowDirectionSet.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWhenFlowDirectionSet.png
index b2f2f066b84a..0285b32d7e9d 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWhenFlowDirectionSet.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWhenFlowDirectionSet.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithCharacterSpacing.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithCharacterSpacing.png
index 6cd2bb046fc9..1c8ef01d2316 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithCharacterSpacing.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithCharacterSpacing.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithFontAttributes.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithFontAttributes.png
index 346e93680b26..c15ae591e1f1 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithFontAttributes.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithFontAttributes.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithFontFamily.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithFontFamily.png
index dd8654576064..755d7b777996 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithFontFamily.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithFontFamily.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithFontSize.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithFontSize.png
index 4af66e4ca877..75fe68764094 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithFontSize.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithFontSize.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithHorizontalAlignment.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithHorizontalAlignment.png
index 77d1d7e88b2f..6a9f710b987a 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithHorizontalAlignment.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyPlaceholderWithHorizontalAlignment.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenClearButtonVisibleSetNever.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenClearButtonVisibleSetNever.png
index 75b1e9602c27..9fe76a6187f9 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenClearButtonVisibleSetNever.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenClearButtonVisibleSetNever.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenFontAttributesSet.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenFontAttributesSet.png
index 7b36e9780bbe..5acbff7aeb59 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenFontAttributesSet.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenFontAttributesSet.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenFontFamilySetValue.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenFontFamilySetValue.png
index cb9d160a91d7..c6a00685dd24 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenFontFamilySetValue.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenFontFamilySetValue.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenFontSizeSetCorrectly.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenFontSizeSetCorrectly.png
index e25ecef34666..9290510f7748 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenFontSizeSetCorrectly.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenFontSizeSetCorrectly.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenKeyboardTypeSet.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenKeyboardTypeSet.png
index 96b5837a77f8..db4272ff3ae3 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenKeyboardTypeSet.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenKeyboardTypeSet.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenReturnTypeSet.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenReturnTypeSet.png
index 0011d2802ed1..919924ead811 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenReturnTypeSet.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTextWhenReturnTypeSet.png differ
diff --git a/src/Core/src/Handlers/Button/ButtonHandler.cs b/src/Core/src/Handlers/Button/ButtonHandler.cs
index 89e0ce92b1bc..76e5fe4c51fd 100644
--- a/src/Core/src/Handlers/Button/ButtonHandler.cs
+++ b/src/Core/src/Handlers/Button/ButtonHandler.cs
@@ -27,10 +27,10 @@ public partial class ButtonHandler : IButtonHandler
 
 		public static IPropertyMapper<ITextButton, IButtonHandler> TextButtonMapper = new PropertyMapper<ITextButton, IButtonHandler>()
 		{
+			[nameof(IText.Text)] = MapText,
 			[nameof(ITextStyle.CharacterSpacing)] = MapCharacterSpacing,
 			[nameof(ITextStyle.Font)] = MapFont,
 			[nameof(ITextStyle.TextColor)] = MapTextColor,
-			[nameof(IText.Text)] = MapText
 		};
 
 		public static IPropertyMapper<IButton, IButtonHandler> Mapper = new PropertyMapper<IButton, IButtonHandler>(TextButtonMapper, ImageButtonMapper, ViewHandler.ViewMapper)
diff --git a/src/Core/src/Handlers/Button/ButtonHandler.iOS.cs b/src/Core/src/Handlers/Button/ButtonHandler.iOS.cs
index 678e953c4acc..e623987f874b 100644
--- a/src/Core/src/Handlers/Button/ButtonHandler.iOS.cs
+++ b/src/Core/src/Handlers/Button/ButtonHandler.iOS.cs
@@ -103,8 +103,11 @@ public static void MapText(IButtonHandler handler, IText button)
 		{
 			handler.PlatformView?.UpdateText(button);
 
-			// Any text update requires that we update any attributed string formatting
-			MapFormatting(handler, button);
+			if (!handler.IsConnectingHandler())
+			{
+				// Any text update requires that we update any attributed string formatting
+				MapFormatting(handler, button);
+			}
 		}
 
 		public static void MapTextColor(IButtonHandler handler, ITextStyle button)
@@ -141,10 +144,13 @@ public static void MapFont(IButtonHandler handler, ITextStyle button)
 			handler.PlatformView?.UpdateFont(button, fontManager);
 		}
 
+		// NOTE: This method routes through UpdateValue() rather than calling platform methods
+		// directly. This means any AppendToMapping/ModifyMapping customizations on CharacterSpacing
+		// will also fire here. This is intentional for extensibility and mirrors the EntryHandler pattern.
 		public static void MapFormatting(IButtonHandler handler, IText button)
 		{
 			// Update all of the attributed text formatting properties
-			handler.PlatformView?.UpdateCharacterSpacing(button);
+			handler.UpdateValue(nameof(ITextStyle.CharacterSpacing));
 		}
 
 		public static void MapImageSource(IButtonHandler handler, IImage image) =>
diff --git a/src/Core/src/Handlers/Editor/EditorHandler.cs b/src/Core/src/Handlers/Editor/EditorHandler.cs
index 632bcb5b28e5..1c4d469c8405 100644
--- a/src/Core/src/Handlers/Editor/EditorHandler.cs
+++ b/src/Core/src/Handlers/Editor/EditorHandler.cs
@@ -17,6 +17,9 @@ public partial class EditorHandler : IEditorHandler
 	{
 		public static IPropertyMapper<IEditor, IEditorHandler> Mapper = new PropertyMapper<IEditor, IEditorHandler>(ViewHandler.ViewMapper)
 		{
+			// Ensure Text is mapped before CharacterSpacing/MaxLength/HorizontalTextAlignment
+			// because formatting is applied to the native attributed text created by MapText.
+			[nameof(IEditor.Text)] = MapText,
 			[nameof(IEditor.Background)] = MapBackground,
 			[nameof(IEditor.CharacterSpacing)] = MapCharacterSpacing,
 			[nameof(IEditor.Font)] = MapFont,
@@ -26,7 +29,6 @@ public partial class EditorHandler : IEditorHandler
 			[nameof(IEditor.MaxLength)] = MapMaxLength,
 			[nameof(IEditor.Placeholder)] = MapPlaceholder,
 			[nameof(IEditor.PlaceholderColor)] = MapPlaceholderColor,
-			[nameof(IEditor.Text)] = MapText,
 			[nameof(IEditor.TextColor)] = MapTextColor,
 			[nameof(IEditor.HorizontalTextAlignment)] = MapHorizontalTextAlignment,
 			[nameof(IEditor.VerticalTextAlignment)] = MapVerticalTextAlignment,
diff --git a/src/Core/src/Handlers/Editor/EditorHandler.iOS.cs b/src/Core/src/Handlers/Editor/EditorHandler.iOS.cs
index d823f4254304..8719b0bd4f55 100644
--- a/src/Core/src/Handlers/Editor/EditorHandler.iOS.cs
+++ b/src/Core/src/Handlers/Editor/EditorHandler.iOS.cs
@@ -135,8 +135,11 @@ public static void MapText(IEditorHandler handler, IEditor editor)
 		{
 			handler.PlatformView?.UpdateText(editor);
 
-			// Any text update requires that we update any attributed string formatting
-			MapFormatting(handler, editor);
+			if (!handler.IsConnectingHandler())
+			{
+				// Any text update requires that we update any attributed string formatting
+				MapFormatting(handler, editor);
+			}
 		}
 
 		public static void MapBackground(IEditorHandler handler, IEditor editor)
@@ -206,12 +209,17 @@ public static void MapSelectionLength(IEditorHandler handler, IEditor editor) =>
 		public static void MapKeyboard(IEditorHandler handler, IEditor editor) =>
 			handler.PlatformView?.UpdateKeyboard(editor);
 
+		// NOTE: This method routes through UpdateValue() rather than calling platform methods
+		// directly. This means any AppendToMapping/ModifyMapping customizations on MaxLength
+		// and CharacterSpacing will also fire here. This is intentional for extensibility
+		// and mirrors the EntryHandler pattern.
 		public static void MapFormatting(IEditorHandler handler, IEditor editor)
 		{
-			handler.PlatformView?.UpdateMaxLength(editor);
+			// We update MaxLength which depends on the text
+			handler.UpdateValue(nameof(IEditor.MaxLength));
 
 			// Update all of the attributed text formatting properties
-			handler.PlatformView?.UpdateCharacterSpacing(editor);
+			handler.UpdateValue(nameof(IEditor.CharacterSpacing));
 		}
 
 		public static void MapIsEnabled(IEditorHandler handler, IEditor editor) =>
diff --git a/src/Core/src/Handlers/Entry/EntryHandler.cs b/src/Core/src/Handlers/Entry/EntryHandler.cs
index aa9347240b6e..74ac6120a758 100644
--- a/src/Core/src/Handlers/Entry/EntryHandler.cs
+++ b/src/Core/src/Handlers/Entry/EntryHandler.cs
@@ -17,20 +17,26 @@ namespace Microsoft.Maui.Handlers
 {
 	public partial class EntryHandler : IEntryHandler
 	{
-		private static readonly IPropertyMapper<IEntry, IEntryHandler> EntryPriorityMapper = new PropertyMapper<IEntry, IEntryHandler>()
+		private static readonly IPropertyMapper<IEntry, IEntryHandler> TextMapper = new PropertyMapper<IEntry, IEntryHandler>
 		{
+			// Ensure IsPassword is mapped before Text so the native field is secured before
+			// text (and any TextTransform) is applied on initial attachment
+			[nameof(IEntry.IsPassword)] = MapIsPassword,
+			// Ensure Text is mapped before LineHeight/Decorations/CharacterSpacing/HorizontalTextAlignment/TextColor/Font
+			// due to them being applied to the native object (i.e. AttributedText on iOS) created by mapping Text
+			[nameof(IEntry.Text)] = MapText,
+			[nameof(IEntry.ClearButtonVisibility)] = MapClearButtonVisibility,
 			[nameof(IEntry.MaxLength)] = MapMaxLength,
+			[nameof(IEntry.Font)] = MapFont,
+			[nameof(IEntry.CharacterSpacing)] = MapCharacterSpacing,
+			[nameof(IEntry.TextColor)] = MapTextColor,
+			[nameof(IEntry.HorizontalTextAlignment)] = MapHorizontalTextAlignment,
+			[nameof(IEntry.VerticalTextAlignment)] = MapVerticalTextAlignment,
 		};
 
-		public static IPropertyMapper<IEntry, IEntryHandler> Mapper = new PropertyMapper<IEntry, IEntryHandler>(ViewHandler.ViewMapper, EntryPriorityMapper)
+		public static IPropertyMapper<IEntry, IEntryHandler> Mapper = new PropertyMapper<IEntry, IEntryHandler>(TextMapper, ViewHandler.ViewMapper)
 		{
 			[nameof(IEntry.Background)] = MapBackground,
-			[nameof(IEntry.CharacterSpacing)] = MapCharacterSpacing,
-			[nameof(IEntry.ClearButtonVisibility)] = MapClearButtonVisibility,
-			[nameof(IEntry.Font)] = MapFont,
-			[nameof(IEntry.IsPassword)] = MapIsPassword,
-			[nameof(IEntry.HorizontalTextAlignment)] = MapHorizontalTextAlignment,
-			[nameof(IEntry.VerticalTextAlignment)] = MapVerticalTextAlignment,
 			[nameof(IEntry.IsReadOnly)] = MapIsReadOnly,
 			[nameof(IEntry.IsTextPredictionEnabled)] = MapIsTextPredictionEnabled,
 			[nameof(IEntry.IsSpellCheckEnabled)] = MapIsSpellCheckEnabled,
@@ -38,8 +44,6 @@ public partial class EntryHandler : IEntryHandler
 			[nameof(IEntry.Placeholder)] = MapPlaceholder,
 			[nameof(IEntry.PlaceholderColor)] = MapPlaceholderColor,
 			[nameof(IEntry.ReturnType)] = MapReturnType,
-			[nameof(IEntry.Text)] = MapText,
-			[nameof(IEntry.TextColor)] = MapTextColor,
 			[nameof(IEntry.CursorPosition)] = MapCursorPosition,
 			[nameof(IEntry.SelectionLength)] = MapSelectionLength
 		};
diff --git a/src/Core/src/Handlers/Entry/EntryHandler.iOS.cs b/src/Core/src/Handlers/Entry/EntryHandler.iOS.cs
index ec5779150915..6aba5fb1cd63 100644
--- a/src/Core/src/Handlers/Entry/EntryHandler.iOS.cs
+++ b/src/Core/src/Handlers/Entry/EntryHandler.iOS.cs
@@ -44,8 +44,13 @@ public static void MapText(IEntryHandler handler, IEntry entry)
 		{
 			handler.PlatformView?.UpdateText(entry);
 
-			// Any text update requires that we update any attributed string formatting
-			MapFormatting(handler, entry);
+			if (!handler.IsConnectingHandler())
+			{
+				// If we're not connecting the handler, we need to update the text formatting
+				// This is because the text may have changed, and we need to ensure that
+				// any attributed string formatting is applied correctly.
+				MapFormatting(handler, entry);
+			}
 		}
 
 		public static void MapBackground(IEntryHandler handler, IEntry entry)
@@ -129,16 +134,22 @@ public static void MapSelectionLength(IEntryHandler handler, IEntry entry) =>
 		public static void MapClearButtonVisibility(IEntryHandler handler, IEntry entry) =>
 			handler.PlatformView?.UpdateClearButtonVisibility(entry);
 
+		// NOTE: This method routes through UpdateValue() rather than calling platform methods
+		// directly. This means any AppendToMapping/ModifyMapping customizations on MaxLength,
+		// CharacterSpacing, and HorizontalTextAlignment will also fire here, and subclass
+		// overrides of MapMaxLength/MapCharacterSpacing/MapHorizontalTextAlignment will be
+		// invoked. This is intentional for extensibility but is a behavioral change vs. prior
+		// releases where MapFormatting bypassed the mapper entirely for these three properties.
 		public static void MapFormatting(IEntryHandler handler, IEntry entry)
 		{
-			handler.PlatformView?.UpdateMaxLength(entry);
+			handler.UpdateValue(nameof(IEntry.MaxLength));
 
 			// Update all of the attributed text formatting properties
-			handler.PlatformView?.UpdateCharacterSpacing(entry);
+			handler.UpdateValue(nameof(IEntry.CharacterSpacing));
 
 			// Setting any of those may have removed text alignment settings,
 			// so we need to make sure those are applied, too
-			handler.PlatformView?.UpdateHorizontalTextAlignment(entry);
+			handler.UpdateValue(nameof(IEntry.HorizontalTextAlignment));
 		}
 
 		protected virtual bool OnShouldReturn(UITextField view) =>
diff --git a/src/Core/src/Handlers/Label/LabelHandler.cs b/src/Core/src/Handlers/Label/LabelHandler.cs
index 4f56985c4e03..931997768384 100644
--- a/src/Core/src/Handlers/Label/LabelHandler.cs
+++ b/src/Core/src/Handlers/Label/LabelHandler.cs
@@ -15,8 +15,23 @@ namespace Microsoft.Maui.Handlers
 {
 	public partial class LabelHandler : ILabelHandler
 	{
-		public static IPropertyMapper<ILabel, ILabelHandler> Mapper = new PropertyMapper<ILabel, ILabelHandler>(ViewHandler.ViewMapper)
+		private static readonly IPropertyMapper<ILabel, ILabelHandler> TextMapper = new PropertyMapper<ILabel, ILabelHandler>
 		{
+			// Ensure Text is mapped before LineHeight/Decorations/CharacterSpacing/HorizontalTextAlignment/TextColor/Font
+			// due to them being applied to the native object (i.e. AttributedText on iOS) created by mapping Text
+			[nameof(ILabel.Text)] = MapText,
+			[nameof(ITextStyle.Font)] = MapFont,
+			[nameof(ILabel.LineHeight)] = MapLineHeight,
+			[nameof(ILabel.TextDecorations)] = MapTextDecorations,
+			[nameof(ITextStyle.CharacterSpacing)] = MapCharacterSpacing,
+			[nameof(ITextAlignment.HorizontalTextAlignment)] = MapHorizontalTextAlignment,
+			[nameof(ITextAlignment.VerticalTextAlignment)] = MapVerticalTextAlignment,
+			[nameof(ITextStyle.TextColor)] = MapTextColor,
+		};
+
+		public static IPropertyMapper<ILabel, ILabelHandler> Mapper = new PropertyMapper<ILabel, ILabelHandler>(TextMapper, ViewHandler.ViewMapper)
+		{
+			[nameof(ILabel.Padding)] = MapPadding,
 #if IOS || TIZEN
 			[nameof(ILabel.Background)] = MapBackground,
 			[nameof(ILabel.Opacity)] = MapOpacity,
@@ -28,15 +43,6 @@ public partial class LabelHandler : ILabelHandler
 #if TIZEN
 			[nameof(ILabel.Shadow)] = MapShadow,
 #endif
-			[nameof(ITextStyle.CharacterSpacing)] = MapCharacterSpacing,
-			[nameof(ITextStyle.Font)] = MapFont,
-			[nameof(ITextAlignment.HorizontalTextAlignment)] = MapHorizontalTextAlignment,
-			[nameof(ITextAlignment.VerticalTextAlignment)] = MapVerticalTextAlignment,
-			[nameof(ILabel.LineHeight)] = MapLineHeight,
-			[nameof(ILabel.Padding)] = MapPadding,
-			[nameof(ILabel.Text)] = MapText,
-			[nameof(ITextStyle.TextColor)] = MapTextColor,
-			[nameof(ILabel.TextDecorations)] = MapTextDecorations,
 #if ANDROID
 			[nameof(ILabel.Background)] = MapBackground,
 #endif
diff --git a/src/Core/src/Handlers/Label/LabelHandler.iOS.cs b/src/Core/src/Handlers/Label/LabelHandler.iOS.cs
index ab58f52604e7..85dd99ca7dbb 100644
--- a/src/Core/src/Handlers/Label/LabelHandler.iOS.cs
+++ b/src/Core/src/Handlers/Label/LabelHandler.iOS.cs
@@ -48,8 +48,11 @@ public static void MapText(ILabelHandler handler, ILabel label)
 		{
 			handler.PlatformView?.UpdateTextPlainText(label);
 
-			// Any text update requires that we update any attributed string formatting
-			MapFormatting(handler, label);
+			if (!handler.IsConnectingHandler())
+			{
+				// Any text update requires that we update any attributed string formatting
+				MapFormatting(handler, label);
+			}
 		}
 
 		public static void MapTextColor(ILabelHandler handler, ILabel label)
diff --git a/src/Core/src/Handlers/SearchBar/SearchBarHandler.cs b/src/Core/src/Handlers/SearchBar/SearchBarHandler.cs
index 2fa26d6010c5..d016bd592cf9 100644
--- a/src/Core/src/Handlers/SearchBar/SearchBarHandler.cs
+++ b/src/Core/src/Handlers/SearchBar/SearchBarHandler.cs
@@ -21,8 +21,10 @@ public partial class SearchBarHandler : ISearchBarHandler
 			[nameof(ISearchBar.IsEnabled)] = MapIsEnabled,
 #endif
 			[nameof(ISearchBar.Background)] = MapBackground,
-			[nameof(ISearchBar.CharacterSpacing)] = MapCharacterSpacing,
 			[nameof(ISearchBar.Font)] = MapFont,
+			[nameof(ISearchBar.Text)] = MapText,
+			[nameof(ISearchBar.TextColor)] = MapTextColor,
+			[nameof(ISearchBar.CharacterSpacing)] = MapCharacterSpacing,
 			[nameof(ITextAlignment.HorizontalTextAlignment)] = MapHorizontalTextAlignment,
 			[nameof(ITextAlignment.VerticalTextAlignment)] = MapVerticalTextAlignment,
 			[nameof(ISearchBar.IsReadOnly)] = MapIsReadOnly,
@@ -31,8 +33,6 @@ public partial class SearchBarHandler : ISearchBarHandler
 			[nameof(ISearchBar.MaxLength)] = MapMaxLength,
 			[nameof(ISearchBar.Placeholder)] = MapPlaceholder,
 			[nameof(ISearchBar.PlaceholderColor)] = MapPlaceholderColor,
-			[nameof(ISearchBar.Text)] = MapText,
-			[nameof(ISearchBar.TextColor)] = MapTextColor,
 			[nameof(ISearchBar.CursorPosition)] = MapCursorPosition,
 			[nameof(ISearchBar.SelectionLength)] = MapSelectionLength,
 			[nameof(ISearchBar.CancelButtonColor)] = MapCancelButtonColor,
diff --git a/src/Core/src/Handlers/SearchBar/SearchBarHandler.iOS.cs b/src/Core/src/Handlers/SearchBar/SearchBarHandler.iOS.cs
index d4fdacbaa286..b86b0ed5ff4f 100644
--- a/src/Core/src/Handlers/SearchBar/SearchBarHandler.iOS.cs
+++ b/src/Core/src/Handlers/SearchBar/SearchBarHandler.iOS.cs
@@ -77,8 +77,15 @@ public static void MapText(ISearchBarHandler handler, ISearchBar searchBar)
 		{
 			handler.PlatformView?.UpdateText(searchBar);
 
-			// Any text update requires that we update any attributed string formatting
-			MapFormatting(handler, searchBar);
+			if (!handler.IsConnectingHandler())
+			{
+				// If we're not connecting the handler, we need to update the text formatting.
+				// During connect, CharacterSpacing/HorizontalTextAlignment/MaxLength are applied
+				// by the normal mapper sweep after Text, so calling MapFormatting here would
+				// cause those properties to fire twice (including any AppendToMapping/ModifyMapping
+				// callbacks).
+				MapFormatting(handler, searchBar);
+			}
 		}
 
 		public static void MapPlaceholder(ISearchBarHandler handler, ISearchBar searchBar)
@@ -113,17 +120,21 @@ public static void MapCharacterSpacing(ISearchBarHandler handler, ISearchBar sea
 			handler.QueryEditor?.UpdateCharacterSpacing(searchBar);
 		}
 
+		// NOTE: This method routes through UpdateValue() rather than calling platform methods
+		// directly. This means any AppendToMapping/ModifyMapping customizations on CharacterSpacing,
+		// HorizontalTextAlignment, and MaxLength will also fire here. This is intentional for
+		// extensibility and mirrors the EntryHandler pattern.
 		public static void MapFormatting(ISearchBarHandler handler, ISearchBar searchBar)
 		{
 			// Update all of the attributed text formatting properties
-			handler.QueryEditor?.UpdateCharacterSpacing(searchBar);
+			handler.UpdateValue(nameof(ISearchBar.CharacterSpacing));
 
 			// Setting any of those may have removed text alignment settings,
 			// so we need to make sure those are applied, too
-			handler.QueryEditor?.UpdateHorizontalTextAlignment(searchBar);
+			handler.UpdateValue(nameof(ISearchBar.HorizontalTextAlignment));
 
 			// We also update MaxLength which depends on the text
-			handler.PlatformView?.UpdateMaxLength(searchBar);
+			handler.UpdateValue(nameof(ISearchBar.MaxLength));
 		}
 
 		public static void MapTextColor(ISearchBarHandler handler, ISearchBar searchBar)
diff --git a/src/Core/src/Platform/iOS/SearchBarExtensions.cs b/src/Core/src/Platform/iOS/SearchBarExtensions.cs
index a8b498e4ed62..a5f16baafeb7 100644
--- a/src/Core/src/Platform/iOS/SearchBarExtensions.cs
+++ b/src/Core/src/Platform/iOS/SearchBarExtensions.cs
@@ -80,8 +80,8 @@ public static void UpdatePlaceholder(this UISearchBar uiSearchBar, ISearchBar se
 
 			var placeholder = searchBar.Placeholder ?? string.Empty;
 			var placeholderColor = searchBar.PlaceholderColor is Color color ? color.ToPlatform() : ColorExtensions.PlaceholderColor;
-			textField.AttributedPlaceholder = new NSAttributedString(str: placeholder, foregroundColor: placeholderColor);
-			textField.AttributedPlaceholder.WithCharacterSpacing(searchBar.CharacterSpacing);
+			var attributed = new NSAttributedString(str: placeholder, foregroundColor: placeholderColor);
+			textField.AttributedPlaceholder = attributed.WithCharacterSpacing(searchBar.CharacterSpacing) ?? attributed;
 		}
 
 		public static void UpdateFont(this UISearchBar uiSearchBar, ITextStyle textStyle, IFontManager fontManager)
diff --git a/src/Core/src/Platform/iOS/TextFieldExtensions.cs b/src/Core/src/Platform/iOS/TextFieldExtensions.cs
index 7d1040697be5..c9b14a2d9bcd 100644
--- a/src/Core/src/Platform/iOS/TextFieldExtensions.cs
+++ b/src/Core/src/Platform/iOS/TextFieldExtensions.cs
@@ -105,11 +105,11 @@ public static void UpdatePlaceholder(this UITextField textField, IEntry entry, C
 			var placeholderColor = entry.PlaceholderColor;
 			var foregroundColor = placeholderColor ?? defaultPlaceholderColor;
 
-			textField.AttributedPlaceholder = foregroundColor == null
+			var attrPlaceholder = foregroundColor == null
  				? new NSAttributedString(placeholder)
  				: new NSAttributedString(str: placeholder, foregroundColor: foregroundColor.ToPlatform());
 
-			textField.AttributedPlaceholder.WithCharacterSpacing(entry.CharacterSpacing);
+			textField.AttributedPlaceholder = attrPlaceholder.WithCharacterSpacing(entry.CharacterSpacing) ?? attrPlaceholder;
 		}
 
 		public static void UpdateIsReadOnly(this UITextField textField, IEntry entry)