From 1fd66b5c24981965d0ec7da745c5c8172ba09a72 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 11 Mar 2026 10:51:45 +0100
Subject: [PATCH 1/7] [net11.0] Trimmable element handlers

Squashed for clean rebase onto net11.0.
---
 docs/design/HandlerResolution.md              |  39 ++-
 .../BordelessEntryServiceBuilder.cs           |   2 +
 .../ActivityIndicator/ActivityIndicator.cs    |   2 +
 .../Core/Application/Application.Mapper.cs    |   6 +-
 .../src/Core/Application/Application.cs       |   3 +
 src/Controls/src/Core/Border/Border.cs        |   2 +
 src/Controls/src/Core/BoxView/BoxView.cs      |   2 +
 src/Controls/src/Core/Button/Button.Mapper.cs |   7 +-
 src/Controls/src/Core/Button/Button.cs        |   2 +
 src/Controls/src/Core/Cells/Cell.cs           |   5 +
 src/Controls/src/Core/Cells/EntryCell.cs      |   5 +
 src/Controls/src/Core/Cells/ImageCell.cs      |   3 +
 src/Controls/src/Core/Cells/SwitchCell.cs     |   5 +
 src/Controls/src/Core/Cells/TextCell.cs       |   5 +
 src/Controls/src/Core/Cells/ViewCell.cs       |   5 +
 .../src/Core/CheckBox/CheckBox.Mapper.cs      |   8 +-
 src/Controls/src/Core/CheckBox/CheckBox.cs    |   2 +-
 .../Core/ContentPage/ContentPage.Mapper.cs    |   6 +-
 .../src/Core/ContentView/ContentView.cs       |   2 +
 .../src/Core/DatePicker/DatePicker.Mapper.cs  |   6 +-
 .../src/Core/DatePicker/DatePicker.cs         |  13 +
 src/Controls/src/Core/Editor/Editor.Mapper.cs |   6 +-
 src/Controls/src/Core/Editor/Editor.cs        |   8 +
 .../src/Core/Element/Element.Mapper.cs        |   9 +-
 src/Controls/src/Core/Element/Element.cs      |  41 +---
 src/Controls/src/Core/Entry/Entry.Mapper.cs   |   6 +-
 src/Controls/src/Core/Entry/Entry.cs          |   8 +
 .../src/Core/FlyoutPage/FlyoutPage.Mapper.cs  |   6 +-
 .../src/Core/FlyoutPage/FlyoutPage.cs         |   6 +
 src/Controls/src/Core/Frame/Frame.cs          |   5 +
 .../src/Core/GraphicsView/GraphicsView.cs     |   2 +
 .../Core/Hosting/AppHostBuilderExtensions.cs  | 224 +-----------------
 .../src/Core/HybridWebView/HybridWebView.cs   |   3 +
 src/Controls/src/Core/Image/Image.cs          |   2 +
 .../Core/ImageButton/ImageButton.Mapper.cs    |   6 +-
 .../src/Core/ImageButton/ImageButton.cs       |   2 +
 .../src/Core/IndicatorView/IndicatorView.cs   |   2 +
 src/Controls/src/Core/Items/CarouselView.cs   |   6 +
 src/Controls/src/Core/Items/CollectionView.cs |   5 +
 src/Controls/src/Core/Label/Label.Mapper.cs   |   8 +-
 src/Controls/src/Core/Label/Label.cs          |   7 +
 src/Controls/src/Core/Layout/Layout.Mapper.cs |   5 +-
 src/Controls/src/Core/Layout/Layout.cs        |   2 +
 src/Controls/src/Core/ListView/ListView.cs    |   6 +
 src/Controls/src/Core/Menu/MenuBar.cs         |   1 +
 src/Controls/src/Core/Menu/MenuBarItem.cs     |   1 +
 src/Controls/src/Core/Menu/MenuFlyout.cs      |   3 +
 src/Controls/src/Core/Menu/MenuFlyoutItem.cs  |   1 +
 .../src/Core/Menu/MenuFlyoutSeparator.cs      |   1 +
 .../src/Core/Menu/MenuFlyoutSubItem.cs        |   1 +
 .../NavigationPage/NavigationPage.Mapper.cs   |   6 +-
 .../src/Core/NavigationPage/NavigationPage.cs |   5 +
 src/Controls/src/Core/Page/Page.cs            |   2 +
 src/Controls/src/Core/Picker/Picker.Mapper.cs |   6 +-
 src/Controls/src/Core/Picker/Picker.cs        |   2 +
 .../src/Core/ProgressBar/ProgressBar.cs       |   2 +
 .../Core/RadioButton/RadioButton.Mapper.cs    |   6 +-
 .../src/Core/RadioButton/RadioButton.cs       |  13 +
 .../Core/RefreshView/RefreshView.Mapper.cs    |   7 +-
 .../src/Core/RefreshView/RefreshView.cs       |   1 +
 src/Controls/src/Core/RemappingHelper.cs      |  25 ++
 .../src/Core/ScrollView/ScrollView.Mapper.cs  |   6 +-
 .../src/Core/ScrollView/ScrollView.cs         |   2 +
 .../src/Core/SearchBar/SearchBar.Mapper.cs    |   7 +-
 src/Controls/src/Core/SearchBar/SearchBar.cs  |   2 +
 src/Controls/src/Core/Shape/Shape.Mapper.cs   |   6 +-
 src/Controls/src/Core/Shapes/Ellipse.cs       |   2 +
 src/Controls/src/Core/Shapes/Line.cs          |   2 +
 src/Controls/src/Core/Shapes/Path.cs          |   2 +
 src/Controls/src/Core/Shapes/Polygon.cs       |   2 +
 src/Controls/src/Core/Shapes/Polyline.cs      |   2 +
 src/Controls/src/Core/Shapes/Rectangle.cs     |   2 +
 .../src/Core/Shapes/RoundRectangle.cs         |   2 +
 src/Controls/src/Core/Shell/Shell.cs          |   6 +
 src/Controls/src/Core/Shell/ShellContent.cs   |   4 +
 src/Controls/src/Core/Shell/ShellItem.cs      |   4 +
 src/Controls/src/Core/Shell/ShellSection.cs   |   3 +
 src/Controls/src/Core/Slider/Slider.Mapper.cs |   6 +-
 src/Controls/src/Core/Slider/Slider.cs        |   2 +
 .../src/Core/Stepper/Stepper.Mapper.cs        |   6 +-
 src/Controls/src/Core/Stepper/Stepper.cs      |   2 +
 src/Controls/src/Core/SwipeView/SwipeItem.cs  |   2 +
 .../src/Core/SwipeView/SwipeItemView.cs       |   2 +
 .../src/Core/SwipeView/SwipeView.Mapper.cs    |   6 +-
 src/Controls/src/Core/SwipeView/SwipeView.cs  |   1 +
 src/Controls/src/Core/Switch/Switch.cs        |  12 +
 .../src/Core/TabbedPage/TabbedPage.Mapper.cs  |   6 +-
 .../src/Core/TabbedPage/TabbedPage.cs         |   6 +
 src/Controls/src/Core/TableView/TableView.cs  |   5 +
 .../src/Core/TemplatedView/TemplatedView.cs   |   2 +-
 .../src/Core/TimePicker/TimePicker.Mapper.cs  |   6 +-
 .../src/Core/TimePicker/TimePicker.cs         |  13 +
 .../src/Core/Toolbar/Toolbar.Mapper.cs        |   2 +-
 src/Controls/src/Core/Toolbar/Toolbar.cs      |   3 +
 .../VisualElement/VisualElement.Mapper.cs     |  40 +---
 .../src/Core/WebView/WebView.Mapper.cs        |   6 +-
 src/Controls/src/Core/WebView/WebView.cs      |   1 +
 src/Controls/src/Core/Window/Window.Mapper.cs |   6 +-
 src/Controls/src/Core/Window/Window.cs        |   1 +
 .../Xaml/Hosting/AppHostBuilderExtensions.cs  |   3 +-
 .../Core.UnitTests/VisualElementTests.cs      |  17 --
 .../ControlsDeviceTestExtensions.cs           |   1 -
 .../Handlers/Button/ButtonHandler.Windows.cs  |   2 +
 .../DatePicker/DatePickerHandler.Windows.cs   |   2 +
 .../Element/ElementHandlerAttribute.cs        |  17 +-
 .../src/Handlers/Element/RemappingHelper.cs   |  26 --
 src/Core/src/Handlers/IElementHandler.cs      |   2 +-
 .../ImageButton/ImageButtonHandler.Windows.cs |   2 +
 .../RadioButton/RadioButtonHandler.Windows.cs |   2 +
 .../Handlers/Slider/SliderHandler.Windows.cs  |   2 +
 .../Stepper/StepperHandler.Windows.cs         |   2 +
 .../Handlers/Switch/SwitchHandler.Windows.cs  |   2 +
 .../TimePicker/TimePickerHandler.Windows.cs   |   2 +
 .../src/Handlers/View/ViewHandler.Windows.cs  |  14 +-
 src/Core/src/Hosting/IMauiHandlersFactory.cs  |   1 +
 .../Hosting/Internal/MauiHandlersFactory.cs   |  79 ++++--
 .../net-android/PublicAPI.Unshipped.txt       |   3 +
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt |   3 +
 .../net-maccatalyst/PublicAPI.Unshipped.txt   |   3 +
 .../net-tizen/PublicAPI.Unshipped.txt         |   3 +
 .../net-windows/PublicAPI.Unshipped.txt       |   3 +
 .../src/PublicAPI/net/PublicAPI.Unshipped.txt |   3 +
 .../netstandard/PublicAPI.Unshipped.txt       |   3 +
 .../netstandard2.0/PublicAPI.Unshipped.txt    |   3 +
 124 files changed, 552 insertions(+), 426 deletions(-)
 create mode 100644 src/Controls/src/Core/RemappingHelper.cs
 delete mode 100644 src/Core/src/Handlers/Element/RemappingHelper.cs

diff --git a/docs/design/HandlerResolution.md b/docs/design/HandlerResolution.md
index 93a5e1db85a3..d131c69477cb 100644
--- a/docs/design/HandlerResolution.md
+++ b/docs/design/HandlerResolution.md
@@ -3,7 +3,20 @@ Handler Resolution
 
 # Introduction
 
-Handlers are the platform components used to render a cross platform `View` on the screen. Every platform registers a handler against a .NET Maui type.  
+Handlers are the platform components used to render a cross-platform `View` on the screen. Each view type is associated with a handler that knows how to create and manage the corresponding platform-native control.
+
+## Declaring a Handler with `[ElementHandler]`
+
+Most built-in .NET MAUI views declare their handler using the `[ElementHandler]` attribute directly on the view class:
+
+```csharp
+[ElementHandler(typeof(ButtonHandler))]
+public partial class Button : View, IButton { ... }
+```
+
+This is the primary mechanism for associating views with handlers. It is trimmer-safe and AOT-friendly because the handler type is statically referenced.
+
+The attribute is declared with `Inherited = false`, so each view type must explicitly declare it. However, `MauiHandlersFactory` walks the type's base class hierarchy (`Type.BaseType`) when looking for the attribute, so a base class attribute acts as a fallback for derived types that don't declare their own.
 
 ## Registering a Handler in Code
 
@@ -14,6 +27,26 @@ builder.ConfigureMauiHandlers(handlers =>
        }
 ```
 
+DI registration should only be used to override an existing `[ElementHandler]` declaration or when the element type is an interface (e.g., `IScrollView`). DI-registered handlers take priority over `[ElementHandler]` attributes when registered for the exact same type.
+
+## Resolution Order
+
+Both `MauiHandlersFactory.GetHandler(Type)` and `MauiHandlersFactory.GetHandlerType(Type)` follow the same resolution order:
+
+1. **Exact DI registration** — checks if a handler was registered for this exact type via `AddHandler`
+2. **`[ElementHandler]` attribute** — walks the type's base class hierarchy looking for the attribute
+3. **Interface-based DI registration** — uses `RegisteredHandlerServiceTypeSet` to find the best matching interface registration (e.g., a handler registered for `IScrollView` matches a `ScrollView` instance)
+4. **`IContentView` fallback** — returns `ContentViewHandler` for any `IContentView` implementation
+5. **`GetHandlerType` returns `null`** / **`GetHandler` throws `HandlerNotFoundException`** — if none of the above matched
+
+### Handler Instantiation
+
+How a handler instance is created depends on how it was resolved:
+
+- **DI-registered handlers** (steps 1 & 3): Instantiated through `MauiFactory.GetService()`, which uses `Activator.CreateInstance` on the registered `ImplementationType`, or invokes the `ImplementationFactory` delegate if one was provided.
+- **`[ElementHandler]` attribute** (step 2): Instantiated directly via `Activator.CreateInstance` — no DI involvement.
+- **Fallback in `ElementExtensions.ToHandler()`**: When `Activator.CreateInstance` fails with a `MissingMethodException` (e.g., the handler requires constructor parameters), `ActivatorUtilities.CreateInstance` is used instead, which supports constructor injection from the DI container.
+
 ## Types used in the resolution of Handlers to Views
 
 ### `MauiFactory`
@@ -34,8 +67,7 @@ public class MauiHandlersFactory : MauiFactory, IMauiHandlersFactory
 - `MauiFactory` has support for `ctor` resolution but we currently have it disabled in all cases.
   - Handlers will currently attempt to instantiate through [Extensions.DependencyInjection.ActivatorUtilities.CreateInstance](https://github.com/dotnet/maui/blob/cc53f0979baf5d6bb8a5d6bf84b64f3cf591c56f/src/Core/src/Platform/ElementExtensions.cs#L34 ) if a default constructor hasn't been created. So the ctor resolution feature of `MauiFactory` probably doesn't have any currently useful purpose.
 - `MauiFactory` currently doesn't support Scoped Services which is the main reason why we switched to `Ms.Ext.DI` for our main implementation. .NET MAUI Blazor requires Scoped Services and we've started using Scoped Services as well for multi-window.
-- `MauiFactory` retrieves all base types from the requested type and all implemented interfaces. It first iterates over base types and then if nothing is found it loops through the interfaces. The interface behavior currently leads to some odd behavior because everything implements `IView`. This means that if a handler isn't registered then `MauiFactory` just returns a random handler because technically every single handler is registered against a cross platform view that implements`IView`. https://github.com/dotnet/maui/issues/1298
-  - We should probably remove the interface matching part of `MauiFactory` 
+- `MauiFactory` retrieves the handler type registered for the requested type. Interface-based registration matching is now handled by `RegisteredHandlerServiceTypeSet`, which finds the most specific matching interface to avoid ambiguity (the old behavior of matching any `IView`-implementing interface has been fixed — see https://github.com/dotnet/maui/issues/1298).
 
 ### IMauiHandlersFactory
 
@@ -54,7 +86,6 @@ public interface IMauiHandlersFactory : IMauiFactory
     Type? GetHandlerType(Type iview);
     IElementHandler? GetHandler(Type type);
     IElementHandler? GetHandler<T>() where T : IElement;
-    IMauiHandlersCollection GetCollection();
 }
 ```
 
diff --git a/src/Controls/samples/Controls.Sample/Controls/BordelessEntry/BordelessEntryServiceBuilder.cs b/src/Controls/samples/Controls.Sample/Controls/BordelessEntry/BordelessEntryServiceBuilder.cs
index 647bd41eafe8..7599234bf010 100644
--- a/src/Controls/samples/Controls.Sample/Controls/BordelessEntry/BordelessEntryServiceBuilder.cs
+++ b/src/Controls/samples/Controls.Sample/Controls/BordelessEntry/BordelessEntryServiceBuilder.cs
@@ -57,7 +57,9 @@ public void Initialize(IServiceProvider services)
 				}
 			}
 
+#pragma warning disable CS0618 // Obsolete
 			BordelessEntryServiceBuilder.HandlersCollection ??= services.GetRequiredService<IMauiHandlersFactory>().GetCollection();
+#pragma warning restore CS0618
 
 			if (BordelessEntryServiceBuilder.PendingHandlers.Count > 0)
 			{
diff --git a/src/Controls/src/Core/ActivityIndicator/ActivityIndicator.cs b/src/Controls/src/Core/ActivityIndicator/ActivityIndicator.cs
index 0498db4a2c80..8ea14d06a9bb 100644
--- a/src/Controls/src/Core/ActivityIndicator/ActivityIndicator.cs
+++ b/src/Controls/src/Core/ActivityIndicator/ActivityIndicator.cs
@@ -3,6 +3,7 @@
 using System.Diagnostics;
 
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
 
 namespace Microsoft.Maui.Controls
 {
@@ -13,6 +14,7 @@ namespace Microsoft.Maui.Controls
 	/// This control gives a visual clue to the user that something is happening, without information about its progress.
 	/// </remarks>
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
+	[ElementHandler(typeof(ActivityIndicatorHandler))]
 	public partial class ActivityIndicator : View, IColorElement, IElementConfiguration<ActivityIndicator>, IActivityIndicator
 	{
 		/// <summary>Bindable property for <see cref="IsRunning"/>.</summary>
diff --git a/src/Controls/src/Core/Application/Application.Mapper.cs b/src/Controls/src/Core/Application/Application.Mapper.cs
index e67bb20e1151..a186f4f2c8c4 100644
--- a/src/Controls/src/Core/Application/Application.Mapper.cs
+++ b/src/Controls/src/Core/Application/Application.Mapper.cs
@@ -6,8 +6,12 @@ namespace Microsoft.Maui.Controls
 {
 	public partial class Application
 	{
-		internal static new void RemapForControls()
+		static Application()
 		{
+			// Force Element's static constructor to run first so base-level
+			// mapper remappings are applied before these Control-specific ones.
+			RemappingHelper.EnsureBaseTypeRemapped(typeof(Application), typeof(Element));
+
 			// Adjust the mappings to preserve Controls.Application legacy behaviors
 #if ANDROID
 			// There is also a mapper on Window for this property since this property is relevant at the window level for
diff --git a/src/Controls/src/Core/Application/Application.cs b/src/Controls/src/Core/Application/Application.cs
index 5e58016a9eb0..d4635c4258c8 100644
--- a/src/Controls/src/Core/Application/Application.cs
+++ b/src/Controls/src/Core/Application/Application.cs
@@ -13,11 +13,14 @@
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Handlers;
 
+using Microsoft.Maui.Handlers;
+
 namespace Microsoft.Maui.Controls
 {
 	/// <summary>
 	/// Represents the main application class that provides lifecycle management, resources, and theming.
 	/// </summary>
+	[ElementHandler(typeof(ApplicationHandler))]
 	public partial class Application : Element, IResourcesProvider, IApplicationController, IElementConfiguration<Application>, IVisualTreeElement, IApplication
 	{
 		readonly WeakEventManager _weakEventManager = new WeakEventManager();
diff --git a/src/Controls/src/Core/Border/Border.cs b/src/Controls/src/Core/Border/Border.cs
index eef7d2615adf..4d6e4aa6ade4 100644
--- a/src/Controls/src/Core/Border/Border.cs
+++ b/src/Controls/src/Core/Border/Border.cs
@@ -6,6 +6,7 @@
 using Microsoft.Maui.Controls.Shapes;
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Layouts;
+using Microsoft.Maui.Handlers;
 
 namespace Microsoft.Maui.Controls
 {
@@ -17,6 +18,7 @@ namespace Microsoft.Maui.Controls
 	/// background, shape, padding, and more to create visually rich containers.
 	/// </remarks>
 	[ContentProperty(nameof(Content))]
+	[ElementHandler(typeof(BorderHandler))]
 	public class Border : View, IContentView, IBorderView, IPaddingElement, ISafeAreaElement, ISafeAreaView2
 	{
 		float[]? _strokeDashPattern;
diff --git a/src/Controls/src/Core/BoxView/BoxView.cs b/src/Controls/src/Core/BoxView/BoxView.cs
index 8e802f72a35b..8242c51ee2ea 100644
--- a/src/Controls/src/Core/BoxView/BoxView.cs
+++ b/src/Controls/src/Core/BoxView/BoxView.cs
@@ -3,12 +3,14 @@
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Handlers;
 
 namespace Microsoft.Maui.Controls
 {
 	/// <summary>
 	/// A <see cref="View" /> used to draw a solid colored rectangle.
 	/// </summary>
+	[ElementHandler(typeof(BoxViewHandler))]
 	public partial class BoxView : View, IColorElement, ICornerElement, IElementConfiguration<BoxView>, IShapeView, IShape
 	{
 		/// <summary>Bindable property for <see cref="Color"/>.</summary>
diff --git a/src/Controls/src/Core/Button/Button.Mapper.cs b/src/Controls/src/Core/Button/Button.Mapper.cs
index 53bbdb65d5e9..f0c3b3113b7d 100644
--- a/src/Controls/src/Core/Button/Button.Mapper.cs
+++ b/src/Controls/src/Core/Button/Button.Mapper.cs
@@ -11,9 +11,12 @@ namespace Microsoft.Maui.Controls
 	public partial class Button
 	{
 		// IButton does not include the ContentType property, so we map it here to handle Image Positioning
-
-		internal new static void RemapForControls()
+		static Button()
 		{
+			// Force VisualElement's static constructor to run first so base-level
+			// mapper remappings are applied before these Control-specific ones.
+			RemappingHelper.EnsureBaseTypeRemapped(typeof(Button), typeof(VisualElement));
+
 			ButtonHandler.Mapper.ReplaceMapping<Button, IButtonHandler>(nameof(ContentLayout), MapContentLayout);
 #if IOS
 			ButtonHandler.Mapper.ReplaceMapping<Button, IButtonHandler>(nameof(Padding), MapPadding);
diff --git a/src/Controls/src/Core/Button/Button.cs b/src/Controls/src/Core/Button/Button.cs
index cc87be1f60c8..4696dea90fde 100644
--- a/src/Controls/src/Core/Button/Button.cs
+++ b/src/Controls/src/Core/Button/Button.cs
@@ -6,6 +6,7 @@
 using System.Runtime.CompilerServices;
 using System.Windows.Input;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Handlers;
 
 using Microsoft.Maui.Graphics;
 
@@ -15,6 +16,7 @@ namespace Microsoft.Maui.Controls
 	/// A button <see cref="View" /> that reacts to touch events.
 	/// </summary>
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
+	[ElementHandler(typeof(ButtonHandler))]
 	public partial class Button : View, IFontElement, ITextElement, IBorderElement, IButtonController, IElementConfiguration<Button>, IPaddingElement, IImageController, IViewController, IButtonElement, ICommandElement, IImageElement, IButton, ITextButton, IImageButton
 	{
 		const double DefaultSpacing = 10;
diff --git a/src/Controls/src/Core/Cells/Cell.cs b/src/Controls/src/Core/Cells/Cell.cs
index 683c8603ece8..44d25500bebb 100644
--- a/src/Controls/src/Core/Cells/Cell.cs
+++ b/src/Controls/src/Core/Cells/Cell.cs
@@ -11,6 +11,11 @@ namespace Microsoft.Maui.Controls
 {
 	// Don't add IElementConfiguration<Cell> because it kills performance on UWP structures that use Cells
 	/// <summary>Provides base class and capabilities for all Microsoft.Maui.Controls cells. Cells are elements meant to be added to <see cref="Microsoft.Maui.Controls.ListView"/> or <see cref="Microsoft.Maui.Controls.TableView"/>.</summary>
+#if WINDOWS || ANDROID || IOS || MACCATALYST
+#pragma warning disable CS0618 // Type or member is obsolete
+	[ElementHandler(typeof(Handlers.Compatibility.CellRenderer))]
+#pragma warning restore CS0618 // Type or member is obsolete
+#endif
 	public abstract class Cell : Element, ICellController, IFlowDirectionController, IPropertyPropagationController, IVisualController, IWindowController, IVisualTreeElement
 	{
 		/// <summary>The default height of cells.</summary>
diff --git a/src/Controls/src/Core/Cells/EntryCell.cs b/src/Controls/src/Core/Cells/EntryCell.cs
index b4dce4f6b633..6042e9db9ee9 100644
--- a/src/Controls/src/Core/Cells/EntryCell.cs
+++ b/src/Controls/src/Core/Cells/EntryCell.cs
@@ -7,6 +7,11 @@ namespace Microsoft.Maui.Controls
 {
 	/// <summary>A <see cref="Microsoft.Maui.Controls.Cell"/> with a label and a single line text entry field.</summary>
 	[Obsolete("The controls which use EntryCell (ListView and TableView) are obsolete. Please use CollectionView instead.")]
+#if WINDOWS || ANDROID || IOS || MACCATALYST
+#pragma warning disable CS0618 // Type or member is obsolete
+	[ElementHandler(typeof(Handlers.Compatibility.EntryCellRenderer))]
+#pragma warning restore CS0618 // Type or member is obsolete
+#endif
 	public class EntryCell : Cell, ITextAlignmentElement, IEntryCellController, ITextAlignment
 	{
 		/// <summary>Bindable property for <see cref="Text"/>.</summary>
diff --git a/src/Controls/src/Core/Cells/ImageCell.cs b/src/Controls/src/Core/Cells/ImageCell.cs
index 5ea33149ae3c..38e81d715fcd 100644
--- a/src/Controls/src/Core/Cells/ImageCell.cs
+++ b/src/Controls/src/Core/Cells/ImageCell.cs
@@ -5,6 +5,9 @@ namespace Microsoft.Maui.Controls
 {
 	/// <summary>A <see cref="Microsoft.Maui.Controls.TextCell"/> that has an image.</summary>
 	[Obsolete("The controls which use ImageCell (ListView and TableView) are obsolete. Please use CollectionView instead.")]
+#if WINDOWS || ANDROID || IOS || MACCATALYST
+	[ElementHandler(typeof(Handlers.Compatibility.ImageCellRenderer))]
+#endif
 	public class ImageCell : TextCell
 	{
 		/// <summary>Bindable property for <see cref="ImageSource"/>.</summary>
diff --git a/src/Controls/src/Core/Cells/SwitchCell.cs b/src/Controls/src/Core/Cells/SwitchCell.cs
index 0e2845b43871..08b8e47be580 100644
--- a/src/Controls/src/Core/Cells/SwitchCell.cs
+++ b/src/Controls/src/Core/Cells/SwitchCell.cs
@@ -6,6 +6,11 @@ namespace Microsoft.Maui.Controls
 {
 	/// <summary>A <see cref="Microsoft.Maui.Controls.Cell"/> with a label and an on/off switch.</summary>
 	[Obsolete("The controls which use SwitchCell (ListView and TableView) are obsolete. Please use CollectionView instead.")]
+#if WINDOWS || ANDROID || IOS || MACCATALYST || TIZEN
+#pragma warning disable CS0618 // Type or member is obsolete
+	[ElementHandler(typeof(Handlers.Compatibility.SwitchCellRenderer))]
+#pragma warning restore CS0618 // Type or member is obsolete
+#endif
 	public class SwitchCell : Cell
 	{
 		/// <summary>Bindable property for <see cref="On"/>.</summary>
diff --git a/src/Controls/src/Core/Cells/TextCell.cs b/src/Controls/src/Core/Cells/TextCell.cs
index 0b22d618a9f1..93a9306fff11 100644
--- a/src/Controls/src/Core/Cells/TextCell.cs
+++ b/src/Controls/src/Core/Cells/TextCell.cs
@@ -8,6 +8,11 @@ namespace Microsoft.Maui.Controls
 {
 	/// <summary>A <see cref="Microsoft.Maui.Controls.Cell"/> with primary <see cref="Microsoft.Maui.Controls.TextCell.Text"/>  and <see cref="Microsoft.Maui.Controls.TextCell.Detail"/> text.</summary>
 	[Obsolete("The controls which use TextCell (ListView and TableView) are obsolete. Please use CollectionView instead.")]
+#if WINDOWS || ANDROID || IOS || MACCATALYST
+#pragma warning disable CS0618 // Type or member is obsolete
+	[ElementHandler(typeof(Handlers.Compatibility.TextCellRenderer))]
+#pragma warning restore CS0618 // Type or member is obsolete
+#endif
 	public class TextCell : Cell, ICommandElement
 	{
 		/// <summary>Bindable property for <see cref="Command"/>.</summary>
diff --git a/src/Controls/src/Core/Cells/ViewCell.cs b/src/Controls/src/Core/Cells/ViewCell.cs
index adb4f3b5c978..419389f62333 100644
--- a/src/Controls/src/Core/Cells/ViewCell.cs
+++ b/src/Controls/src/Core/Cells/ViewCell.cs
@@ -8,6 +8,11 @@ namespace Microsoft.Maui.Controls
 	/// <summary>A <see cref="Microsoft.Maui.Controls.Cell"/> containing a developer-defined <see cref="Microsoft.Maui.Controls.View"/>.</summary>
 	[Obsolete("The controls which use ViewCell (ListView and TableView) are obsolete. Please use CollectionView instead.")]
 	[ContentProperty("View")]
+#if WINDOWS || IOS || MACCATALYST || ANDROID || TIZEN
+#pragma warning disable CS0618 // Type or member is obsolete
+	[ElementHandler(typeof(Handlers.Compatibility.ViewCellRenderer))]
+#pragma warning restore CS0618 // Type or member is obsolete
+#endif
 	public class ViewCell : Cell
 	{
 		View _view;
diff --git a/src/Controls/src/Core/CheckBox/CheckBox.Mapper.cs b/src/Controls/src/Core/CheckBox/CheckBox.Mapper.cs
index 4453b3727b7c..840aae23eea1 100644
--- a/src/Controls/src/Core/CheckBox/CheckBox.Mapper.cs
+++ b/src/Controls/src/Core/CheckBox/CheckBox.Mapper.cs
@@ -14,12 +14,10 @@ static CheckBox()
 			// Register dependency: Command depends on CommandParameter for CanExecute evaluation
 			// See https://github.com/dotnet/maui/issues/31939
 			CommandProperty.DependsOn(CommandParameterProperty);
-			RemapForControls();
-		}
 
-		private new static void RemapForControls()
-		{
-			VisualElement.RemapForControls();
+			// Force VisualElement's static constructor to run first so base-level
+			// mapper remappings are applied before these Control-specific ones.
+			RemappingHelper.EnsureBaseTypeRemapped(typeof(CheckBox), typeof(VisualElement));
 
 			CheckBoxHandler.Mapper.ReplaceMapping<ICheckBox, ICheckBoxHandler>(nameof(Color), MapColor);
 		}
diff --git a/src/Controls/src/Core/CheckBox/CheckBox.cs b/src/Controls/src/Core/CheckBox/CheckBox.cs
index 03423defc58c..15480f170c2a 100644
--- a/src/Controls/src/Core/CheckBox/CheckBox.cs
+++ b/src/Controls/src/Core/CheckBox/CheckBox.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Maui.Controls
 	/// Use the <see cref="IsChecked"/> property to determine or set the state.
 	/// </remarks>
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	[ElementHandler<CheckBoxHandler>]
+	[ElementHandler(typeof(CheckBoxHandler))]
 	public partial class CheckBox : View, IElementConfiguration<CheckBox>, IBorderElement, IColorElement, ICheckBox, ICommandElement
 	{
 		readonly Lazy<PlatformConfigurationRegistry<CheckBox>> _platformConfigurationRegistry;
diff --git a/src/Controls/src/Core/ContentPage/ContentPage.Mapper.cs b/src/Controls/src/Core/ContentPage/ContentPage.Mapper.cs
index c3d425d12c4d..fcda297e85fd 100644
--- a/src/Controls/src/Core/ContentPage/ContentPage.Mapper.cs
+++ b/src/Controls/src/Core/ContentPage/ContentPage.Mapper.cs
@@ -9,8 +9,12 @@ namespace Microsoft.Maui.Controls
 {
 	public partial class ContentPage
 	{
-		internal new static void RemapForControls()
+		static ContentPage()
 		{
+			// Force VisualElement's static constructor to run first so base-level
+			// mapper remappings are applied before these Control-specific ones.
+			RemappingHelper.EnsureBaseTypeRemapped(typeof(ContentPage), typeof(VisualElement));
+
 			PageHandler.Mapper.ReplaceMapping<ContentPage, IPageHandler>(nameof(ContentPage.HideSoftInputOnTapped), MapHideSoftInputOnTapped);
 #if IOS
 			PageHandler.Mapper.ReplaceMapping<ContentPage, IPageHandler>(PlatformConfiguration.iOSSpecific.Page.PrefersHomeIndicatorAutoHiddenProperty.PropertyName, MapPrefersHomeIndicatorAutoHidden);
diff --git a/src/Controls/src/Core/ContentView/ContentView.cs b/src/Controls/src/Core/ContentView/ContentView.cs
index ea256fa81f69..c136304ecc06 100644
--- a/src/Controls/src/Core/ContentView/ContentView.cs
+++ b/src/Controls/src/Core/ContentView/ContentView.cs
@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using Microsoft.Maui;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
 using Microsoft.Maui.Layouts;
 
 namespace Microsoft.Maui.Controls
@@ -15,6 +16,7 @@ namespace Microsoft.Maui.Controls
 	/// </remarks>
 	[ContentProperty("Content")]
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
+	[ElementHandler(typeof(ContentViewHandler))]
 	public partial class ContentView : TemplatedView, IContentView, ISafeAreaView2, ISafeAreaElement
 	{
 		/// <summary>Bindable property for <see cref="Content"/>.</summary>
diff --git a/src/Controls/src/Core/DatePicker/DatePicker.Mapper.cs b/src/Controls/src/Core/DatePicker/DatePicker.Mapper.cs
index 0f34af68f51b..a6622e0d76d9 100644
--- a/src/Controls/src/Core/DatePicker/DatePicker.Mapper.cs
+++ b/src/Controls/src/Core/DatePicker/DatePicker.Mapper.cs
@@ -6,8 +6,12 @@ namespace Microsoft.Maui.Controls
 {
 	public partial class DatePicker
 	{
-		internal static new void RemapForControls()
+		static DatePicker()
 		{
+			// Force VisualElement's static constructor to run first so base-level
+			// mapper remappings are applied before these Control-specific ones.
+			RemappingHelper.EnsureBaseTypeRemapped(typeof(DatePicker), typeof(VisualElement));
+
 			// Adjust the mappings to preserve Controls.DatePicker legacy behaviors
 #if IOS
 			DatePickerHandler.Mapper.ReplaceMapping<DatePicker, IDatePickerHandler>(PlatformConfiguration.iOSSpecific.DatePicker.UpdateModeProperty.PropertyName, MapUpdateMode);
diff --git a/src/Controls/src/Core/DatePicker/DatePicker.cs b/src/Controls/src/Core/DatePicker/DatePicker.cs
index a670a250674a..651b8cccca0b 100644
--- a/src/Controls/src/Core/DatePicker/DatePicker.cs
+++ b/src/Controls/src/Core/DatePicker/DatePicker.cs
@@ -4,6 +4,7 @@
 using System.Diagnostics;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
 
 namespace Microsoft.Maui.Controls
 {
@@ -15,6 +16,7 @@ namespace Microsoft.Maui.Controls
 	/// specified by <see cref="MinimumDate"/> and <see cref="MaximumDate"/>. The selected date is stored in the <see cref="Date"/> property.
 	/// </remarks>
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
+	[ElementHandler(typeof(DatePickerHandler))]
 	public partial class DatePicker : View, IFontElement, ITextElement, IElementConfiguration<DatePicker>, IDatePicker
 	{
 		/// <summary>Bindable property for <see cref="Format"/>.</summary>
@@ -346,5 +348,16 @@ private protected override string GetDebuggerDisplay()
 		{
 			return $"{base.GetDebuggerDisplay()}, Date = {Date}";
 		}
+
+		internal override bool TrySetValue(string text)
+		{
+			if (DateTime.TryParse(text, out DateTime dpResult))
+			{
+				Date = dpResult;
+				return true;
+			}
+
+			return false;
+		}
 	}
 }
diff --git a/src/Controls/src/Core/Editor/Editor.Mapper.cs b/src/Controls/src/Core/Editor/Editor.Mapper.cs
index 0258acedebea..7738f75f04da 100644
--- a/src/Controls/src/Core/Editor/Editor.Mapper.cs
+++ b/src/Controls/src/Core/Editor/Editor.Mapper.cs
@@ -6,8 +6,12 @@ namespace Microsoft.Maui.Controls
 {
 	public partial class Editor
 	{
-		internal static new void RemapForControls()
+		static Editor()
 		{
+			// Force VisualElement's static constructor to run first so base-level
+			// mapper remappings are applied before these Control-specific ones.
+			RemappingHelper.EnsureBaseTypeRemapped(typeof(Editor), typeof(VisualElement));
+
 			// Adjust the mappings to preserve Controls.Editor legacy behaviors
 #if WINDOWS
 			EditorHandler.Mapper.ReplaceMapping<Editor, IEditorHandler>(PlatformConfiguration.WindowsSpecific.InputView.DetectReadingOrderFromContentProperty.PropertyName, MapDetectReadingOrderFromContent);
diff --git a/src/Controls/src/Core/Editor/Editor.cs b/src/Controls/src/Core/Editor/Editor.cs
index b7f85625537d..ba21a53f275c 100644
--- a/src/Controls/src/Core/Editor/Editor.cs
+++ b/src/Controls/src/Core/Editor/Editor.cs
@@ -4,11 +4,13 @@
 using System.Runtime.CompilerServices;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
 using static Microsoft.Maui.Primitives.Dimension;
 
 namespace Microsoft.Maui.Controls
 {
 	/// <summary>A control that can edit multiple lines of text.</summary>
+	[ElementHandler(typeof(EditorHandler))]
 	public partial class Editor : InputView, IEditorController, ITextAlignmentElement, IElementConfiguration<Editor>, IEditor
 	{
 		/// <summary>Identifies the Text bindable property.</summary>
@@ -208,5 +210,11 @@ bool TheSame(double width, double otherWidth)
 					(width - otherWidth) < double.Epsilon;
 			}
 		}
+
+		internal override bool TrySetValue(string text)
+		{
+			Text = text;
+			return true;
+		}
 	}
 }
diff --git a/src/Controls/src/Core/Element/Element.Mapper.cs b/src/Controls/src/Core/Element/Element.Mapper.cs
index 2160c1b466e6..173cc93fbcc6 100644
--- a/src/Controls/src/Core/Element/Element.Mapper.cs
+++ b/src/Controls/src/Core/Element/Element.Mapper.cs
@@ -8,14 +8,7 @@ namespace Microsoft.Maui.Controls
 {
 	public partial class Element
 	{
-		static Element() => RemapIfNeeded();
-
-		internal static void RemapIfNeeded()
-		{
-			RemappingHelper.RemapIfNeeded(typeof(Element), RemapForControls);
-		}
-
-		internal static void RemapForControls()
+		static Element()
 		{
 			ViewHandler.ViewMapper.ReplaceMapping<Maui.IElement, IElementHandler>(AutomationProperties.IsInAccessibleTreeProperty.PropertyName, MapAutomationPropertiesIsInAccessibleTree);
 			ViewHandler.ViewMapper.ReplaceMapping<Maui.IElement, IElementHandler>(AutomationProperties.ExcludedWithChildrenProperty.PropertyName, MapAutomationPropertiesExcludedWithChildren);
diff --git a/src/Controls/src/Core/Element/Element.cs b/src/Controls/src/Core/Element/Element.cs
index a084ff390fee..6cdd7afe98c4 100644
--- a/src/Controls/src/Core/Element/Element.cs
+++ b/src/Controls/src/Core/Element/Element.cs
@@ -1224,46 +1224,7 @@ HandlerDisconnectPolicy IHandlerDisconnectPolicies.DisconnectPolicy
 			set => HandlerProperties.SetDisconnectPolicy(this, value);
 		}
 
-		internal virtual bool TrySetValue(string text)
-		{
-			if (this is Label label)
-			{
-				label.Text = text;
-				return true;
-			}
-			else if (this is Entry entry)
-			{
-				entry.Text = text;
-				return true;
-			}
-			else if (this is Editor editor)
-			{
-				editor.Text = text;
-				return true;
-			}
-			else if (this is Switch sw && bool.TryParse(text, out bool swResult))
-			{
-				sw.IsToggled = swResult;
-				return true;
-			}
-			else if (this is RadioButton rb && bool.TryParse(text, out bool rbResult))
-			{
-				rb.IsChecked = rbResult;
-				return true;
-			}
-			else if (this is TimePicker tp && TimeSpan.TryParse(text, out TimeSpan tpResult))
-			{
-				tp.Time = tpResult;
-				return true;
-			}
-			else if (this is DatePicker dp && DateTime.TryParse(text, out DateTime dpResult))
-			{
-				dp.Date = dpResult;
-				return true;
-			}
-
-			return false;
-		}
+		internal virtual bool TrySetValue(string text) => false;
 
 		class TemporaryWrapper : IList<Element>
 		{
diff --git a/src/Controls/src/Core/Entry/Entry.Mapper.cs b/src/Controls/src/Core/Entry/Entry.Mapper.cs
index 9acb2b4127b6..da442f1628c2 100644
--- a/src/Controls/src/Core/Entry/Entry.Mapper.cs
+++ b/src/Controls/src/Core/Entry/Entry.Mapper.cs
@@ -6,8 +6,12 @@ namespace Microsoft.Maui.Controls
 {
 	public partial class Entry
 	{
-		internal static new void RemapForControls()
+		static Entry()
 		{
+			// Force VisualElement's static constructor to run first so base-level
+			// mapper remappings are applied before these Control-specific ones.
+			RemappingHelper.EnsureBaseTypeRemapped(typeof(Entry), typeof(VisualElement));
+
 			// Adjust the mappings to preserve Controls.Entry legacy behaviors
 #if ANDROID
 			EntryHandler.Mapper.ReplaceMapping<Entry, IEntryHandler>(PlatformConfiguration.AndroidSpecific.Entry.ImeOptionsProperty.PropertyName, MapImeOptions);
diff --git a/src/Controls/src/Core/Entry/Entry.cs b/src/Controls/src/Core/Entry/Entry.cs
index 9681fd5b8ec7..5a3c9fbf45a0 100644
--- a/src/Controls/src/Core/Entry/Entry.cs
+++ b/src/Controls/src/Core/Entry/Entry.cs
@@ -3,12 +3,14 @@
 using System.ComponentModel;
 using System.Windows.Input;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Handlers;
 
 namespace Microsoft.Maui.Controls
 {
 	/// <summary>
 	/// Entry is a single line text entry. It is best used for collecting small discrete pieces of information, like usernames and passwords.
 	/// </summary>
+	[ElementHandler(typeof(EntryHandler))]
 	public partial class Entry : InputView, ITextAlignmentElement, IEntryController, IElementConfiguration<Entry>, IEntry
 	{
 		/// <summary>
@@ -200,5 +202,11 @@ void IEntry.Completed()
 		{
 			(this as IEntryController).SendCompleted();
 		}
+
+		internal override bool TrySetValue(string text)
+		{
+			Text = text;
+			return true;
+		}
 	}
 }
diff --git a/src/Controls/src/Core/FlyoutPage/FlyoutPage.Mapper.cs b/src/Controls/src/Core/FlyoutPage/FlyoutPage.Mapper.cs
index a013be611fbf..dfc4382a8d05 100644
--- a/src/Controls/src/Core/FlyoutPage/FlyoutPage.Mapper.cs
+++ b/src/Controls/src/Core/FlyoutPage/FlyoutPage.Mapper.cs
@@ -6,8 +6,12 @@ namespace Microsoft.Maui.Controls
 	/// <summary>A <see cref="Page"/> that manages two panes of information: a flyout that presents a menu or navigation, and a detail that presents the selected content.</summary>
 	public partial class FlyoutPage
 	{
-		internal new static void RemapForControls()
+		static FlyoutPage()
 		{
+			// Force VisualElement's static constructor to run first so base-level
+			// mapper remappings are applied before these Control-specific ones.
+			RemappingHelper.EnsureBaseTypeRemapped(typeof(FlyoutPage), typeof(VisualElement));
+
 			FlyoutViewHandler.Mapper.ReplaceMapping<IFlyoutView, IFlyoutViewHandler>(nameof(FlyoutLayoutBehavior), MapFlyoutLayoutBehavior);
 #if IOS
 			FlyoutViewHandler.Mapper.ReplaceMapping<IFlyoutView, IFlyoutViewHandler>(nameof(PlatformConfiguration.iOSSpecific.Page.PrefersHomeIndicatorAutoHiddenProperty), MapPrefersHomeIndicatorAutoHiddenProperty);
diff --git a/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs b/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
index 580652749e05..37faf7fb79eb 100644
--- a/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
+++ b/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
@@ -8,12 +8,18 @@
 
 using Microsoft.Maui.Devices;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
 
 namespace Microsoft.Maui.Controls
 {
 	/// <summary>A <see cref="Page"/> that manages two panes of information: a flyout that presents a menu or navigation, and a detail that presents the selected content.</summary>
 	[ContentProperty(nameof(Detail))]
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
+#if IOS || MACCATALYST
+	[ElementHandler(typeof(Handlers.Compatibility.PhoneFlyoutPageRenderer))]
+#elif WINDOWS || ANDROID || TIZEN
+	[ElementHandler(typeof(FlyoutViewHandler))]
+#endif
 	public partial class FlyoutPage : Page, IFlyoutPageController, IElementConfiguration<FlyoutPage>, IFlyoutView
 	{
 		/// <summary>Bindable property for <see cref="IsGestureEnabled"/>.</summary>
diff --git a/src/Controls/src/Core/Frame/Frame.cs b/src/Controls/src/Core/Frame/Frame.cs
index a15e72d8bbe1..ead33c5152b4 100644
--- a/src/Controls/src/Core/Frame/Frame.cs
+++ b/src/Controls/src/Core/Frame/Frame.cs
@@ -8,6 +8,11 @@ namespace Microsoft.Maui.Controls
 	/// <summary>An element containing a single child, with some framing options.</summary>
 	[ContentProperty(nameof(Content))]
 	[Obsolete("Frame is obsolete as of .NET 9. Please use Border instead.")]
+#if WINDOWS || IOS || MACCATALYST || TIZEN || ANDROID
+#pragma warning disable CS0618 // Type or member is obsolete
+	[ElementHandler(typeof(Handlers.Compatibility.FrameRenderer))]
+#pragma warning restore CS0618 // Type or member is obsolete
+#endif
 	public partial class Frame : ContentView, IElementConfiguration<Frame>, IPaddingElement, IBorderElement, IView, IContentView
 	{
 		/// <summary>Bindable property for <see cref="BorderColor"/>.</summary>
diff --git a/src/Controls/src/Core/GraphicsView/GraphicsView.cs b/src/Controls/src/Core/GraphicsView/GraphicsView.cs
index fe26385f796e..d3e1e03ebf13 100644
--- a/src/Controls/src/Core/GraphicsView/GraphicsView.cs
+++ b/src/Controls/src/Core/GraphicsView/GraphicsView.cs
@@ -1,9 +1,11 @@
 #nullable disable
 using System;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
 
 namespace Microsoft.Maui.Controls
 {
+	[ElementHandler(typeof(GraphicsViewHandler))]
 	public class GraphicsView : View, IGraphicsView
 	{
 		public event EventHandler<TouchEventArgs> StartHoverInteraction;
diff --git a/src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs b/src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs
index cb496527128f..425c950222aa 100644
--- a/src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs
+++ b/src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs
@@ -61,189 +61,6 @@ public static partial class AppHostBuilderExtensions
 		return builder;
 	}
 
-	internal static IMauiHandlersCollection AddControlsHandlers(this IMauiHandlersCollection handlersCollection)
-	{
-#if IOS || MACCATALYST
-		handlersCollection.AddHandler<CollectionView, CollectionViewHandler2>();
-		handlersCollection.AddHandler<CarouselView, CarouselViewHandler2>();
-#else
-		handlersCollection.AddHandler<CollectionView, CollectionViewHandler>();
-		handlersCollection.AddHandler<CarouselView, CarouselViewHandler>();
-#endif
-#if ANDROID
-		if (RuntimeFeature.IsMaterial3Enabled)
-		{
-			handlersCollection.AddHandler<Label, LabelHandler2>();
-			handlersCollection.AddHandler<Editor, EditorHandler2>();
-			handlersCollection.AddHandler<Picker, PickerHandler2>();
-			handlersCollection.AddHandler<RadioButton, RadioButtonHandler2>();
-			handlersCollection.AddHandler<TimePicker, TimePickerHandler2>();
-		}
-		else
-		{
-			handlersCollection.AddHandler<Label, LabelHandler>();
-			handlersCollection.AddHandler<Editor, EditorHandler>();
-			handlersCollection.AddHandler<Picker, PickerHandler>();
-			handlersCollection.AddHandler<RadioButton, RadioButtonHandler>();
-			handlersCollection.AddHandler<TimePicker, TimePickerHandler>();
-		}
-#else
-		handlersCollection.AddHandler<Label, LabelHandler>();
-		handlersCollection.AddHandler<Editor, EditorHandler>();
-		handlersCollection.AddHandler<Picker, PickerHandler>();
-		handlersCollection.AddHandler<RadioButton, RadioButtonHandler>();
-		handlersCollection.AddHandler<TimePicker, TimePickerHandler>();
-#endif
-#if ANDROID
-		if (RuntimeFeature.IsMaterial3Enabled)
-		{
-			handlersCollection.AddHandler<ProgressBar, ProgressBarHandler2>();
-		}
-		else
-		{
-			handlersCollection.AddHandler<ProgressBar, ProgressBarHandler>();
-		}
-#else
-		handlersCollection.AddHandler<ProgressBar, ProgressBarHandler>();
-#endif
-		handlersCollection.AddHandler<Application, ApplicationHandler>();
-		handlersCollection.AddHandler<BoxView, BoxViewHandler>();
-		handlersCollection.AddHandler<Button, ButtonHandler>();
-		handlersCollection.AddHandler<DatePicker, DatePickerHandler>();
-		handlersCollection.AddHandler<Entry, EntryHandler>();
-		handlersCollection.AddHandler<GraphicsView, GraphicsViewHandler>();
-		handlersCollection.AddHandler<Layout, LayoutHandler>();
-		handlersCollection.AddHandler<ScrollView, ScrollViewHandler>();
-		handlersCollection.AddHandler<SearchBar, SearchBarHandler>();
-		handlersCollection.AddHandler<Slider, SliderHandler>();
-		handlersCollection.AddHandler<Stepper, StepperHandler>();
-		handlersCollection.AddHandler<Switch, SwitchHandler>();
-		handlersCollection.AddHandler<Page, PageHandler>();
-		handlersCollection.AddHandler<WebView, WebViewHandler>();
-		if (RuntimeFeature.IsHybridWebViewSupported)
-		{
-			// NOTE: not registered under NativeAOT or TrimMode=Full scenarios
-			handlersCollection.AddHandler<HybridWebView, HybridWebViewHandler>();
-		}
-
-#if ANDROID
-		if (RuntimeFeature.IsMaterial3Enabled)
-		{
-			handlersCollection.AddHandler<ActivityIndicator, ActivityIndicatorHandler2>();
-		}
-		else
-		{
-			handlersCollection.AddHandler<ActivityIndicator, ActivityIndicatorHandler>();
-		}
-#else
-		handlersCollection.AddHandler<ActivityIndicator, ActivityIndicatorHandler>();
-#endif
-#if ANDROID
-		if (RuntimeFeature.IsMaterial3Enabled)
-		{
-			handlersCollection.AddHandler<Image, ImageHandler2>();
-		}
-		else
-		{
-			handlersCollection.AddHandler<Image, ImageHandler>();
-		}
-#else
-		handlersCollection.AddHandler<Image, ImageHandler>();
-#endif
-		handlersCollection.AddHandler<Border, BorderHandler>();
-		handlersCollection.AddHandler<IContentView, ContentViewHandler>();
-		handlersCollection.AddHandler<ContentView, ContentViewHandler>();
-		handlersCollection.AddHandler<Shapes.Ellipse, ShapeViewHandler>();
-		handlersCollection.AddHandler<Shapes.Line, LineHandler>();
-		handlersCollection.AddHandler<Shapes.Path, PathHandler>();
-		handlersCollection.AddHandler<Shapes.Polygon, PolygonHandler>();
-		handlersCollection.AddHandler<Shapes.Polyline, PolylineHandler>();
-		handlersCollection.AddHandler<Shapes.Rectangle, RectangleHandler>();
-		handlersCollection.AddHandler<Shapes.RoundRectangle, RoundRectangleHandler>();
-		handlersCollection.AddHandler<Window, WindowHandler>();
-		handlersCollection.AddHandler<ImageButton, ImageButtonHandler>();
-		handlersCollection.AddHandler<IndicatorView, IndicatorViewHandler>();
-		handlersCollection.AddHandler<RefreshView, RefreshViewHandler>();
-		handlersCollection.AddHandler<SwipeItem, SwipeItemMenuItemHandler>();
-		handlersCollection.AddHandler<SwipeView, SwipeViewHandler>();
-
-#pragma warning disable CA1416 //  'MenuBarHandler', MenuFlyoutSubItemHandler, MenuFlyoutSubItemHandler, MenuBarItemHandler is only supported on: 'ios' 13.0 and later
-		handlersCollection.AddHandler<MenuBar, MenuBarHandler>();
-		handlersCollection.AddHandler<MenuFlyoutSubItem, MenuFlyoutSubItemHandler>();
-		handlersCollection.AddHandler<MenuFlyoutSeparator, MenuFlyoutSeparatorHandler>();
-		handlersCollection.AddHandler<MenuFlyoutItem, MenuFlyoutItemHandler>();
-		handlersCollection.AddHandler<MenuBarItem, MenuBarItemHandler>();
-#pragma warning restore CA1416
-
-#if WINDOWS || ANDROID || IOS || MACCATALYST || TIZEN
-#pragma warning disable CS0618 // Type or member is obsolete
-		handlersCollection.AddHandler(typeof(ListView), typeof(Handlers.Compatibility.ListViewRenderer));
-#pragma warning restore CS0618 // Type or member is obsolete
-#if !TIZEN
-#pragma warning disable CS0618 // Type or member is obsolete
-		handlersCollection.AddHandler(typeof(Cell), typeof(Handlers.Compatibility.CellRenderer));
-#pragma warning restore CS0618 // Type or member is obsolete
-#pragma warning disable CS0618 // Type or member is obsolete
-		handlersCollection.AddHandler(typeof(ImageCell), typeof(Handlers.Compatibility.ImageCellRenderer));
-#pragma warning restore CS0618 // Type or member is obsolete
-#pragma warning disable CS0618 // Type or member is obsolete
-		handlersCollection.AddHandler(typeof(EntryCell), typeof(Handlers.Compatibility.EntryCellRenderer));
-#pragma warning restore CS0618 // Type or member is obsolete
-#pragma warning disable CS0618 // Type or member is obsolete
-		handlersCollection.AddHandler(typeof(TextCell), typeof(Handlers.Compatibility.TextCellRenderer));
-#pragma warning restore CS0618 // Type or member is obsolete
-#pragma warning disable CS0618 // Type or member is obsolete
-		handlersCollection.AddHandler(typeof(ViewCell), typeof(Handlers.Compatibility.ViewCellRenderer));
-#pragma warning restore CS0618 // Type or member is obsolete
-#pragma warning disable CS0618 // Type or member is obsolete
-		handlersCollection.AddHandler(typeof(SwitchCell), typeof(Handlers.Compatibility.SwitchCellRenderer));
-#pragma warning restore CS0618 // Type or member is obsolete
-#endif
-#pragma warning disable CS0618 // Type or member is obsolete
-		handlersCollection.AddHandler(typeof(TableView), typeof(Handlers.Compatibility.TableViewRenderer));
-#pragma warning restore CS0618 // Type or member is obsolete
-#pragma warning disable CS0618 // Type or member is obsolete
-		handlersCollection.AddHandler(typeof(Frame), typeof(Handlers.Compatibility.FrameRenderer));
-#pragma warning restore CS0618 // Type or member is obsolete
-#endif
-
-#if WINDOWS || MACCATALYST
-		handlersCollection.AddHandler(typeof(MenuFlyout), typeof(MenuFlyoutHandler));
-#endif
-
-#if IOS || MACCATALYST
-		handlersCollection.AddHandler(typeof(NavigationPage), typeof(Handlers.Compatibility.NavigationRenderer));
-		handlersCollection.AddHandler(typeof(TabbedPage), typeof(Handlers.Compatibility.TabbedRenderer));
-		handlersCollection.AddHandler(typeof(FlyoutPage), typeof(Handlers.Compatibility.PhoneFlyoutPageRenderer));
-#endif
-
-#if ANDROID || IOS || MACCATALYST || TIZEN
-		handlersCollection.AddHandler<SwipeItemView, SwipeItemViewHandler>();
-#endif
-
-#if ANDROID || IOS || MACCATALYST
-		handlersCollection.AddHandler<Shell, ShellRenderer>();
-#elif WINDOWS
-		handlersCollection.AddHandler<Shell, ShellHandler>();
-		handlersCollection.AddHandler<ShellItem, ShellItemHandler>();
-		handlersCollection.AddHandler<ShellSection, ShellSectionHandler>();
-		handlersCollection.AddHandler<ShellContent, ShellContentHandler>();
-#elif TIZEN
-		handlersCollection.AddHandler<Shell, ShellHandler>();
-		handlersCollection.AddHandler<ShellItem, ShellItemHandler>();
-		handlersCollection.AddHandler<ShellSection, ShellSectionHandler>();
-#endif
-
-#if WINDOWS || ANDROID || TIZEN
-		handlersCollection.AddHandler<NavigationPage, NavigationViewHandler>();
-		handlersCollection.AddHandler<Toolbar, ToolbarHandler>();
-		handlersCollection.AddHandler<FlyoutPage, FlyoutViewHandler>();
-		handlersCollection.AddHandler<TabbedPage, TabbedViewHandler>();
-#endif
-
-		return handlersCollection;
-	}
-
 	static MauiAppBuilder SetupDefaults(this MauiAppBuilder builder)
 	{
 #if WINDOWS || ANDROID || IOS || MACCATALYST || TIZEN
@@ -259,10 +76,9 @@ static MauiAppBuilder SetupDefaults(this MauiAppBuilder builder)
 
 		builder.ConfigureImageSourceHandlers();
 
-		builder.ConfigureMauiHandlers(handlers =>
-		{
-			handlers.AddControlsHandlers();
-		});
+		// Ensure the handlers factory is registered even though we have no handlers to add via DI.
+		// All built-in handlers are resolved via [ElementHandler] attributes on the view types.
+		builder.ConfigureMauiHandlers(configureDelegate: null);
 
 		// NOTE: not registered under NativeAOT or TrimMode=Full scenarios
 		if (RuntimeFeature.IsHybridWebViewSupported)
@@ -276,8 +92,6 @@ static MauiAppBuilder SetupDefaults(this MauiAppBuilder builder)
 		builder.Services.TryAddEnumerable(ServiceDescriptor.Transient<IMauiInitializeService, MauiControlsInitializer>());
 #endif
 
-		builder.RemapForControls();
-
 		return builder;
 	}
 
@@ -314,36 +128,4 @@ static MauiAppBuilder ConfigureImageSourceHandlers(this MauiAppBuilder builder)
 
 		return builder;
 	}
-
-	internal static MauiAppBuilder RemapForControls(this MauiAppBuilder builder)
-	{
-		// Update the mappings for IView/View to work specifically for Controls
-		Element.RemapIfNeeded();
-		Application.RemapForControls();
-		VisualElement.RemapIfNeeded();
-		Button.RemapForControls();
-		DatePicker.RemapForControls();
-		RadioButton.RemapForControls();
-		FlyoutPage.RemapForControls();
-		Toolbar.RemapForControls();
-		Window.RemapForControls();
-		Editor.RemapForControls();
-		Entry.RemapForControls();
-		SwipeView.RemapForControls();
-		Picker.RemapForControls();
-		SearchBar.RemapForControls();
-		Stepper.RemapForControls();
-		TabbedPage.RemapForControls();
-		TimePicker.RemapForControls();
-		Layout.RemapForControls();
-		ScrollView.RemapForControls();
-		RefreshView.RemapForControls();
-		Shape.RemapForControls();
-		WebView.RemapForControls();
-		ContentPage.RemapForControls();
-		ImageButton.RemapForControls();
-
-		Slider.RemapForControls();
-		return builder;
-	}
 }
diff --git a/src/Controls/src/Core/HybridWebView/HybridWebView.cs b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
index 26bd068576c4..b33d0c5946b5 100644
--- a/src/Controls/src/Core/HybridWebView/HybridWebView.cs
+++ b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
@@ -3,6 +3,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization.Metadata;
 using System.Threading.Tasks;
+using Microsoft.Maui.Handlers;
 
 namespace Microsoft.Maui.Controls
 {
@@ -10,6 +11,8 @@ namespace Microsoft.Maui.Controls
 	/// A <see cref="View"/> that presents local HTML content in a web view and allows JavaScript and C# code to
 	/// communicate by using messages and by invoking methods.
 	/// </summary>
+	[UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "HybridWebViewHandler is only instantiated when RuntimeFeature.IsHybridWebViewSupported is true.")]
+	[ElementHandler(typeof(HybridWebViewHandler))]
 	public class HybridWebView : View, IHybridWebView
 	{
 		/// <summary>Bindable property for <see cref="DefaultFile"/>.</summary>
diff --git a/src/Controls/src/Core/Image/Image.cs b/src/Controls/src/Core/Image/Image.cs
index 8253c09b6313..11b5251e4d21 100644
--- a/src/Controls/src/Core/Image/Image.cs
+++ b/src/Controls/src/Core/Image/Image.cs
@@ -2,6 +2,7 @@
 using System;
 using System.ComponentModel;
 using System.Diagnostics;
+using Microsoft.Maui.Handlers;
 
 
 namespace Microsoft.Maui.Controls
@@ -14,6 +15,7 @@ namespace Microsoft.Maui.Controls
 	/// Use the <see cref="Source"/> property to specify the image, and the <see cref="Aspect"/> property to control how the image is scaled.
 	/// </remarks>
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
+	[ElementHandler(typeof(ImageHandler))]
 	public partial class Image : View, IImageController, IElementConfiguration<Image>, IViewController, IImageElement, IImage
 	{
 		/// <summary>Bindable property for <see cref="Source"/>.</summary>
diff --git a/src/Controls/src/Core/ImageButton/ImageButton.Mapper.cs b/src/Controls/src/Core/ImageButton/ImageButton.Mapper.cs
index 3e7367ffabf1..17d1275a362b 100644
--- a/src/Controls/src/Core/ImageButton/ImageButton.Mapper.cs
+++ b/src/Controls/src/Core/ImageButton/ImageButton.Mapper.cs
@@ -2,8 +2,12 @@ namespace Microsoft.Maui.Controls
 {
 	public partial class ImageButton
 	{
-		internal new static void RemapForControls()
+		static ImageButton()
 		{
+			// Force VisualElement's static constructor to run first so base-level
+			// mapper remappings are applied before these Control-specific ones.
+			RemappingHelper.EnsureBaseTypeRemapped(typeof(ImageButton), typeof(VisualElement));
+
 #if ANDROID
 			ImageButtonHandler.Mapper.ReplaceMapping<ImageButton, IImageButtonHandler>(PlatformConfiguration.AndroidSpecific.ImageButton.RippleColorProperty.PropertyName, MapRippleColor);
 			ImageButtonHandler.Mapper.AppendToMapping<ImageButton, IImageButtonHandler>(nameof(Background), MapRippleColor);
diff --git a/src/Controls/src/Core/ImageButton/ImageButton.cs b/src/Controls/src/Core/ImageButton/ImageButton.cs
index 706cc5b7fbac..3a53b448173e 100644
--- a/src/Controls/src/Core/ImageButton/ImageButton.cs
+++ b/src/Controls/src/Core/ImageButton/ImageButton.cs
@@ -7,6 +7,7 @@
 using System.Windows.Input;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
 
 namespace Microsoft.Maui.Controls
 {
@@ -17,6 +18,7 @@ namespace Microsoft.Maui.Controls
 	/// <see cref="ImageButton"/> is similar to <see cref="Button"/> but displays an image instead of text.
 	/// It supports all standard button features including commands, events, borders, and visual states.
 	/// </remarks>
+	[ElementHandler(typeof(ImageButtonHandler))]
 	public partial class ImageButton : View, IImageController, IElementConfiguration<ImageButton>, IBorderElement, IButtonController, IViewController, IPaddingElement, IButtonElement, ICommandElement, IImageElement, IImageButton
 	{
 		const int DefaultCornerRadius = -1;
diff --git a/src/Controls/src/Core/IndicatorView/IndicatorView.cs b/src/Controls/src/Core/IndicatorView/IndicatorView.cs
index 961d99bb11d3..80f0f0588a5b 100644
--- a/src/Controls/src/Core/IndicatorView/IndicatorView.cs
+++ b/src/Controls/src/Core/IndicatorView/IndicatorView.cs
@@ -4,6 +4,7 @@
 using System.Collections.Specialized;
 using System.Diagnostics;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Handlers;
 
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Layouts;
@@ -20,6 +21,7 @@ namespace Microsoft.Maui.Controls
 	/// </remarks>
 	[ContentProperty(nameof(IndicatorLayout))]
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
+	[ElementHandler(typeof(IndicatorViewHandler))]
 	public partial class IndicatorView : TemplatedView, ITemplatedIndicatorView
 	{
 		const int DefaultPadding = 4;
diff --git a/src/Controls/src/Core/Items/CarouselView.cs b/src/Controls/src/Core/Items/CarouselView.cs
index 2039736d9304..390bae90cb88 100644
--- a/src/Controls/src/Core/Items/CarouselView.cs
+++ b/src/Controls/src/Core/Items/CarouselView.cs
@@ -8,6 +8,7 @@
 using System.Runtime.CompilerServices;
 using System.Windows.Input;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Handlers;
 
 namespace Microsoft.Maui.Controls
 {
@@ -20,6 +21,11 @@ namespace Microsoft.Maui.Controls
 	/// <see cref="CarouselView"/> enforces single-item snap points and provides additional features like looping
 	/// and position tracking.
 	/// </remarks>
+#if IOS || MACCATALYST
+	[ElementHandler(typeof(Handlers.Items2.CarouselViewHandler2))]
+#else
+	[ElementHandler(typeof(Handlers.Items.CarouselViewHandler))]
+#endif
 	public class CarouselView : ItemsView
 	{
 		/// <summary>
diff --git a/src/Controls/src/Core/Items/CollectionView.cs b/src/Controls/src/Core/Items/CollectionView.cs
index 7b8f412cbd1f..105608b9158d 100644
--- a/src/Controls/src/Core/Items/CollectionView.cs
+++ b/src/Controls/src/Core/Items/CollectionView.cs
@@ -9,6 +9,11 @@
 namespace Microsoft.Maui.Controls
 {
 	/// <summary>A <see cref="Microsoft.Maui.Controls.SelectableItemsView"/> that presents a collection of items.</summary>
+#if IOS || MACCATALYST
+	[ElementHandler(typeof(Handlers.Items2.CollectionViewHandler2))]
+#else
+	[ElementHandler(typeof(Handlers.Items.CollectionViewHandler))]
+#endif
 	public class CollectionView : ReorderableItemsView
 	{
 	}
diff --git a/src/Controls/src/Core/Label/Label.Mapper.cs b/src/Controls/src/Core/Label/Label.Mapper.cs
index fc4fb4b10930..285ed91e37af 100644
--- a/src/Controls/src/Core/Label/Label.Mapper.cs
+++ b/src/Controls/src/Core/Label/Label.Mapper.cs
@@ -9,11 +9,11 @@ namespace Microsoft.Maui.Controls
 	/// <summary>A <see cref="Microsoft.Maui.Controls.View"/> that displays text.</summary>
 	public partial class Label
 	{
-		static Label() => RemapForControls();
-
-		private new static void RemapForControls()
+		static Label()
 		{
-			VisualElement.RemapIfNeeded();
+			// Force VisualElement's static constructor to run first so base-level
+			// mapper remappings are applied before these Control-specific ones.
+			RemappingHelper.EnsureBaseTypeRemapped(typeof(Label), typeof(VisualElement));
 
 			// Adjust the mappings to preserve Controls.Label legacy behaviors
 			// ILabel does not include the TextType property, so we map it here to handle HTML text
diff --git a/src/Controls/src/Core/Label/Label.cs b/src/Controls/src/Core/Label/Label.cs
index 3521cb8dc192..11efadde74ce 100644
--- a/src/Controls/src/Core/Label/Label.cs
+++ b/src/Controls/src/Core/Label/Label.cs
@@ -15,6 +15,7 @@ namespace Microsoft.Maui.Controls
 	/// <summary>A <see cref="Microsoft.Maui.Controls.View"/> that displays text.</summary>
 	[ContentProperty(nameof(Text))]
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
+	[ElementHandler(typeof(LabelHandler))]
 	public partial class Label : View, IFontElement, ITextElement, ITextAlignmentElement, ILineHeightElement, IElementConfiguration<Label>, IDecorableTextElement, IPaddingElement, ILabel
 	{
 		/// <summary>Bindable property for <see cref="HorizontalTextAlignment"/>.</summary>
@@ -498,5 +499,11 @@ private protected override string GetDebuggerDisplay()
 			var debugText = DebuggerDisplayHelpers.GetDebugText(nameof(Text), Text);
 			return $"{base.GetDebuggerDisplay()}, {debugText}";
 		}
+
+		internal override bool TrySetValue(string text)
+		{
+			Text = text;
+			return true;
+		}
 	}
 }
diff --git a/src/Controls/src/Core/Layout/Layout.Mapper.cs b/src/Controls/src/Core/Layout/Layout.Mapper.cs
index f4ad8baf70ee..d057216c3a75 100644
--- a/src/Controls/src/Core/Layout/Layout.Mapper.cs
+++ b/src/Controls/src/Core/Layout/Layout.Mapper.cs
@@ -9,8 +9,11 @@ namespace Microsoft.Maui.Controls
 {
 	public abstract partial class Layout
 	{
-		internal static new void RemapForControls()
+		static Layout()
 		{
+			// Force VisualElement's static constructor to run first so base-level
+			// mapper remappings are applied before these Control-specific ones.
+			RemappingHelper.EnsureBaseTypeRemapped(typeof(Layout), typeof(VisualElement));
 		}
 	}
 }
diff --git a/src/Controls/src/Core/Layout/Layout.cs b/src/Controls/src/Core/Layout/Layout.cs
index 14e83aa3e1b9..55bf15cb9931 100644
--- a/src/Controls/src/Core/Layout/Layout.cs
+++ b/src/Controls/src/Core/Layout/Layout.cs
@@ -9,6 +9,7 @@
 using Microsoft.Maui.Controls.Xaml.Diagnostics;
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Layouts;
+using Microsoft.Maui.Handlers;
 
 namespace Microsoft.Maui.Controls
 {
@@ -17,6 +18,7 @@ namespace Microsoft.Maui.Controls
 	/// </summary>
 	[ContentProperty(nameof(Children))]
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
+	[ElementHandler(typeof(LayoutHandler))]
 	public abstract partial class Layout : View, Maui.ILayout, IList<IView>, IBindableLayout, IPaddingElement, IVisualTreeElement, ISafeAreaView, IInputTransparentContainerElement, ISafeAreaView2, ISafeAreaElement
 	{
 		protected ILayoutManager _layoutManager;
diff --git a/src/Controls/src/Core/ListView/ListView.cs b/src/Controls/src/Core/ListView/ListView.cs
index ea1e941d3a7f..99b57d702bb0 100644
--- a/src/Controls/src/Core/ListView/ListView.cs
+++ b/src/Controls/src/Core/ListView/ListView.cs
@@ -12,11 +12,17 @@
 using Microsoft.Maui.Controls.Xaml.Diagnostics;
 using Microsoft.Maui.Devices;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
 
 namespace Microsoft.Maui.Controls
 {
 	/// <summary>An <see cref="Microsoft.Maui.Controls.ItemsView{T}"/> that displays a collection of data as a vertical list.</summary>
 	[Obsolete("ListView is deprecated. Please use CollectionView instead.")]
+#if WINDOWS || IOS || MACCATALYST || TIZEN || ANDROID
+#pragma warning disable CS0618 // Type or member is obsolete
+	[ElementHandler(typeof(Handlers.Compatibility.ListViewRenderer))]
+#pragma warning restore CS0618 // Type or member is obsolete
+#endif
 	public class ListView : ItemsView<Cell>, IListViewController, IElementConfiguration<ListView>, IVisualTreeElement
 	{
 		// The ListViewRenderer has some odd behavior with LogicalChildren
diff --git a/src/Controls/src/Core/Menu/MenuBar.cs b/src/Controls/src/Core/Menu/MenuBar.cs
index efea6758ea8e..985e5e2aa6ae 100644
--- a/src/Controls/src/Core/Menu/MenuBar.cs
+++ b/src/Controls/src/Core/Menu/MenuBar.cs
@@ -6,6 +6,7 @@
 
 namespace Microsoft.Maui.Controls
 {
+	[ElementHandler(typeof(MenuBarHandler))]
 	public partial class MenuBar : Element, IMenuBar
 	{
 		/// <summary>Bindable property for <see cref="IsEnabled"/>.</summary>
diff --git a/src/Controls/src/Core/Menu/MenuBarItem.cs b/src/Controls/src/Core/Menu/MenuBarItem.cs
index 79fbf10b92a6..04f4b07c44a1 100644
--- a/src/Controls/src/Core/Menu/MenuBarItem.cs
+++ b/src/Controls/src/Core/Menu/MenuBarItem.cs
@@ -6,6 +6,7 @@
 
 namespace Microsoft.Maui.Controls
 {
+	[ElementHandler(typeof(MenuBarItemHandler))]
 	public partial class MenuBarItem : BaseMenuItem, IMenuBarItem
 	{
 		/// <summary>Bindable property for <see cref="Text"/>.</summary>
diff --git a/src/Controls/src/Core/Menu/MenuFlyout.cs b/src/Controls/src/Core/Menu/MenuFlyout.cs
index 89ef7e78eb5c..049b821fdcf3 100644
--- a/src/Controls/src/Core/Menu/MenuFlyout.cs
+++ b/src/Controls/src/Core/Menu/MenuFlyout.cs
@@ -7,6 +7,9 @@
 namespace Microsoft.Maui.Controls
 {
 
+#if WINDOWS || MACCATALYST
+	[ElementHandler(typeof(MenuFlyoutHandler))]
+#endif
 	public class MenuFlyout : FlyoutBase, IMenuFlyout // Same pattern as MenuBarItem
 	{
 		readonly List<IMenuElement> _menus = new List<IMenuElement>();
diff --git a/src/Controls/src/Core/Menu/MenuFlyoutItem.cs b/src/Controls/src/Core/Menu/MenuFlyoutItem.cs
index 398e17be945d..d3a6b780c865 100644
--- a/src/Controls/src/Core/Menu/MenuFlyoutItem.cs
+++ b/src/Controls/src/Core/Menu/MenuFlyoutItem.cs
@@ -6,6 +6,7 @@ namespace Microsoft.Maui.Controls
 	/// <summary>
 	/// Represents a MenuFlyoutItem.
 	/// </summary>
+	[ElementHandler(typeof(MenuFlyoutItemHandler))]
 	public partial class MenuFlyoutItem : MenuItem, IMenuFlyoutItem
 	{
 		/// <summary>
diff --git a/src/Controls/src/Core/Menu/MenuFlyoutSeparator.cs b/src/Controls/src/Core/Menu/MenuFlyoutSeparator.cs
index 37ee838a9001..739be39bd8bd 100644
--- a/src/Controls/src/Core/Menu/MenuFlyoutSeparator.cs
+++ b/src/Controls/src/Core/Menu/MenuFlyoutSeparator.cs
@@ -3,6 +3,7 @@ namespace Microsoft.Maui.Controls
 	/// <summary>
 	/// Represents a horizontal line that separates items in a menu. 
 	/// </summary>
+	[ElementHandler(typeof(MenuFlyoutSeparatorHandler))]
 	public class MenuFlyoutSeparator : MenuFlyoutItem, IMenuFlyoutSeparator
 	{
 	}
diff --git a/src/Controls/src/Core/Menu/MenuFlyoutSubItem.cs b/src/Controls/src/Core/Menu/MenuFlyoutSubItem.cs
index 4d9eb8ae3b7a..49af5b95cdd7 100644
--- a/src/Controls/src/Core/Menu/MenuFlyoutSubItem.cs
+++ b/src/Controls/src/Core/Menu/MenuFlyoutSubItem.cs
@@ -4,6 +4,7 @@
 
 namespace Microsoft.Maui.Controls
 {
+	[ElementHandler(typeof(MenuFlyoutSubItemHandler))]
 	public partial class MenuFlyoutSubItem : MenuFlyoutItem, IMenuFlyoutSubItem
 	{
 		readonly List<IMenuElement> _menus = new List<IMenuElement>();
diff --git a/src/Controls/src/Core/NavigationPage/NavigationPage.Mapper.cs b/src/Controls/src/Core/NavigationPage/NavigationPage.Mapper.cs
index a3929d683eeb..a238dc2b133f 100644
--- a/src/Controls/src/Core/NavigationPage/NavigationPage.Mapper.cs
+++ b/src/Controls/src/Core/NavigationPage/NavigationPage.Mapper.cs
@@ -6,8 +6,12 @@ namespace Microsoft.Maui.Controls
 {
 	public partial class NavigationPage
 	{
-		internal static new void RemapForControls()
+		static NavigationPage()
 		{
+			// Force VisualElement's static constructor to run first so base-level
+			// mapper remappings are applied before these Control-specific ones.
+			RemappingHelper.EnsureBaseTypeRemapped(typeof(NavigationPage), typeof(VisualElement));
+
 			// Adjust the mappings to preserve Controls.NavigationPage legacy behaviors
 #if IOS
 			NavigationViewHandler.Mapper.ReplaceMapping<NavigationPage, NavigationViewHandler>(PlatformConfiguration.iOSSpecific.NavigationPage.PrefersLargeTitlesProperty.PropertyName, MapPrefersLargeTitles);
diff --git a/src/Controls/src/Core/NavigationPage/NavigationPage.cs b/src/Controls/src/Core/NavigationPage/NavigationPage.cs
index d32935873058..83077ee9cd10 100644
--- a/src/Controls/src/Core/NavigationPage/NavigationPage.cs
+++ b/src/Controls/src/Core/NavigationPage/NavigationPage.cs
@@ -12,6 +12,11 @@
 namespace Microsoft.Maui.Controls
 {
 	/// <summary>A <see cref="Microsoft.Maui.Controls.Page"/> that manages the navigation and user-experience of a stack of other pages.</summary>
+#if IOS || MACCATALYST
+	[ElementHandler(typeof(Handlers.Compatibility.NavigationRenderer))]
+#elif WINDOWS || ANDROID || TIZEN
+	[ElementHandler(typeof(NavigationViewHandler))]
+#endif
 	public partial class NavigationPage : Page, IPageContainer<Page>, IBarElement, IElementConfiguration<NavigationPage>, IStackNavigationView, IToolbarElement
 	{
 		/// <summary>Bindable property for attached property <c>BackButtonTitle</c>.</summary>
diff --git a/src/Controls/src/Core/Page/Page.cs b/src/Controls/src/Core/Page/Page.cs
index 7a182f67112e..f7ab2f585c7e 100644
--- a/src/Controls/src/Core/Page/Page.cs
+++ b/src/Controls/src/Core/Page/Page.cs
@@ -12,6 +12,7 @@
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
 
 namespace Microsoft.Maui.Controls
 {
@@ -21,6 +22,7 @@ namespace Microsoft.Maui.Controls
 	/// <remarks><see cref = "Page" /> is primarily a base class for more useful derived types. Objects that are derived from the <see cref="Page"/> class are most prominently used as the top level UI element in .NET MAUI applications. In addition to their role as the main pages of applications, <see cref="Page"/> objects and their descendants can be used with navigation classes, such as <see cref="NavigationPage"/> or <see cref="FlyoutPage"/>, among others, to provide rich user experiences that conform to the expected behaviors on each platform.
 	/// </remarks>
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
+	[ElementHandler(typeof(PageHandler))]
 	public partial class Page : VisualElement, ILayout, IPageController, IElementConfiguration<Page>, IPaddingElement, ISafeAreaView2, IView, ITitledElement, IToolbarElement, ISafeAreaView, IConstrainedView
 #if IOS
 	,IiOSPageSpecifics
diff --git a/src/Controls/src/Core/Picker/Picker.Mapper.cs b/src/Controls/src/Core/Picker/Picker.Mapper.cs
index e4c66149c5bf..99dd878db365 100644
--- a/src/Controls/src/Core/Picker/Picker.Mapper.cs
+++ b/src/Controls/src/Core/Picker/Picker.Mapper.cs
@@ -6,8 +6,12 @@ namespace Microsoft.Maui.Controls
 {
 	public partial class Picker
 	{
-		internal static new void RemapForControls()
+		static Picker()
 		{
+			// Force VisualElement's static constructor to run first so base-level
+			// mapper remappings are applied before these Control-specific ones.
+			RemappingHelper.EnsureBaseTypeRemapped(typeof(Picker), typeof(VisualElement));
+
 			// Adjust the mappings to preserve Controls.Picker legacy behaviors
 #if IOS
 			PickerHandler.Mapper.ReplaceMapping<Picker, IPickerHandler>(PlatformConfiguration.iOSSpecific.Picker.UpdateModeProperty.PropertyName, MapUpdateMode);
diff --git a/src/Controls/src/Core/Picker/Picker.cs b/src/Controls/src/Core/Picker/Picker.cs
index 2b8f363bbf52..fd8f5ad873ef 100644
--- a/src/Controls/src/Core/Picker/Picker.cs
+++ b/src/Controls/src/Core/Picker/Picker.cs
@@ -7,6 +7,7 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
+using Microsoft.Maui.Handlers;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Controls.Xaml;
 
@@ -23,6 +24,7 @@ namespace Microsoft.Maui.Controls
 	/// The visual representation is similar to an <see cref="Entry"/>, but displays a picker interface instead of a keyboard.
 	/// </remarks>
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
+	[ElementHandler(typeof(PickerHandler))]
 	public partial class Picker : View, IFontElement, ITextElement, ITextAlignmentElement, IElementConfiguration<Picker>, IPicker
 	{
 		/// <summary>Bindable property for <see cref="TextColor"/>.</summary>
diff --git a/src/Controls/src/Core/ProgressBar/ProgressBar.cs b/src/Controls/src/Core/ProgressBar/ProgressBar.cs
index 3cc4d6807eaf..166f74ef1ea0 100644
--- a/src/Controls/src/Core/ProgressBar/ProgressBar.cs
+++ b/src/Controls/src/Core/ProgressBar/ProgressBar.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
 
 namespace Microsoft.Maui.Controls
 {
@@ -16,6 +17,7 @@ namespace Microsoft.Maui.Controls
 	/// Use the <see cref="ProgressTo"/> method to animate the progress bar.
 	/// </remarks>
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
+	[ElementHandler(typeof(ProgressBarHandler))]
 	public partial class ProgressBar : View, IElementConfiguration<ProgressBar>, IProgress
 	{
 		/// <summary>Bindable property for <see cref="ProgressColor"/>.</summary>
diff --git a/src/Controls/src/Core/RadioButton/RadioButton.Mapper.cs b/src/Controls/src/Core/RadioButton/RadioButton.Mapper.cs
index 05fbf99dc26a..3f8812085c62 100644
--- a/src/Controls/src/Core/RadioButton/RadioButton.Mapper.cs
+++ b/src/Controls/src/Core/RadioButton/RadioButton.Mapper.cs
@@ -11,8 +11,12 @@ public partial class RadioButton
 	{
 		IMauiContext MauiContext => Handler?.MauiContext ?? throw new InvalidOperationException("MauiContext not set");
 
-		internal new static void RemapForControls()
+		static RadioButton()
 		{
+			// Force VisualElement's static constructor to run first so base-level
+			// mapper remappings are applied before these Control-specific ones.
+			RemappingHelper.EnsureBaseTypeRemapped(typeof(RadioButton), typeof(VisualElement));
+
 			RadioButtonHandler.Mapper.ReplaceMapping<RadioButton, IRadioButtonHandler>(nameof(IRadioButton.Content), MapContent);
 
 #if ANDROID
diff --git a/src/Controls/src/Core/RadioButton/RadioButton.cs b/src/Controls/src/Core/RadioButton/RadioButton.cs
index 37c1212ca47f..75fb4a100250 100644
--- a/src/Controls/src/Core/RadioButton/RadioButton.cs
+++ b/src/Controls/src/Core/RadioButton/RadioButton.cs
@@ -4,6 +4,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Controls.Shapes;
+using Microsoft.Maui.Handlers;
 
 using Microsoft.Maui.Devices;
 using Microsoft.Maui.Graphics;
@@ -19,6 +20,7 @@ namespace Microsoft.Maui.Controls
 	/// Use the <see cref="GroupName"/> property or <see cref="RadioButtonGroup"/> to group radio buttons together.
 	/// </remarks>
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
+	[ElementHandler(typeof(RadioButtonHandler))]
 	public partial class RadioButton : TemplatedView, IElementConfiguration<RadioButton>, ITextElement, IFontElement, IBorderElement, IRadioButton
 	{
 		/// <summary>
@@ -779,5 +781,16 @@ public object ConvertBack(object value, Type targetType, object parameter, Syste
 				throw new NotImplementedException();
 			}
 		}
+
+		internal override bool TrySetValue(string text)
+		{
+			if (bool.TryParse(text, out bool rbResult))
+			{
+				IsChecked = rbResult;
+				return true;
+			}
+
+			return false;
+		}
 	}
 }
diff --git a/src/Controls/src/Core/RefreshView/RefreshView.Mapper.cs b/src/Controls/src/Core/RefreshView/RefreshView.Mapper.cs
index 038f56fb9277..f6fc7bd0413d 100644
--- a/src/Controls/src/Core/RefreshView/RefreshView.Mapper.cs
+++ b/src/Controls/src/Core/RefreshView/RefreshView.Mapper.cs
@@ -11,10 +11,11 @@ static RefreshView()
 			// Register dependency: Command depends on CommandParameter for CanExecute evaluation
 			// See https://github.com/dotnet/maui/issues/31939
 			CommandProperty.DependsOn(CommandParameterProperty);
-		}
 
-		internal static new void RemapForControls()
-		{
+			// Force VisualElement's static constructor to run first so base-level
+			// mapper remappings are applied before these Control-specific ones.
+			RemappingHelper.EnsureBaseTypeRemapped(typeof(RefreshView), typeof(VisualElement));
+
 			// Adjust the mappings to preserve Controls.RefreshView legacy behaviors
 #if WINDOWS
 			RefreshViewHandler.Mapper.ReplaceMapping<RefreshView, IRefreshViewHandler>(PlatformConfiguration.WindowsSpecific.RefreshView.RefreshPullDirectionProperty.PropertyName, MapRefreshPullDirection);
diff --git a/src/Controls/src/Core/RefreshView/RefreshView.cs b/src/Controls/src/Core/RefreshView/RefreshView.cs
index 509cec88c683..45188c2080ba 100644
--- a/src/Controls/src/Core/RefreshView/RefreshView.cs
+++ b/src/Controls/src/Core/RefreshView/RefreshView.cs
@@ -14,6 +14,7 @@ namespace Microsoft.Maui.Controls
 	/// </summary>
 	[ContentProperty(nameof(Content))]
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
+	[ElementHandler(typeof(RefreshViewHandler))]
 	public partial class RefreshView : ContentView, IElementConfiguration<RefreshView>, IRefreshView, ICommandElement
 	{
 		readonly Lazy<PlatformConfigurationRegistry<RefreshView>> _platformConfigurationRegistry;
diff --git a/src/Controls/src/Core/RemappingHelper.cs b/src/Controls/src/Core/RemappingHelper.cs
new file mode 100644
index 000000000000..047b6ad36c42
--- /dev/null
+++ b/src/Controls/src/Core/RemappingHelper.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Maui.Controls;
+
+internal static class RemappingHelper
+{
+	/// <summary>
+	/// Ensures the static constructor of <paramref name="baseType"/> has run before the
+	/// caller's static constructor continues, so that base-level mapper remappings are
+	/// applied first. In DEBUG builds, also validates that no intermediate type in the
+	/// hierarchy is accidentally skipped.
+	/// </summary>
+	[UnconditionalSuppressMessage("Trimming", "IL2059",
+		Justification = "We intentionally trigger the static constructor of the base type to ensure mapper remappings are applied in order.")]
+	public static void EnsureBaseTypeRemapped(Type derivedType, Type baseType)
+	{
+		Debug.Assert(baseType.IsAssignableFrom(derivedType),
+			$"{baseType} is not a base class of {derivedType}.");
+
+		RuntimeHelpers.RunClassConstructor(baseType.TypeHandle);
+	}
+}
diff --git a/src/Controls/src/Core/ScrollView/ScrollView.Mapper.cs b/src/Controls/src/Core/ScrollView/ScrollView.Mapper.cs
index 0d522dbf0e56..f0b6c98e2e03 100644
--- a/src/Controls/src/Core/ScrollView/ScrollView.Mapper.cs
+++ b/src/Controls/src/Core/ScrollView/ScrollView.Mapper.cs
@@ -6,8 +6,12 @@ namespace Microsoft.Maui.Controls
 {
 	public partial class ScrollView
 	{
-		internal static new void RemapForControls()
+		static ScrollView()
 		{
+			// Force VisualElement's static constructor to run first so base-level
+			// mapper remappings are applied before these Control-specific ones.
+			RemappingHelper.EnsureBaseTypeRemapped(typeof(ScrollView), typeof(VisualElement));
+
 			// Adjust the mappings to preserve Controls.ScrollView legacy behaviors
 #if IOS
 			ScrollViewHandler.Mapper.ReplaceMapping<ScrollView, IScrollViewHandler>(PlatformConfiguration.iOSSpecific.ScrollView.ShouldDelayContentTouchesProperty.PropertyName, MapShouldDelayContentTouches);
diff --git a/src/Controls/src/Core/ScrollView/ScrollView.cs b/src/Controls/src/Core/ScrollView/ScrollView.cs
index 075b9b9d9734..f76f8934386a 100644
--- a/src/Controls/src/Core/ScrollView/ScrollView.cs
+++ b/src/Controls/src/Core/ScrollView/ScrollView.cs
@@ -5,6 +5,7 @@
 using System.Diagnostics;
 using System.Threading.Tasks;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
 using Microsoft.Maui.Layouts;
 
 namespace Microsoft.Maui.Controls
@@ -14,6 +15,7 @@ namespace Microsoft.Maui.Controls
 	/// </summary>
 	[ContentProperty(nameof(Content))]
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
+	[ElementHandler(typeof(ScrollViewHandler))]
 #pragma warning disable CS0618 // Type or member is obsolete
 	public partial class ScrollView : Compatibility.Layout, ILayout, ILayoutController, IPaddingElement, IView, IVisualTreeElement, IInputTransparentContainerElement, IScrollViewController, IElementConfiguration<ScrollView>, IFlowDirectionController, IScrollView, IContentView, ISafeAreaElement, ISafeAreaView2
 #pragma warning restore CS0618 // Type or member is obsolete
diff --git a/src/Controls/src/Core/SearchBar/SearchBar.Mapper.cs b/src/Controls/src/Core/SearchBar/SearchBar.Mapper.cs
index 3278ba05f637..6c00aaa61569 100644
--- a/src/Controls/src/Core/SearchBar/SearchBar.Mapper.cs
+++ b/src/Controls/src/Core/SearchBar/SearchBar.Mapper.cs
@@ -11,10 +11,11 @@ static SearchBar()
 			// Register dependency: SearchCommand depends on SearchCommandParameter for CanExecute evaluation
 			// See https://github.com/dotnet/maui/issues/31939
 			SearchCommandProperty.DependsOn(SearchCommandParameterProperty);
-		}
 
-		internal static new void RemapForControls()
-		{
+			// Force VisualElement's static constructor to run first so base-level
+			// mapper remappings are applied before these Control-specific ones.
+			RemappingHelper.EnsureBaseTypeRemapped(typeof(SearchBar), typeof(VisualElement));
+
 			// Adjust the mappings to preserve Controls.SearchBar legacy behaviors
 #if IOS
 			SearchBarHandler.Mapper.ReplaceMapping<SearchBar, ISearchBarHandler>(PlatformConfiguration.iOSSpecific.SearchBar.SearchBarStyleProperty.PropertyName, MapSearchBarStyle);
diff --git a/src/Controls/src/Core/SearchBar/SearchBar.cs b/src/Controls/src/Core/SearchBar/SearchBar.cs
index a9b115d3f026..ba38ea825a4f 100644
--- a/src/Controls/src/Core/SearchBar/SearchBar.cs
+++ b/src/Controls/src/Core/SearchBar/SearchBar.cs
@@ -7,6 +7,7 @@
 using Microsoft.Maui.Controls.Internals;
 
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
 
 namespace Microsoft.Maui.Controls
 {
@@ -18,6 +19,7 @@ namespace Microsoft.Maui.Controls
 	/// placeholder text, and optionally a cancel button. Use the <see cref="SearchCommand"/> to respond to search requests.
 	/// </remarks>
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
+	[ElementHandler(typeof(SearchBarHandler))]
 	public partial class SearchBar : InputView, ITextAlignmentElement, ISearchBarController, IElementConfiguration<SearchBar>, ICommandElement, ISearchBar
 	{
 		/// <summary>Bindable property for <see cref="ReturnType"/>. This is a bindable property.</summary>
diff --git a/src/Controls/src/Core/Shape/Shape.Mapper.cs b/src/Controls/src/Core/Shape/Shape.Mapper.cs
index 1aacac625557..e7807f847fd6 100644
--- a/src/Controls/src/Core/Shape/Shape.Mapper.cs
+++ b/src/Controls/src/Core/Shape/Shape.Mapper.cs
@@ -11,8 +11,12 @@ namespace Microsoft.Maui.Controls.Shapes
 {
 	public partial class Shape
 	{
-		internal new static void RemapForControls()
+		static Shape()
 		{
+			// Force VisualElement's static constructor to run first so base-level
+			// mapper remappings are applied before these Control-specific ones.
+			RemappingHelper.EnsureBaseTypeRemapped(typeof(Shape), typeof(VisualElement));
+
 			ShapeViewHandler.Mapper.ReplaceMapping<IShapeView, IShapeViewHandler>(nameof(StrokeDashArray), MapStrokeDashArray);
 		}
 	}
diff --git a/src/Controls/src/Core/Shapes/Ellipse.cs b/src/Controls/src/Core/Shapes/Ellipse.cs
index c4f7ee16e3e0..ee042ed49f3e 100644
--- a/src/Controls/src/Core/Shapes/Ellipse.cs
+++ b/src/Controls/src/Core/Shapes/Ellipse.cs
@@ -1,12 +1,14 @@
 #nullable disable
 using System.Runtime.CompilerServices;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
 
 namespace Microsoft.Maui.Controls.Shapes
 {
 	/// <summary>
 	/// A shape that draws an ellipse or circle.
 	/// </summary>
+	[ElementHandler(typeof(ShapeViewHandler))]
 	public sealed partial class Ellipse : Shape, IShape
 	{
 		/// <summary>
diff --git a/src/Controls/src/Core/Shapes/Line.cs b/src/Controls/src/Core/Shapes/Line.cs
index c445e84d4b8d..7eabebef6bfa 100644
--- a/src/Controls/src/Core/Shapes/Line.cs
+++ b/src/Controls/src/Core/Shapes/Line.cs
@@ -1,12 +1,14 @@
 #nullable disable
 using System.Runtime.CompilerServices;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Handlers;
 
 namespace Microsoft.Maui.Controls.Shapes
 {
 	/// <summary>
 	/// A shape that draws a straight line between two points.
 	/// </summary>
+	[ElementHandler(typeof(LineHandler))]
 	public sealed partial class Line : Shape, IShape
 	{
 		/// <summary>
diff --git a/src/Controls/src/Core/Shapes/Path.cs b/src/Controls/src/Core/Shapes/Path.cs
index 264c48d2875e..78a6af1bd6bb 100644
--- a/src/Controls/src/Core/Shapes/Path.cs
+++ b/src/Controls/src/Core/Shapes/Path.cs
@@ -3,12 +3,14 @@
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Handlers;
 
 namespace Microsoft.Maui.Controls.Shapes
 {
 	/// <summary>
 	/// A shape that can draw complex geometries defined by a <see cref="PathGeometry"/>.
 	/// </summary>
+	[ElementHandler(typeof(PathHandler))]
 	public sealed partial class Path : Shape, IShape
 	{
 		/// <summary>
diff --git a/src/Controls/src/Core/Shapes/Polygon.cs b/src/Controls/src/Core/Shapes/Polygon.cs
index deaf9beec541..b491ea99e58e 100644
--- a/src/Controls/src/Core/Shapes/Polygon.cs
+++ b/src/Controls/src/Core/Shapes/Polygon.cs
@@ -1,12 +1,14 @@
 #nullable disable
 using System.Runtime.CompilerServices;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Handlers;
 
 namespace Microsoft.Maui.Controls.Shapes
 {
 	/// <summary>
 	/// A shape that draws a closed polygon from a series of connected lines.
 	/// </summary>
+	[ElementHandler(typeof(PolygonHandler))]
 	public sealed partial class Polygon : Shape, IShape
 	{
 		/// <summary>
diff --git a/src/Controls/src/Core/Shapes/Polyline.cs b/src/Controls/src/Core/Shapes/Polyline.cs
index dca6af0e2296..9ed2a1de6d94 100644
--- a/src/Controls/src/Core/Shapes/Polyline.cs
+++ b/src/Controls/src/Core/Shapes/Polyline.cs
@@ -1,12 +1,14 @@
 #nullable disable
 using System.Runtime.CompilerServices;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Handlers;
 
 namespace Microsoft.Maui.Controls.Shapes
 {
 	/// <summary>
 	/// A shape that draws a series of connected straight lines. Unlike <see cref="Polygon"/>, a polyline is not automatically closed.
 	/// </summary>
+	[ElementHandler(typeof(PolylineHandler))]
 	public sealed partial class Polyline : Shape, IShape
 	{
 		/// <summary>
diff --git a/src/Controls/src/Core/Shapes/Rectangle.cs b/src/Controls/src/Core/Shapes/Rectangle.cs
index 80526ae36d15..7690ce48e621 100644
--- a/src/Controls/src/Core/Shapes/Rectangle.cs
+++ b/src/Controls/src/Core/Shapes/Rectangle.cs
@@ -2,12 +2,14 @@
 using System;
 using System.Runtime.CompilerServices;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Handlers;
 
 namespace Microsoft.Maui.Controls.Shapes
 {
 	/// <summary>
 	/// A <see cref="Shape"/> that draws a rectangle, optionally with rounded corners via <see cref="RadiusX"/> and <see cref="RadiusY"/>.
 	/// </summary>
+	[ElementHandler(typeof(RectangleHandler))]
 	public sealed partial class Rectangle : Shape, IShape
 	{
 		/// <summary>
diff --git a/src/Controls/src/Core/Shapes/RoundRectangle.cs b/src/Controls/src/Core/Shapes/RoundRectangle.cs
index e2a6cf5914c1..19e40edbd31d 100644
--- a/src/Controls/src/Core/Shapes/RoundRectangle.cs
+++ b/src/Controls/src/Core/Shapes/RoundRectangle.cs
@@ -2,9 +2,11 @@
 using System;
 using System.Runtime.CompilerServices;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Handlers;
 
 namespace Microsoft.Maui.Controls.Shapes
 {
+	[ElementHandler(typeof(RoundRectangleHandler))]
 	public sealed partial class RoundRectangle : Shape, IShape, IRoundRectangle
 	{
 		public RoundRectangle() : base()
diff --git a/src/Controls/src/Core/Shell/Shell.cs b/src/Controls/src/Core/Shell/Shell.cs
index c79b855a08e9..cd76bfc1b461 100644
--- a/src/Controls/src/Core/Shell/Shell.cs
+++ b/src/Controls/src/Core/Shell/Shell.cs
@@ -17,6 +17,7 @@
 using Microsoft.Maui.Controls.Xaml.Diagnostics;
 using Microsoft.Maui.Devices;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
 
 namespace Microsoft.Maui.Controls
 {
@@ -25,6 +26,11 @@ namespace Microsoft.Maui.Controls
 	/// </summary>
 	[ContentProperty(nameof(Items))]
 	[DebuggerTypeProxy(typeof(ShellDebugView))]
+#if ANDROID || IOS || MACCATALYST
+	[ElementHandler(typeof(Handlers.Compatibility.ShellRenderer))]
+#elif WINDOWS || TIZEN
+	[ElementHandler(typeof(Handlers.ShellHandler))]
+#endif
 	public partial class Shell : Page, IShellController, IPropertyPropagationController, IPageContainer<Page>, IFlyoutView
 	{
 		/// <summary>
diff --git a/src/Controls/src/Core/Shell/ShellContent.cs b/src/Controls/src/Core/Shell/ShellContent.cs
index 68c3f10a8ceb..634914e813aa 100644
--- a/src/Controls/src/Core/Shell/ShellContent.cs
+++ b/src/Controls/src/Core/Shell/ShellContent.cs
@@ -6,6 +6,7 @@
 using System.ComponentModel;
 using System.Reflection;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Handlers;
 
 namespace Microsoft.Maui.Controls
 {
@@ -14,6 +15,9 @@ namespace Microsoft.Maui.Controls
 	/// </summary>
 	[ContentProperty(nameof(Content))]
 	[TypeConverter(typeof(ShellContentConverter))]
+#if WINDOWS
+	[ElementHandler(typeof(Handlers.ShellContentHandler))]
+#endif
 	public class ShellContent : BaseShellItem, IShellContentController, IVisualTreeElement
 	{
 		static readonly BindablePropertyKey MenuItemsPropertyKey =
diff --git a/src/Controls/src/Core/Shell/ShellItem.cs b/src/Controls/src/Core/Shell/ShellItem.cs
index f78b8d535c26..2325f3081438 100644
--- a/src/Controls/src/Core/Shell/ShellItem.cs
+++ b/src/Controls/src/Core/Shell/ShellItem.cs
@@ -9,6 +9,7 @@
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Handlers;
 
 namespace Microsoft.Maui.Controls
 {
@@ -16,6 +17,9 @@ namespace Microsoft.Maui.Controls
 	/// Represents a flyout menu item in a <see cref="Shell"/> application.
 	/// </summary>
 	[EditorBrowsable(EditorBrowsableState.Always)]
+#if WINDOWS || TIZEN
+	[ElementHandler(typeof(Handlers.ShellItemHandler))]
+#endif
 	public class FlyoutItem : ShellItem
 	{
 		/// <summary>The style class for flyout item labels.</summary>
diff --git a/src/Controls/src/Core/Shell/ShellSection.cs b/src/Controls/src/Core/Shell/ShellSection.cs
index 76ca2919b6c0..2591f67a2aa2 100644
--- a/src/Controls/src/Core/Shell/ShellSection.cs
+++ b/src/Controls/src/Core/Shell/ShellSection.cs
@@ -28,6 +28,9 @@ public class Tab : ShellSection
 	[EditorBrowsable(EditorBrowsableState.Never)]
 	[TypeConverter(typeof(ShellSectionTypeConverter))]
 	[DebuggerTypeProxy(typeof(ShellSectionDebugView))]
+#if WINDOWS || TIZEN
+	[ElementHandler(typeof(Handlers.ShellSectionHandler))]
+#endif
 	public partial class ShellSection : ShellGroupItem, IShellSectionController, IPropertyPropagationController, IVisualTreeElement, IStackNavigation
 	{
 		#region PropertyKeys
diff --git a/src/Controls/src/Core/Slider/Slider.Mapper.cs b/src/Controls/src/Core/Slider/Slider.Mapper.cs
index 65f51e9b0820..7505975e25ab 100644
--- a/src/Controls/src/Core/Slider/Slider.Mapper.cs
+++ b/src/Controls/src/Core/Slider/Slider.Mapper.cs
@@ -5,8 +5,12 @@ namespace Microsoft.Maui.Controls
 {
 	public partial class Slider
 	{
-		internal static new void RemapForControls()
+		static Slider()
 		{
+			// Force VisualElement's static constructor to run first so base-level
+			// mapper remappings are applied before these Control-specific ones.
+			RemappingHelper.EnsureBaseTypeRemapped(typeof(Slider), typeof(VisualElement));
+
 			// Adjust the mappings to preserve Controls.Slider legacy behaviors
 #if IOS
 			SliderHandler.Mapper.ReplaceMapping<Slider, ISliderHandler>(PlatformConfiguration.iOSSpecific.Slider.UpdateOnTapProperty.PropertyName, MapUpdateOnTap);
diff --git a/src/Controls/src/Core/Slider/Slider.cs b/src/Controls/src/Core/Slider/Slider.cs
index 6de035d3214f..9db550a1f761 100644
--- a/src/Controls/src/Core/Slider/Slider.cs
+++ b/src/Controls/src/Core/Slider/Slider.cs
@@ -3,6 +3,7 @@
 using System.Diagnostics;
 using System.Windows.Input;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
 
 namespace Microsoft.Maui.Controls
 {
@@ -15,6 +16,7 @@ namespace Microsoft.Maui.Controls
 	/// and the <see cref="Value"/> property to get or set the current selection.
 	/// </remarks>
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
+	[ElementHandler(typeof(SliderHandler))]
 	public partial class Slider : View, ISliderController, IElementConfiguration<Slider>, ISlider
 	{
 		// Stores the value that was requested by the user, before clamping
diff --git a/src/Controls/src/Core/Stepper/Stepper.Mapper.cs b/src/Controls/src/Core/Stepper/Stepper.Mapper.cs
index c2fe437207a3..30fdf11ffd69 100644
--- a/src/Controls/src/Core/Stepper/Stepper.Mapper.cs
+++ b/src/Controls/src/Core/Stepper/Stepper.Mapper.cs
@@ -4,8 +4,12 @@ namespace Microsoft.Maui.Controls;
 
 public partial class Stepper
 {
-	internal static new void RemapForControls()
+	static Stepper()
 	{
+		// Force VisualElement's static constructor to run first so base-level
+		// mapper remappings are applied before these Control-specific ones.
+		RemappingHelper.EnsureBaseTypeRemapped(typeof(Stepper), typeof(VisualElement));
+
 		StepperHandler.Mapper.AppendToMapping(nameof(Stepper.Increment), MapInterval);
 	}
 
diff --git a/src/Controls/src/Core/Stepper/Stepper.cs b/src/Controls/src/Core/Stepper/Stepper.cs
index b6bc864590c4..6db2b08a112b 100644
--- a/src/Controls/src/Core/Stepper/Stepper.cs
+++ b/src/Controls/src/Core/Stepper/Stepper.cs
@@ -3,6 +3,7 @@
 using System.Diagnostics;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
 
 namespace Microsoft.Maui.Controls
 {
@@ -14,6 +15,7 @@ namespace Microsoft.Maui.Controls
 	/// The value is constrained between <see cref="Minimum"/> and <see cref="Maximum"/>.
 	/// </remarks>
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
+	[ElementHandler(typeof(StepperHandler))]
 	public partial class Stepper : View, IElementConfiguration<Stepper>, IStepper
 	{
 		// Stores the value that was requested by the user, before clamping
diff --git a/src/Controls/src/Core/SwipeView/SwipeItem.cs b/src/Controls/src/Core/SwipeView/SwipeItem.cs
index c295bc49362d..bfb86368fc43 100644
--- a/src/Controls/src/Core/SwipeView/SwipeItem.cs
+++ b/src/Controls/src/Core/SwipeView/SwipeItem.cs
@@ -2,12 +2,14 @@
 using System;
 using System.ComponentModel;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
 
 namespace Microsoft.Maui.Controls
 {
 	/// <summary>
 	/// Represents a menu item displayed in a <see cref="SwipeView"/> when the view is swiped.
 	/// </summary>
+	[ElementHandler(typeof(SwipeItemMenuItemHandler))]
 	public partial class SwipeItem : MenuItem, Controls.ISwipeItem, Maui.ISwipeItemMenuItem
 	{
 		/// <summary>Bindable property for <see cref="BackgroundColor"/>.</summary>
diff --git a/src/Controls/src/Core/SwipeView/SwipeItemView.cs b/src/Controls/src/Core/SwipeView/SwipeItemView.cs
index 346ada5523f6..a3bd7f72ba76 100644
--- a/src/Controls/src/Core/SwipeView/SwipeItemView.cs
+++ b/src/Controls/src/Core/SwipeView/SwipeItemView.cs
@@ -2,6 +2,7 @@
 using System;
 using System.ComponentModel;
 using System.Windows.Input;
+using Microsoft.Maui.Handlers;
 
 namespace Microsoft.Maui.Controls
 {
@@ -9,6 +10,7 @@ namespace Microsoft.Maui.Controls
 	/// Represents a swipe item that displays custom content in a <see cref="SwipeView"/>.
 	/// </summary>
 	[ContentProperty(nameof(Content))]
+	[ElementHandler(typeof(SwipeItemViewHandler))]
 	public partial class SwipeItemView : ContentView, Controls.ISwipeItem, Maui.ISwipeItemView
 	{
 		/// <summary>Bindable property for <see cref="Command"/>.</summary>
diff --git a/src/Controls/src/Core/SwipeView/SwipeView.Mapper.cs b/src/Controls/src/Core/SwipeView/SwipeView.Mapper.cs
index d555790e5b0c..4e7006efbff1 100644
--- a/src/Controls/src/Core/SwipeView/SwipeView.Mapper.cs
+++ b/src/Controls/src/Core/SwipeView/SwipeView.Mapper.cs
@@ -5,8 +5,12 @@ namespace Microsoft.Maui.Controls
 {
 	public partial class SwipeView
 	{
-		internal static new void RemapForControls()
+		static SwipeView()
 		{
+			// Force VisualElement's static constructor to run first so base-level
+			// mapper remappings are applied before these Control-specific ones.
+			RemappingHelper.EnsureBaseTypeRemapped(typeof(SwipeView), typeof(VisualElement));
+
 			// Adjusted the mapping to preserve SwipeView.Entry legacy behavior
 			SwipeViewHandler.Mapper.AppendToMapping<SwipeView, ISwipeViewHandler>(nameof(Background), MapBackground);
 		}
diff --git a/src/Controls/src/Core/SwipeView/SwipeView.cs b/src/Controls/src/Core/SwipeView/SwipeView.cs
index d0bb86c0534d..6b9efa9d31d6 100644
--- a/src/Controls/src/Core/SwipeView/SwipeView.cs
+++ b/src/Controls/src/Core/SwipeView/SwipeView.cs
@@ -11,6 +11,7 @@ namespace Microsoft.Maui.Controls
 	/// Represents a view that provides context-specific swipe interactions.
 	/// </summary>
 	[ContentProperty(nameof(Content))]
+	[ElementHandler(typeof(SwipeViewHandler))]
 	public partial class SwipeView : ContentView, IElementConfiguration<SwipeView>, ISwipeViewController, ISwipeView, IVisualTreeElement
 	{
 		readonly Lazy<PlatformConfigurationRegistry<SwipeView>> _platformConfigurationRegistry;
diff --git a/src/Controls/src/Core/Switch/Switch.cs b/src/Controls/src/Core/Switch/Switch.cs
index b988bdc84aa6..473123255c80 100644
--- a/src/Controls/src/Core/Switch/Switch.cs
+++ b/src/Controls/src/Core/Switch/Switch.cs
@@ -14,6 +14,7 @@ namespace Microsoft.Maui.Controls
 	/// Use the <see cref="IsToggled"/> property to determine or set the current state.
 	/// </remarks>
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
+	[ElementHandler(typeof(SwitchHandler))]
 	public partial class Switch : View, IElementConfiguration<Switch>, ISwitch
 	{
 		/// <summary>
@@ -163,5 +164,16 @@ private protected override string GetDebuggerDisplay()
 		{
 			return $"{base.GetDebuggerDisplay()}, IsToggled = {IsToggled}";
 		}
+
+		internal override bool TrySetValue(string text)
+		{
+			if (bool.TryParse(text, out bool swResult))
+			{
+				IsToggled = swResult;
+				return true;
+			}
+
+			return false;
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/TabbedPage/TabbedPage.Mapper.cs b/src/Controls/src/Core/TabbedPage/TabbedPage.Mapper.cs
index 89d49d5d073b..1b8be98c2ef0 100644
--- a/src/Controls/src/Core/TabbedPage/TabbedPage.Mapper.cs
+++ b/src/Controls/src/Core/TabbedPage/TabbedPage.Mapper.cs
@@ -8,8 +8,12 @@ namespace Microsoft.Maui.Controls
 {
 	public partial class TabbedPage
 	{
-		internal new static void RemapForControls()
+		static TabbedPage()
 		{
+			// Force VisualElement's static constructor to run first so base-level
+			// mapper remappings are applied before these Control-specific ones.
+			RemappingHelper.EnsureBaseTypeRemapped(typeof(TabbedPage), typeof(VisualElement));
+
 			TabbedViewHandler.Mapper.ReplaceMapping<TabbedPage, ITabbedViewHandler>(nameof(BarBackground), MapBarBackground);
 			TabbedViewHandler.Mapper.ReplaceMapping<TabbedPage, ITabbedViewHandler>(nameof(BarBackgroundColor), MapBarBackgroundColor);
 			TabbedViewHandler.Mapper.ReplaceMapping<TabbedPage, ITabbedViewHandler>(nameof(BarTextColor), MapBarTextColor);
diff --git a/src/Controls/src/Core/TabbedPage/TabbedPage.cs b/src/Controls/src/Core/TabbedPage/TabbedPage.cs
index dd27c460bf0a..fc1fbb3b52af 100644
--- a/src/Controls/src/Core/TabbedPage/TabbedPage.cs
+++ b/src/Controls/src/Core/TabbedPage/TabbedPage.cs
@@ -1,11 +1,17 @@
 #nullable disable
 using System;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
 
 namespace Microsoft.Maui.Controls
 {
 	/// <summary>A <see cref="MultiPage{T}"/> that displays an array of tabs across the top of the screen, each of which loads content onto the screen.</summary>
 	[ContentProperty(nameof(Children))]
+#if IOS || MACCATALYST
+	[ElementHandler(typeof(Handlers.Compatibility.NavigationRenderer))]
+#elif WINDOWS || ANDROID || TIZEN
+	[ElementHandler(typeof(TabbedViewHandler))]
+#endif
 	public partial class TabbedPage : MultiPage<Page>, IBarElement, IElementConfiguration<TabbedPage>, ITabbedView
 	{
 		/// <summary>Bindable property for <see cref="BarBackgroundColor"/>.</summary>
diff --git a/src/Controls/src/Core/TableView/TableView.cs b/src/Controls/src/Core/TableView/TableView.cs
index b13cf3880148..d74768710504 100644
--- a/src/Controls/src/Core/TableView/TableView.cs
+++ b/src/Controls/src/Core/TableView/TableView.cs
@@ -16,6 +16,11 @@ namespace Microsoft.Maui.Controls
 	/// </summary>
 	[Obsolete("Please use CollectionView instead.")]
 	[ContentProperty(nameof(Root))]
+#if WINDOWS || IOS || MACCATALYST || TIZEN || ANDROID
+#pragma warning disable CS0618 // Type or member is obsolete
+	[ElementHandler(typeof(Handlers.Compatibility.TableViewRenderer))]
+#pragma warning restore CS0618 // Type or member is obsolete
+#endif
 	public class TableView : View, ITableViewController, IElementConfiguration<TableView>, IVisualTreeElement
 	{
 		/// <summary>Bindable property for <see cref="RowHeight"/>.</summary>
diff --git a/src/Controls/src/Core/TemplatedView/TemplatedView.cs b/src/Controls/src/Core/TemplatedView/TemplatedView.cs
index 6b97e4a637b0..ca45a3dbefd4 100644
--- a/src/Controls/src/Core/TemplatedView/TemplatedView.cs
+++ b/src/Controls/src/Core/TemplatedView/TemplatedView.cs
@@ -13,8 +13,8 @@ namespace Microsoft.Maui.Controls
 	/// </summary>
 #pragma warning disable CS0618 // Type or member is obsolete
 	public partial class TemplatedView : Compatibility.Layout, ILayout, ILayoutController, IPaddingElement, IView, IVisualTreeElement, IInputTransparentContainerElement, IControlTemplated, IContentView, IClippedToBoundsElement
+#pragma warning restore CS0618 // Type or member is obsolete
 	{
-#pragma warning restore CS0618
 		/// <summary>Bindable property for <see cref="ControlTemplate"/>.</summary>
 		public static readonly BindableProperty ControlTemplateProperty = BindableProperty.Create(nameof(ControlTemplate), typeof(ControlTemplate), typeof(TemplatedView), null,
 			propertyChanged: TemplateUtilities.OnControlTemplateChanged);
diff --git a/src/Controls/src/Core/TimePicker/TimePicker.Mapper.cs b/src/Controls/src/Core/TimePicker/TimePicker.Mapper.cs
index 6f6592039c46..0c62fbdef7a9 100644
--- a/src/Controls/src/Core/TimePicker/TimePicker.Mapper.cs
+++ b/src/Controls/src/Core/TimePicker/TimePicker.Mapper.cs
@@ -5,8 +5,12 @@ namespace Microsoft.Maui.Controls
 {
 	public partial class TimePicker
 	{
-		internal static new void RemapForControls()
+		static TimePicker()
 		{
+			// Force VisualElement's static constructor to run first so base-level
+			// mapper remappings are applied before these Control-specific ones.
+			RemappingHelper.EnsureBaseTypeRemapped(typeof(TimePicker), typeof(VisualElement));
+
 			// Adjust the mappings to preserve Controls.TimePicker legacy behaviors
 #if IOS
 			TimePickerHandler.Mapper.ReplaceMapping<TimePicker, ITimePickerHandler>(PlatformConfiguration.iOSSpecific.TimePicker.UpdateModeProperty.PropertyName, MapUpdateMode);
diff --git a/src/Controls/src/Core/TimePicker/TimePicker.cs b/src/Controls/src/Core/TimePicker/TimePicker.cs
index 7eb2f28e5036..52e57294b7e5 100644
--- a/src/Controls/src/Core/TimePicker/TimePicker.cs
+++ b/src/Controls/src/Core/TimePicker/TimePicker.cs
@@ -4,6 +4,7 @@
 using System.Diagnostics;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
 
 namespace Microsoft.Maui.Controls
 {
@@ -16,6 +17,7 @@ namespace Microsoft.Maui.Controls
 	/// The visual representation is similar to an <see cref="Entry"/>, but displays a time picker interface instead of a keyboard.
 	/// </remarks>
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
+	[ElementHandler(typeof(TimePickerHandler))]
 	public partial class TimePicker : View, IFontElement, ITextElement, IElementConfiguration<TimePicker>, ITimePicker
 	{
 		/// <summary>Bindable property for <see cref="Format"/>.</summary>
@@ -250,5 +252,16 @@ private protected override string GetDebuggerDisplay()
 		{
 			return $"{base.GetDebuggerDisplay()}, Time = {Time}";
 		}
+
+		internal override bool TrySetValue(string text)
+		{
+			if (TimeSpan.TryParse(text, out TimeSpan tpResult))
+			{
+				Time = tpResult;
+				return true;
+			}
+
+			return false;
+		}
 	}
 }
diff --git a/src/Controls/src/Core/Toolbar/Toolbar.Mapper.cs b/src/Controls/src/Core/Toolbar/Toolbar.Mapper.cs
index e21ca43cb708..49c327590860 100644
--- a/src/Controls/src/Core/Toolbar/Toolbar.Mapper.cs
+++ b/src/Controls/src/Core/Toolbar/Toolbar.Mapper.cs
@@ -13,7 +13,7 @@ public partial class Toolbar
 	{
 		IMauiContext MauiContext => Handler?.MauiContext ?? throw new InvalidOperationException("MauiContext not set");
 
-		internal static void RemapForControls()
+		static Toolbar()
 		{
 #if ANDROID || WINDOWS || TIZEN
 			ToolbarHandler.Mapper.ReplaceMapping<Toolbar, IToolbarHandler>(nameof(IToolbar.IsVisible), MapIsVisible);
diff --git a/src/Controls/src/Core/Toolbar/Toolbar.cs b/src/Controls/src/Core/Toolbar/Toolbar.cs
index a51b4f3d1261..39e369b0c55d 100644
--- a/src/Controls/src/Core/Toolbar/Toolbar.cs
+++ b/src/Controls/src/Core/Toolbar/Toolbar.cs
@@ -8,6 +8,9 @@
 
 namespace Microsoft.Maui.Controls
 {
+#if WINDOWS || ANDROID || TIZEN
+	[ElementHandler(typeof(ToolbarHandler))]
+#endif
 	public partial class Toolbar : Maui.IToolbar, INotifyPropertyChanged
 	{
 		VisualElement _titleView;
diff --git a/src/Controls/src/Core/VisualElement/VisualElement.Mapper.cs b/src/Controls/src/Core/VisualElement/VisualElement.Mapper.cs
index fe4bfcd817e7..b98e74f3bb54 100644
--- a/src/Controls/src/Core/VisualElement/VisualElement.Mapper.cs
+++ b/src/Controls/src/Core/VisualElement/VisualElement.Mapper.cs
@@ -10,39 +10,25 @@ namespace Microsoft.Maui.Controls
 	/// </summary>
 	public partial class VisualElement
 	{
-		static VisualElement() => RemapIfNeeded();
-
-		internal static new void RemapIfNeeded()
-		{
-			RemappingHelper.RemapIfNeeded(typeof(VisualElement), RemapForControls);
-		}
-
-		internal static new void RemapForControls()
-		{
-			RemapForControls(ViewHandler.ViewMapper, ViewHandler.ViewCommandMapper);
-		}
-
-		internal static void RemapForControls(
-			IPropertyMapper<IView, IViewHandler> viewMapper,
-			CommandMapper<IView, IViewHandler> commandMapper)
+		static VisualElement()
 		{
-			Element.RemapIfNeeded();
+			RemappingHelper.EnsureBaseTypeRemapped(typeof(VisualElement), typeof(Element));
 
 #if WINDOWS
-			viewMapper.ReplaceMapping<IView, IViewHandler>(PlatformConfiguration.WindowsSpecific.VisualElement.AccessKeyHorizontalOffsetProperty.PropertyName, MapAccessKeyHorizontalOffset);
-			viewMapper.ReplaceMapping<IView, IViewHandler>(PlatformConfiguration.WindowsSpecific.VisualElement.AccessKeyPlacementProperty.PropertyName, MapAccessKeyPlacement);
-			viewMapper.ReplaceMapping<IView, IViewHandler>(PlatformConfiguration.WindowsSpecific.VisualElement.AccessKeyProperty.PropertyName, MapAccessKey);
-			viewMapper.ReplaceMapping<IView, IViewHandler>(PlatformConfiguration.WindowsSpecific.VisualElement.AccessKeyVerticalOffsetProperty.PropertyName, MapAccessKeyVerticalOffset);
+			ViewHandler.ViewMapper.ReplaceMapping<IView, IViewHandler>(PlatformConfiguration.WindowsSpecific.VisualElement.AccessKeyHorizontalOffsetProperty.PropertyName, MapAccessKeyHorizontalOffset);
+			ViewHandler.ViewMapper.ReplaceMapping<IView, IViewHandler>(PlatformConfiguration.WindowsSpecific.VisualElement.AccessKeyPlacementProperty.PropertyName, MapAccessKeyPlacement);
+			ViewHandler.ViewMapper.ReplaceMapping<IView, IViewHandler>(PlatformConfiguration.WindowsSpecific.VisualElement.AccessKeyProperty.PropertyName, MapAccessKey);
+			ViewHandler.ViewMapper.ReplaceMapping<IView, IViewHandler>(PlatformConfiguration.WindowsSpecific.VisualElement.AccessKeyVerticalOffsetProperty.PropertyName, MapAccessKeyVerticalOffset);
 #endif
-			viewMapper.ReplaceMapping<IView, IViewHandler>(nameof(BackgroundColor), MapBackgroundColor);
-			viewMapper.ReplaceMapping<IView, IViewHandler>(nameof(Page.BackgroundImageSource), MapBackgroundImageSource);
-			viewMapper.ReplaceMapping<IView, IViewHandler>(SemanticProperties.DescriptionProperty.PropertyName, MapSemanticPropertiesDescriptionProperty);
-			viewMapper.ReplaceMapping<IView, IViewHandler>(SemanticProperties.HintProperty.PropertyName, MapSemanticPropertiesHintProperty);
-			viewMapper.ReplaceMapping<IView, IViewHandler>(SemanticProperties.HeadingLevelProperty.PropertyName, MapSemanticPropertiesHeadingLevelProperty);
+			ViewHandler.ViewMapper.ReplaceMapping<IView, IViewHandler>(nameof(BackgroundColor), MapBackgroundColor);
+			ViewHandler.ViewMapper.ReplaceMapping<IView, IViewHandler>(nameof(Page.BackgroundImageSource), MapBackgroundImageSource);
+			ViewHandler.ViewMapper.ReplaceMapping<IView, IViewHandler>(SemanticProperties.DescriptionProperty.PropertyName, MapSemanticPropertiesDescriptionProperty);
+			ViewHandler.ViewMapper.ReplaceMapping<IView, IViewHandler>(SemanticProperties.HintProperty.PropertyName, MapSemanticPropertiesHintProperty);
+			ViewHandler.ViewMapper.ReplaceMapping<IView, IViewHandler>(SemanticProperties.HeadingLevelProperty.PropertyName, MapSemanticPropertiesHeadingLevelProperty);
 
-			viewMapper.AppendToMapping<VisualElement, IViewHandler>(nameof(IViewHandler.ContainerView), MapContainerView);
+			ViewHandler.ViewMapper.AppendToMapping<VisualElement, IViewHandler>(nameof(IViewHandler.ContainerView), MapContainerView);
 
-			commandMapper.ModifyMapping<VisualElement, IViewHandler>(nameof(IView.Focus), MapFocus);
+			ViewHandler.ViewCommandMapper.ModifyMapping<VisualElement, IViewHandler>(nameof(IView.Focus), MapFocus);
 		}
 
 		public static void MapBackgroundColor(IViewHandler handler, IView view) =>
diff --git a/src/Controls/src/Core/WebView/WebView.Mapper.cs b/src/Controls/src/Core/WebView/WebView.Mapper.cs
index a81cc9c6a99e..f2d8f644b2f6 100644
--- a/src/Controls/src/Core/WebView/WebView.Mapper.cs
+++ b/src/Controls/src/Core/WebView/WebView.Mapper.cs
@@ -6,8 +6,12 @@ namespace Microsoft.Maui.Controls
 {
 	public partial class WebView
 	{
-		internal static new void RemapForControls()
+		static WebView()
 		{
+			// Force VisualElement's static constructor to run first so base-level
+			// mapper remappings are applied before these Control-specific ones.
+			RemappingHelper.EnsureBaseTypeRemapped(typeof(WebView), typeof(VisualElement));
+
 			// Adjust the mappings to preserve Controls.WebView legacy behaviors
 #if ANDROID
 			WebViewHandler.Mapper.ReplaceMapping<WebView, IWebViewHandler>(PlatformConfiguration.AndroidSpecific.WebView.DisplayZoomControlsProperty.PropertyName, MapDisplayZoomControls);
diff --git a/src/Controls/src/Core/WebView/WebView.cs b/src/Controls/src/Core/WebView/WebView.cs
index 881acca37271..3eceee49a454 100644
--- a/src/Controls/src/Core/WebView/WebView.cs
+++ b/src/Controls/src/Core/WebView/WebView.cs
@@ -21,6 +21,7 @@ namespace Microsoft.Maui.Controls
 	/// The WebView supports navigation events and JavaScript evaluation.
 	/// </remarks>
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
+	[ElementHandler(typeof(WebViewHandler))]
 	public partial class WebView : View, IWebViewController, IElementConfiguration<WebView>, IWebView
 	{
 		/// <summary>Bindable property for <see cref="Source"/>.</summary>
diff --git a/src/Controls/src/Core/Window/Window.Mapper.cs b/src/Controls/src/Core/Window/Window.Mapper.cs
index 56b37abda81c..86a2b836afc0 100644
--- a/src/Controls/src/Core/Window/Window.Mapper.cs
+++ b/src/Controls/src/Core/Window/Window.Mapper.cs
@@ -7,8 +7,12 @@ namespace Microsoft.Maui.Controls
 {
 	public partial class Window
 	{
-		internal static new void RemapForControls()
+		static Window()
 		{
+			// Force Element's static constructor to run first so base-level
+			// mapper remappings are applied before these Control-specific ones.
+			RemappingHelper.EnsureBaseTypeRemapped(typeof(Window), typeof(Element));
+
 #if ANDROID
 			// This property is also on the Application Mapper since that's where the attached property exists
 			WindowHandler.Mapper.ReplaceMapping<IWindow, IWindowHandler>(PlatformConfiguration.AndroidSpecific.Application.WindowSoftInputModeAdjustProperty.PropertyName, MapWindowSoftInputModeAdjust);
diff --git a/src/Controls/src/Core/Window/Window.cs b/src/Controls/src/Core/Window/Window.cs
index 429eccb62f12..576a5764593a 100644
--- a/src/Controls/src/Core/Window/Window.cs
+++ b/src/Controls/src/Core/Window/Window.cs
@@ -12,6 +12,7 @@
 namespace Microsoft.Maui.Controls
 {
 	[ContentProperty(nameof(Page))]
+	[ElementHandler(typeof(WindowHandler))]
 	public partial class Window : NavigableElement, IWindow, IToolbarElement, IMenuBarElement, IFlowDirectionController, IWindowController
 	{
 		static readonly BindablePropertyKey IsActivatedPropertyKey = 
diff --git a/src/Controls/src/Xaml/Hosting/AppHostBuilderExtensions.cs b/src/Controls/src/Xaml/Hosting/AppHostBuilderExtensions.cs
index 471986614305..c1b12c4c072b 100644
--- a/src/Controls/src/Xaml/Hosting/AppHostBuilderExtensions.cs
+++ b/src/Controls/src/Xaml/Hosting/AppHostBuilderExtensions.cs
@@ -40,8 +40,9 @@ public static partial class AppHostBuilderExtensions
 	/// </summary>
 	/// <param name="handlersCollection">The handlers collection to register handlers with.</param>
 	/// <returns>The handlers collection for chaining.</returns>
+	[Obsolete("The AddMauiControlsHandlers method is a no-op.")]
 	public static IMauiHandlersCollection AddMauiControlsHandlers(this IMauiHandlersCollection handlersCollection) =>
-		handlersCollection.AddControlsHandlers();
+		handlersCollection;
 
 	static MauiAppBuilder SetupXamlDefaults(this MauiAppBuilder builder)
 	{
diff --git a/src/Controls/tests/Core.UnitTests/VisualElementTests.cs b/src/Controls/tests/Core.UnitTests/VisualElementTests.cs
index 73ccf71b8fd2..a93066823ec2 100644
--- a/src/Controls/tests/Core.UnitTests/VisualElementTests.cs
+++ b/src/Controls/tests/Core.UnitTests/VisualElementTests.cs
@@ -92,23 +92,6 @@ public void FocusedElementGetsFocusedVisualState()
 			Assert.Equal(FocusedStateName, stateGroup.CurrentState.Name);
 		}
 
-		[Fact]
-		public void ContainerChangedFiresWhenMapContainerIsCalled()
-		{
-			var mapper = new PropertyMapper<IView, IViewHandler>(ViewHandler.ViewMapper);
-			var commandMapper = new CommandMapper<IView, IViewHandler>(ViewHandler.ViewCommandMapper);
-
-			VisualElement.RemapForControls(mapper, commandMapper);
-			var handlerStub = new HandlerStub(mapper);
-			var button = new Button();
-			button.Handler = handlerStub;
-
-			bool fired = false;
-			(button as IControlsView).PlatformContainerViewChanged += (_, _) => fired = true;
-			handlerStub.UpdateValue(nameof(IViewHandler.ContainerView));
-			Assert.True(fired);
-		}
-
 		[Theory, Category(TestCategory.Memory)]
 		[InlineData(typeof(ImmutableBrush), false)]
 		[InlineData(typeof(SolidColorBrush), false)]
diff --git a/src/Controls/tests/DeviceTests/ControlsDeviceTestExtensions.cs b/src/Controls/tests/DeviceTests/ControlsDeviceTestExtensions.cs
index 5f7dec1aac41..9b411eb9702d 100644
--- a/src/Controls/tests/DeviceTests/ControlsDeviceTestExtensions.cs
+++ b/src/Controls/tests/DeviceTests/ControlsDeviceTestExtensions.cs
@@ -17,7 +17,6 @@ public static MauiAppBuilder ConfigureTestBuilder(this MauiAppBuilder mauiAppBui
 		{
 			return
 				mauiAppBuilder
-					.RemapForControls()
 					.ConfigureLifecycleEvents(lifecycle =>
 					{
 #if IOS || MACCATALYST
diff --git a/src/Core/src/Handlers/Button/ButtonHandler.Windows.cs b/src/Core/src/Handlers/Button/ButtonHandler.Windows.cs
index d5141a1b4edd..875e2fcbb6f5 100644
--- a/src/Core/src/Handlers/Button/ButtonHandler.Windows.cs
+++ b/src/Core/src/Handlers/Button/ButtonHandler.Windows.cs
@@ -130,5 +130,7 @@ public override void SetImageSource(ImageSource? platformImage)
 				button.UpdateImageSource(platformImage);
 			}
 		}
+
+		internal override bool PreventGestureBubbling => true;
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Handlers/DatePicker/DatePickerHandler.Windows.cs b/src/Core/src/Handlers/DatePicker/DatePickerHandler.Windows.cs
index 52eb87e8f277..3a514ae02070 100644
--- a/src/Core/src/Handlers/DatePicker/DatePickerHandler.Windows.cs
+++ b/src/Core/src/Handlers/DatePicker/DatePickerHandler.Windows.cs
@@ -101,4 +101,6 @@ public static partial void MapBackground(IDatePickerHandler handler, IDatePicker
 	{
 		handler.PlatformView?.UpdateBackground(datePicker);
 	}
+
+	internal override bool PreventGestureBubbling => true;
 }
\ No newline at end of file
diff --git a/src/Core/src/Handlers/Element/ElementHandlerAttribute.cs b/src/Core/src/Handlers/Element/ElementHandlerAttribute.cs
index c4d8823fab93..3fa3d4131166 100644
--- a/src/Core/src/Handlers/Element/ElementHandlerAttribute.cs
+++ b/src/Core/src/Handlers/Element/ElementHandlerAttribute.cs
@@ -1,17 +1,12 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Microsoft.Maui.Handlers;
 
-[AttributeUsage(AttributeTargets.Class, Inherited = true, AllowMultiple = false)]
-internal abstract class ElementHandlerAttribute : Attribute
+[AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = false)]
+public class ElementHandlerAttribute([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] Type handlerType)
+	: Attribute
 {
-	public abstract IElementHandler CreateHandler();
-	public abstract Type HandlerType { get; }
-}
-
-internal sealed class ElementHandlerAttribute<THandler> : ElementHandlerAttribute
-	where THandler : IElementHandler, new()
-{
-	public override IElementHandler CreateHandler() => new THandler();
-	public override Type HandlerType => typeof(THandler);
+	[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)]
+	public Type HandlerType { get; } = handlerType;
 }
diff --git a/src/Core/src/Handlers/Element/RemappingHelper.cs b/src/Core/src/Handlers/Element/RemappingHelper.cs
deleted file mode 100644
index 2f57deed6518..000000000000
--- a/src/Core/src/Handlers/Element/RemappingHelper.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-
-#if !NET9_0_OR_GREATER
-using Lock = object;
-#endif
-
-namespace Microsoft.Maui.Handlers;
-
-internal static class RemappingHelper
-{
-	private static readonly HashSet<Type> s_remappedTypes = new();
-	private static readonly Lock s_lock = new();
-
-	public static void RemapIfNeeded(Type handlerType, Action remapForControls)
-	{
-		lock (s_lock)
-		{
-			if (s_remappedTypes.Add(handlerType))
-			{
-				remapForControls();
-			}
-		}
-	}
-}
diff --git a/src/Core/src/Handlers/IElementHandler.cs b/src/Core/src/Handlers/IElementHandler.cs
index 228253f8486e..893f1e18fd0b 100644
--- a/src/Core/src/Handlers/IElementHandler.cs
+++ b/src/Core/src/Handlers/IElementHandler.cs
@@ -51,4 +51,4 @@ public interface IElementHandler
 		/// </summary>
 		IMauiContext? MauiContext { get; }
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Core/src/Handlers/ImageButton/ImageButtonHandler.Windows.cs b/src/Core/src/Handlers/ImageButton/ImageButtonHandler.Windows.cs
index 4db50de8ea3e..1017561c52b9 100644
--- a/src/Core/src/Handlers/ImageButton/ImageButtonHandler.Windows.cs
+++ b/src/Core/src/Handlers/ImageButton/ImageButtonHandler.Windows.cs
@@ -147,5 +147,7 @@ public override void SetImageSource(ImageSource? platformImage)
 				button.UpdateImageSource(platformImage);
 			}
 		}
+
+		internal override bool PreventGestureBubbling => true;
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Handlers/RadioButton/RadioButtonHandler.Windows.cs b/src/Core/src/Handlers/RadioButton/RadioButtonHandler.Windows.cs
index bbdfc28ac144..39e75197cd09 100644
--- a/src/Core/src/Handlers/RadioButton/RadioButtonHandler.Windows.cs
+++ b/src/Core/src/Handlers/RadioButton/RadioButtonHandler.Windows.cs
@@ -71,5 +71,7 @@ void OnCheckedOrUnchecked(object? sender, RoutedEventArgs e)
 
 			VirtualView.IsChecked = PlatformView.IsChecked == true;
 		}
+
+		internal override bool PreventGestureBubbling => true;
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Handlers/Slider/SliderHandler.Windows.cs b/src/Core/src/Handlers/Slider/SliderHandler.Windows.cs
index ba2111a38d16..c28b76e4e573 100644
--- a/src/Core/src/Handlers/Slider/SliderHandler.Windows.cs
+++ b/src/Core/src/Handlers/Slider/SliderHandler.Windows.cs
@@ -123,5 +123,7 @@ void OnPointerReleased(object? sender, PointerRoutedEventArgs e)
 		{
 			VirtualView?.DragCompleted();
 		}
+
+		internal override bool PreventGestureBubbling => true;
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Handlers/Stepper/StepperHandler.Windows.cs b/src/Core/src/Handlers/Stepper/StepperHandler.Windows.cs
index a4cc1d98924c..450b1288ccc3 100644
--- a/src/Core/src/Handlers/Stepper/StepperHandler.Windows.cs
+++ b/src/Core/src/Handlers/Stepper/StepperHandler.Windows.cs
@@ -57,5 +57,7 @@ void OnValueChanged(object sender, EventArgs e)
 				VirtualView.Value = PlatformView.Value;
 			}
 		}
+
+		internal override bool PreventGestureBubbling => true;
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Handlers/Switch/SwitchHandler.Windows.cs b/src/Core/src/Handlers/Switch/SwitchHandler.Windows.cs
index e3629e73d365..fb34bfbdfd00 100644
--- a/src/Core/src/Handlers/Switch/SwitchHandler.Windows.cs
+++ b/src/Core/src/Handlers/Switch/SwitchHandler.Windows.cs
@@ -43,5 +43,7 @@ void OnToggled(object sender, UI.Xaml.RoutedEventArgs e)
 
 			VirtualView.IsOn = PlatformView.IsOn;
 		}
+
+		internal override bool PreventGestureBubbling => true;
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Handlers/TimePicker/TimePickerHandler.Windows.cs b/src/Core/src/Handlers/TimePicker/TimePickerHandler.Windows.cs
index 689705f768ac..6f8064acbba2 100644
--- a/src/Core/src/Handlers/TimePicker/TimePickerHandler.Windows.cs
+++ b/src/Core/src/Handlers/TimePicker/TimePickerHandler.Windows.cs
@@ -62,5 +62,7 @@ void OnControlTimeChanged(object? sender, TimePickerValueChangedEventArgs e)
 				VirtualView.InvalidateMeasure();
 			}
 		}
+
+		internal override bool PreventGestureBubbling => true;
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Handlers/View/ViewHandler.Windows.cs b/src/Core/src/Handlers/View/ViewHandler.Windows.cs
index d0c0db2885a4..e4b63e9a3469 100644
--- a/src/Core/src/Handlers/View/ViewHandler.Windows.cs
+++ b/src/Core/src/Handlers/View/ViewHandler.Windows.cs
@@ -190,19 +190,7 @@ internal static void MapContextFlyout(IElementHandler handler, IContextFlyoutEle
 		}
 	}
 
-	internal virtual bool PreventGestureBubbling
-		=> this switch
-		{
-			ButtonHandler => true,
-			DatePickerHandler => true,
-			StepperHandler => true,
-			SliderHandler => true,
-			SwitchHandler => true,
-			TimePickerHandler => true,
-			ImageButtonHandler => true,
-			RadioButtonHandler => true,
-			_ => false,
-		};
+	internal virtual bool PreventGestureBubbling => false;
 
 	static void FocusManager_GotFocus(object? sender, FocusManagerGotFocusEventArgs e)
 	{
diff --git a/src/Core/src/Hosting/IMauiHandlersFactory.cs b/src/Core/src/Hosting/IMauiHandlersFactory.cs
index 1a854a3724c6..759bdfa2e4e4 100644
--- a/src/Core/src/Hosting/IMauiHandlersFactory.cs
+++ b/src/Core/src/Hosting/IMauiHandlersFactory.cs
@@ -14,6 +14,7 @@ public interface IMauiHandlersFactory : IMauiFactory
 
 		IElementHandler? GetHandler<T>() where T : IElement;
 
+		[Obsolete("The handlers collection no longer contains all registered handlers. Use GetHandlerType instead.")]
 		IMauiHandlersCollection GetCollection();
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Hosting/Internal/MauiHandlersFactory.cs b/src/Core/src/Hosting/Internal/MauiHandlersFactory.cs
index 639b2e19b3e5..5c9959cfc1c2 100644
--- a/src/Core/src/Hosting/Internal/MauiHandlersFactory.cs
+++ b/src/Core/src/Hosting/Internal/MauiHandlersFactory.cs
@@ -3,6 +3,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Maui.Handlers;
 
 namespace Microsoft.Maui.Hosting.Internal
 {
@@ -20,15 +21,30 @@ public MauiHandlersFactory(IMauiHandlersCollection collection)
 
 		public IElementHandler? GetHandler(Type type)
 		{
-			if (TryGetVirtualViewHandlerServiceType(type) is Type serviceType
-				&& GetService(serviceType) is IElementHandler handler)
+			// 1. Exact DI registration (allows overriding attribute-based defaults)
+			if (InternalCollection.TryGetService(type, out _)
+				&& GetService(type) is IElementHandler exactHandler)
 			{
-				return handler;
+				return exactHandler;
 			}
 
+			// 2. ElementHandler attribute (no DI, just Activator.CreateInstance)
 			if (TryGetElementHandlerAttribute(type, out var elementHandlerAttribute))
 			{
-				return elementHandlerAttribute.CreateHandler();
+				return (IElementHandler?)Activator.CreateInstance(elementHandlerAttribute.HandlerType);
+			}
+
+			// 3. Interface-based DI registration (e.g., handler registered for IScrollView)
+			if (TryGetVirtualViewHandlerServiceType(type) is Type serviceType
+				&& GetService(serviceType) is IElementHandler interfaceHandler)
+			{
+				return interfaceHandler;
+			}
+
+			// 4. ContentView fallback
+			if (typeof(IContentView).IsAssignableFrom(type))
+			{
+				return new ContentViewHandler();
 			}
 
 			throw new HandlerNotFoundException($"Unable to find a {nameof(IElementHandler)} corresponding to {type}. Please register a handler for {type} using `Microsoft.Maui.Hosting.MauiHandlersCollectionExtensions.AddHandler` or `Microsoft.Maui.Hosting.MauiHandlersCollectionExtensions.TryAddHandler`");
@@ -40,34 +56,65 @@ public MauiHandlersFactory(IMauiHandlersCollection collection)
 		[return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)]
 		public Type? GetHandlerType(Type iview)
 		{
-			if (TryGetVirtualViewHandlerServiceType(iview) is Type serviceType
-				&& InternalCollection.TryGetService(serviceType, out ServiceDescriptor? serviceDescriptor)
-				&& serviceDescriptor?.ImplementationType is Type type)
+			// Check if there is a handler registered for this EXACT type -- allows overriding the default handler
+			if (TryGetRegisteredHandlerType(iview, out Type? type))
 			{
 				return type;
 			}
 
 			if (TryGetElementHandlerAttribute(iview, out var elementHandlerAttribute))
 			{
-				return GetHandlerType(elementHandlerAttribute);
+				return elementHandlerAttribute.HandlerType;
+			}
+
+			if (TryGetVirtualViewHandlerServiceType(iview) is Type serviceType
+				&& TryGetRegisteredHandlerType(serviceType, out type))
+			{
+				return type;
+			}
+
+			// ContentViewHandler is the default/fallback handler for any IContentView
+			if (typeof(IContentView).IsAssignableFrom(iview))
+			{
+				return typeof(ContentViewHandler);
 			}
 
 			return null;
+		}
+
+		private bool TryGetRegisteredHandlerType(Type serviceType, [NotNullWhen(returnValue: true)] out Type? handlerType)
+		{
+			if (InternalCollection.TryGetService(serviceType, out ServiceDescriptor? serviceDescriptor)
+				&& serviceDescriptor?.ImplementationType is Type type)
+			{
+				handlerType = type;
+				return true;
+			}
 
-			[UnconditionalSuppressMessage("ReflectionAnalysis", "IL2073",
-				Justification = "There is no need to create instances of the handlers for types with this attribute using reflection."
-					+ "We intentionally avoid annotating these handler types with DAM.")]
-			[return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)]
-			static Type GetHandlerType(ElementHandlerAttribute elementHandlerAttribute)
-				=> elementHandlerAttribute.HandlerType;
+			handlerType = null;
+			return false;
 		}
 
 		private static bool TryGetElementHandlerAttribute(Type viewType, [NotNullWhen(returnValue: true)] out ElementHandlerAttribute? elementHandlerAttribute)
 		{
-			elementHandlerAttribute = viewType.GetCustomAttribute<ElementHandlerAttribute>();
-			return elementHandlerAttribute is not null;
+			elementHandlerAttribute = null;
+			Type? type = viewType;
+
+			while (type is not null)
+			{
+				elementHandlerAttribute = type.GetCustomAttribute<ElementHandlerAttribute>();
+				if (elementHandlerAttribute is not null)
+				{
+					return true;
+				}
+
+				type = type.BaseType;
+			}
+
+			return false;
 		}
 
+		[Obsolete("The handlers collection no longer contains all registered handlers. Use GetHandlerType instead.")]
 		public IMauiHandlersCollection GetCollection() => (IMauiHandlersCollection)InternalCollection;
 
 		private Type? TryGetVirtualViewHandlerServiceType(Type type)
diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 91219f7e7d3c..0f63a40acd3f 100644
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -9,5 +9,8 @@ override Microsoft.Maui.PlatformDrawable.ThresholdType.get -> System.Type!
 *REMOVED*override Microsoft.Maui.Graphics.MauiDrawable.OnBoundsChange(Android.Graphics.Rect! bounds) -> void
 *REMOVED*override Microsoft.Maui.Graphics.MauiDrawable.OnDraw(Android.Graphics.Drawables.Shapes.Shape? shape, Android.Graphics.Canvas? canvas, Android.Graphics.Paint? paint) -> void
 override Microsoft.Maui.Handlers.LabelHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
+Microsoft.Maui.Handlers.ElementHandlerAttribute
+Microsoft.Maui.Handlers.ElementHandlerAttribute.ElementHandlerAttribute(System.Type! handlerType) -> void
+Microsoft.Maui.Handlers.ElementHandlerAttribute.HandlerType.get -> System.Type!
 static Microsoft.Maui.GridLength.implicit operator Microsoft.Maui.GridLength(string! value) -> Microsoft.Maui.GridLength
 Microsoft.Maui.Handlers.PickerHandler._dialog -> AndroidX.AppCompat.App.AlertDialog?
diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index 6bb7431a3601..d95e12e8372b 100644
--- a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -1,4 +1,7 @@
 #nullable enable
+Microsoft.Maui.Handlers.ElementHandlerAttribute
+Microsoft.Maui.Handlers.ElementHandlerAttribute.ElementHandlerAttribute(System.Type! handlerType) -> void
+Microsoft.Maui.Handlers.ElementHandlerAttribute.HandlerType.get -> System.Type!
 override Microsoft.Maui.Handlers.StepperHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 override Microsoft.Maui.Platform.MauiView.DidUpdateFocus(UIKit.UIFocusUpdateContext! context, UIKit.UIFocusAnimationCoordinator! coordinator) -> void
 static Microsoft.Maui.GridLength.implicit operator Microsoft.Maui.GridLength(string! value) -> Microsoft.Maui.GridLength
diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index 6bb7431a3601..d95e12e8372b 100644
--- a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -1,4 +1,7 @@
 #nullable enable
+Microsoft.Maui.Handlers.ElementHandlerAttribute
+Microsoft.Maui.Handlers.ElementHandlerAttribute.ElementHandlerAttribute(System.Type! handlerType) -> void
+Microsoft.Maui.Handlers.ElementHandlerAttribute.HandlerType.get -> System.Type!
 override Microsoft.Maui.Handlers.StepperHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 override Microsoft.Maui.Platform.MauiView.DidUpdateFocus(UIKit.UIFocusUpdateContext! context, UIKit.UIFocusAnimationCoordinator! coordinator) -> void
 static Microsoft.Maui.GridLength.implicit operator Microsoft.Maui.GridLength(string! value) -> Microsoft.Maui.GridLength
diff --git a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index 66a516d720b9..2cc542b340fc 100644
--- a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -1,2 +1,5 @@
 #nullable enable
+Microsoft.Maui.Handlers.ElementHandlerAttribute
+Microsoft.Maui.Handlers.ElementHandlerAttribute.ElementHandlerAttribute(System.Type! handlerType) -> void
+Microsoft.Maui.Handlers.ElementHandlerAttribute.HandlerType.get -> System.Type!
 static Microsoft.Maui.GridLength.implicit operator Microsoft.Maui.GridLength(string! value) -> Microsoft.Maui.GridLength
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index 66a516d720b9..2cc542b340fc 100644
--- a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -1,2 +1,5 @@
 #nullable enable
+Microsoft.Maui.Handlers.ElementHandlerAttribute
+Microsoft.Maui.Handlers.ElementHandlerAttribute.ElementHandlerAttribute(System.Type! handlerType) -> void
+Microsoft.Maui.Handlers.ElementHandlerAttribute.HandlerType.get -> System.Type!
 static Microsoft.Maui.GridLength.implicit operator Microsoft.Maui.GridLength(string! value) -> Microsoft.Maui.GridLength
diff --git a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
index 66a516d720b9..2cc542b340fc 100644
--- a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -1,2 +1,5 @@
 #nullable enable
+Microsoft.Maui.Handlers.ElementHandlerAttribute
+Microsoft.Maui.Handlers.ElementHandlerAttribute.ElementHandlerAttribute(System.Type! handlerType) -> void
+Microsoft.Maui.Handlers.ElementHandlerAttribute.HandlerType.get -> System.Type!
 static Microsoft.Maui.GridLength.implicit operator Microsoft.Maui.GridLength(string! value) -> Microsoft.Maui.GridLength
diff --git a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index 7dc5c58110bf..bb7ac2cccaff 100644
--- a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -1 +1,4 @@
 #nullable enable
+Microsoft.Maui.Handlers.ElementHandlerAttribute
+Microsoft.Maui.Handlers.ElementHandlerAttribute.ElementHandlerAttribute(System.Type! handlerType) -> void
+Microsoft.Maui.Handlers.ElementHandlerAttribute.HandlerType.get -> System.Type!
diff --git a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
index 7dc5c58110bf..bb7ac2cccaff 100644
--- a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -1 +1,4 @@
 #nullable enable
+Microsoft.Maui.Handlers.ElementHandlerAttribute
+Microsoft.Maui.Handlers.ElementHandlerAttribute.ElementHandlerAttribute(System.Type! handlerType) -> void
+Microsoft.Maui.Handlers.ElementHandlerAttribute.HandlerType.get -> System.Type!

From a94b1631f82bd3745887e62f1a8a178e1426b765 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 11 Mar 2026 14:26:05 +0100
Subject: [PATCH 2/7] Document parameterless ctor requirement for
 [ElementHandler]

Handlers resolved via [ElementHandler] attribute use
Activator.CreateInstance(), not ActivatorUtilities.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 docs/design/HandlerResolution.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/design/HandlerResolution.md b/docs/design/HandlerResolution.md
index d131c69477cb..50940e891a68 100644
--- a/docs/design/HandlerResolution.md
+++ b/docs/design/HandlerResolution.md
@@ -47,6 +47,11 @@ How a handler instance is created depends on how it was resolved:
 - **`[ElementHandler]` attribute** (step 2): Instantiated directly via `Activator.CreateInstance` — no DI involvement.
 - **Fallback in `ElementExtensions.ToHandler()`**: When `Activator.CreateInstance` fails with a `MissingMethodException` (e.g., the handler requires constructor parameters), `ActivatorUtilities.CreateInstance` is used instead, which supports constructor injection from the DI container.
 
+> **Note:** Handlers registered via `[ElementHandler]` must have a public parameterless constructor.
+> They are instantiated with `Activator.CreateInstance()`, not through the DI container.
+> The `ActivatorUtilities.CreateInstance()` fallback only applies to DI-registered handlers
+> resolved through `ElementExtensions.ToHandler()`.
+
 ## Types used in the resolution of Handlers to Views
 
 ### `MauiFactory`

From 09521e1c6d3d77869f7794ad55eb9f802cb8f829 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Tue, 17 Mar 2026 15:26:19 +0100
Subject: [PATCH 3/7] Fix IL2068 trim annotation on TryGetRegisteredHandlerType
 out parameter

Add [DynamicallyAccessedMembers(PublicConstructors)] to the 'handlerType'
out parameter so it satisfies the return annotation on GetHandlerType().
This fixes NETSDK1144 build failures in RunOniOS_MauiReleaseTrimFull.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 src/Core/src/Hosting/Internal/MauiHandlersFactory.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/src/Hosting/Internal/MauiHandlersFactory.cs b/src/Core/src/Hosting/Internal/MauiHandlersFactory.cs
index 5c9959cfc1c2..817657d16d12 100644
--- a/src/Core/src/Hosting/Internal/MauiHandlersFactory.cs
+++ b/src/Core/src/Hosting/Internal/MauiHandlersFactory.cs
@@ -82,7 +82,7 @@ public MauiHandlersFactory(IMauiHandlersCollection collection)
 			return null;
 		}
 
-		private bool TryGetRegisteredHandlerType(Type serviceType, [NotNullWhen(returnValue: true)] out Type? handlerType)
+		private bool TryGetRegisteredHandlerType(Type serviceType, [NotNullWhen(returnValue: true), DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] out Type? handlerType)
 		{
 			if (InternalCollection.TryGetService(serviceType, out ServiceDescriptor? serviceDescriptor)
 				&& serviceDescriptor?.ImplementationType is Type type)

From 6df1fba805c90b3c9a7a5b48ba719e97b1013e41 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 18 Mar 2026 12:49:14 +0100
Subject: [PATCH 4/7] Remove calls to obsolete AddMauiControlsHandlers in
 device tests

The method is now a no-op, and warnings-as-errors (CS0618) breaks the
device test build on CI.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../DeviceTests/Elements/Accessibility/AccessibilityTests.cs    | 1 -
 src/Controls/tests/DeviceTests/MapperTests.cs                   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Controls/tests/DeviceTests/Elements/Accessibility/AccessibilityTests.cs b/src/Controls/tests/DeviceTests/Elements/Accessibility/AccessibilityTests.cs
index 5f78f0c00594..c8f79e3b658a 100644
--- a/src/Controls/tests/DeviceTests/Elements/Accessibility/AccessibilityTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Accessibility/AccessibilityTests.cs
@@ -56,7 +56,6 @@ public async Task ValidateIsImportantForAccessibility()
 				{
 					builder.ConfigureMauiHandlers(handlers =>
 					{
-						handlers.AddMauiControlsHandlers();
 						handlers.AddHandler(typeof(Window), typeof(WindowHandlerStub));
 					});
 				});
diff --git a/src/Controls/tests/DeviceTests/MapperTests.cs b/src/Controls/tests/DeviceTests/MapperTests.cs
index 7bbae6aa49ca..fee64ec8774d 100644
--- a/src/Controls/tests/DeviceTests/MapperTests.cs
+++ b/src/Controls/tests/DeviceTests/MapperTests.cs
@@ -19,7 +19,7 @@ public class MapperTests : ControlsHandlerTestBase
 		[ClassData(typeof(MapperGenericTypeCases))]
 		public void ValidateMapperGenerics(IPropertyMapper propertyMapper, Type viewType, Type handlerType)
 		{
-			EnsureHandlerCreated(builder => builder.ConfigureMauiHandlers(h => h.AddMauiControlsHandlers()));
+			EnsureHandlerCreated(builder => { });
 			var generics = propertyMapper.GetType().GenericTypeArguments;
 			Assert.Equal(viewType, generics[0]);
 			Assert.Equal(handlerType, generics[1]);

From 5327392df1b243a8fcbf5574b33280d6dfb2cec9 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Tue, 31 Mar 2026 08:30:38 +0200
Subject: [PATCH 5/7] Fix handler resolution failures for TabbedPage and Shell

Two root cause bugs in [ElementHandler] attribute placement:

1. TabbedPage on iOS/MacCatalyst incorrectly used NavigationRenderer instead
   of TabbedRenderer. This caused TabbedPage to be treated as a NavigationPage,
   leading to crashes on iOS/Mac.

2. ShellItem's [ElementHandler] attribute was placed on FlyoutItem (a derived
   class) instead of ShellItem (the base class). Since TryGetElementHandlerAttribute
   walks the base type chain, TabBar (which also inherits from ShellItem but not
   from FlyoutItem) could not resolve its handler on Windows/Tizen, causing Shell
   test crashes.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 src/Controls/src/Core/Shell/ShellItem.cs       | 6 +++---
 src/Controls/src/Core/TabbedPage/TabbedPage.cs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Controls/src/Core/Shell/ShellItem.cs b/src/Controls/src/Core/Shell/ShellItem.cs
index 2325f3081438..039c28cef4e3 100644
--- a/src/Controls/src/Core/Shell/ShellItem.cs
+++ b/src/Controls/src/Core/Shell/ShellItem.cs
@@ -17,9 +17,6 @@ namespace Microsoft.Maui.Controls
 	/// Represents a flyout menu item in a <see cref="Shell"/> application.
 	/// </summary>
 	[EditorBrowsable(EditorBrowsableState.Always)]
-#if WINDOWS || TIZEN
-	[ElementHandler(typeof(Handlers.ShellItemHandler))]
-#endif
 	public class FlyoutItem : ShellItem
 	{
 		/// <summary>The style class for flyout item labels.</summary>
@@ -67,6 +64,9 @@ public TabBar()
 	[EditorBrowsable(EditorBrowsableState.Never)]
 	[TypeConverter(typeof(ShellItemConverter))]
 	[DebuggerTypeProxy(typeof(ShellItemDebugView))]
+#if WINDOWS || TIZEN
+	[ElementHandler(typeof(Handlers.ShellItemHandler))]
+#endif
 	public class ShellItem : ShellGroupItem, IShellItemController, IElementConfiguration<ShellItem>, IPropertyPropagationController, IVisualTreeElement
 	{
 		#region PropertyKeys
diff --git a/src/Controls/src/Core/TabbedPage/TabbedPage.cs b/src/Controls/src/Core/TabbedPage/TabbedPage.cs
index fc1fbb3b52af..052dea95a753 100644
--- a/src/Controls/src/Core/TabbedPage/TabbedPage.cs
+++ b/src/Controls/src/Core/TabbedPage/TabbedPage.cs
@@ -8,7 +8,7 @@ namespace Microsoft.Maui.Controls
 	/// <summary>A <see cref="MultiPage{T}"/> that displays an array of tabs across the top of the screen, each of which loads content onto the screen.</summary>
 	[ContentProperty(nameof(Children))]
 #if IOS || MACCATALYST
-	[ElementHandler(typeof(Handlers.Compatibility.NavigationRenderer))]
+	[ElementHandler(typeof(Handlers.Compatibility.TabbedRenderer))]
 #elif WINDOWS || ANDROID || TIZEN
 	[ElementHandler(typeof(TabbedViewHandler))]
 #endif

From aa375100c87b72670761ff02702bde7bc9218ca8 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Tue, 31 Mar 2026 11:03:27 +0200
Subject: [PATCH 6/7] Fix CS8632: remove nullable annotations from #nullable
 disable context

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 src/Controls/src/Core/Element/Element.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Controls/src/Core/Element/Element.cs b/src/Controls/src/Core/Element/Element.cs
index 6cdd7afe98c4..dabe4855fec1 100644
--- a/src/Controls/src/Core/Element/Element.cs
+++ b/src/Controls/src/Core/Element/Element.cs
@@ -1044,7 +1044,7 @@ void OnDescendantAdded(Element child)
 			OnDescendantAddedCore(child, null);
 		}
 
-		void OnDescendantAddedCore(Element child, ElementEventArgs? args)
+		void OnDescendantAddedCore(Element child, ElementEventArgs args)
 		{
 			if (DescendantAdded is not null)
 			{
@@ -1059,7 +1059,7 @@ void OnDescendantRemoved(Element child)
 			OnDescendantRemovedCore(child, null);
 		}
 
-		void OnDescendantRemovedCore(Element child, ElementEventArgs? args)
+		void OnDescendantRemovedCore(Element child, ElementEventArgs args)
 		{
 			if (DescendantRemoved is not null)
 			{

From f5da4860780a0fda04b320a4665ce916d218173e Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Tue, 31 Mar 2026 17:09:55 +0200
Subject: [PATCH 7/7] Fix ILC error: use conditional DI registration for
 HybridWebViewHandler

HybridWebViewHandler is marked [RequiresDynamicCode] because it uses
dynamic System.Text.Json serialization. Placing [ElementHandler(typeof(
HybridWebViewHandler))] on HybridWebView creates a hard compile-time
type reference that ILC cannot eliminate via feature switches, causing
NativeAOT compilation failures.

Restore the conditional DI registration pattern behind
RuntimeFeature.IsHybridWebViewSupported, which has [FeatureSwitchDefinition]
and [FeatureGuard(typeof(RequiresDynamicCodeAttribute))] attributes that
allow ILC to eliminate the entire code path (including the typeof reference)
when NativeAOT is used.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs | 6 +++++-
 src/Controls/src/Core/HybridWebView/HybridWebView.cs      | 3 ---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs b/src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs
index 425c950222aa..242a0658b5b9 100644
--- a/src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs
+++ b/src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs
@@ -80,9 +80,13 @@ static MauiAppBuilder SetupDefaults(this MauiAppBuilder builder)
 		// All built-in handlers are resolved via [ElementHandler] attributes on the view types.
 		builder.ConfigureMauiHandlers(configureDelegate: null);
 
-		// NOTE: not registered under NativeAOT or TrimMode=Full scenarios
+		// NOTE: not registered under NativeAOT or TrimMode=Full scenarios.
+		// HybridWebViewHandler uses dynamic System.Text.Json features and cannot be referenced
+		// via [ElementHandler] attribute because that would create a hard type reference that
+		// ILC cannot eliminate based on the feature switch.
 		if (RuntimeFeature.IsHybridWebViewSupported)
 		{
+			builder.ConfigureMauiHandlers(handlers => handlers.AddHandler<HybridWebView, HybridWebViewHandler>());
 			builder.Services.AddScoped<IHybridWebViewTaskManager>(_ => new HybridWebViewTaskManager());
 		}
 
diff --git a/src/Controls/src/Core/HybridWebView/HybridWebView.cs b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
index b33d0c5946b5..26bd068576c4 100644
--- a/src/Controls/src/Core/HybridWebView/HybridWebView.cs
+++ b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
@@ -3,7 +3,6 @@
 using System.Text.Json;
 using System.Text.Json.Serialization.Metadata;
 using System.Threading.Tasks;
-using Microsoft.Maui.Handlers;
 
 namespace Microsoft.Maui.Controls
 {
@@ -11,8 +10,6 @@ namespace Microsoft.Maui.Controls
 	/// A <see cref="View"/> that presents local HTML content in a web view and allows JavaScript and C# code to
 	/// communicate by using messages and by invoking methods.
 	/// </summary>
-	[UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "HybridWebViewHandler is only instantiated when RuntimeFeature.IsHybridWebViewSupported is true.")]
-	[ElementHandler(typeof(HybridWebViewHandler))]
 	public class HybridWebView : View, IHybridWebView
 	{
 		/// <summary>Bindable property for <see cref="DefaultFile"/>.</summary>