From e6aafa63c06d51c721b3231068a4c150200e327e Mon Sep 17 00:00:00 2001
From: reunion-maestro-bot <reunion-maestro-bot@microsoft.com>
Date: Thu, 22 Aug 2024 19:58:38 +0000
Subject: [PATCH] Syncing content from committish
 7a0b1f66408042405abb69cf4b1974cbb14997ff

---
 .../Generated/ScrollPresenter.properties.cpp  |  33 +-
 .../Generated/ScrollPresenter.properties.h    |   9 +-
 .../dev/Generated/ScrollView.properties.cpp   |  33 +-
 .../dev/Generated/ScrollView.properties.h     |   9 +-
 .../dev/NavigationView/NavigationView.cpp     |   8 +-
 .../Repeater/TestUI/RepeaterTestUIPage.xaml   |   1 +
 .../TestUI/RepeaterTestUIPage.xaml.cs         |   5 +
 .../Repeater/TestUI/Repeater_TestUI.projitems |  27 +-
 .../TestUI/Samples/ObjectModelTestPage.xaml   | 103 +++
 .../Samples/ObjectModelTestPage.xaml.cs       | 597 ++++++++++++++++++
 .../ViewportManagerWithPlatformFeatures.cpp   |  24 +-
 .../ViewportManagerWithPlatformFeatures.h     |  10 +-
 .../ScrollPresenterViewChangeTests.cs         | 212 +++++--
 .../dev/ScrollPresenter/ScrollPresenter.cpp   | 105 +--
 .../dev/ScrollPresenter/ScrollPresenter.h     |  14 +-
 .../dev/ScrollPresenter/ScrollPresenter.idl   |  13 +-
 .../ScrollPresenter/ScrollPresenter.vcxitems  |   6 +-
 .../ScrollPresenterAnchoring.cpp              |  10 +-
 .../ScrollPresenterPrimitives.idl             |   4 +-
 .../ScrollingScrollStartingEventArgs.cpp      |  45 ++
 ...s.h => ScrollingScrollStartingEventArgs.h} |  24 +-
 .../ScrollingViewChangingEventArgs.cpp        |  47 --
 .../ScrollingZoomStartingEventArgs.cpp        |  45 ++
 .../ScrollingZoomStartingEventArgs.h          |  39 ++
 .../TestUI/ScrollPresenterDynamicPage.xaml    |  14 +-
 .../TestUI/ScrollPresenterDynamicPage.xaml.cs |  32 +-
 src/controls/dev/ScrollView/ScrollView.cpp    |  44 +-
 src/controls/dev/ScrollView/ScrollView.h      |  10 +-
 src/controls/dev/ScrollView/ScrollView.idl    |   4 +-
 .../TestUI/ScrollViewBlankPage.xaml.cs        |  41 +-
 .../TestUI/ScrollViewDynamicPage.xaml.cs      |  50 +-
 src/controls/dev/WebView2/WebView2.cpp        |  39 +-
 src/controls/dev/WebView2/WebView2.h          |   2 +
 src/controls/dev/dll/packages.config          |   2 +-
 .../test/MUXControlsTestApp/App.xaml.cs       |  21 +-
 src/controls/test/TestAppCX/packages.config   |   2 +-
 src/controls/tools/CustomTasksTool/Program.cs |   8 +-
 .../LoopingSelectorAutomationPeer_Partial.cpp |   2 +-
 ...SelectorItemDataAutomationPeer_Partial.cpp |   2 +-
 .../phone/lib/LoopingSelector_Partial.cpp     |   2 +-
 src/dxaml/phone/lib/LoopingSelector_Partial.h |   2 +-
 src/dxaml/phone/lib/Pivot_Partial.cpp         |   2 +-
 src/dxaml/xcp/components/CValue/CValue.cpp    |   2 +-
 .../ContentRoot/PointerInputProcessor.cpp     |  24 +-
 src/dxaml/xcp/components/base/inc/minerror.h  |  58 +-
 .../brushes/LinearGradientBrush.cpp           |   2 +-
 .../components/brushes/WUCBrushManager.cpp    |   4 +-
 .../components/deferral/StyleCustomWriter.cpp |   4 +-
 ...pCollectionCustomRuntimeDataSerializer.cpp |   1 +
 .../elements/sharedstubs/SharedStubs.cpp      |   2 +-
 .../gestures/inc/ElementGestureTracker.h      |   2 +-
 .../graphics/EffectPolicyHelper.cpp           |   2 +-
 .../graphics/ProjectedShadowManager.cpp       |   2 +-
 .../components/imaging/AsyncImageDecoder.cpp  |  10 +-
 .../components/imaging/ImageDecodeRequest.cpp |   4 +-
 .../lifetime/lib/ReferenceTrackerManager.cpp  |   8 +-
 src/dxaml/xcp/components/math/inlined.cpp     |   2 +-
 .../xcp/components/metadata/inc/EnumDefs.g.h  |   1 +
 .../metadata/inc/EnumValueTable.g.h           |   1 +
 .../components/text/inc/TextRangeCollection.h |   4 +-
 src/dxaml/xcp/control/download/download.cpp   |   2 +-
 .../xcp/core/Parser/objectwriternodelist.cpp  |   2 +-
 .../xcp/core/core/elements/AutomationPeer.cpp |  12 +-
 src/dxaml/xcp/core/core/elements/Glyphs.cpp   |   2 +-
 src/dxaml/xcp/core/core/elements/Popup.cpp    |   4 +-
 .../core/core/elements/TargetPropertyPath.cpp |   2 +-
 src/dxaml/xcp/core/core/elements/depends.cpp  |   2 +-
 .../xcp/core/core/elements/imagesource.cpp    |   6 +-
 src/dxaml/xcp/core/dll/VisualTree.cpp         |   2 +-
 src/dxaml/xcp/core/dll/xcpcore.cpp            |   2 +-
 .../ImagingProvider/LoadedImageSurface.cpp    |   2 +-
 src/dxaml/xcp/core/inc/ObjectWriterNode.h     |   2 +-
 src/dxaml/xcp/core/inc/Popup.h                |   1 +
 src/dxaml/xcp/core/inc/RenderTargetBitmap.h   |   2 +-
 src/dxaml/xcp/core/inc/XamlIslandRoot.h       |   2 +-
 .../core/native/inc/MediaPlayerPresenter.h    |   2 +-
 .../native/media/MediaPlayerPresenter.cpp     |   2 +-
 .../text/Common/D2DTextDrawingContext.cpp     |   7 +-
 .../Controls/PrivateTextInputSettings.cpp     |  10 +-
 .../text/Controls/PrivateTextInputSettings.h  |   6 +-
 .../core/native/text/Controls/TextBoxView.cpp |  12 +-
 .../core/native/text/Controls/TextBoxView.h   |   6 +-
 .../native/text/Controls/TextServicesHost.h   |  12 +-
 .../xcp/PALFontAndScriptServices.cpp          |  40 +-
 .../xcp/core/text/shaping/inc/ShapingTypes.h  |   4 +-
 .../core/microsoft.ui.xaml.coretypes.idl      |   3 +
 src/dxaml/xcp/dxaml/lib/AppBar_Partial.cpp    |   2 +-
 .../xcp/dxaml/lib/AutomationPeer_Partial.cpp  |   4 +-
 .../xcp/dxaml/lib/CommandBar_Partial.cpp      |   4 +-
 src/dxaml/xcp/dxaml/lib/CueStyler.cpp         |   2 +-
 .../lib/CustomXamlResourceLoaderWrapper.cpp   |   2 +-
 .../xcp/dxaml/lib/DropOperationTarget.cpp     | 187 +++++-
 src/dxaml/xcp/dxaml/lib/DropOperationTarget.h |  34 +-
 ...FrameworkElementAutomationPeer_partial.cpp |   2 +-
 .../xcp/dxaml/lib/ListViewBase_Partial.cpp    |   2 +-
 .../lib/MediaTransportControls_Partial.h      |   2 +-
 .../lib/MediaTransportControls_partial.cpp    |   6 +-
 .../xcp/dxaml/lib/StackPanel_Partial.cpp      |   4 +-
 .../xcp/dxaml/lib/TextElement_Partial.cpp     |   2 +-
 .../xcp/dxaml/lib/TimePicker_Partial.cpp      |   2 +-
 src/dxaml/xcp/dxaml/lib/ToolTip_Partial.cpp   |   4 +-
 .../lib/WindowedPopupInputSiteAdapter.cpp     |  32 +
 .../dxaml/lib/WindowedPopupInputSiteAdapter.h |  13 +-
 ...mlSourceFocusNavigationRequest_Partial.cpp |  18 +-
 src/dxaml/xcp/inc/UIAEnums.g.h                |   1 +
 src/dxaml/xcp/inc/cvalue.h                    |   2 +-
 src/dxaml/xcp/pal/inc/paltext.h               |   5 +
 .../pal/win/DWriteFontAndScriptServices.cpp   |  16 +-
 .../pal/win/inc/DWriteFontAndScriptServices.h |   2 +
 .../plat/win/browserdesktop/WinThreadPool.cpp |   4 +-
 .../Microsoft.UI.Xaml.Automation.Peers.cs     |   4 +
 src/eng/Version.Details.xml                   |  16 +-
 src/eng/versions.props                        |   6 +-
 src/global.json                               |   5 +-
 src/packages.config                           |  10 +-
 .../CodeGenerators/CSharpAppPass1.cs          |  13 +-
 .../CodeGenerators/CSharpAppPass1.tt          |  10 -
 .../CppWinRT/CppWinRT_AppPass2.cs             |  18 +-
 .../CppWinRT/CppWinRT_AppPass2.tt             |  15 -
 .../CppWinRT/CppWinRT_PageBinding.cs          |  11 +-
 .../CppWinRT/CppWinRT_PageBinding.tt          |   6 +-
 src/src/projection/Directory.Build.props      |  34 +-
 src/src/projection/WindowsUITypeForwarders.cs |  54 ++
 123 files changed, 1956 insertions(+), 582 deletions(-)
 create mode 100644 src/controls/dev/Repeater/TestUI/Samples/ObjectModelTestPage.xaml
 create mode 100644 src/controls/dev/Repeater/TestUI/Samples/ObjectModelTestPage.xaml.cs
 create mode 100644 src/controls/dev/ScrollPresenter/ScrollingScrollStartingEventArgs.cpp
 rename src/controls/dev/ScrollPresenter/{ScrollingViewChangingEventArgs.h => ScrollingScrollStartingEventArgs.h} (60%)
 delete mode 100644 src/controls/dev/ScrollPresenter/ScrollingViewChangingEventArgs.cpp
 create mode 100644 src/controls/dev/ScrollPresenter/ScrollingZoomStartingEventArgs.cpp
 create mode 100644 src/controls/dev/ScrollPresenter/ScrollingZoomStartingEventArgs.h
 create mode 100644 src/src/projection/WindowsUITypeForwarders.cs

diff --git a/src/controls/dev/Generated/ScrollPresenter.properties.cpp b/src/controls/dev/Generated/ScrollPresenter.properties.cpp
index 2cd699d9f0..36a30aafb5 100644
--- a/src/controls/dev/Generated/ScrollPresenter.properties.cpp
+++ b/src/controls/dev/Generated/ScrollPresenter.properties.cpp
@@ -38,11 +38,12 @@ ScrollPresenterProperties::ScrollPresenterProperties()
     , m_extentChangedEventSource{static_cast<ScrollPresenter*>(this)}
     , m_scrollAnimationStartingEventSource{static_cast<ScrollPresenter*>(this)}
     , m_scrollCompletedEventSource{static_cast<ScrollPresenter*>(this)}
+    , m_scrollStartingEventSource{static_cast<ScrollPresenter*>(this)}
     , m_stateChangedEventSource{static_cast<ScrollPresenter*>(this)}
     , m_viewChangedEventSource{static_cast<ScrollPresenter*>(this)}
-    , m_viewChangingEventSource{static_cast<ScrollPresenter*>(this)}
     , m_zoomAnimationStartingEventSource{static_cast<ScrollPresenter*>(this)}
     , m_zoomCompletedEventSource{static_cast<ScrollPresenter*>(this)}
+    , m_zoomStartingEventSource{static_cast<ScrollPresenter*>(this)}
 {
     EnsureProperties();
 }
@@ -747,6 +748,16 @@ void ScrollPresenterProperties::ScrollCompleted(winrt::event_token const& token)
     m_scrollCompletedEventSource.remove(token);
 }
 
+winrt::event_token ScrollPresenterProperties::ScrollStarting(winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::ScrollingScrollStartingEventArgs> const& value)
+{
+    return m_scrollStartingEventSource.add(value);
+}
+
+void ScrollPresenterProperties::ScrollStarting(winrt::event_token const& token)
+{
+    m_scrollStartingEventSource.remove(token);
+}
+
 winrt::event_token ScrollPresenterProperties::StateChanged(winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::IInspectable> const& value)
 {
     return m_stateChangedEventSource.add(value);
@@ -767,16 +778,6 @@ void ScrollPresenterProperties::ViewChanged(winrt::event_token const& token)
     m_viewChangedEventSource.remove(token);
 }
 
-winrt::event_token ScrollPresenterProperties::ViewChanging(winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::ScrollingViewChangingEventArgs> const& value)
-{
-    return m_viewChangingEventSource.add(value);
-}
-
-void ScrollPresenterProperties::ViewChanging(winrt::event_token const& token)
-{
-    m_viewChangingEventSource.remove(token);
-}
-
 winrt::event_token ScrollPresenterProperties::ZoomAnimationStarting(winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::ScrollingZoomAnimationStartingEventArgs> const& value)
 {
     return m_zoomAnimationStartingEventSource.add(value);
@@ -796,3 +797,13 @@ void ScrollPresenterProperties::ZoomCompleted(winrt::event_token const& token)
 {
     m_zoomCompletedEventSource.remove(token);
 }
+
+winrt::event_token ScrollPresenterProperties::ZoomStarting(winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::ScrollingZoomStartingEventArgs> const& value)
+{
+    return m_zoomStartingEventSource.add(value);
+}
+
+void ScrollPresenterProperties::ZoomStarting(winrt::event_token const& token)
+{
+    m_zoomStartingEventSource.remove(token);
+}
diff --git a/src/controls/dev/Generated/ScrollPresenter.properties.h b/src/controls/dev/Generated/ScrollPresenter.properties.h
index 9f5b265ad4..cfad166073 100644
--- a/src/controls/dev/Generated/ScrollPresenter.properties.h
+++ b/src/controls/dev/Generated/ScrollPresenter.properties.h
@@ -111,27 +111,30 @@ class ScrollPresenterProperties
     void ScrollAnimationStarting(winrt::event_token const& token);
     winrt::event_token ScrollCompleted(winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::ScrollingScrollCompletedEventArgs> const& value);
     void ScrollCompleted(winrt::event_token const& token);
+    winrt::event_token ScrollStarting(winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::ScrollingScrollStartingEventArgs> const& value);
+    void ScrollStarting(winrt::event_token const& token);
     winrt::event_token StateChanged(winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::IInspectable> const& value);
     void StateChanged(winrt::event_token const& token);
     winrt::event_token ViewChanged(winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::IInspectable> const& value);
     void ViewChanged(winrt::event_token const& token);
-    winrt::event_token ViewChanging(winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::ScrollingViewChangingEventArgs> const& value);
-    void ViewChanging(winrt::event_token const& token);
     winrt::event_token ZoomAnimationStarting(winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::ScrollingZoomAnimationStartingEventArgs> const& value);
     void ZoomAnimationStarting(winrt::event_token const& token);
     winrt::event_token ZoomCompleted(winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::ScrollingZoomCompletedEventArgs> const& value);
     void ZoomCompleted(winrt::event_token const& token);
+    winrt::event_token ZoomStarting(winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::ScrollingZoomStartingEventArgs> const& value);
+    void ZoomStarting(winrt::event_token const& token);
 
     event_source<winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::ScrollingAnchorRequestedEventArgs>> m_anchorRequestedEventSource;
     event_source<winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::ScrollingBringingIntoViewEventArgs>> m_bringingIntoViewEventSource;
     event_source<winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::IInspectable>> m_extentChangedEventSource;
     event_source<winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::ScrollingScrollAnimationStartingEventArgs>> m_scrollAnimationStartingEventSource;
     event_source<winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::ScrollingScrollCompletedEventArgs>> m_scrollCompletedEventSource;
+    event_source<winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::ScrollingScrollStartingEventArgs>> m_scrollStartingEventSource;
     event_source<winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::IInspectable>> m_stateChangedEventSource;
     event_source<winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::IInspectable>> m_viewChangedEventSource;
-    event_source<winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::ScrollingViewChangingEventArgs>> m_viewChangingEventSource;
     event_source<winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::ScrollingZoomAnimationStartingEventArgs>> m_zoomAnimationStartingEventSource;
     event_source<winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::ScrollingZoomCompletedEventArgs>> m_zoomCompletedEventSource;
+    event_source<winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::ScrollingZoomStartingEventArgs>> m_zoomStartingEventSource;
 
     static void EnsureProperties();
     static void ClearProperties();
diff --git a/src/controls/dev/Generated/ScrollView.properties.cpp b/src/controls/dev/Generated/ScrollView.properties.cpp
index 8d3d11a9e7..61d3fa20f3 100644
--- a/src/controls/dev/Generated/ScrollView.properties.cpp
+++ b/src/controls/dev/Generated/ScrollView.properties.cpp
@@ -42,11 +42,12 @@ ScrollViewProperties::ScrollViewProperties()
     , m_extentChangedEventSource{static_cast<ScrollView*>(this)}
     , m_scrollAnimationStartingEventSource{static_cast<ScrollView*>(this)}
     , m_scrollCompletedEventSource{static_cast<ScrollView*>(this)}
+    , m_scrollStartingEventSource{static_cast<ScrollView*>(this)}
     , m_stateChangedEventSource{static_cast<ScrollView*>(this)}
     , m_viewChangedEventSource{static_cast<ScrollView*>(this)}
-    , m_viewChangingEventSource{static_cast<ScrollView*>(this)}
     , m_zoomAnimationStartingEventSource{static_cast<ScrollView*>(this)}
     , m_zoomCompletedEventSource{static_cast<ScrollView*>(this)}
+    , m_zoomStartingEventSource{static_cast<ScrollView*>(this)}
 {
     EnsureProperties();
 }
@@ -883,6 +884,16 @@ void ScrollViewProperties::ScrollCompleted(winrt::event_token const& token)
     m_scrollCompletedEventSource.remove(token);
 }
 
+winrt::event_token ScrollViewProperties::ScrollStarting(winrt::TypedEventHandler<winrt::ScrollView, winrt::ScrollingScrollStartingEventArgs> const& value)
+{
+    return m_scrollStartingEventSource.add(value);
+}
+
+void ScrollViewProperties::ScrollStarting(winrt::event_token const& token)
+{
+    m_scrollStartingEventSource.remove(token);
+}
+
 winrt::event_token ScrollViewProperties::StateChanged(winrt::TypedEventHandler<winrt::ScrollView, winrt::IInspectable> const& value)
 {
     return m_stateChangedEventSource.add(value);
@@ -903,16 +914,6 @@ void ScrollViewProperties::ViewChanged(winrt::event_token const& token)
     m_viewChangedEventSource.remove(token);
 }
 
-winrt::event_token ScrollViewProperties::ViewChanging(winrt::TypedEventHandler<winrt::ScrollView, winrt::ScrollingViewChangingEventArgs> const& value)
-{
-    return m_viewChangingEventSource.add(value);
-}
-
-void ScrollViewProperties::ViewChanging(winrt::event_token const& token)
-{
-    m_viewChangingEventSource.remove(token);
-}
-
 winrt::event_token ScrollViewProperties::ZoomAnimationStarting(winrt::TypedEventHandler<winrt::ScrollView, winrt::ScrollingZoomAnimationStartingEventArgs> const& value)
 {
     return m_zoomAnimationStartingEventSource.add(value);
@@ -932,3 +933,13 @@ void ScrollViewProperties::ZoomCompleted(winrt::event_token const& token)
 {
     m_zoomCompletedEventSource.remove(token);
 }
+
+winrt::event_token ScrollViewProperties::ZoomStarting(winrt::TypedEventHandler<winrt::ScrollView, winrt::ScrollingZoomStartingEventArgs> const& value)
+{
+    return m_zoomStartingEventSource.add(value);
+}
+
+void ScrollViewProperties::ZoomStarting(winrt::event_token const& token)
+{
+    m_zoomStartingEventSource.remove(token);
+}
diff --git a/src/controls/dev/Generated/ScrollView.properties.h b/src/controls/dev/Generated/ScrollView.properties.h
index 2c4c99c3e7..fcb82b5218 100644
--- a/src/controls/dev/Generated/ScrollView.properties.h
+++ b/src/controls/dev/Generated/ScrollView.properties.h
@@ -131,27 +131,30 @@ class ScrollViewProperties
     void ScrollAnimationStarting(winrt::event_token const& token);
     winrt::event_token ScrollCompleted(winrt::TypedEventHandler<winrt::ScrollView, winrt::ScrollingScrollCompletedEventArgs> const& value);
     void ScrollCompleted(winrt::event_token const& token);
+    winrt::event_token ScrollStarting(winrt::TypedEventHandler<winrt::ScrollView, winrt::ScrollingScrollStartingEventArgs> const& value);
+    void ScrollStarting(winrt::event_token const& token);
     winrt::event_token StateChanged(winrt::TypedEventHandler<winrt::ScrollView, winrt::IInspectable> const& value);
     void StateChanged(winrt::event_token const& token);
     winrt::event_token ViewChanged(winrt::TypedEventHandler<winrt::ScrollView, winrt::IInspectable> const& value);
     void ViewChanged(winrt::event_token const& token);
-    winrt::event_token ViewChanging(winrt::TypedEventHandler<winrt::ScrollView, winrt::ScrollingViewChangingEventArgs> const& value);
-    void ViewChanging(winrt::event_token const& token);
     winrt::event_token ZoomAnimationStarting(winrt::TypedEventHandler<winrt::ScrollView, winrt::ScrollingZoomAnimationStartingEventArgs> const& value);
     void ZoomAnimationStarting(winrt::event_token const& token);
     winrt::event_token ZoomCompleted(winrt::TypedEventHandler<winrt::ScrollView, winrt::ScrollingZoomCompletedEventArgs> const& value);
     void ZoomCompleted(winrt::event_token const& token);
+    winrt::event_token ZoomStarting(winrt::TypedEventHandler<winrt::ScrollView, winrt::ScrollingZoomStartingEventArgs> const& value);
+    void ZoomStarting(winrt::event_token const& token);
 
     event_source<winrt::TypedEventHandler<winrt::ScrollView, winrt::ScrollingAnchorRequestedEventArgs>> m_anchorRequestedEventSource;
     event_source<winrt::TypedEventHandler<winrt::ScrollView, winrt::ScrollingBringingIntoViewEventArgs>> m_bringingIntoViewEventSource;
     event_source<winrt::TypedEventHandler<winrt::ScrollView, winrt::IInspectable>> m_extentChangedEventSource;
     event_source<winrt::TypedEventHandler<winrt::ScrollView, winrt::ScrollingScrollAnimationStartingEventArgs>> m_scrollAnimationStartingEventSource;
     event_source<winrt::TypedEventHandler<winrt::ScrollView, winrt::ScrollingScrollCompletedEventArgs>> m_scrollCompletedEventSource;
+    event_source<winrt::TypedEventHandler<winrt::ScrollView, winrt::ScrollingScrollStartingEventArgs>> m_scrollStartingEventSource;
     event_source<winrt::TypedEventHandler<winrt::ScrollView, winrt::IInspectable>> m_stateChangedEventSource;
     event_source<winrt::TypedEventHandler<winrt::ScrollView, winrt::IInspectable>> m_viewChangedEventSource;
-    event_source<winrt::TypedEventHandler<winrt::ScrollView, winrt::ScrollingViewChangingEventArgs>> m_viewChangingEventSource;
     event_source<winrt::TypedEventHandler<winrt::ScrollView, winrt::ScrollingZoomAnimationStartingEventArgs>> m_zoomAnimationStartingEventSource;
     event_source<winrt::TypedEventHandler<winrt::ScrollView, winrt::ScrollingZoomCompletedEventArgs>> m_zoomCompletedEventSource;
+    event_source<winrt::TypedEventHandler<winrt::ScrollView, winrt::ScrollingZoomStartingEventArgs>> m_zoomStartingEventSource;
 
     static void EnsureProperties();
     static void ClearProperties();
diff --git a/src/controls/dev/NavigationView/NavigationView.cpp b/src/controls/dev/NavigationView/NavigationView.cpp
index ea5f8a7a13..e2b9187650 100644
--- a/src/controls/dev/NavigationView/NavigationView.cpp
+++ b/src/controls/dev/NavigationView/NavigationView.cpp
@@ -2407,13 +2407,17 @@ void NavigationView::ChangeSelection(const winrt::IInspectable& prevItem, const
             m_pendingSelectionChangedItem = nextItem;
             m_pendingSelectionChangedDirection = recommendedDirection;
 
+            // Previously we used get_weak() here, but we hit a refcounting problem where 
+            // in some scenarios the outer object gets an extra Release() in this process.
+            auto weakThis {winrt::make_weak(static_cast<winrt::NavigationView>(*this))};
             DispatcherQueue().TryEnqueue(
                 winrt::DispatcherQueuePriority::Low,
-                winrt::DispatcherQueueHandler([weakThis{get_weak()}]()
+                winrt::DispatcherQueueHandler([weakThis]()
                 {
                     if(auto strongThis = weakThis.get())
                     {
-                        strongThis->CompletePendingSelectionChange();
+                        NavigationView* rawThis = winrt::get_self<NavigationView>(strongThis);
+                        rawThis->CompletePendingSelectionChange();
                     }
                 }));
         }
diff --git a/src/controls/dev/Repeater/TestUI/RepeaterTestUIPage.xaml b/src/controls/dev/Repeater/TestUI/RepeaterTestUIPage.xaml
index aa36ad9253..bbdf7507dc 100644
--- a/src/controls/dev/Repeater/TestUI/RepeaterTestUIPage.xaml
+++ b/src/controls/dev/Repeater/TestUI/RepeaterTestUIPage.xaml
@@ -83,6 +83,7 @@
 
         <StackPanel>
             <TextBlock Text="Other Samples" Style="{ThemeResource HeaderTextBlockStyle}"/>
+            <Button x:Name="objectModelTest" AutomationProperties.Name="Object Model Test">Object Model Test</Button>
             <Button x:Name="defaultDemo" AutomationProperties.Name="Default Demo">Default Demo</Button>
             <Button x:Name="basicDemo" AutomationProperties.Name="Basic Demo">Basic Demo</Button>
             <Button x:Name="uniformGridLayoutDemo" AutomationProperties.Name="UniformGridLayoutDemo">UniformGridLayout testing</Button>
diff --git a/src/controls/dev/Repeater/TestUI/RepeaterTestUIPage.xaml.cs b/src/controls/dev/Repeater/TestUI/RepeaterTestUIPage.xaml.cs
index 74a2257367..ddd2165d96 100644
--- a/src/controls/dev/Repeater/TestUI/RepeaterTestUIPage.xaml.cs
+++ b/src/controls/dev/Repeater/TestUI/RepeaterTestUIPage.xaml.cs
@@ -19,6 +19,11 @@ public RepeaterTestUIPage()
         {
             this.InitializeComponent();
 
+            objectModelTest.Click += delegate
+            {
+                Frame.NavigateWithoutAnimation(typeof(ObjectModelTestPage));
+            };
+
             defaultDemo.Click += delegate 
             {
                 Frame.NavigateWithoutAnimation(typeof(Defaults));
diff --git a/src/controls/dev/Repeater/TestUI/Repeater_TestUI.projitems b/src/controls/dev/Repeater/TestUI/Repeater_TestUI.projitems
index 460919a505..894c61591d 100644
--- a/src/controls/dev/Repeater/TestUI/Repeater_TestUI.projitems
+++ b/src/controls/dev/Repeater/TestUI/Repeater_TestUI.projitems
@@ -37,6 +37,10 @@
       <Generator>MSBuild:Compile</Generator>
       <IncludeInWindowsAppx>false</IncludeInWindowsAppx>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Samples\ObjectModelTestPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Samples\BasicDemo.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -145,6 +149,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)Samples\AnimationSamples\AnimationsDemoPage.xaml.cs">
       <DependentUpon>AnimationsDemoPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Samples\ObjectModelTestPage.xaml.cs">
+      <DependentUpon>ObjectModelTestPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Samples\BasicDemo.xaml.cs">
       <DependentUpon>BasicDemo.xaml</DependentUpon>
     </Compile>
@@ -152,14 +159,18 @@
     <Compile Include="$(MSBuildThisFileDirectory)Samples\Defaults.xaml.cs">
       <DependentUpon>Defaults.xaml</DependentUpon>
     </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Samples\ItemsSourceSamples\ElementsInItemsSourcePage.xaml.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Samples\ItemsSourceSamples\ElementsInItemsSourcePage.xaml.cs">
+      <DependentUpon>ElementsInItemsSourcePage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Samples\LayoutSamples\VirtualLayoutPages\FlowLayoutDemoPage.xaml.cs">
       <DependentUpon>FlowLayoutDemoPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Samples\ItemTemplateSamples\ItemTemplateDemo.xaml.cs">
       <DependentUpon>ItemTemplateDemo.xaml</DependentUpon>
     </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Samples\AnimationSamples\ScaleAnimatedVerticalListDemo.xaml.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Samples\AnimationSamples\ScaleAnimatedVerticalListDemo.xaml.cs">
+      <DependentUpon>ScaleAnimatedVerticalListDemo.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Samples\LayoutSamples\NonVirtualLayoutPages\NonVirtualStackLayoutSamplePage.xaml.cs">
       <DependentUpon>NonVirtualStackLayoutSamplePage.xaml</DependentUpon>
     </Compile>
@@ -233,16 +244,4 @@
       <Link>Images\%(Filename)%(Extension)</Link>
     </Content>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Update="$(MSBuildThisFileDirectory)Samples\ScaleAnimatedVerticalListDemo.xaml.cs">
-      <DependentUpon>ScaleAnimatedVerticalListDemo.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="$(MSBuildThisFileDirectory)Samples\ElementsInItemsSourcePage.xaml.cs">
-      <DependentUpon>ElementsInItemsSourcePage.xaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="$(MSBuildThisFileDirectory)Samples\LayoutSamples\" />
-    <Folder Include="$(MSBuildThisFileDirectory)Samples\AnimationSamples\" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/controls/dev/Repeater/TestUI/Samples/ObjectModelTestPage.xaml b/src/controls/dev/Repeater/TestUI/Samples/ObjectModelTestPage.xaml
new file mode 100644
index 0000000000..fe8f44f7be
--- /dev/null
+++ b/src/controls/dev/Repeater/TestUI/Samples/ObjectModelTestPage.xaml
@@ -0,0 +1,103 @@
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<local:TestPage
+    x:Class="MUXControlsTestApp.Samples.ObjectModelTestPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:MUXControlsTestApp">
+    <local:TestPage.Resources>
+        <DataTemplate x:Key="template1">
+            <TextBlock Text="{Binding}" TextWrapping="Wrap" Margin="4" FontSize="14" MinWidth="100" MaxWidth="600" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+        </DataTemplate>
+    </local:TestPage.Resources>
+    
+    <Grid x:Name="rootGrid" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Margin="4"
+        RowDefinitions="Auto, Auto, *, Auto" ColumnDefinitions="Auto, Auto, *">
+        
+        <StackPanel Orientation="Horizontal" Grid.ColumnSpan="4">
+            <CheckBox x:Name="chkItemsRepeaterProperties"
+                Content="ItemsRepeater Properties"
+                Checked="ChkItemsRepeaterProperties_IsCheckedChanged"
+                Unchecked="ChkItemsRepeaterProperties_IsCheckedChanged"
+                IsChecked="True"
+                IsThreeState="False"
+                Margin="2,0,0,0"/>
+            <CheckBox x:Name="chkLogs"
+                Content="Logs"
+                Checked="ChkLogs_IsCheckedChanged"
+                Unchecked="ChkLogs_IsCheckedChanged"
+                IsChecked="True"
+                IsThreeState="False"
+                Margin="2,0,0,0"/>
+        </StackPanel>
+
+        <ScrollView
+            x:Name="scrollView"
+            Width="300" Height="600"
+            Grid.Row="1" Margin="1"
+            Background="AliceBlue" VerticalAlignment="Top"
+            HorizontalScrollMode="Auto"
+            HorizontalScrollBarVisibility="Auto">
+            <ItemsRepeater x:Name="itemsRepeater">
+            </ItemsRepeater>
+        </ScrollView>
+
+        <Grid x:Name="grdItemsRepeaterProperties" Grid.Row="1" Grid.RowSpan="2" Grid.Column="1" Margin="2" Background="LightYellow"
+            RowDefinitions="Auto, Auto, Auto, Auto, Auto, Auto, Auto" ColumnDefinitions="Auto, Auto">
+            <TextBlock Text="ItemsRepeater Properties" Grid.ColumnSpan="2" Foreground="Red"/>
+
+            <TextBlock Text="ItemTemplate:" Grid.Row="1" VerticalAlignment="Center"/>
+            <ComboBox x:Name="cmbItemTemplate" Width="240" Margin="1" Grid.Row="1" Grid.Column="1"
+                HorizontalAlignment="Left" VerticalAlignment="Center" SelectedIndex="0" SelectionChanged="CmbItemTemplate_SelectionChanged">
+                <ComboBoxItem>null</ComboBoxItem>
+                <ComboBoxItem>TextBlock</ComboBoxItem>
+            </ComboBox>
+
+            <TextBlock Text="ItemsSource:" Grid.Row="2" VerticalAlignment="Center"/>
+            <ComboBox x:Name="cmbItemsSource" Width="240" Margin="1" Grid.Row="2" Grid.Column="1"
+                HorizontalAlignment="Left" VerticalAlignment="Center" SelectedIndex="0" SelectionChanged="CmbItemsSource_SelectionChanged">
+                <ComboBoxItem>null</ComboBoxItem>
+                <ComboBoxItem>ObservableCollection&lt;string&gt;</ComboBoxItem>
+            </ComboBox>
+
+            <TextBlock Text="Layout:" Grid.Row="3" VerticalAlignment="Center"/>
+            <ComboBox x:Name="cmbLayout" Width="240" Margin="1" Grid.Row="3" Grid.Column="1"
+                HorizontalAlignment="Left" VerticalAlignment="Center" SelectedIndex="1" SelectionChanged="CmbLayout_SelectionChanged">
+                <ComboBoxItem>null</ComboBoxItem>
+                <ComboBoxItem>StackLayout</ComboBoxItem>
+                <ComboBoxItem>UniformGridLayout</ComboBoxItem>
+            </ComboBox>
+
+            <TextBlock Text="Children Properties" Grid.Row="4" Grid.ColumnSpan="2" Foreground="Red" Margin="0,4,0,0"/>
+
+            <Button x:Name="btnChangeEvenItemsVisibility" Content="Collapse even realized items" Grid.Row="5" Grid.ColumnSpan="2" Margin="1" Click="BtnChangeEvenItemsVisibility_Click"/>
+            <Button x:Name="btnChangeOddItemsVisibility" Content="Collapse odd realized items" Grid.Row="6" Grid.ColumnSpan="2" Margin="1" Click="BtnChangeOddItemsVisibility_Click"/>
+        </Grid>
+
+        <Grid x:Name="grdLogs" Grid.Row="1" Grid.RowSpan="2" Grid.Column="2" Margin="2"
+            RowDefinitions="Auto, Auto, *" ColumnDefinitions="*">
+            
+            <TextBlock Text="Logs" Foreground="Red"/>
+
+            <StackPanel Orientation="Horizontal" Grid.Row="1">
+                <Button x:Name="btnClearLogs" Content="Clear" Click="BtnClearLogs_Click" Margin="1"/>
+                <StackPanel>
+                    <StackPanel Orientation="Horizontal">
+                        <CheckBox x:Name="chkLogItemsRepeaterEvents" Content="Log ItemsRepeater Events?" IsChecked="True" Margin="1" Checked="ChkLogItemsRepeaterEvents_Checked" Unchecked="ChkLogItemsRepeaterEvents_Unchecked"/>
+                        <CheckBox x:Name="chkLogScrollViewEvents" Content="Log ScrollView Events?" Margin="1" Checked="ChkLogScrollViewEvents_Checked" Unchecked="ChkLogScrollViewEvents_Unchecked"/>
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal">
+                        <CheckBox x:Name="chkLogItemsRepeaterMessages" Content="Log ItemsRepeater Messages?" Margin="1" Checked="ChkLogItemsRepeaterMessages_Checked" Unchecked="ChkLogItemsRepeaterMessages_Unchecked"/>
+                        <CheckBox x:Name="chkLogScrollViewMessages" Content="Log ScrollView Messages?" Margin="1" Checked="ChkLogScrollViewMessages_Checked" Unchecked="ChkLogScrollViewMessages_Unchecked"/>
+                    </StackPanel>
+                </StackPanel>
+            </StackPanel>
+            <ListBox x:Name="lstLogs" Margin="1" Grid.Row="2"/>
+        </Grid>
+
+        <StackPanel Orientation="Horizontal" Grid.Row="3" Grid.ColumnSpan="4">
+            <TextBlock Text="Exception Report" VerticalAlignment="Center" Margin="2"/>
+            <Button x:Name="btnClearExceptionReport" Content="Clear Exception Report" Click="BtnClearExceptionReport_Click" Margin="2"/>
+            <TextBox x:Name="txtExceptionReport" IsReadOnly="True" Margin="2"/>
+        </StackPanel>
+    </Grid>
+</local:TestPage>
diff --git a/src/controls/dev/Repeater/TestUI/Samples/ObjectModelTestPage.xaml.cs b/src/controls/dev/Repeater/TestUI/Samples/ObjectModelTestPage.xaml.cs
new file mode 100644
index 0000000000..c3bf6849a1
--- /dev/null
+++ b/src/controls/dev/Repeater/TestUI/Samples/ObjectModelTestPage.xaml.cs
@@ -0,0 +1,597 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using Common;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using MUXControlsTestApp.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Windows.UI;
+
+using MUXControlsTestHooks = Microsoft.UI.Private.Controls.MUXControlsTestHooks;
+using MUXControlsTestHooksLoggingMessageEventArgs = Microsoft.UI.Private.Controls.MUXControlsTestHooksLoggingMessageEventArgs;
+
+namespace MUXControlsTestApp.Samples
+{
+    public sealed partial class ObjectModelTestPage : TestPage
+    {
+        private List<int> _collapsedElements = null;
+        private ObservableCollection<string> _colStrings = null;
+
+        public ObjectModelTestPage()
+        {
+            this.InitializeComponent();
+
+            if (chkLogScrollViewMessages.IsChecked == true || chkLogItemsRepeaterMessages.IsChecked == true)
+            {
+                MUXControlsTestHooks.LoggingMessage += MUXControlsTestHooks_LoggingMessage;
+
+                if (chkLogItemsRepeaterMessages.IsChecked == true)
+                {
+                    MUXControlsTestHooks.SetLoggingLevelForType("ItemsRepeater", isLoggingInfoLevel: true, isLoggingVerboseLevel: true);
+                }
+                if (chkLogScrollViewMessages.IsChecked == true)
+                {
+                    MUXControlsTestHooks.SetLoggingLevelForType("ScrollView", isLoggingInfoLevel: true, isLoggingVerboseLevel: true);
+                }
+            }
+
+            if (itemsRepeater != null)
+            {
+                itemsRepeater.ElementPrepared += ItemsRepeater_ElementPrepared;
+                itemsRepeater.ElementClearing += ItemsRepeater_ElementClearing;
+            }
+        }
+
+        ~ObjectModelTestPage()
+        {
+        }
+
+        protected override void OnNavigatedFrom(NavigationEventArgs e)
+        {
+            MUXControlsTestHooks.SetLoggingLevelForType("ItemsRepeater", isLoggingInfoLevel: false, isLoggingVerboseLevel: false);
+            MUXControlsTestHooks.SetLoggingLevelForType("ScrollView", isLoggingInfoLevel: false, isLoggingVerboseLevel: false);
+
+            MUXControlsTestHooks.LoggingMessage -= MUXControlsTestHooks_LoggingMessage;
+
+            if (itemsRepeater != null)
+            {
+                itemsRepeater.ElementPrepared -= ItemsRepeater_ElementPrepared;
+                itemsRepeater.ElementClearing -= ItemsRepeater_ElementClearing;
+            }
+
+            base.OnNavigatedFrom(e);
+        }
+
+        private void CmbItemTemplate_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            try
+            {
+                if (itemsRepeater != null)
+                {
+                    if (cmbItemTemplate.SelectedIndex == 0)
+                    {
+                        itemsRepeater.ItemTemplate = null;
+                    }
+                    else
+                    {
+                        itemsRepeater.ItemTemplate = Resources["template" + cmbItemTemplate.SelectedIndex.ToString()] as DataTemplate;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+                AppendEventMessage(ex.ToString());
+            }
+        }
+
+        private void CmbItemsSource_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            try
+            {
+                if (itemsRepeater != null)
+                {
+                    switch (cmbItemsSource.SelectedIndex)
+                    {
+                        case 0:
+                            if (itemsRepeater.ItemsSource != null)
+                            {
+                                itemsRepeater.ItemsSource = null;
+                                _collapsedElements = null;
+                                btnChangeEvenItemsVisibility.Content = "Collapse even realized items";
+                                btnChangeOddItemsVisibility.Content = "Collapse odd realized items";
+                            }
+                            break;
+                        case 1:
+                            if (_colStrings == null)
+                            {
+                                _colStrings = new ObservableCollection<string>();
+
+                                for (int itemIndex = 0; itemIndex < 200; itemIndex++)
+                                {
+                                    _colStrings.Add("Item" + itemIndex);
+                                }
+                            }
+                            itemsRepeater.ItemsSource = _colStrings;
+                            break;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+                AppendEventMessage(ex.ToString());
+            }
+        }
+
+        private void CmbLayout_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            try
+            {
+                if (itemsRepeater != null)
+                {
+                    switch (cmbLayout.SelectedIndex)
+                    {
+                        case 0:
+                            itemsRepeater.Layout = null;
+                            break;
+                        case 1:
+                            itemsRepeater.Layout = new StackLayout();
+                            break;
+                        case 2:
+                            itemsRepeater.Layout = new UniformGridLayout();
+                            break;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+                AppendEventMessage(ex.ToString());
+            }
+        }
+
+        private void BtnChangeEvenItemsVisibility_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (itemsRepeater != null && _colStrings != null)
+                {
+                    Visibility newVisibility = Visibility.Collapsed;
+
+                    if (btnChangeEvenItemsVisibility.Content as string == "Collapse even realized items")
+                    {
+                        btnChangeEvenItemsVisibility.Content = "Show even realized items";
+                    }
+                    else
+                    {
+                        btnChangeEvenItemsVisibility.Content = "Collapse even realized items";
+                        newVisibility = Visibility.Visible;
+                    }
+
+                    if (_collapsedElements == null)
+                    {
+                        _collapsedElements = new List<int>();
+                    }
+
+                    for (int i = 0; i < (_colStrings.Count + 1) / 2; i++)
+                    {
+                        UIElement element = itemsRepeater.TryGetElement(2 * i);
+                        if (element != null)
+                        {
+                            element.Visibility = newVisibility;
+
+                            if (newVisibility == Visibility.Visible)
+                            {
+                                if (_collapsedElements.Contains(2 * i))
+                                {
+                                    _collapsedElements.Remove(2 * i);
+                                }
+                            }
+                            else
+                            {
+                                if (!_collapsedElements.Contains(2 * i))
+                                {
+                                    _collapsedElements.Add(2 * i);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+                AppendEventMessage(ex.ToString());
+            }
+        }
+
+        private void BtnChangeOddItemsVisibility_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (itemsRepeater != null && _colStrings != null)
+                {
+                    Visibility newVisibility = Visibility.Collapsed;
+
+                    if (btnChangeOddItemsVisibility.Content as string == "Collapse odd realized items")
+                    {
+                        btnChangeOddItemsVisibility.Content = "Show odd realized items";
+                    }
+                    else
+                    {
+                        btnChangeOddItemsVisibility.Content = "Collapse odd realized items";
+                        newVisibility = Visibility.Visible;
+                    }
+
+                    if (_collapsedElements == null)
+                    {
+                        _collapsedElements = new List<int>();
+                    }
+
+                    for (int i = 0; i < _colStrings.Count / 2; i++)
+                    {
+                        UIElement element = itemsRepeater.TryGetElement(2 * i + 1);
+                        if (element != null)
+                        {
+                            element.Visibility = newVisibility;
+
+                            if (newVisibility == Visibility.Visible)
+                            {
+                                if (_collapsedElements.Contains(2 * i + 1))
+                                {
+                                    _collapsedElements.Remove(2 * i + 1);
+                                }
+                            }
+                            else
+                            {
+                                if (!_collapsedElements.Contains(2 * i + 1))
+                                {
+                                    _collapsedElements.Add(2 * i + 1);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+                AppendEventMessage(ex.ToString());
+            }
+        }
+
+        private void ChkItemsRepeaterProperties_IsCheckedChanged(object sender, RoutedEventArgs e)
+        {
+            if (grdItemsRepeaterProperties != null && chkItemsRepeaterProperties != null)
+                grdItemsRepeaterProperties.Visibility = chkItemsRepeaterProperties.IsChecked == true ? Visibility.Visible : Visibility.Collapsed;
+        }
+
+        private void ChkLogs_IsCheckedChanged(object sender, RoutedEventArgs e)
+        {
+            if (grdLogs != null && chkLogs != null)
+                grdLogs.Visibility = chkLogs.IsChecked == true ? Visibility.Visible : Visibility.Collapsed;
+        }
+
+        private void ScrollView_Loaded(object sender, RoutedEventArgs e)
+        {
+            AppendEventMessage($"ScrollView.Loaded");
+            LogScrollViewInfo();
+        }
+
+        private void ScrollView_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            AppendEventMessage($"ScrollView.SizeChanged Size={scrollView.ActualWidth}, {scrollView.ActualHeight}");
+            LogScrollViewInfo();
+        }
+
+        private void ScrollView_GettingFocus(UIElement sender, Microsoft.UI.Xaml.Input.GettingFocusEventArgs args)
+        {
+            FrameworkElement oldFE = args.OldFocusedElement as FrameworkElement;
+            string oldFEName = (oldFE == null) ? "null" : oldFE.Name;
+            FrameworkElement newFE = args.NewFocusedElement as FrameworkElement;
+            string newFEName = (newFE == null) ? "null" : newFE.Name;
+
+            AppendEventMessage($"ScrollView.GettingFocus FocusState={args.FocusState}, Direction={args.Direction}, InputDevice={args.InputDevice}, oldFE={oldFEName}, newFE={newFEName}");
+        }
+
+        private void ScrollView_LostFocus(object sender, RoutedEventArgs e)
+        {
+            AppendEventMessage("ScrollView.LostFocus");
+        }
+
+        private void ScrollView_LosingFocus(UIElement sender, Microsoft.UI.Xaml.Input.LosingFocusEventArgs args)
+        {
+            FrameworkElement oldFE = args.OldFocusedElement as FrameworkElement;
+            string oldFEName = (oldFE == null) ? "null" : oldFE.Name;
+            FrameworkElement newFE = args.NewFocusedElement as FrameworkElement;
+            string newFEName = (newFE == null) ? "null" : newFE.Name;
+
+            AppendEventMessage($"ScrollView.LosingFocus FocusState={args.FocusState}, Direction={args.Direction}, InputDevice={args.InputDevice}, oldFE={oldFEName}, newFE={newFEName}");
+        }
+
+        private void ScrollView_GotFocus(object sender, RoutedEventArgs e)
+        {
+            AppendEventMessage("ScrollView.GotFocus");
+        }
+
+        private void ScrollView_ExtentChanged(ScrollView sender, object args)
+        {
+            AppendEventMessage($"ScrollView.ExtentChanged ExtentWidth={sender.ExtentWidth}, ExtentHeight={sender.ExtentHeight}");
+        }
+
+        private void ScrollView_StateChanged(ScrollView sender, object args)
+        {
+            AppendEventMessage($"ScrollView.StateChanged {sender.State.ToString()}");
+        }
+
+        private void ScrollView_ViewChanged(ScrollView sender, object args)
+        {
+            AppendEventMessage($"ScrollView.ViewChanged HorizontalOffset={sender.HorizontalOffset}, VerticalOffset={sender.VerticalOffset}, ZoomFactor={sender.ZoomFactor}");
+        }
+
+        private void ScrollView_ScrollAnimationStarting(ScrollView sender, ScrollingScrollAnimationStartingEventArgs args)
+        {
+            AppendEventMessage($"ScrollView.ScrollAnimationStarting OffsetsChangeCorrelationId={args.CorrelationId}");
+        }
+
+        private void ScrollView_ZoomAnimationStarting(ScrollView sender, ScrollingZoomAnimationStartingEventArgs args)
+        {
+            AppendEventMessage($"ScrollView.ZoomAnimationStarting ZoomFactorChangeCorrelationId={args.CorrelationId}, CenterPoint={args.CenterPoint}");
+        }
+
+        private void ScrollView_ScrollCompleted(ScrollView sender, ScrollingScrollCompletedEventArgs args)
+        {
+            AppendEventMessage($"ScrollView.ScrollCompleted OffsetsChangeCorrelationId={args.CorrelationId}");
+        }
+
+        private void ScrollView_ZoomCompleted(ScrollView sender, ScrollingZoomCompletedEventArgs args)
+        {
+            AppendEventMessage($"ScrollView.ZoomCompleted ZoomFactorChangeCorrelationId={args.CorrelationId}");
+        }
+
+        private void ItemsRepeater_Loaded(object sender, RoutedEventArgs e)
+        {
+            AppendEventMessage($"ItemsRepeater.Loaded");
+            if (chkLogScrollViewEvents.IsChecked == true)
+            {
+                LogScrollViewInfo();
+            }
+        }
+
+        private void ItemsRepeater_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            AppendEventMessage($"ItemsRepeater.SizeChanged Size={scrollView.ActualWidth}, {scrollView.ActualHeight}");
+            if (chkLogScrollViewEvents.IsChecked == true)
+            {
+                LogScrollViewInfo();
+            }
+        }
+
+        private void ItemsRepeater_ElementPrepared(ItemsRepeater sender, ItemsRepeaterElementPreparedEventArgs args)
+        {
+            try
+            {                 
+                if (chkLogItemsRepeaterEvents.IsChecked == true)
+                {
+                    AppendEventMessage($"ItemsRepeater.ElementPrepared Index={args.Index}, Element={args.Element}, Visibility={args.Element.Visibility}");
+                }
+
+                if (_collapsedElements != null && _collapsedElements.Contains(args.Index))
+                {
+                    if (args.Element.Visibility == Visibility.Visible)
+                    {
+                        args.Element.Visibility = Visibility.Collapsed;
+                    }
+                }
+                else if (args.Element.Visibility == Visibility.Collapsed)
+                {
+                    args.Element.Visibility = Visibility.Visible;
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+                AppendEventMessage(ex.ToString());
+            }
+        }
+
+        private void ItemsRepeater_ElementClearing(ItemsRepeater sender, ItemsRepeaterElementClearingEventArgs args)
+        {
+            try
+            {
+                if (chkLogItemsRepeaterEvents.IsChecked == true)
+                {
+                    AppendEventMessage($"ItemsRepeater.ElementClearing Element={args.Element}, Visibility={args.Element.Visibility}");
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+                AppendEventMessage(ex.ToString());
+            }
+        }
+
+        private void LogScrollViewInfo()
+        {
+            AppendEventMessage($"ScrollView Info: HorizontalOffset={scrollView.HorizontalOffset}, VerticalOffset={scrollView.VerticalOffset}, ZoomFactor={scrollView.ZoomFactor}");
+            AppendEventMessage($"ScrollView Info: ViewportWidth={scrollView.ViewportWidth}, ExtentHeight={scrollView.ViewportHeight}");
+            AppendEventMessage($"ScrollView Info: ExtentWidth={scrollView.ExtentWidth}, ExtentHeight={scrollView.ExtentHeight}");
+            AppendEventMessage($"ScrollView Info: ScrollableWidth={scrollView.ScrollableWidth}, ScrollableHeight={scrollView.ScrollableHeight}");
+        }
+
+        private void BtnClearLogs_Click(object sender, RoutedEventArgs e)
+        {
+            lstLogs.Items.Clear();
+        }
+
+        private void ChkLogItemsRepeaterEvents_Checked(object sender, RoutedEventArgs e)
+        {
+            if (itemsRepeater != null)
+            {
+                itemsRepeater.Loaded += ItemsRepeater_Loaded;
+                itemsRepeater.SizeChanged += ItemsRepeater_SizeChanged;
+            }
+        }
+
+        private void ChkLogItemsRepeaterEvents_Unchecked(object sender, RoutedEventArgs e)
+        {
+            if (itemsRepeater != null)
+            {
+                itemsRepeater.Loaded -= ItemsRepeater_Loaded;
+                itemsRepeater.SizeChanged -= ItemsRepeater_SizeChanged;
+            }
+        }
+
+        private void ChkLogScrollViewEvents_Checked(object sender, RoutedEventArgs e)
+        {
+            if (scrollView != null)
+            {
+                scrollView.GettingFocus += ScrollView_GettingFocus;
+                scrollView.GotFocus += ScrollView_GotFocus;
+                scrollView.LosingFocus += ScrollView_LosingFocus;
+                scrollView.LostFocus += ScrollView_LostFocus;
+                scrollView.Loaded += ScrollView_Loaded;
+                scrollView.SizeChanged += ScrollView_SizeChanged;
+                scrollView.ExtentChanged += ScrollView_ExtentChanged;
+                scrollView.StateChanged += ScrollView_StateChanged;
+                scrollView.ViewChanged += ScrollView_ViewChanged;
+                scrollView.ScrollAnimationStarting += ScrollView_ScrollAnimationStarting;
+                scrollView.ZoomAnimationStarting += ScrollView_ZoomAnimationStarting;
+                scrollView.ScrollCompleted += ScrollView_ScrollCompleted;
+                scrollView.ZoomCompleted += ScrollView_ZoomCompleted;
+            }
+        }
+
+        private void ChkLogScrollViewEvents_Unchecked(object sender, RoutedEventArgs e)
+        {
+            if (scrollView != null)
+            {
+                scrollView.GettingFocus -= ScrollView_GettingFocus;
+                scrollView.GotFocus -= ScrollView_GotFocus;
+                scrollView.LosingFocus -= ScrollView_LosingFocus;
+                scrollView.LostFocus -= ScrollView_LostFocus;
+                scrollView.Loaded -= ScrollView_Loaded;
+                scrollView.SizeChanged -= ScrollView_SizeChanged;
+                scrollView.ExtentChanged -= ScrollView_ExtentChanged;
+                scrollView.StateChanged -= ScrollView_StateChanged;
+                scrollView.ViewChanged -= ScrollView_ViewChanged;
+                scrollView.ScrollAnimationStarting -= ScrollView_ScrollAnimationStarting;
+                scrollView.ZoomAnimationStarting -= ScrollView_ZoomAnimationStarting;
+                scrollView.ScrollCompleted -= ScrollView_ScrollCompleted;
+                scrollView.ZoomCompleted -= ScrollView_ZoomCompleted;
+            }
+        }
+
+        private void ChkLogItemsRepeaterMessages_Checked(object sender, RoutedEventArgs e)
+        {
+            MUXControlsTestHooks.SetLoggingLevelForType("ItemsRepeater", isLoggingInfoLevel: true, isLoggingVerboseLevel: true);
+            if (chkLogScrollViewMessages.IsChecked == false)
+                MUXControlsTestHooks.LoggingMessage += MUXControlsTestHooks_LoggingMessage;
+        }
+
+        private void ChkLogItemsRepeaterMessages_Unchecked(object sender, RoutedEventArgs e)
+        {
+            MUXControlsTestHooks.SetLoggingLevelForType("ItemsRepeater", isLoggingInfoLevel: false, isLoggingVerboseLevel: false);
+            if (chkLogScrollViewMessages.IsChecked == false)
+                MUXControlsTestHooks.LoggingMessage -= MUXControlsTestHooks_LoggingMessage;
+        }
+
+        private void ChkLogScrollViewMessages_Checked(object sender, RoutedEventArgs e)
+        {
+            MUXControlsTestHooks.SetLoggingLevelForType("ScrollView", isLoggingInfoLevel: true, isLoggingVerboseLevel: true);
+            if (chkLogItemsRepeaterMessages.IsChecked == false)
+                MUXControlsTestHooks.LoggingMessage += MUXControlsTestHooks_LoggingMessage;
+        }
+
+        private void ChkLogScrollViewMessages_Unchecked(object sender, RoutedEventArgs e)
+        {
+            MUXControlsTestHooks.SetLoggingLevelForType("ScrollView", isLoggingInfoLevel: false, isLoggingVerboseLevel: false);
+            if (chkLogItemsRepeaterMessages.IsChecked == false)
+                MUXControlsTestHooks.LoggingMessage -= MUXControlsTestHooks_LoggingMessage;
+        }
+
+        private void MUXControlsTestHooks_LoggingMessage(object sender, MUXControlsTestHooksLoggingMessageEventArgs args)
+        {
+            // Cut off the terminating new line.
+            string msg = args.Message.Substring(0, args.Message.Length - 1);
+            string eventMessage = string.Empty;
+            string senderName = string.Empty;
+
+            try
+            {
+                FrameworkElement fe = sender as FrameworkElement;
+
+                if (fe != null)
+                {
+                    senderName = "s:" + fe.Name + ", ";
+                }
+            }
+            catch
+            {
+            }
+
+            if (args.IsVerboseLevel)
+            {
+                eventMessage = "Verbose: " + senderName + "m:" + msg;
+            }
+            else
+            {
+                eventMessage = "Info: " + senderName + "m:" + msg;
+            }
+
+            AppendEventMessage(eventMessage);
+        }
+
+        private void AppendEventMessage(string eventMessage)
+        {
+            List<string> lstEventMessage = new List<string>();
+
+            while (eventMessage.Length > 0)
+            {
+                string msgHead = eventMessage;
+
+                if (eventMessage.Length > 110)
+                {
+                    int commaIndex = eventMessage.IndexOf(',', 110);
+                    if (commaIndex != -1)
+                    {
+                        msgHead = eventMessage.Substring(0, commaIndex);
+                        eventMessage = eventMessage.Substring(commaIndex + 1);
+                    }
+                    else
+                    {
+                        eventMessage = string.Empty;
+                    }
+                }
+                else
+                {
+                    eventMessage = string.Empty;
+                }
+
+                lstEventMessage.Add(msgHead);
+            }
+            AppendEventMessage(lstEventMessage);
+        }
+
+        private void AppendEventMessage(List<string> lstEventMessage)
+        {
+            foreach (string eventMessage in lstEventMessage)
+            {
+                lstLogs.Items.Add(eventMessage);
+            }
+            lstEventMessage.Clear();
+        }
+
+        private void BtnClearExceptionReport_Click(object sender, RoutedEventArgs e)
+        {
+            txtExceptionReport.Text = string.Empty;
+        }
+    }
+}
diff --git a/src/controls/dev/Repeater/ViewportManagerWithPlatformFeatures.cpp b/src/controls/dev/Repeater/ViewportManagerWithPlatformFeatures.cpp
index 81e2cb673c..c44ad78f04 100644
--- a/src/controls/dev/Repeater/ViewportManagerWithPlatformFeatures.cpp
+++ b/src/controls/dev/Repeater/ViewportManagerWithPlatformFeatures.cpp
@@ -624,7 +624,8 @@ void ViewportManagerWithPlatformFeatures::OnCompositionTargetRendering(const win
 void ViewportManagerWithPlatformFeatures::ResetScrollers()
 {
     m_scroller.set(nullptr);
-    m_scrollPresenterViewChangingRevoker.revoke();
+    m_scrollPresenterScrollStartingRevoker.revoke();
+    m_scrollPresenterZoomStartingRevoker.revoke();
     m_effectiveViewportChangedRevoker.revoke();
     m_skipScrollAnchorRegistrationsDuringNextMeasurePass = false;
     m_skipScrollAnchorRegistrationsDuringNextArrangePass = false;
@@ -652,12 +653,22 @@ void ViewportManagerWithPlatformFeatures::OnCacheBuildActionCompleted()
 // This event handler checks if that anticipated view, without UI re-generation, would create a blank region in the ScrollPresenter. In the interest of performance, less than
 // 5% blank is tolerated and will not trigger a re-generation. Beyond that, UpdateViewport is called with the anticipated realization window. This is trigger an ItemsRepeater
 // measure/arrange pass based on the anticipated view.
-void ViewportManagerWithPlatformFeatures::OnScrollPresenterViewChanging(winrt::ScrollPresenter const& scrollPresenter, winrt::ScrollingViewChangingEventArgs const& args)
+void ViewportManagerWithPlatformFeatures::OnScrollPresenterScrollStarting(winrt::ScrollPresenter const& scrollPresenter, winrt::ScrollingScrollStartingEventArgs const& args)
+{
+    OnScrollPresenterViewChangeStarting(scrollPresenter, args.HorizontalOffset(), args.VerticalOffset(), args.ZoomFactor());
+}
+
+void ViewportManagerWithPlatformFeatures::OnScrollPresenterZoomStarting(winrt::ScrollPresenter const& scrollPresenter, winrt::ScrollingZoomStartingEventArgs const& args)
+{
+    OnScrollPresenterViewChangeStarting(scrollPresenter, args.HorizontalOffset(), args.VerticalOffset(), args.ZoomFactor());
+}
+
+void ViewportManagerWithPlatformFeatures::OnScrollPresenterViewChangeStarting(winrt::ScrollPresenter const& scrollPresenter, double horizontalOffset, double verticalOffset, float zoomFactor)
 {
     const float blankViewportRatioTolerated = 0.05f;
-    const float anticipatedHorizontalOffset = static_cast<float>(args.HorizontalOffset());
-    const float anticipatedVerticalOffset = static_cast<float>(args.VerticalOffset());
-    const float anticipatedZoomFactor = args.ZoomFactor();
+    const float anticipatedHorizontalOffset = static_cast<float>(horizontalOffset);
+    const float anticipatedVerticalOffset = static_cast<float>(verticalOffset);
+    const float anticipatedZoomFactor = zoomFactor;
     const float anticipatedExtentWidth = static_cast<float>(scrollPresenter.ExtentWidth() * anticipatedZoomFactor);
     const float anticipatedExtentHeight = static_cast<float>(scrollPresenter.ExtentHeight() * anticipatedZoomFactor);
     const float viewportWidth = static_cast<float>(scrollPresenter.ViewportWidth());
@@ -809,7 +820,8 @@ void ViewportManagerWithPlatformFeatures::EnsureScroller()
 
         if (const auto scrollPresenter2 = m_scroller.try_as<winrt::IScrollPresenter2>())
         {
-            m_scrollPresenterViewChangingRevoker = scrollPresenter2.ViewChanging(winrt::auto_revoke, { this, &ViewportManagerWithPlatformFeatures::OnScrollPresenterViewChanging });
+            m_scrollPresenterScrollStartingRevoker = scrollPresenter2.ScrollStarting(winrt::auto_revoke, { this, &ViewportManagerWithPlatformFeatures::OnScrollPresenterScrollStarting });
+            m_scrollPresenterZoomStartingRevoker = scrollPresenter2.ZoomStarting(winrt::auto_revoke, { this, &ViewportManagerWithPlatformFeatures::OnScrollPresenterZoomStarting });
         }
 
         m_ensuredScroller = true;
diff --git a/src/controls/dev/Repeater/ViewportManagerWithPlatformFeatures.h b/src/controls/dev/Repeater/ViewportManagerWithPlatformFeatures.h
index 2f7b95c755..7cb0fd4637 100644
--- a/src/controls/dev/Repeater/ViewportManagerWithPlatformFeatures.h
+++ b/src/controls/dev/Repeater/ViewportManagerWithPlatformFeatures.h
@@ -4,7 +4,8 @@
 #pragma once
 
 #include "ViewportManager.h"
-#include "ScrollingViewChangingEventArgs.h"
+#include "ScrollingScrollStartingEventArgs.h"
+#include "ScrollingZoomStartingEventArgs.h"
 
 class ItemsRepeater;
 
@@ -62,7 +63,9 @@ class ViewportManagerWithPlatformFeatures : public ViewportManager
     void OnCacheBuildActionCompleted();
     void OnEffectiveViewportChanged(winrt::FrameworkElement const& sender, winrt::EffectiveViewportChangedEventArgs const& args);
     void OnLayoutUpdated(winrt::IInspectable const& sender, winrt::IInspectable const& args);
-    void OnScrollPresenterViewChanging(winrt::ScrollPresenter const& scrollPresenter, winrt::ScrollingViewChangingEventArgs const& args);
+    void OnScrollPresenterScrollStarting(winrt::ScrollPresenter const& scrollPresenter, winrt::ScrollingScrollStartingEventArgs const& args);
+    void OnScrollPresenterZoomStarting(winrt::ScrollPresenter const& scrollPresenter, winrt::ScrollingZoomStartingEventArgs const& args);
+    void OnScrollPresenterViewChangeStarting(winrt::ScrollPresenter const& scrollPresenter, double horizontalOffset, double verticalOffset, float zoomFactor);
 
     void EnsureScroller();
     bool HasScroller() const { return m_scroller != nullptr; }
@@ -129,7 +132,8 @@ class ViewportManagerWithPlatformFeatures : public ViewportManager
     bool m_managingViewportDisabled{ false };
 
     // Event tokens
-    winrt::ScrollPresenter::ViewChanging_revoker m_scrollPresenterViewChangingRevoker{};
+    winrt::ScrollPresenter::ScrollStarting_revoker m_scrollPresenterScrollStartingRevoker{};
+    winrt::ScrollPresenter::ZoomStarting_revoker m_scrollPresenterZoomStartingRevoker{};
     winrt::FrameworkElement::EffectiveViewportChanged_revoker m_effectiveViewportChangedRevoker{};
     winrt::FrameworkElement::LayoutUpdated_revoker m_layoutUpdatedRevoker{};
     winrt::Microsoft::UI::Xaml::Media::CompositionTarget::Rendering_revoker m_renderingToken{};
diff --git a/src/controls/dev/ScrollPresenter/APITests/ScrollPresenterViewChangeTests.cs b/src/controls/dev/ScrollPresenter/APITests/ScrollPresenterViewChangeTests.cs
index c7f60e037f..26717e3260 100644
--- a/src/controls/dev/ScrollPresenter/APITests/ScrollPresenterViewChangeTests.cs
+++ b/src/controls/dev/ScrollPresenter/APITests/ScrollPresenterViewChangeTests.cs
@@ -38,7 +38,8 @@ private enum ViewChangeInterruptionKind
         private const int c_MaxStockOffsetsChangeDuration = 1000;
         private const int c_MaxStockZoomFactorChangeDuration = 1000;
 
-        private uint viewChangingCount = 0u;
+        private uint scrollStartingCount = 0u;
+        private uint zoomStartingCount = 0u;
         private uint viewChangedCount = 0u;
 
         [TestMethod]
@@ -526,9 +527,14 @@ public void OffsetsChangeWithCustomDuration()
 
                 RunOnUIThread.Execute(() =>
                 {
-                    scrollPresenter.ViewChanging += (sender, args) =>
+                    scrollPresenter.ScrollStarting += (sender, args) =>
                     {
-                        Log.Comment($"ViewChanging viewChangingCount={++viewChangingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                        Log.Comment($"ScrollStarting scrollStartingCount={++scrollStartingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                    };
+
+                    scrollPresenter.ZoomStarting += (sender, args) =>
+                    {
+                        Log.Comment($"ZoomStarting zoomStartingCount={++zoomStartingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
                     };
 
                     scrollPresenter.ViewChanged += (sender, args) =>
@@ -561,14 +567,16 @@ public void OffsetsChangeWithCustomDuration()
                 RunOnUIThread.Execute(() =>
                 {
                     Log.Comment($"Final HorizontalOffset={scrollPresenter.HorizontalOffset}, VerticalOffset={scrollPresenter.VerticalOffset}, ZoomFactor={scrollPresenter.ZoomFactor}");
-                    Log.Comment($"Final viewChangingCount={viewChangingCount}");
+                    Log.Comment($"Final scrollStartingCount={scrollStartingCount}");
+                    Log.Comment($"Final zoomStartingCount={zoomStartingCount}");
                     Log.Comment($"Final viewChangedCount={viewChangedCount}");
 
                     Verify.AreEqual(600.0, scrollPresenter.HorizontalOffset);
                     Verify.AreEqual(400.0, scrollPresenter.VerticalOffset);
                     Verify.AreEqual(1.0f, scrollPresenter.ZoomFactor);
 
-                    Verify.AreEqual(0u, viewChangingCount);
+                    Verify.AreEqual(0u, scrollStartingCount);
+                    Verify.AreEqual(0u, zoomStartingCount);
                     Verify.IsLessThanOrEqual(viewChangedCount, 2u);
 
                     Verify.AreEqual(ScrollPresenterViewChangeResult.Completed, operation.Result);
@@ -600,9 +608,14 @@ public void ZoomFactorChangeWithCustomDuration()
 
                 RunOnUIThread.Execute(() =>
                 {
-                    scrollPresenter.ViewChanging += (sender, args) =>
+                    scrollPresenter.ScrollStarting += (sender, args) =>
+                    {
+                        Log.Comment($"ScrollStarting scrollStartingCount={++scrollStartingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                    };
+
+                    scrollPresenter.ZoomStarting += (sender, args) =>
                     {
-                        Log.Comment($"ViewChanging viewChangingCount={++viewChangingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                        Log.Comment($"ZoomStarting zoomStartingCount={++zoomStartingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
                     };
 
                     scrollPresenter.ViewChanged += (sender, args) =>
@@ -636,14 +649,16 @@ public void ZoomFactorChangeWithCustomDuration()
                 RunOnUIThread.Execute(() =>
                 {
                     Log.Comment($"Final HorizontalOffset={scrollPresenter.HorizontalOffset}, VerticalOffset={scrollPresenter.VerticalOffset}, ZoomFactor={scrollPresenter.ZoomFactor}");
-                    Log.Comment($"Final viewChangingCount={viewChangingCount}");
+                    Log.Comment($"Final scrollStartingCount={scrollStartingCount}");
+                    Log.Comment($"Final zoomStartingCount={zoomStartingCount}");
                     Log.Comment($"Final viewChangedCount={viewChangedCount}");
 
                     Verify.IsLessThan(Math.Abs(scrollPresenter.HorizontalOffset - 700.0), 0.01);
                     Verify.IsLessThan(Math.Abs(scrollPresenter.VerticalOffset - 1050.0), 0.01);
                     Verify.AreEqual(8.0f, scrollPresenter.ZoomFactor);
 
-                    Verify.AreEqual(0u, viewChangingCount);
+                    Verify.AreEqual(0u, scrollStartingCount);
+                    Verify.AreEqual(0u, zoomStartingCount);
                     Verify.IsLessThanOrEqual(viewChangedCount, 2u);
 
                     Verify.AreEqual(ScrollPresenterViewChangeResult.Completed, operation.Result);
@@ -673,9 +688,14 @@ public void InterruptViewChangeWithUnloading()
 
             RunOnUIThread.Execute(() =>
             {
-                scrollPresenter.ViewChanging += (sender, args) =>
+                scrollPresenter.ScrollStarting += (sender, args) =>
                 {
-                    Log.Comment($"ViewChanging viewChangingCount={++viewChangingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                    Log.Comment($"ScrollStarting scrollStartingCount={++scrollStartingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                };
+
+                scrollPresenter.ZoomStarting += (sender, args) =>
+                {
+                    Log.Comment($"ZoomStarting zoomStartingCount={++zoomStartingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
                 };
 
                 scrollPresenter.ViewChanged += (sender, args) =>
@@ -859,9 +879,14 @@ private void ConsecutiveOffsetJumps(bool waitForFirstCompletion)
 
                 operations = new ScrollPresenterOperation[3];
 
-                scrollPresenter.ViewChanging += (sender, args) =>
+                scrollPresenter.ScrollStarting += (sender, args) =>
+                {
+                    Log.Comment($"ScrollStarting scrollStartingCount={++scrollStartingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                };
+
+                scrollPresenter.ZoomStarting += (sender, args) =>
                 {
-                    Log.Comment($"ViewChanging viewChangingCount={++viewChangingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                    Log.Comment($"ZoomStarting zoomStartingCount={++zoomStartingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
                 };
 
                 scrollPresenter.ViewChanged += (sender, args) =>
@@ -983,9 +1008,14 @@ private void ConsecutiveZoomFactorJumps(bool isFirstZoomRelative, bool isSecondZ
 
                 operations = new ScrollPresenterOperation[3];
 
-                scrollPresenter.ViewChanging += (sender, args) =>
+                scrollPresenter.ScrollStarting += (sender, args) =>
+                {
+                    Log.Comment($"ScrollStarting scrollStartingCount={++scrollStartingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                };
+
+                scrollPresenter.ZoomStarting += (sender, args) =>
                 {
-                    Log.Comment($"ViewChanging viewChangingCount={++viewChangingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                    Log.Comment($"ZoomStarting zoomStartingCount={++zoomStartingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
                 };
 
                 scrollPresenter.ViewChanged += (sender, args) =>
@@ -1130,9 +1160,14 @@ private void ConsecutiveScrollAndZoomJumps(bool isScrollRelative, bool isZoomRel
 
                 operations = new ScrollPresenterOperation[2];
 
-                scrollPresenter.ViewChanging += (sender, args) =>
+                scrollPresenter.ScrollStarting += (sender, args) =>
                 {
-                    Log.Comment($"ViewChanging viewChangingCount={++viewChangingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                    Log.Comment($"ScrollStarting scrollStartingCount={++scrollStartingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                };
+
+                scrollPresenter.ZoomStarting += (sender, args) =>
+                {
+                    Log.Comment($"ZoomStarting zoomStartingCount={++zoomStartingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
                 };
 
                 scrollPresenter.ViewChanged += (sender, args) =>
@@ -1252,9 +1287,14 @@ private void ConsecutiveZoomAndScrollJumps(bool isZoomRelative, bool isScrollRel
 
                 operations = new ScrollPresenterOperation[2];
 
-                scrollPresenter.ViewChanging += (sender, args) =>
+                scrollPresenter.ScrollStarting += (sender, args) =>
                 {
-                    Log.Comment($"ViewChanging viewChangingCount={++viewChangingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                    Log.Comment($"ScrollStarting scrollStartingCount={++scrollStartingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                };
+
+                scrollPresenter.ZoomStarting += (sender, args) =>
+                {
+                    Log.Comment($"ZoomStarting zoomStartingCount={++zoomStartingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
                 };
 
                 scrollPresenter.ViewChanged += (sender, args) =>
@@ -1417,9 +1457,14 @@ private void ChangeOffsetsBeforeLoading(bool animate)
 
                 SetupDefaultUI(scrollPresenter, rectangleScrollPresenterContent, scrollPresenterLoadedEvent, false /*setAsContentRoot*/);
 
-                scrollPresenter.ViewChanging += (sender, args) =>
+                scrollPresenter.ScrollStarting += (sender, args) =>
+                {
+                    Log.Comment($"ScrollStarting scrollStartingCount={++scrollStartingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                };
+
+                scrollPresenter.ZoomStarting += (sender, args) =>
                 {
-                    Log.Comment($"ViewChanging viewChangingCount={++viewChangingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                    Log.Comment($"ZoomStarting zoomStartingCount={++zoomStartingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
                 };
 
                 scrollPresenter.ViewChanged += (sender, args) =>
@@ -1470,9 +1515,14 @@ private void ChangeZoomFactorBeforeLoading(bool animate)
 
                 SetupDefaultUI(scrollPresenter, rectangleScrollPresenterContent, scrollPresenterLoadedEvent, false /*setAsContentRoot*/);
 
-                scrollPresenter.ViewChanging += (sender, args) =>
+                scrollPresenter.ScrollStarting += (sender, args) =>
                 {
-                    Log.Comment($"ViewChanging viewChangingCount={++viewChangingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                    Log.Comment($"ScrollStarting scrollStartingCount={++scrollStartingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                };
+
+                scrollPresenter.ZoomStarting += (sender, args) =>
+                {
+                    Log.Comment($"ZoomStarting zoomStartingCount={++zoomStartingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
                 };
 
                 scrollPresenter.ViewChanged += (sender, args) =>
@@ -1542,9 +1592,17 @@ private void ScrollTo(
 
                     if (hookViewChangingAndChanged)
                     {
-                        scrollPresenter.ViewChanging += (sender, args) =>
+                        scrollPresenter.ScrollStarting += (sender, args) =>
                         {
-                            Log.Comment($"ViewChanging viewChangingCount={++viewChangingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                            Log.Comment($"ScrollStarting scrollStartingCount={++scrollStartingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                            anticipatedHorizontalOffset = args.HorizontalOffset;
+                            anticipatedVerticalOffset = args.VerticalOffset;
+                            anticipatedZoomFactor = args.ZoomFactor;
+                        };
+
+                        scrollPresenter.ZoomStarting += (sender, args) =>
+                        {
+                            Log.Comment($"ZoomStarting zoomStartingCount={++zoomStartingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
                             anticipatedHorizontalOffset = args.HorizontalOffset;
                             anticipatedVerticalOffset = args.VerticalOffset;
                             anticipatedZoomFactor = args.ZoomFactor;
@@ -1582,22 +1640,24 @@ private void ScrollTo(
                 RunOnUIThread.Execute(() =>
                 {
                     Log.Comment($"Final HorizontalOffset={scrollPresenter.HorizontalOffset}, VerticalOffset={scrollPresenter.VerticalOffset}, ZoomFactor={scrollPresenter.ZoomFactor}");
-                    Log.Comment($"Final viewChangingCount={viewChangingCount}");
+                    Log.Comment($"Final scrollStartingCount={scrollStartingCount}");
+                    Log.Comment($"Final zoomStartingCount={zoomStartingCount}");
                     Log.Comment($"Final viewChangedCount={viewChangedCount}");
 
                     Verify.AreEqual(expectedFinalHorizontalOffset, scrollPresenter.HorizontalOffset);
                     Verify.AreEqual(expectedFinalVerticalOffset, scrollPresenter.VerticalOffset);
                     Verify.AreEqual(originalZoomFactor, scrollPresenter.ZoomFactor);
                     Verify.AreEqual(ScrollPresenterViewChangeResult.Completed, operation.Result);
+                    Verify.AreEqual(0u, zoomStartingCount);
 
                     if (GetEffectiveIsAnimationEnabled(animationMode, isAnimationsEnabledOverride))
                     {
-                        Verify.AreEqual(0u, viewChangingCount);
+                        Verify.AreEqual(0u, scrollStartingCount);
                         Verify.IsFalse(viewChangedCount == 1u);
                     }
                     else
                     {
-                        Verify.IsLessThanOrEqual(viewChangingCount, 1u);
+                        Verify.IsLessThanOrEqual(scrollStartingCount, 1u);
                         Verify.IsLessThanOrEqual(viewChangedCount, 1u);
                         if (anticipatedHorizontalOffset != null && anticipatedVerticalOffset != null && anticipatedZoomFactor != null)
                         {
@@ -1655,9 +1715,17 @@ private void ScrollBy(
 
                     if (hookViewChangingAndChanged)
                     {
-                        scrollPresenter.ViewChanging += (sender, args) =>
+                        scrollPresenter.ScrollStarting += (sender, args) =>
+                        {
+                            Log.Comment($"ScrollStarting scrollStartingCount={++scrollStartingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                            anticipatedHorizontalOffset = args.HorizontalOffset;
+                            anticipatedVerticalOffset = args.VerticalOffset;
+                            anticipatedZoomFactor = args.ZoomFactor;
+                        };
+
+                        scrollPresenter.ZoomStarting += (sender, args) =>
                         {
-                            Log.Comment($"ViewChanging viewChangingCount={++viewChangingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                            Log.Comment($"ZoomStarting zoomStartingCount={++zoomStartingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
                             anticipatedHorizontalOffset = args.HorizontalOffset;
                             anticipatedVerticalOffset = args.VerticalOffset;
                             anticipatedZoomFactor = args.ZoomFactor;
@@ -1699,22 +1767,24 @@ private void ScrollBy(
                 RunOnUIThread.Execute(() =>
                 {
                     Log.Comment($"Final HorizontalOffset={scrollPresenter.HorizontalOffset}, VerticalOffset={scrollPresenter.VerticalOffset}, ZoomFactor={scrollPresenter.ZoomFactor}");
-                    Log.Comment($"Final viewChangingCount={viewChangingCount}");
+                    Log.Comment($"Final scrollStartingCount={scrollStartingCount}");
+                    Log.Comment($"Final zoomStartingCount={zoomStartingCount}");
                     Log.Comment($"Final viewChangedCount={viewChangedCount}");
 
                     Verify.AreEqual(expectedFinalHorizontalOffset, scrollPresenter.HorizontalOffset);
                     Verify.AreEqual(expectedFinalVerticalOffset, scrollPresenter.VerticalOffset);
                     Verify.AreEqual(originalZoomFactor, scrollPresenter.ZoomFactor);
                     Verify.AreEqual(ScrollPresenterViewChangeResult.Completed, operation.Result);
+                    Verify.AreEqual(0u, zoomStartingCount);
 
                     if (GetEffectiveIsAnimationEnabled(animationMode, isAnimationsEnabledOverride))
                     {
-                        Verify.AreEqual(0u, viewChangingCount);
+                        Verify.AreEqual(0u, scrollStartingCount);
                         Verify.IsGreaterThan(viewChangedCount, 1u);
                     }
                     else
                     {
-                        Verify.AreEqual(1u, viewChangingCount);
+                        Verify.AreEqual(1u, scrollStartingCount);
                         Verify.AreEqual(1u, viewChangedCount);
                         if (anticipatedHorizontalOffset != null && anticipatedVerticalOffset != null && anticipatedZoomFactor != null)
                         {
@@ -1766,9 +1836,14 @@ private void AddScrollVelocity(
 
                     if (hookViewChangingAndChanged)
                     {
-                        scrollPresenter.ViewChanging += (sender, args) =>
+                        scrollPresenter.ScrollStarting += (sender, args) =>
                         {
-                            Log.Comment($"ViewChanging viewChangingCount={++viewChangingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                            Log.Comment($"ScrollStarting scrollStartingCount={++scrollStartingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                        };
+
+                        scrollPresenter.ZoomStarting += (sender, args) =>
+                        {
+                            Log.Comment($"ZoomStarting zoomStartingCount={++zoomStartingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
                         };
 
                         scrollPresenter.ViewChanged += (sender, args) =>
@@ -1841,7 +1916,8 @@ private ScrollPresenterOperation StartScrollTo(
             Log.Comment("ScrollTo - horizontalOffset={0}, verticalOffset={1}, animationMode={2}, snapPointsMode={3}",
                 horizontalOffset, verticalOffset, animationMode, snapPointsMode);
 
-            viewChangingCount = 0u;
+            scrollStartingCount = 0u;
+            zoomStartingCount = 0u;
             viewChangedCount = 0u;
             ScrollPresenterOperation operation = new ScrollPresenterOperation();
 
@@ -1885,7 +1961,8 @@ private ScrollPresenterOperation StartScrollBy(
             Log.Comment("ScrollBy - horizontalOffsetDelta={0}, verticalOffsetDelta={1}, animationMode={2}, snapPointsMode={3}",
                 horizontalOffsetDelta, verticalOffsetDelta, animationMode, snapPointsMode);
 
-            viewChangingCount = 0u;
+            scrollStartingCount = 0u;
+            zoomStartingCount = 0u;
             viewChangedCount = 0u;
             ScrollPresenterOperation operation = new ScrollPresenterOperation();
 
@@ -1936,7 +2013,8 @@ private ScrollPresenterOperation StartAddScrollVelocity(
                 inertiaDecayRate = new Vector2((float)horizontalInertiaDecayRate, (float)verticalInertiaDecayRate);
             }
 
-            viewChangingCount = 0u;
+            scrollStartingCount = 0u;
+            zoomStartingCount = 0u;
             viewChangedCount = 0u;
             ScrollPresenterOperation operation = new ScrollPresenterOperation();
 
@@ -1994,9 +2072,17 @@ private void ZoomTo(
                 {
                     if (hookViewChangingAndChanged)
                     {
-                        scrollPresenter.ViewChanging += (sender, args) =>
+                        scrollPresenter.ScrollStarting += (sender, args) =>
+                        {
+                            Log.Comment($"ScrollStarting scrollStartingCount={++scrollStartingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                            anticipatedHorizontalOffset = args.HorizontalOffset;
+                            anticipatedVerticalOffset = args.VerticalOffset;
+                            anticipatedZoomFactor = args.ZoomFactor;
+                        };
+
+                        scrollPresenter.ZoomStarting += (sender, args) =>
                         {
-                            Log.Comment($"ViewChanging viewChangingCount={++viewChangingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                            Log.Comment($"ZoomStarting zoomStartingCount={++zoomStartingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
                             anticipatedHorizontalOffset = args.HorizontalOffset;
                             anticipatedVerticalOffset = args.VerticalOffset;
                             anticipatedZoomFactor = args.ZoomFactor;
@@ -2023,20 +2109,22 @@ private void ZoomTo(
                 RunOnUIThread.Execute(() =>
                 {
                     Log.Comment($"Final HorizontalOffset={scrollPresenter.HorizontalOffset}, VerticalOffset={scrollPresenter.VerticalOffset}, ZoomFactor={scrollPresenter.ZoomFactor}");
-                    Log.Comment($"Final viewChangingCount={viewChangingCount}");
+                    Log.Comment($"Final scrollStartingCount={scrollStartingCount}");
+                    Log.Comment($"Final zoomStartingCount={zoomStartingCount}");
                     Log.Comment($"Final viewChangedCount={viewChangedCount}");
 
                     Verify.AreEqual(zoomFactor, scrollPresenter.ZoomFactor);
                     Verify.AreEqual(ScrollPresenterViewChangeResult.Completed, operation.Result);
+                    Verify.AreEqual(0u, scrollStartingCount);
 
                     if (GetEffectiveIsAnimationEnabled(animationMode, isAnimationsEnabledOverride))
                     {
-                        Verify.AreEqual(0u, viewChangingCount);
+                        Verify.AreEqual(0u, zoomStartingCount);
                         Verify.IsGreaterThan(viewChangedCount, 1u);
                     }
                     else
                     {
-                        Verify.AreEqual(1u, viewChangingCount);
+                        Verify.AreEqual(1u, zoomStartingCount);
                         Verify.AreEqual(1u, viewChangedCount);
                         if (anticipatedHorizontalOffset != null && anticipatedVerticalOffset != null && anticipatedZoomFactor != null)
                         {
@@ -2086,9 +2174,17 @@ private void ZoomBy(
                 {
                     if (hookViewChangingAndChanged)
                     {
-                        scrollPresenter.ViewChanging += (sender, args) =>
+                        scrollPresenter.ScrollStarting += (sender, args) =>
+                        {
+                            Log.Comment($"ScrollStarting scrollStartingCount={++scrollStartingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                            anticipatedHorizontalOffset = args.HorizontalOffset;
+                            anticipatedVerticalOffset = args.VerticalOffset;
+                            anticipatedZoomFactor = args.ZoomFactor;
+                        };
+
+                        scrollPresenter.ZoomStarting += (sender, args) =>
                         {
-                            Log.Comment($"ViewChanging viewChangingCount={++viewChangingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                            Log.Comment($"ZoomStarting zoomStartingCount={++zoomStartingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
                             anticipatedHorizontalOffset = args.HorizontalOffset;
                             anticipatedVerticalOffset = args.VerticalOffset;
                             anticipatedZoomFactor = args.ZoomFactor;
@@ -2119,20 +2215,22 @@ private void ZoomBy(
                 RunOnUIThread.Execute(() =>
                 {
                     Log.Comment($"Final HorizontalOffset={scrollPresenter.HorizontalOffset}, VerticalOffset={scrollPresenter.VerticalOffset}, ZoomFactor={scrollPresenter.ZoomFactor}");
-                    Log.Comment($"Final viewChangingCount={viewChangingCount}");
+                    Log.Comment($"Final scrollStartingCount={scrollStartingCount}");
+                    Log.Comment($"Final zoomStartingCount={zoomStartingCount}");
                     Log.Comment($"Final viewChangedCount={viewChangedCount}");
 
                     Verify.AreEqual(zoomFactorDelta + originalZoomFactor, scrollPresenter.ZoomFactor);
                     Verify.AreEqual(ScrollPresenterViewChangeResult.Completed, operation.Result);
+                    Verify.AreEqual(0u, scrollStartingCount);
 
                     if (GetEffectiveIsAnimationEnabled(animationMode, isAnimationsEnabledOverride))
                     {
-                        Verify.AreEqual(0u, viewChangingCount);
+                        Verify.AreEqual(0u, zoomStartingCount);
                         Verify.IsGreaterThan(viewChangedCount, 1u);
                     }
                     else
                     {
-                        Verify.AreEqual(1u, viewChangingCount);
+                        Verify.AreEqual(1u, zoomStartingCount);
                         Verify.AreEqual(1u, viewChangedCount);
                         if (anticipatedHorizontalOffset != null && anticipatedVerticalOffset != null && anticipatedZoomFactor != null)
                         {
@@ -2177,9 +2275,14 @@ private void AddZoomVelocity(
                 {
                     if (hookViewChangingAndChanged)
                     {
-                        scrollPresenter.ViewChanging += (sender, args) =>
+                        scrollPresenter.ScrollStarting += (sender, args) =>
+                        {
+                            Log.Comment($"ScrollStarting scrollStartingCount={++scrollStartingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                        };
+
+                        scrollPresenter.ZoomStarting += (sender, args) =>
                         {
-                            Log.Comment($"ViewChanging viewChangingCount={++viewChangingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                            Log.Comment($"ZoomStarting zoomStartingCount={++zoomStartingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
                         };
 
                         scrollPresenter.ViewChanged += (sender, args) =>
@@ -2244,7 +2347,8 @@ private ScrollPresenterOperation StartZoomTo(
             Log.Comment("ZoomTo - zoomFactor={0}, centerPoint=({1},{2}), animationMode={3}, snapPointsMode={4}",
                 zoomFactor, centerPointX, centerPointY, animationMode, snapPointsMode);
 
-            viewChangingCount = 0u;
+            scrollStartingCount = 0u;
+            zoomStartingCount = 0u;
             viewChangedCount = 0u;
             ScrollPresenterOperation operation = new ScrollPresenterOperation();
 
@@ -2289,7 +2393,8 @@ private ScrollPresenterOperation StartZoomBy(
             Log.Comment("ZoomBy - zoomFactorDelta={0}, centerPoint=({1},{2}), animationMode={3}, snapPointsMode={4}",
                 zoomFactorDelta, centerPointX, centerPointY, animationMode, snapPointsMode);
 
-            viewChangingCount = 0u;
+            scrollStartingCount = 0u;
+            zoomStartingCount = 0u;
             viewChangedCount = 0u;
             ScrollPresenterOperation operation = new ScrollPresenterOperation();
 
@@ -2333,7 +2438,8 @@ private ScrollPresenterOperation StartAddZoomVelocity(
             Log.Comment("AddZoomVelocity - zoomFactorVelocity={0}, inertiaDecayRate={1}, centerPoint=({2},{3})",
                 zoomFactorVelocity, inertiaDecayRate, centerPointX, centerPointY);
 
-            viewChangingCount = 0u;
+            scrollStartingCount = 0u;
+            zoomStartingCount = 0u;
             viewChangedCount = 0u;
             ScrollPresenterOperation operation = new ScrollPresenterOperation();
 
diff --git a/src/controls/dev/ScrollPresenter/ScrollPresenter.cpp b/src/controls/dev/ScrollPresenter/ScrollPresenter.cpp
index bd3e28e39b..16b249da0e 100644
--- a/src/controls/dev/ScrollPresenter/ScrollPresenter.cpp
+++ b/src/controls/dev/ScrollPresenter/ScrollPresenter.cpp
@@ -235,8 +235,8 @@ double ScrollPresenter::ScrollableHeight() const
 }
 
 // AnticipatedZoomedHorizontalOffset, AnticipatedZoomedVerticalOffset() and AnticipatedZoomFactor() are
-// used to evaluate the view for the ViewChanging event raised when a ScrollTo, ScrollBy, ZoomTo or ZoomBy
-// request is handed off to the InteractionTracker.
+// used to evaluate the view for the ScrollStarting/ZoomStarting events raised when a ScrollTo, ScrollBy,
+// ZoomTo or ZoomBy request is handed off to the InteractionTracker.
 
 double ScrollPresenter::AnticipatedZoomedHorizontalOffset() const
 {
@@ -3739,7 +3739,7 @@ void ScrollPresenter::SetContentLayoutOffsetXDbg(float contentLayoutOffsetX)
 
     if (m_contentLayoutOffsetX != contentLayoutOffsetX)
     {
-        UpdateOffset(ScrollPresenterDimension::HorizontalScroll, m_zoomedHorizontalOffset + contentLayoutOffsetX - m_contentLayoutOffsetX);
+        UpdateOffset(ScrollPresenterDimension::HorizontalScroll, m_zoomedHorizontalOffset - contentLayoutOffsetX + m_contentLayoutOffsetX);
         m_contentLayoutOffsetX = contentLayoutOffsetX;
         InvalidateArrange();
         OnContentLayoutOffsetChanged(ScrollPresenterDimension::HorizontalScroll);
@@ -3753,7 +3753,7 @@ void ScrollPresenter::SetContentLayoutOffsetYDbg(float contentLayoutOffsetY)
 
     if (m_contentLayoutOffsetY != contentLayoutOffsetY)
     {
-        UpdateOffset(ScrollPresenterDimension::VerticalScroll, m_zoomedVerticalOffset + contentLayoutOffsetY - m_contentLayoutOffsetY);
+        UpdateOffset(ScrollPresenterDimension::VerticalScroll, m_zoomedVerticalOffset - contentLayoutOffsetY + m_contentLayoutOffsetY);
         m_contentLayoutOffsetY = contentLayoutOffsetY;
         InvalidateArrange();
         OnContentLayoutOffsetChanged(ScrollPresenterDimension::VerticalScroll);
@@ -5212,6 +5212,13 @@ void ScrollPresenter::UpdateContent(
     }
     else
     {
+        UpdateUnzoomedExtentAndViewport(
+            false /*renderSizeChanged*/,
+            0.0 /*unzoomedExtentWidth*/,
+            0.0 /*unzoomedExtentHeight*/,
+            m_viewportWidth,
+            m_viewportHeight);
+
         if (m_contentLayoutOffsetX != 0.0f)
         {
             m_contentLayoutOffsetX = 0.0f;
@@ -5340,12 +5347,6 @@ void ScrollPresenter::UpdateUnzoomedExtentAndViewport(
     double viewportWidth,
     double viewportHeight)
 {
-    SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_STR_INT, METH_NAME, this, L"renderSizeChanged", renderSizeChanged);
-    SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_STR_DBL, METH_NAME, this, L"unzoomedExtentWidth", unzoomedExtentWidth);
-    SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_STR_DBL, METH_NAME, this, L"unzoomedExtentHeight", unzoomedExtentHeight);
-    SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_STR_DBL, METH_NAME, this, L"viewportWidth", viewportWidth);
-    SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_STR_DBL, METH_NAME, this, L"viewportHeight", viewportHeight);
-
     const winrt::UIElement content = Content();
     const winrt::UIElement thisAsUIE = *this;
     const double oldUnzoomedExtentWidth = m_unzoomedExtentWidth;
@@ -5353,6 +5354,12 @@ void ScrollPresenter::UpdateUnzoomedExtentAndViewport(
     const double oldViewportWidth = m_viewportWidth;
     const double oldViewportHeight = m_viewportHeight;
 
+    SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_STR_INT, METH_NAME, this, L"renderSizeChanged", renderSizeChanged);
+    SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_STR_DBL_DBL, METH_NAME, this, L"old/new unzoomedExtentWidth", oldUnzoomedExtentWidth, unzoomedExtentWidth);
+    SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_STR_DBL_DBL, METH_NAME, this, L"old/new unzoomedExtentHeight", oldUnzoomedExtentHeight, unzoomedExtentHeight);
+    SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_STR_DBL_DBL, METH_NAME, this, L"old/new viewportWidth", oldViewportWidth, viewportWidth);
+    SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_STR_DBL_DBL, METH_NAME, this, L"old/new viewportHeight", oldViewportHeight, viewportHeight);
+
     MUX_ASSERT(!isinf(unzoomedExtentWidth));
     MUX_ASSERT(!isnan(unzoomedExtentWidth));
     MUX_ASSERT(!isinf(unzoomedExtentHeight));
@@ -5467,7 +5474,7 @@ void ScrollPresenter::UpdateAnticipatedOffset(ScrollPresenterDimension dimension
     {
         if (m_anticipatedZoomedHorizontalOffset != zoomedOffset)
         {
-            SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_STR_DBL, METH_NAME, this, L"anticipatedZoomedHorizontalOffset", zoomedOffset);
+            SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_STR_DBL_DBL, METH_NAME, this, L"old/new anticipatedZoomedHorizontalOffset", m_anticipatedZoomedHorizontalOffset, zoomedOffset);
 
             m_anticipatedZoomedHorizontalOffset = zoomedOffset;
         }
@@ -5477,7 +5484,7 @@ void ScrollPresenter::UpdateAnticipatedOffset(ScrollPresenterDimension dimension
         MUX_ASSERT(dimension == ScrollPresenterDimension::VerticalScroll);
         if (m_anticipatedZoomedVerticalOffset != zoomedOffset)
         {
-            SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_STR_DBL, METH_NAME, this, L"anticipatedZoomedVerticalOffset", zoomedOffset);
+            SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_STR_DBL_DBL, METH_NAME, this, L"old/new anticipatedZoomedVerticalOffset", m_anticipatedZoomedVerticalOffset, zoomedOffset);
 
             m_anticipatedZoomedVerticalOffset = zoomedOffset;
         }
@@ -5488,7 +5495,7 @@ void ScrollPresenter::UpdateAnticipatedZoomFactor(float zoomFactor)
 {
     if (m_anticipatedZoomFactor != zoomFactor)
     {
-        SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_STR_FLT, METH_NAME, this, L"anticipatedZoomFactor", zoomFactor);
+        SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_STR_FLT_FLT, METH_NAME, this, L"old/new anticipatedZoomFactor", m_anticipatedZoomFactor, zoomFactor);
 
         m_anticipatedZoomFactor = zoomFactor;
     }
@@ -5500,7 +5507,7 @@ void ScrollPresenter::UpdateOffset(ScrollPresenterDimension dimension, double zo
     {
         if (m_zoomedHorizontalOffset != zoomedOffset)
         {
-            SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_STR_DBL, METH_NAME, this, L"zoomedHorizontalOffset", zoomedOffset);
+            SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_STR_DBL_DBL, METH_NAME, this, L"old/new zoomedHorizontalOffset", m_zoomedHorizontalOffset, zoomedOffset);
 
             m_zoomedHorizontalOffset = zoomedOffset;
         }
@@ -5510,7 +5517,7 @@ void ScrollPresenter::UpdateOffset(ScrollPresenterDimension dimension, double zo
         MUX_ASSERT(dimension == ScrollPresenterDimension::VerticalScroll);
         if (m_zoomedVerticalOffset != zoomedOffset)
         {
-            SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_STR_DBL, METH_NAME, this, L"zoomedVerticalOffset", zoomedOffset);
+            SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_STR_DBL_DBL, METH_NAME, this, L"old/new zoomedVerticalOffset", m_zoomedVerticalOffset, zoomedOffset);
 
             m_zoomedVerticalOffset = zoomedOffset;
         }
@@ -6372,10 +6379,8 @@ void ScrollPresenter::ProcessOffsetsChange(
             UpdateAnticipatedOffset(ScrollPresenterDimension::VerticalScroll, newAnticipatedZoomedVerticalOffset);
         }
 
-        RaiseViewChanging(
-#ifdef DBG
+        RaiseScrollStarting(
             offsetsChangeCorrelationId,
-#endif // DBG
             AnticipatedZoomedHorizontalOffset(),
             AnticipatedZoomedVerticalOffset(),
             AnticipatedZoomFactor());
@@ -6589,10 +6594,8 @@ void ScrollPresenter::ProcessZoomFactorChange(
         newAnticipatedZoomedVerticalOffset = std::min(AnticipatedScrollableHeight(), newAnticipatedZoomedVerticalOffset);
         UpdateAnticipatedOffset(ScrollPresenterDimension::VerticalScroll, newAnticipatedZoomedVerticalOffset);
 
-        RaiseViewChanging(
-#ifdef DBG
+        RaiseZoomStarting(
             zoomFactorChangeCorrelationId,
-#endif // DBG
             newAnticipatedZoomedHorizontalOffset,
             newAnticipatedZoomedVerticalOffset,
             zoomFactor);
@@ -6698,7 +6701,7 @@ void ScrollPresenter::PostProcessZoomFactorChange(
     ResetZoomFactorInertiaDecayRate();
 }
 
-// Clears the last recorded anticipated view for the ViewChanging event.
+// Clears the last recorded anticipated view for the ScrollStarting/ZoomStarting events.
 // Called in two classes of circumstances:
 // - all queued view change requested were completed,
 // - an animated view change request is handed off to the InteractionTracker.
@@ -6784,15 +6787,18 @@ void ScrollPresenter::CompleteViewChange(
         break;
         case static_cast<int>(InteractionTrackerAsyncOperationTrigger::HorizontalScrollControllerRequest) :
             onHorizontalOffsetChangeCompleted = true;
+            RaiseViewChangeCompleted(true /*isForScroll*/, result, viewChangeCorrelationId);
             break;
         case static_cast<int>(InteractionTrackerAsyncOperationTrigger::VerticalScrollControllerRequest) :
             onVerticalOffsetChangeCompleted = true;
+            RaiseViewChangeCompleted(true /*isForScroll*/, result, viewChangeCorrelationId);
             break;
         case static_cast<int>(InteractionTrackerAsyncOperationTrigger::HorizontalScrollControllerRequest) |
              static_cast<int>(InteractionTrackerAsyncOperationTrigger::VerticalScrollControllerRequest) :
-             onHorizontalOffsetChangeCompleted = true;
-             onVerticalOffsetChangeCompleted = true;
-             break;
+            onHorizontalOffsetChangeCompleted = true;
+            onVerticalOffsetChangeCompleted = true;
+            RaiseViewChangeCompleted(true /*isForScroll*/, result, viewChangeCorrelationId);
+            break;
     }
 
     if (onHorizontalOffsetChangeCompleted && m_horizontalScrollController)
@@ -7492,30 +7498,47 @@ void ScrollPresenter::RaiseStateChanged()
     }
 }
 
-void ScrollPresenter::RaiseViewChanging(
-#ifdef DBG
-    int32_t viewChangeCorrelationIdDbg,
-#endif // DBG
+void ScrollPresenter::RaiseScrollStarting(
+    int32_t offsetsChangeCorrelationId,
     double anticipatedHorizontalOffset,
     double anticipatedVerticalOffset,
     float anticipatedZoomFactor)
 {
-    if (m_viewChangingEventSource)
+    if (m_scrollStartingEventSource)
     {
-        auto viewChangingEventArgs = winrt::make_self<ScrollingViewChangingEventArgs>();
+        auto scrollStartingEventArgs = winrt::make_self<ScrollingScrollStartingEventArgs>();
 
-#ifdef DBG
-        SCROLLPRESENTER_TRACE_INFO(*this, TRACE_MSG_METH_INT, METH_NAME, this, viewChangeCorrelationIdDbg);
-        SCROLLPRESENTER_TRACE_INFO(*this, TRACE_MSG_METH_DBL_DBL, METH_NAME, this, anticipatedHorizontalOffset, anticipatedVerticalOffset);
-        SCROLLPRESENTER_TRACE_INFO(*this, TRACE_MSG_METH_FLT, METH_NAME, this, anticipatedZoomFactor);
+        SCROLLPRESENTER_TRACE_INFO_DBG(*this, TRACE_MSG_METH_INT, METH_NAME, this, offsetsChangeCorrelationId);
+        SCROLLPRESENTER_TRACE_INFO_DBG(*this, TRACE_MSG_METH_DBL_DBL, METH_NAME, this, anticipatedHorizontalOffset, anticipatedVerticalOffset);
+        SCROLLPRESENTER_TRACE_INFO_DBG(*this, TRACE_MSG_METH_FLT, METH_NAME, this, anticipatedZoomFactor);
 
-        viewChangingEventArgs->SetCorrelationIdDbg(viewChangeCorrelationIdDbg);
-#endif // DBG
+        scrollStartingEventArgs->SetCorrelationId(offsetsChangeCorrelationId);
+        scrollStartingEventArgs->SetHorizontalOffset(anticipatedHorizontalOffset);
+        scrollStartingEventArgs->SetVerticalOffset(anticipatedVerticalOffset);
+        scrollStartingEventArgs->SetZoomFactor(anticipatedZoomFactor);
+        m_scrollStartingEventSource(*this, *scrollStartingEventArgs);
+    }
+}
+
+void ScrollPresenter::RaiseZoomStarting(
+    int32_t zoomFactorChangeCorrelationId,
+    double anticipatedHorizontalOffset,
+    double anticipatedVerticalOffset,
+    float anticipatedZoomFactor)
+{
+    if (m_zoomStartingEventSource)
+    {
+        auto zoomStartingEventArgs = winrt::make_self<ScrollingZoomStartingEventArgs>();
+
+        SCROLLPRESENTER_TRACE_INFO_DBG(*this, TRACE_MSG_METH_INT, METH_NAME, this, zoomFactorChangeCorrelationId);
+        SCROLLPRESENTER_TRACE_INFO_DBG(*this, TRACE_MSG_METH_DBL_DBL, METH_NAME, this, anticipatedHorizontalOffset, anticipatedVerticalOffset);
+        SCROLLPRESENTER_TRACE_INFO_DBG(*this, TRACE_MSG_METH_FLT, METH_NAME, this, anticipatedZoomFactor);
 
-        viewChangingEventArgs->SetHorizontalOffset(anticipatedHorizontalOffset);
-        viewChangingEventArgs->SetVerticalOffset(anticipatedVerticalOffset);
-        viewChangingEventArgs->SetZoomFactor(anticipatedZoomFactor);
-        m_viewChangingEventSource(*this, *viewChangingEventArgs);
+        zoomStartingEventArgs->SetCorrelationId(zoomFactorChangeCorrelationId);
+        zoomStartingEventArgs->SetHorizontalOffset(anticipatedHorizontalOffset);
+        zoomStartingEventArgs->SetVerticalOffset(anticipatedVerticalOffset);
+        zoomStartingEventArgs->SetZoomFactor(anticipatedZoomFactor);
+        m_zoomStartingEventSource(*this, *zoomStartingEventArgs);
     }
 }
 
diff --git a/src/controls/dev/ScrollPresenter/ScrollPresenter.h b/src/controls/dev/ScrollPresenter/ScrollPresenter.h
index 1748450d70..173ec1d57d 100644
--- a/src/controls/dev/ScrollPresenter/ScrollPresenter.h
+++ b/src/controls/dev/ScrollPresenter/ScrollPresenter.h
@@ -12,7 +12,8 @@
 #include "ScrollingZoomCompletedEventArgs.h"
 #include "ScrollingBringingIntoViewEventArgs.h"
 #include "ScrollingAnchorRequestedEventArgs.h"
-#include "ScrollingViewChangingEventArgs.h"
+#include "ScrollingScrollStartingEventArgs.h"
+#include "ScrollingZoomStartingEventArgs.h"
 #include "SnapPointWrapper.h"
 #include "ScrollPresenterTrace.h"
 #include "ViewChange.h"
@@ -615,10 +616,13 @@ class ScrollPresenter :
         wstring_view const& propertyName);
     void RaiseExtentChanged();
     void RaiseStateChanged();
-    void RaiseViewChanging(
-#ifdef DBG
-        int32_t viewChangeCorrelationIdDbg,
-#endif // DBG
+    void RaiseScrollStarting(
+        int32_t offsetsChangeCorrelationId,
+        double anticipatedHorizontalOffset,
+        double anticipatedVerticalOffset,
+        float anticipatedZoomFactor);
+    void RaiseZoomStarting(
+        int32_t zoomFactorChangeCorrelationId,
         double anticipatedHorizontalOffset,
         double anticipatedVerticalOffset,
         float anticipatedZoomFactor);
diff --git a/src/controls/dev/ScrollPresenter/ScrollPresenter.idl b/src/controls/dev/ScrollPresenter/ScrollPresenter.idl
index d1986969fc..48d1a82dee 100644
--- a/src/controls/dev/ScrollPresenter/ScrollPresenter.idl
+++ b/src/controls/dev/ScrollPresenter/ScrollPresenter.idl
@@ -169,8 +169,19 @@ runtimeclass ScrollingAnchorRequestedEventArgs
 
 [MUX_PREVIEW]
 [webhosthidden]
-runtimeclass ScrollingViewChangingEventArgs
+runtimeclass ScrollingScrollStartingEventArgs
 {
+    Int32 CorrelationId { get; };
+    Double HorizontalOffset { get; };
+    Double VerticalOffset { get; };
+    Single ZoomFactor{ get; };
+}
+
+[MUX_PREVIEW]
+[webhosthidden]
+runtimeclass ScrollingZoomStartingEventArgs
+{
+    Int32 CorrelationId { get; };
     Double HorizontalOffset { get; };
     Double VerticalOffset { get; };
     Single ZoomFactor{ get; };
diff --git a/src/controls/dev/ScrollPresenter/ScrollPresenter.vcxitems b/src/controls/dev/ScrollPresenter/ScrollPresenter.vcxitems
index 115ffd4998..b8b7b2acf2 100644
--- a/src/controls/dev/ScrollPresenter/ScrollPresenter.vcxitems
+++ b/src/controls/dev/ScrollPresenter/ScrollPresenter.vcxitems
@@ -38,7 +38,8 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)ScrollPresenterTrace.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ScrollingScrollCompletedEventArgs.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ScrollingScrollAnimationStartingEventArgs.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)ScrollingViewChangingEventArgs.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)ScrollingScrollStartingEventArgs.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)ScrollingZoomStartingEventArgs.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)SnapPoint.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)SnapPointWrapper.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ScrollingZoomAnimationStartingEventArgs.h" />
@@ -67,7 +68,8 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)ScrollingBringingIntoViewEventArgs.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)ScrollingScrollCompletedEventArgs.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)ScrollingScrollAnimationStartingEventArgs.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)ScrollingViewChangingEventArgs.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)ScrollingScrollStartingEventArgs.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)ScrollingZoomStartingEventArgs.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)ScrollPresenterTestHooksExpressionAnimationStatusChangedEventArgs.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)ScrollingZoomAnimationStartingEventArgs.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)ScrollingAnchorRequestedEventArgs.cpp" />
diff --git a/src/controls/dev/ScrollPresenter/ScrollPresenterAnchoring.cpp b/src/controls/dev/ScrollPresenter/ScrollPresenterAnchoring.cpp
index 3e35313d7e..6462934597 100644
--- a/src/controls/dev/ScrollPresenter/ScrollPresenterAnchoring.cpp
+++ b/src/controls/dev/ScrollPresenter/ScrollPresenterAnchoring.cpp
@@ -341,6 +341,15 @@ void ScrollPresenter::EnsureAnchorElementSelection()
     m_anchorElementBounds = winrt::Rect{};
     m_isAnchorElementDirty = false;
 
+    const winrt::UIElement content = Content();
+
+    if (!content)
+    {
+        SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_PTR_STR, METH_NAME, this, m_anchorElement.get(), L"Early exit as Content is null.");
+
+        return;
+    }
+
     com_ptr<ScrollPresenterTestHooks> globalTestHooks = ScrollPresenterTestHooks::GetGlobalTestHooks();
     double viewportAnchorPointHorizontalOffset{ 0.0 };
     double viewportAnchorPointVerticalOffset{ 0.0 };
@@ -358,7 +367,6 @@ void ScrollPresenter::EnsureAnchorElementSelection()
     auto anchorRequestedEventArgs = winrt::get_self<ScrollingAnchorRequestedEventArgs>(m_anchorRequestedEventArgs.get());
     winrt::UIElement requestedAnchorElement{ nullptr };
     winrt::IVector<winrt::UIElement> anchorCandidates{ nullptr };
-    const winrt::UIElement content = Content();
 
     if (anchorRequestedEventArgs)
     {
diff --git a/src/controls/dev/ScrollPresenter/ScrollPresenterPrimitives.idl b/src/controls/dev/ScrollPresenter/ScrollPresenterPrimitives.idl
index 01123acadf..eced085d08 100644
--- a/src/controls/dev/ScrollPresenter/ScrollPresenterPrimitives.idl
+++ b/src/controls/dev/ScrollPresenter/ScrollPresenterPrimitives.idl
@@ -354,7 +354,9 @@ unsealed runtimeclass ScrollPresenter :
     event Windows.Foundation.TypedEventHandler<ScrollPresenter, MU_XC_NAMESPACE.ScrollingAnchorRequestedEventArgs> AnchorRequested;
 
     [MUX_PREVIEW]
-    event Windows.Foundation.TypedEventHandler<ScrollPresenter, MU_XC_NAMESPACE.ScrollingViewChangingEventArgs> ViewChanging;
+    event Windows.Foundation.TypedEventHandler<ScrollPresenter, MU_XC_NAMESPACE.ScrollingScrollStartingEventArgs> ScrollStarting;
+    [MUX_PREVIEW]
+    event Windows.Foundation.TypedEventHandler<ScrollPresenter, MU_XC_NAMESPACE.ScrollingZoomStartingEventArgs> ZoomStarting;
 
     static Microsoft.UI.Xaml.DependencyProperty BackgroundProperty { get; };
     static Microsoft.UI.Xaml.DependencyProperty ContentProperty { get; };
diff --git a/src/controls/dev/ScrollPresenter/ScrollingScrollStartingEventArgs.cpp b/src/controls/dev/ScrollPresenter/ScrollingScrollStartingEventArgs.cpp
new file mode 100644
index 0000000000..f3faae3c38
--- /dev/null
+++ b/src/controls/dev/ScrollPresenter/ScrollingScrollStartingEventArgs.cpp
@@ -0,0 +1,45 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+#include "pch.h"
+#include "ScrollingScrollStartingEventArgs.h"
+
+int32_t ScrollingScrollStartingEventArgs::CorrelationId() const
+{
+    return m_correlationId;
+}
+
+void ScrollingScrollStartingEventArgs::SetCorrelationId(int32_t correlationId)
+{
+    m_correlationId = correlationId;
+}
+
+double ScrollingScrollStartingEventArgs::HorizontalOffset() const
+{
+    return m_horizontalOffset;
+}
+
+void ScrollingScrollStartingEventArgs::SetHorizontalOffset(double horizontalOffset)
+{
+    m_horizontalOffset = horizontalOffset;
+}
+
+double ScrollingScrollStartingEventArgs::VerticalOffset() const
+{
+    return m_verticalOffset;
+}
+
+void ScrollingScrollStartingEventArgs::SetVerticalOffset(double verticalOffset)
+{
+    m_verticalOffset = verticalOffset;
+}
+
+float ScrollingScrollStartingEventArgs::ZoomFactor() const
+{
+    return m_zoomFactor;
+}
+
+void ScrollingScrollStartingEventArgs::SetZoomFactor(float zoomFactor)
+{
+    m_zoomFactor = zoomFactor;
+}
diff --git a/src/controls/dev/ScrollPresenter/ScrollingViewChangingEventArgs.h b/src/controls/dev/ScrollPresenter/ScrollingScrollStartingEventArgs.h
similarity index 60%
rename from src/controls/dev/ScrollPresenter/ScrollingViewChangingEventArgs.h
rename to src/controls/dev/ScrollPresenter/ScrollingScrollStartingEventArgs.h
index fc95967326..762a8aebfc 100644
--- a/src/controls/dev/ScrollPresenter/ScrollingViewChangingEventArgs.h
+++ b/src/controls/dev/ScrollPresenter/ScrollingScrollStartingEventArgs.h
@@ -4,42 +4,36 @@
 #pragma once
 
 #include "ScrollPresenter.h"
-#include "ScrollingViewChangingEventArgs.g.h"
+#include "ScrollingScrollStartingEventArgs.g.h"
 
-class ScrollingViewChangingEventArgs :
-    public winrt::implementation::ScrollingViewChangingEventArgsT<ScrollingViewChangingEventArgs>
+class ScrollingScrollStartingEventArgs :
+    public winrt::implementation::ScrollingScrollStartingEventArgsT<ScrollingScrollStartingEventArgs>
 {
 public:
-    ScrollingViewChangingEventArgs()
+    ScrollingScrollStartingEventArgs()
     {
         SCROLLPRESENTER_TRACE_VERBOSE(nullptr, TRACE_MSG_METH, METH_NAME, this);
     }
 
-    ~ScrollingViewChangingEventArgs()
+    ~ScrollingScrollStartingEventArgs()
     {
         SCROLLPRESENTER_TRACE_VERBOSE(nullptr, TRACE_MSG_METH, METH_NAME, this);
     }
 
-    // IScrollingViewChangingEventArgs overrides
+    // IScrollingScrollStartingEventArgs overrides
+    int32_t CorrelationId() const;
     double HorizontalOffset() const;
     double VerticalOffset() const;
     float ZoomFactor() const;
 
+    void SetCorrelationId(int32_t correlationId);
     void SetHorizontalOffset(double horizontalOffset);
     void SetVerticalOffset(double verticalOffset);
     void SetZoomFactor(float zoomFactor);
 
-#ifdef DBG
-    int32_t CorrelationIdDbg() const;
-    void SetCorrelationIdDbg(int32_t correlationIdDbg);
-#endif // DBG
-
 private:
+    int32_t m_correlationId{ -1 };
     double m_horizontalOffset{};
     double m_verticalOffset{};
     float m_zoomFactor{};
-
-#ifdef DBG
-    int32_t m_correlationIdDbg{ -1 };
-#endif // DBG
 };
diff --git a/src/controls/dev/ScrollPresenter/ScrollingViewChangingEventArgs.cpp b/src/controls/dev/ScrollPresenter/ScrollingViewChangingEventArgs.cpp
deleted file mode 100644
index 7cc46e22c3..0000000000
--- a/src/controls/dev/ScrollPresenter/ScrollingViewChangingEventArgs.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-#include "pch.h"
-#include "ScrollingViewChangingEventArgs.h"
-
-double ScrollingViewChangingEventArgs::HorizontalOffset() const
-{
-    return m_horizontalOffset;
-}
-
-void ScrollingViewChangingEventArgs::SetHorizontalOffset(double horizontalOffset)
-{
-    m_horizontalOffset = horizontalOffset;
-}
-
-double ScrollingViewChangingEventArgs::VerticalOffset() const
-{
-    return m_verticalOffset;
-}
-
-void ScrollingViewChangingEventArgs::SetVerticalOffset(double verticalOffset)
-{
-    m_verticalOffset = verticalOffset;
-}
-
-float ScrollingViewChangingEventArgs::ZoomFactor() const
-{
-    return m_zoomFactor;
-}
-
-void ScrollingViewChangingEventArgs::SetZoomFactor(float zoomFactor)
-{
-    m_zoomFactor = zoomFactor;
-}
-
-#ifdef DBG
-int32_t ScrollingViewChangingEventArgs::CorrelationIdDbg() const
-{
-    return m_correlationIdDbg;
-}
-
-void ScrollingViewChangingEventArgs::SetCorrelationIdDbg(int32_t correlationIdDbg)
-{
-    m_correlationIdDbg = correlationIdDbg;
-}
-#endif // DBG
diff --git a/src/controls/dev/ScrollPresenter/ScrollingZoomStartingEventArgs.cpp b/src/controls/dev/ScrollPresenter/ScrollingZoomStartingEventArgs.cpp
new file mode 100644
index 0000000000..447f73e7a4
--- /dev/null
+++ b/src/controls/dev/ScrollPresenter/ScrollingZoomStartingEventArgs.cpp
@@ -0,0 +1,45 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+#include "pch.h"
+#include "ScrollingZoomStartingEventArgs.h"
+
+int32_t ScrollingZoomStartingEventArgs::CorrelationId() const
+{
+    return m_correlationId;
+}
+
+void ScrollingZoomStartingEventArgs::SetCorrelationId(int32_t correlationId)
+{
+    m_correlationId = correlationId;
+}
+
+double ScrollingZoomStartingEventArgs::HorizontalOffset() const
+{
+    return m_horizontalOffset;
+}
+
+void ScrollingZoomStartingEventArgs::SetHorizontalOffset(double horizontalOffset)
+{
+    m_horizontalOffset = horizontalOffset;
+}
+
+double ScrollingZoomStartingEventArgs::VerticalOffset() const
+{
+    return m_verticalOffset;
+}
+
+void ScrollingZoomStartingEventArgs::SetVerticalOffset(double verticalOffset)
+{
+    m_verticalOffset = verticalOffset;
+}
+
+float ScrollingZoomStartingEventArgs::ZoomFactor() const
+{
+    return m_zoomFactor;
+}
+
+void ScrollingZoomStartingEventArgs::SetZoomFactor(float zoomFactor)
+{
+    m_zoomFactor = zoomFactor;
+}
diff --git a/src/controls/dev/ScrollPresenter/ScrollingZoomStartingEventArgs.h b/src/controls/dev/ScrollPresenter/ScrollingZoomStartingEventArgs.h
new file mode 100644
index 0000000000..82cc74640e
--- /dev/null
+++ b/src/controls/dev/ScrollPresenter/ScrollingZoomStartingEventArgs.h
@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+#pragma once
+
+#include "ScrollPresenter.h"
+#include "ScrollingZoomStartingEventArgs.g.h"
+
+class ScrollingZoomStartingEventArgs :
+    public winrt::implementation::ScrollingZoomStartingEventArgsT<ScrollingZoomStartingEventArgs>
+{
+public:
+    ScrollingZoomStartingEventArgs()
+    {
+        SCROLLPRESENTER_TRACE_VERBOSE(nullptr, TRACE_MSG_METH, METH_NAME, this);
+    }
+
+    ~ScrollingZoomStartingEventArgs()
+    {
+        SCROLLPRESENTER_TRACE_VERBOSE(nullptr, TRACE_MSG_METH, METH_NAME, this);
+    }
+
+    // IScrollingZoomStartingEventArgs overrides
+    int32_t CorrelationId() const;
+    double HorizontalOffset() const;
+    double VerticalOffset() const;
+    float ZoomFactor() const;
+
+    void SetCorrelationId(int32_t correlationId);
+    void SetHorizontalOffset(double horizontalOffset);
+    void SetVerticalOffset(double verticalOffset);
+    void SetZoomFactor(float zoomFactor);
+
+private:
+    int32_t m_correlationId{ -1 };
+    double m_horizontalOffset{};
+    double m_verticalOffset{};
+    float m_zoomFactor{};
+};
diff --git a/src/controls/dev/ScrollPresenter/TestUI/ScrollPresenterDynamicPage.xaml b/src/controls/dev/ScrollPresenter/TestUI/ScrollPresenterDynamicPage.xaml
index dedc3b17d8..61bbbff0d5 100644
--- a/src/controls/dev/ScrollPresenter/TestUI/ScrollPresenterDynamicPage.xaml
+++ b/src/controls/dev/ScrollPresenter/TestUI/ScrollPresenterDynamicPage.xaml
@@ -405,18 +405,18 @@
                     <TextBlock Text="Vertical Offset:" Grid.Column="0" Grid.Row="2" VerticalAlignment="Center"/>
                     <TextBox x:Name="txtScrollVerticalOffset" Text="0" Grid.Column="1" Grid.Row="2" VerticalAlignment="Center"/>
                     <TextBlock Text="AnimationMode:" Grid.Column="0" Grid.Row="3" VerticalAlignment="Center"/>
-                    <ComboBox x:Name="cmbScrollAnimationMode" Grid.Column="1" Grid.Row="3" VerticalAlignment="Center" SelectedIndex="2">
+                    <ComboBox x:Name="cmbScrollAnimationMode" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Stretch" VerticalAlignment="Center" SelectedIndex="2">
                         <ComboBoxItem>Disabled</ComboBoxItem>
                         <ComboBoxItem>Enabled</ComboBoxItem>
                         <ComboBoxItem>Auto</ComboBoxItem>
                     </ComboBox>
                     <TextBlock Text="SnapPointsMode:" Grid.Column="0" Grid.Row="4" VerticalAlignment="Center"/>
-                    <ComboBox x:Name="cmbScrollSnapPointsMode" Grid.Column="1" Grid.Row="4" VerticalAlignment="Center" SelectedIndex="0">
+                    <ComboBox x:Name="cmbScrollSnapPointsMode" Grid.Column="1" Grid.Row="4" HorizontalAlignment="Stretch" VerticalAlignment="Center" SelectedIndex="0">
                         <ComboBoxItem>Default</ComboBoxItem>
                         <ComboBoxItem>Ignore</ComboBoxItem>
                     </ComboBox>
                     <TextBlock Text="Animation override:" Grid.Column="0" Grid.Row="5" VerticalAlignment="Center"/>
-                    <ComboBox x:Name="cmbOverriddenOffsetsChangeAnimation" Grid.Column="1" Grid.Row="5" VerticalAlignment="Center" SelectedIndex="0">
+                    <ComboBox x:Name="cmbOverriddenOffsetsChangeAnimation" Grid.Column="1" Grid.Row="5" HorizontalAlignment="Stretch" VerticalAlignment="Center" SelectedIndex="0">
                         <ComboBoxItem>None</ComboBoxItem>
                         <ComboBoxItem>Accordion</ComboBoxItem>
                         <ComboBoxItem>Teleportation</ComboBoxItem>
@@ -451,19 +451,19 @@
                     <TextBox x:Name="txtZoomZoomFactor" Text="1" Grid.Column="1" Grid.Row="15" VerticalAlignment="Center"/>
                     <TextBlock Text="CenterPoint:" Grid.Column="0" Grid.Row="16" VerticalAlignment="Center"/>
                     <TextBox x:Name="txtZoomCenterPoint" Text="0, 0"  Grid.Column="1" Grid.Row="16" VerticalAlignment="Center"/>
-                    <TextBlock Text="AnimationMode:" Grid.Column="0" Grid.Row="17" VerticalAlignment="Center"/>
-                    <ComboBox x:Name="cmbZoomAnimationMode" Grid.Column="1" Grid.Row="17" VerticalAlignment="Center" SelectedIndex="2">
+                    <TextBlock Text="AnimationMode:" Grid.Column="0" Grid.Row="17" HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
+                    <ComboBox x:Name="cmbZoomAnimationMode" Grid.Column="1" Grid.Row="17" HorizontalAlignment="Stretch" VerticalAlignment="Center" SelectedIndex="2">
                         <ComboBoxItem>Disabled</ComboBoxItem>
                         <ComboBoxItem>Enabled</ComboBoxItem>
                         <ComboBoxItem>Auto</ComboBoxItem>
                     </ComboBox>
                     <TextBlock Text="SnapPointsMode:" Grid.Column="0" Grid.Row="18" VerticalAlignment="Center"/>
-                    <ComboBox x:Name="cmbZoomSnapPointsMode" Grid.Column="1" Grid.Row="18" VerticalAlignment="Center" SelectedIndex="0">
+                    <ComboBox x:Name="cmbZoomSnapPointsMode" Grid.Column="1" Grid.Row="18" HorizontalAlignment="Stretch" VerticalAlignment="Center" SelectedIndex="0">
                         <ComboBoxItem>Default</ComboBoxItem>
                         <ComboBoxItem>Ignore</ComboBoxItem>
                     </ComboBox>
                     <TextBlock Text="Animation override:" Grid.Column="0" Grid.Row="19" VerticalAlignment="Center"/>
-                    <ComboBox x:Name="cmbOverriddenZoomFactorChangeAnimation" Grid.Column="1" Grid.Row="19" VerticalAlignment="Center" SelectedIndex="0">
+                    <ComboBox x:Name="cmbOverriddenZoomFactorChangeAnimation" Grid.Column="1" Grid.Row="19" HorizontalAlignment="Stretch" VerticalAlignment="Center" SelectedIndex="0">
                         <ComboBoxItem>None</ComboBoxItem>
                         <ComboBoxItem>Accordion</ComboBoxItem>
                         <ComboBoxItem>Teleportation</ComboBoxItem>
diff --git a/src/controls/dev/ScrollPresenter/TestUI/ScrollPresenterDynamicPage.xaml.cs b/src/controls/dev/ScrollPresenter/TestUI/ScrollPresenterDynamicPage.xaml.cs
index a9a57dd428..016089fe6f 100644
--- a/src/controls/dev/ScrollPresenter/TestUI/ScrollPresenterDynamicPage.xaml.cs
+++ b/src/controls/dev/ScrollPresenter/TestUI/ScrollPresenterDynamicPage.xaml.cs
@@ -118,14 +118,19 @@ private void ScrollPresenter_StateChanged(ScrollPresenter sender, object args)
             AppendAsyncEventMessage("StateChanged " + sender.State.ToString());
         }
 
-        private void ScrollPresenter_ViewChanging(ScrollPresenter sender, ScrollingViewChangingEventArgs args)
+        private void ScrollPresenter_ViewChanged(ScrollPresenter sender, object args)
         {
-            AppendAsyncEventMessage("ViewChanging H=" + args.HorizontalOffset.ToString() + ", V=" + args.VerticalOffset + ", ZF=" + args.ZoomFactor);
+            AppendAsyncEventMessage("ViewChanged H=" + sender.HorizontalOffset.ToString() + ", V=" + sender.VerticalOffset + ", ZF=" + sender.ZoomFactor);
         }
 
-        private void ScrollPresenter_ViewChanged(ScrollPresenter sender, object args)
+        private void ScrollPresenter_ScrollStarting(ScrollPresenter sender, ScrollingScrollStartingEventArgs args)
         {
-            AppendAsyncEventMessage("ViewChanged H=" + sender.HorizontalOffset.ToString() + ", V=" + sender.VerticalOffset + ", ZF=" + sender.ZoomFactor);
+            AppendAsyncEventMessage("ScrollStarting H=" + args.HorizontalOffset.ToString() + ", V=" + args.VerticalOffset + ", ZF=" + args.ZoomFactor);
+        }
+
+        private void ScrollPresenter_ZoomStarting(ScrollPresenter sender, ScrollingZoomStartingEventArgs args)
+        {
+            AppendAsyncEventMessage("ZoomStarting H=" + args.HorizontalOffset.ToString() + ", V=" + args.VerticalOffset + ", ZF=" + args.ZoomFactor);
         }
 
         private void ScrollPresenter_ScrollCompleted(ScrollPresenter sender, ScrollingScrollCompletedEventArgs args)
@@ -142,13 +147,6 @@ private void ScrollPresenter_ZoomCompleted(ScrollPresenter sender, ScrollingZoom
             AppendAsyncEventMessage("ZoomCompleted ZoomFactorChangeCorrelationId=" + args.CorrelationId + ", Result=" + result);
         }
 
-        private void ZoomCompleted(ScrollPresenter sender, ScrollingZoomCompletedEventArgs args)
-        {
-            ScrollPresenterViewChangeResult result = ScrollPresenterTestHooks.GetZoomCompletedResult(args);
-
-            AppendAsyncEventMessage("ZoomCompleted ZoomFactorChangeCorrelationId=" + args.CorrelationId + ", Result=" + result);
-        }
-
         private void CreateChildren()
         {
             textBlock = new TextBlock();
@@ -274,10 +272,11 @@ private void ChkLogScrollPresenterEvents_Checked(object sender, RoutedEventArgs
         {
             scrollPresenter.ExtentChanged += ScrollPresenter_ExtentChanged;
             scrollPresenter.StateChanged += ScrollPresenter_StateChanged;
-            scrollPresenter.ViewChanging += ScrollPresenter_ViewChanging;
             scrollPresenter.ViewChanged += ScrollPresenter_ViewChanged;
             scrollPresenter.ScrollCompleted += ScrollPresenter_ScrollCompleted;
             scrollPresenter.ZoomCompleted += ScrollPresenter_ZoomCompleted;
+            scrollPresenter.ScrollStarting += ScrollPresenter_ScrollStarting;
+            scrollPresenter.ZoomStarting += ScrollPresenter_ZoomStarting;
             scrollPresenter.ScrollAnimationStarting += ScrollPresenter_ScrollAnimationStarting;
             scrollPresenter.ZoomAnimationStarting += ScrollPresenter_ZoomAnimationStarting;
         }
@@ -286,10 +285,11 @@ private void ChkLogScrollPresenterEvents_Unchecked(object sender, RoutedEventArg
         {
             scrollPresenter.ExtentChanged -= ScrollPresenter_ExtentChanged;
             scrollPresenter.StateChanged -= ScrollPresenter_StateChanged;
-            scrollPresenter.ViewChanging -= ScrollPresenter_ViewChanging;
             scrollPresenter.ViewChanged -= ScrollPresenter_ViewChanged;
             scrollPresenter.ScrollCompleted -= ScrollPresenter_ScrollCompleted;
             scrollPresenter.ZoomCompleted -= ScrollPresenter_ZoomCompleted;
+            scrollPresenter.ScrollStarting -= ScrollPresenter_ScrollStarting;
+            scrollPresenter.ZoomStarting -= ScrollPresenter_ZoomStarting;
             scrollPresenter.ScrollAnimationStarting -= ScrollPresenter_ScrollAnimationStarting;
             scrollPresenter.ZoomAnimationStarting -= ScrollPresenter_ZoomAnimationStarting;
         }
@@ -2699,10 +2699,11 @@ private void UseScrollPresenter(ScrollPresenter s)
                     {
                         scrollPresenter.ExtentChanged -= ScrollPresenter_ExtentChanged;
                         scrollPresenter.StateChanged -= ScrollPresenter_StateChanged;
-                        scrollPresenter.ViewChanging -= ScrollPresenter_ViewChanging;
                         scrollPresenter.ViewChanged -= ScrollPresenter_ViewChanged;
                         scrollPresenter.ScrollCompleted -= ScrollPresenter_ScrollCompleted;
                         scrollPresenter.ZoomCompleted -= ScrollPresenter_ZoomCompleted;
+                        scrollPresenter.ScrollStarting -= ScrollPresenter_ScrollStarting;
+                        scrollPresenter.ZoomStarting -= ScrollPresenter_ZoomStarting;
                         scrollPresenter.ScrollAnimationStarting -= ScrollPresenter_ScrollAnimationStarting;
                         scrollPresenter.ZoomAnimationStarting -= ScrollPresenter_ZoomAnimationStarting;
                     }
@@ -2749,10 +2750,11 @@ private void UseScrollPresenter(ScrollPresenter s)
                     {
                         scrollPresenter.ExtentChanged += ScrollPresenter_ExtentChanged;
                         scrollPresenter.StateChanged += ScrollPresenter_StateChanged;
-                        scrollPresenter.ViewChanging += ScrollPresenter_ViewChanging;
                         scrollPresenter.ViewChanged += ScrollPresenter_ViewChanged;
                         scrollPresenter.ScrollCompleted += ScrollPresenter_ScrollCompleted;
                         scrollPresenter.ZoomCompleted += ScrollPresenter_ZoomCompleted;
+                        scrollPresenter.ScrollStarting += ScrollPresenter_ScrollStarting;
+                        scrollPresenter.ZoomStarting += ScrollPresenter_ZoomStarting;
                         scrollPresenter.ScrollAnimationStarting += ScrollPresenter_ScrollAnimationStarting;
                         scrollPresenter.ZoomAnimationStarting += ScrollPresenter_ZoomAnimationStarting;
                     }
diff --git a/src/controls/dev/ScrollView/ScrollView.cpp b/src/controls/dev/ScrollView/ScrollView.cpp
index d7201c020a..e4b497a08e 100644
--- a/src/controls/dev/ScrollView/ScrollView.cpp
+++ b/src/controls/dev/ScrollView/ScrollView.cpp
@@ -971,15 +971,27 @@ void ScrollView::OnZoomAnimationStarting(
     }
 }
 
-void ScrollView::OnScrollPresenterViewChanging(
+void ScrollView::OnScrollPresenterScrollStarting(
     const winrt::IInspectable& /*sender*/,
-    const winrt::ScrollingViewChangingEventArgs& args)
+    const winrt::ScrollingScrollStartingEventArgs& args)
 {
-    if (m_viewChangingEventSource)
+    if (m_scrollStartingEventSource)
     {
         SCROLLVIEW_TRACE_VERBOSE(*this, TRACE_MSG_METH, METH_NAME, this);
 
-        m_viewChangingEventSource(*this, args);
+        m_scrollStartingEventSource(*this, args);
+    }
+}
+
+void ScrollView::OnScrollPresenterZoomStarting(
+    const winrt::IInspectable& /*sender*/,
+    const winrt::ScrollingZoomStartingEventArgs& args)
+{
+    if (m_zoomStartingEventSource)
+    {
+        SCROLLVIEW_TRACE_VERBOSE(*this, TRACE_MSG_METH, METH_NAME, this);
+
+        m_zoomStartingEventSource(*this, args);
     }
 }
 
@@ -1271,7 +1283,8 @@ void ScrollView::HookScrollPresenterEvents()
     MUX_ASSERT(m_scrollPresenterStateChangedToken.value == 0);
     MUX_ASSERT(m_scrollPresenterScrollAnimationStartingToken.value == 0);
     MUX_ASSERT(m_scrollPresenterZoomAnimationStartingToken.value == 0);
-    MUX_ASSERT(m_scrollPresenterViewChangingToken.value == 0);
+    MUX_ASSERT(m_scrollPresenterScrollStartingToken.value == 0);
+    MUX_ASSERT(m_scrollPresenterZoomStartingToken.value == 0);
     MUX_ASSERT(m_scrollPresenterViewChangedToken.value == 0);
     MUX_ASSERT(m_scrollPresenterScrollCompletedToken.value == 0);
     MUX_ASSERT(m_scrollPresenterZoomCompletedToken.value == 0);
@@ -1296,7 +1309,8 @@ void ScrollView::HookScrollPresenterEvents()
 
         if (scrollPresenter2)
         {
-            m_scrollPresenterViewChangingToken = scrollPresenter2.ViewChanging({ this, &ScrollView::OnScrollPresenterViewChanging });
+            m_scrollPresenterScrollStartingToken = scrollPresenter2.ScrollStarting({ this, &ScrollView::OnScrollPresenterScrollStarting });
+            m_scrollPresenterZoomStartingToken = scrollPresenter2.ZoomStarting({ this, &ScrollView::OnScrollPresenterZoomStarting });
         }
 
         const winrt::DependencyObject scrollPresenterAsDO = scrollPresenter.try_as<winrt::DependencyObject>();
@@ -1346,16 +1360,28 @@ void ScrollView::UnhookScrollPresenterEvents(bool isForDestructor)
             m_scrollPresenterZoomAnimationStartingToken.value = 0;
         }
 
-        if (m_scrollPresenterViewChangingToken.value != 0)
+        if (m_scrollPresenterScrollStartingToken.value != 0)
+        {
+            const winrt::IScrollPresenter2 scrollPresenter2 = scrollPresenter.try_as<winrt::IScrollPresenter2>();
+
+            if (scrollPresenter2)
+            {
+                scrollPresenter2.ScrollStarting(m_scrollPresenterScrollStartingToken);
+            }
+
+            m_scrollPresenterScrollStartingToken.value = 0;
+        }
+
+        if (m_scrollPresenterZoomStartingToken.value != 0)
         {
             const winrt::IScrollPresenter2 scrollPresenter2 = scrollPresenter.try_as<winrt::IScrollPresenter2>();
 
             if (scrollPresenter2)
             {
-                scrollPresenter2.ViewChanging(m_scrollPresenterViewChangingToken);
+                scrollPresenter2.ZoomStarting(m_scrollPresenterZoomStartingToken);
             }
 
-            m_scrollPresenterViewChangingToken.value = 0;
+            m_scrollPresenterZoomStartingToken.value = 0;
         }
 
         if (m_scrollPresenterViewChangedToken.value != 0)
diff --git a/src/controls/dev/ScrollView/ScrollView.h b/src/controls/dev/ScrollView/ScrollView.h
index d1c13066c6..a0ba4197d4 100644
--- a/src/controls/dev/ScrollView/ScrollView.h
+++ b/src/controls/dev/ScrollView/ScrollView.h
@@ -176,9 +176,12 @@ class ScrollView :
     void OnZoomAnimationStarting(
         const winrt::IInspectable& sender,
         const winrt::ScrollingZoomAnimationStartingEventArgs& args);
-    void OnScrollPresenterViewChanging(
+    void OnScrollPresenterScrollStarting(
         const winrt::IInspectable& sender,
-        const winrt::ScrollingViewChangingEventArgs& args);
+        const winrt::ScrollingScrollStartingEventArgs& args);
+    void OnScrollPresenterZoomStarting(
+        const winrt::IInspectable& sender,
+        const winrt::ScrollingZoomStartingEventArgs& args);
     void OnScrollPresenterViewChanged(
         const winrt::IInspectable& sender,
         const winrt::IInspectable& args);
@@ -297,7 +300,8 @@ class ScrollView :
     winrt::event_token m_scrollPresenterStateChangedToken{};
     winrt::event_token m_scrollPresenterScrollAnimationStartingToken{};
     winrt::event_token m_scrollPresenterZoomAnimationStartingToken{};
-    winrt::event_token m_scrollPresenterViewChangingToken{};
+    winrt::event_token m_scrollPresenterScrollStartingToken{};
+    winrt::event_token m_scrollPresenterZoomStartingToken{};
     winrt::event_token m_scrollPresenterViewChangedToken{};
     winrt::event_token m_scrollPresenterScrollCompletedToken{};
     winrt::event_token m_scrollPresenterZoomCompletedToken{};
diff --git a/src/controls/dev/ScrollView/ScrollView.idl b/src/controls/dev/ScrollView/ScrollView.idl
index 1da02a0b27..2848163f93 100644
--- a/src/controls/dev/ScrollView/ScrollView.idl
+++ b/src/controls/dev/ScrollView/ScrollView.idl
@@ -134,7 +134,9 @@ unsealed runtimeclass ScrollView : Microsoft.UI.Xaml.Controls.Control
     event Windows.Foundation.TypedEventHandler<ScrollView, ScrollingAnchorRequestedEventArgs> AnchorRequested;
 
     [MUX_PREVIEW]
-    event Windows.Foundation.TypedEventHandler<ScrollView, ScrollingViewChangingEventArgs> ViewChanging;
+    event Windows.Foundation.TypedEventHandler<ScrollView, ScrollingScrollStartingEventArgs> ScrollStarting;
+    [MUX_PREVIEW]
+    event Windows.Foundation.TypedEventHandler<ScrollView, ScrollingZoomStartingEventArgs> ZoomStarting;
 
     static Microsoft.UI.Xaml.DependencyProperty ContentProperty { get; };
     static Microsoft.UI.Xaml.DependencyProperty ScrollPresenterProperty { get; };
diff --git a/src/controls/dev/ScrollView/TestUI/ScrollViewBlankPage.xaml.cs b/src/controls/dev/ScrollView/TestUI/ScrollViewBlankPage.xaml.cs
index 680bfb3c4b..711ffdaed7 100644
--- a/src/controls/dev/ScrollView/TestUI/ScrollViewBlankPage.xaml.cs
+++ b/src/controls/dev/ScrollView/TestUI/ScrollViewBlankPage.xaml.cs
@@ -10,7 +10,8 @@
 using ScrollingScrollOptions = Microsoft.UI.Xaml.Controls.ScrollingScrollOptions;
 using ScrollingAnimationMode = Microsoft.UI.Xaml.Controls.ScrollingAnimationMode;
 using ScrollingSnapPointsMode = Microsoft.UI.Xaml.Controls.ScrollingSnapPointsMode;
-using ScrollingViewChangingEventArgs = Microsoft.UI.Xaml.Controls.ScrollingViewChangingEventArgs;
+using ScrollingScrollStartingEventArgs = Microsoft.UI.Xaml.Controls.ScrollingScrollStartingEventArgs;
+using ScrollingZoomStartingEventArgs = Microsoft.UI.Xaml.Controls.ScrollingZoomStartingEventArgs;
 using ScrollingScrollAnimationStartingEventArgs = Microsoft.UI.Xaml.Controls.ScrollingScrollAnimationStartingEventArgs;
 using ScrollingZoomAnimationStartingEventArgs = Microsoft.UI.Xaml.Controls.ScrollingZoomAnimationStartingEventArgs;
 using ScrollingScrollCompletedEventArgs = Microsoft.UI.Xaml.Controls.ScrollingScrollCompletedEventArgs;
@@ -163,14 +164,19 @@ private void ScrollPresenter_StateChanged(ScrollPresenter sender, object args)
             AppendAsyncEventMessage($"ScrollPresenter.StateChanged {sender.State.ToString()}");
         }
 
-        private void ScrollPresenter_ViewChanging(ScrollPresenter sender, ScrollingViewChangingEventArgs args)
+        private void ScrollPresenter_ViewChanged(ScrollPresenter sender, object args)
         {
-            AppendAsyncEventMessage($"ScrollPresenter.ViewChanging HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+            AppendAsyncEventMessage($"ScrollPresenter.ViewChanged HorizontalOffset={sender.HorizontalOffset}, VerticalOffset={sender.VerticalOffset}, ZoomFactor={sender.ZoomFactor}");
         }
 
-        private void ScrollPresenter_ViewChanged(ScrollPresenter sender, object args)
+        private void ScrollPresenter_ScrollStarting(ScrollPresenter sender, ScrollingScrollStartingEventArgs args)
         {
-            AppendAsyncEventMessage($"ScrollPresenter.ViewChanged HorizontalOffset={sender.HorizontalOffset}, VerticalOffset={sender.VerticalOffset}, ZoomFactor={sender.ZoomFactor}");
+            AppendAsyncEventMessage($"ScrollPresenter.ScrollStarting OffsetsChangeCorrelationId={args.CorrelationId}, HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+        }
+
+        private void ScrollPresenter_ZoomStarting(ScrollPresenter sender, ScrollingZoomStartingEventArgs args)
+        {
+            AppendAsyncEventMessage($"ScrollPresenter.ZoomStarting ZoomFactorChangeCorrelationId={args.CorrelationId}, HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
         }
 
         private void ScrollPresenter_ScrollAnimationStarting(ScrollPresenter sender, ScrollingScrollAnimationStartingEventArgs args)
@@ -203,14 +209,19 @@ private void ScrollView_StateChanged(ScrollView sender, object args)
             AppendAsyncEventMessage($"ScrollView.StateChanged {sender.State.ToString()}");
         }
 
-        private void ScrollView_ViewChanging(ScrollView sender, ScrollingViewChangingEventArgs args)
+        private void ScrollView_ViewChanged(ScrollView sender, object args)
         {
-            AppendAsyncEventMessage($"ScrollView.ViewChanging HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+            AppendAsyncEventMessage($"ScrollView.ViewChanged HorizontalOffset={sender.HorizontalOffset}, VerticalOffset={sender.VerticalOffset}, ZoomFactor={sender.ZoomFactor}");
         }
 
-        private void ScrollView_ViewChanged(ScrollView sender, object args)
+        private void ScrollView_ScrollStarting(ScrollView sender, ScrollingScrollStartingEventArgs args)
         {
-            AppendAsyncEventMessage($"ScrollView.ViewChanged HorizontalOffset={sender.HorizontalOffset}, VerticalOffset={sender.VerticalOffset}, ZoomFactor={sender.ZoomFactor}");
+            AppendAsyncEventMessage($"ScrollView.ScrollStarting OffsetsChangeCorrelationId={args.CorrelationId}, HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+        }
+
+        private void ScrollView_ZoomStarting(ScrollView sender, ScrollingZoomStartingEventArgs args)
+        {
+            AppendAsyncEventMessage($"ScrollView.ZoomStarting ZoomFactorChangeCorrelationId={args.CorrelationId}, HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
         }
 
         private void ScrollView_ScrollAnimationStarting(ScrollView sender, ScrollingScrollAnimationStartingEventArgs args)
@@ -268,8 +279,9 @@ private void ChkLogScrollPresenterEvents_Checked(object sender, RoutedEventArgs
                     scrollPresenter.SizeChanged += ScrollPresenter_SizeChanged;
                     scrollPresenter.ExtentChanged += ScrollPresenter_ExtentChanged;
                     scrollPresenter.StateChanged += ScrollPresenter_StateChanged;
-                    scrollPresenter.ViewChanging += ScrollPresenter_ViewChanging;
                     scrollPresenter.ViewChanged += ScrollPresenter_ViewChanged;
+                    scrollPresenter.ScrollStarting += ScrollPresenter_ScrollStarting;
+                    scrollPresenter.ZoomStarting += ScrollPresenter_ZoomStarting;
                     scrollPresenter.ScrollAnimationStarting += ScrollPresenter_ScrollAnimationStarting;
                     scrollPresenter.ZoomAnimationStarting += ScrollPresenter_ZoomAnimationStarting;
                     scrollPresenter.ScrollCompleted += ScrollPresenter_ScrollCompleted;
@@ -290,8 +302,9 @@ private void ChkLogScrollPresenterEvents_Unchecked(object sender, RoutedEventArg
                     scrollPresenter.SizeChanged -= ScrollPresenter_SizeChanged;
                     scrollPresenter.ExtentChanged -= ScrollPresenter_ExtentChanged;
                     scrollPresenter.StateChanged -= ScrollPresenter_StateChanged;
-                    scrollPresenter.ViewChanging -= ScrollPresenter_ViewChanging;
                     scrollPresenter.ViewChanged -= ScrollPresenter_ViewChanged;
+                    scrollPresenter.ScrollStarting -= ScrollPresenter_ScrollStarting;
+                    scrollPresenter.ZoomStarting -= ScrollPresenter_ZoomStarting;
                     scrollPresenter.ScrollAnimationStarting -= ScrollPresenter_ScrollAnimationStarting;
                     scrollPresenter.ZoomAnimationStarting -= ScrollPresenter_ZoomAnimationStarting;
                     scrollPresenter.ScrollCompleted -= ScrollPresenter_ScrollCompleted;
@@ -312,8 +325,9 @@ private void ChkLogScrollViewEvents_Checked(object sender, RoutedEventArgs e)
                 scrollView.SizeChanged += ScrollView_SizeChanged;
                 scrollView.ExtentChanged += ScrollView_ExtentChanged;
                 scrollView.StateChanged += ScrollView_StateChanged;
-                scrollView.ViewChanging += ScrollView_ViewChanging;
                 scrollView.ViewChanged += ScrollView_ViewChanged;
+                scrollView.ScrollStarting += ScrollView_ScrollStarting;
+                scrollView.ZoomStarting += ScrollView_ZoomStarting;
                 scrollView.ScrollAnimationStarting += ScrollView_ScrollAnimationStarting;
                 scrollView.ZoomAnimationStarting += ScrollView_ZoomAnimationStarting;
                 scrollView.ScrollCompleted += ScrollView_ScrollCompleted;
@@ -333,8 +347,9 @@ private void ChkLogScrollViewEvents_Unchecked(object sender, RoutedEventArgs e)
                 scrollView.SizeChanged -= ScrollView_SizeChanged;
                 scrollView.ExtentChanged -= ScrollView_ExtentChanged;
                 scrollView.StateChanged -= ScrollView_StateChanged;
-                scrollView.ViewChanging -= ScrollView_ViewChanging;
                 scrollView.ViewChanged -= ScrollView_ViewChanged;
+                scrollView.ScrollStarting -= ScrollView_ScrollStarting;
+                scrollView.ZoomStarting -= ScrollView_ZoomStarting;
                 scrollView.ScrollAnimationStarting -= ScrollView_ScrollAnimationStarting;
                 scrollView.ZoomAnimationStarting -= ScrollView_ZoomAnimationStarting;
                 scrollView.ScrollCompleted -= ScrollView_ScrollCompleted;
diff --git a/src/controls/dev/ScrollView/TestUI/ScrollViewDynamicPage.xaml.cs b/src/controls/dev/ScrollView/TestUI/ScrollViewDynamicPage.xaml.cs
index b114f1b950..971e1c984b 100644
--- a/src/controls/dev/ScrollView/TestUI/ScrollViewDynamicPage.xaml.cs
+++ b/src/controls/dev/ScrollView/TestUI/ScrollViewDynamicPage.xaml.cs
@@ -1893,8 +1893,9 @@ private void UseScrollView(ScrollView sv2)
                     {
                         scrollView.ExtentChanged -= ScrollView_ExtentChanged;
                         scrollView.StateChanged -= ScrollView_StateChanged;
-                        scrollView.ViewChanging -= ScrollView_ViewChanging;
                         scrollView.ViewChanged -= ScrollView_ViewChanged;
+                        scrollView.ScrollStarting -= ScrollView_ScrollStarting;
+                        scrollView.ZoomStarting -= ScrollView_ZoomStarting;
                         scrollView.ScrollAnimationStarting -= ScrollView_ScrollAnimationStarting;
                         scrollView.ZoomAnimationStarting -= ScrollView_ZoomAnimationStarting;
                         if (scrollViewPointerWheelChangedEventHandler != null)
@@ -1909,8 +1910,9 @@ private void UseScrollView(ScrollView sv2)
                     {
                         scrollPresenter.ExtentChanged -= ScrollPresenter_ExtentChanged;
                         scrollPresenter.StateChanged -= ScrollPresenter_StateChanged;
-                        scrollPresenter.ViewChanging -= ScrollPresenter_ViewChanging;
                         scrollPresenter.ViewChanged -= ScrollPresenter_ViewChanged;
+                        scrollPresenter.ScrollStarting -= ScrollPresenter_ScrollStarting;
+                        scrollPresenter.ZoomStarting -= ScrollPresenter_ZoomStarting;
                         scrollPresenter.ScrollAnimationStarting -= ScrollPresenter_ScrollAnimationStarting;
                         scrollPresenter.ZoomAnimationStarting -= ScrollPresenter_ZoomAnimationStarting;
                         if (scrollPresenterPointerWheelChangedEventHandler != null)
@@ -1972,8 +1974,9 @@ private void UseScrollView(ScrollView sv2)
                     {
                         scrollView.ExtentChanged += ScrollView_ExtentChanged;
                         scrollView.StateChanged += ScrollView_StateChanged;
-                        scrollView.ViewChanging += ScrollView_ViewChanging;
                         scrollView.ViewChanged += ScrollView_ViewChanged;
+                        scrollView.ScrollStarting += ScrollView_ScrollStarting;
+                        scrollView.ZoomStarting += ScrollView_ZoomStarting;
                         scrollView.ScrollAnimationStarting += ScrollView_ScrollAnimationStarting;
                         scrollView.ZoomAnimationStarting += ScrollView_ZoomAnimationStarting;
                         if (scrollViewPointerWheelChangedEventHandler == null)
@@ -1989,8 +1992,9 @@ private void UseScrollView(ScrollView sv2)
                     {
                         scrollPresenter.ExtentChanged += ScrollPresenter_ExtentChanged;
                         scrollPresenter.StateChanged += ScrollPresenter_StateChanged;
-                        scrollPresenter.ViewChanging += ScrollPresenter_ViewChanging;
                         scrollPresenter.ViewChanged += ScrollPresenter_ViewChanged;
+                        scrollPresenter.ScrollStarting += ScrollPresenter_ScrollStarting;
+                        scrollPresenter.ZoomStarting += ScrollPresenter_ZoomStarting;
                         scrollPresenter.ScrollAnimationStarting += ScrollPresenter_ScrollAnimationStarting;
                         scrollPresenter.ZoomAnimationStarting += ScrollPresenter_ZoomAnimationStarting;
                         if (scrollPresenterPointerWheelChangedEventHandler == null)
@@ -2099,14 +2103,19 @@ private void ScrollPresenter_StateChanged(ScrollPresenter sender, object args)
             AppendAsyncEventMessage("ScrollPresenter.StateChanged " + sender.State.ToString());
         }
 
-        private void ScrollPresenter_ViewChanging(ScrollPresenter sender, ScrollingViewChangingEventArgs args)
+        private void ScrollPresenter_ViewChanged(ScrollPresenter sender, object args)
         {
-            AppendAsyncEventMessage("ScrollPresenter.ViewChanging H=" + args.HorizontalOffset.ToString() + ", V=" + args.VerticalOffset + ", ZF=" + args.ZoomFactor);
+            AppendAsyncEventMessage("ScrollPresenter.ViewChanged H=" + sender.HorizontalOffset.ToString() + ", V=" + sender.VerticalOffset + ", ZF=" + sender.ZoomFactor);
         }
 
-        private void ScrollPresenter_ViewChanged(ScrollPresenter sender, object args)
+        private void ScrollPresenter_ScrollStarting(ScrollPresenter sender, ScrollingScrollStartingEventArgs args)
         {
-            AppendAsyncEventMessage("ScrollPresenter.ViewChanged H=" + sender.HorizontalOffset.ToString() + ", V=" + sender.VerticalOffset + ", ZF=" + sender.ZoomFactor);
+            AppendAsyncEventMessage($"ScrollPresenter.ScrollStarting OffsetsChangeCorrelationId={args.CorrelationId}, H={args.HorizontalOffset}, V={args.VerticalOffset}, ZF={args.ZoomFactor}");
+        }
+
+        private void ScrollPresenter_ZoomStarting(ScrollPresenter sender, ScrollingZoomStartingEventArgs args)
+        {
+            AppendAsyncEventMessage($"ScrollPresenter.ZoomStarting ZoomFactorChangeCorrelationId={args.CorrelationId}, H={args.HorizontalOffset}, V={args.VerticalOffset}, ZF={args.ZoomFactor}");
         }
 
         private void ScrollPresenter_ScrollAnimationStarting(ScrollPresenter sender, ScrollingScrollAnimationStartingEventArgs args)
@@ -2134,14 +2143,19 @@ private void ScrollView_StateChanged(ScrollView sender, object args)
             AppendAsyncEventMessage("ScrollView.StateChanged " + sender.State.ToString());
         }
 
-        private void ScrollView_ViewChanging(ScrollView sender, ScrollingViewChangingEventArgs args)
+        private void ScrollView_ViewChanged(ScrollView sender, object args)
         {
-            AppendAsyncEventMessage("ScrollView.ViewChanging H=" + args.HorizontalOffset.ToString() + ", V=" + args.VerticalOffset + ", ZF=" + args.ZoomFactor);
+            AppendAsyncEventMessage("ScrollView.ViewChanged H=" + sender.HorizontalOffset.ToString() + ", V=" + sender.VerticalOffset + ", ZF=" + sender.ZoomFactor);
         }
 
-        private void ScrollView_ViewChanged(ScrollView sender, object args)
+        private void ScrollView_ScrollStarting(ScrollView sender, ScrollingScrollStartingEventArgs args)
         {
-            AppendAsyncEventMessage("ScrollView.ViewChanged H=" + sender.HorizontalOffset.ToString() + ", V=" + sender.VerticalOffset + ", ZF=" + sender.ZoomFactor);
+            AppendAsyncEventMessage($"ScrollView.ScrollStarting OffsetsChangeCorrelationId={args.CorrelationId}, H={args.HorizontalOffset}, V={args.VerticalOffset}, ZF={args.ZoomFactor}");
+        }
+
+        private void ScrollView_ZoomStarting(ScrollView sender, ScrollingZoomStartingEventArgs args)
+        {
+            AppendAsyncEventMessage($"ScrollView.ZoomStarting ZoomFactorChangeCorrelationId={args.CorrelationId}, H={args.HorizontalOffset}, V={args.VerticalOffset}, ZF={args.ZoomFactor}");
         }
 
         private void ScrollView_ScrollAnimationStarting(ScrollView sender, ScrollingScrollAnimationStartingEventArgs args)
@@ -2215,8 +2229,9 @@ private void ChkLogScrollPresenterEvents_Checked(object sender, RoutedEventArgs
                 {
                     scrollPresenter.ExtentChanged += ScrollPresenter_ExtentChanged;
                     scrollPresenter.StateChanged += ScrollPresenter_StateChanged;
-                    scrollPresenter.ViewChanging += ScrollPresenter_ViewChanging;
                     scrollPresenter.ViewChanged += ScrollPresenter_ViewChanged;
+                    scrollPresenter.ScrollStarting += ScrollPresenter_ScrollStarting;
+                    scrollPresenter.ZoomStarting += ScrollPresenter_ZoomStarting;
                     scrollPresenter.ScrollAnimationStarting += ScrollPresenter_ScrollAnimationStarting;
                     scrollPresenter.ZoomAnimationStarting += ScrollPresenter_ZoomAnimationStarting;
                     if (scrollPresenterPointerWheelChangedEventHandler == null)
@@ -2238,8 +2253,9 @@ private void ChkLogScrollPresenterEvents_Unchecked(object sender, RoutedEventArg
                 {
                     scrollPresenter.ExtentChanged -= ScrollPresenter_ExtentChanged;
                     scrollPresenter.StateChanged -= ScrollPresenter_StateChanged;
-                    scrollPresenter.ViewChanging -= ScrollPresenter_ViewChanging;
                     scrollPresenter.ViewChanged -= ScrollPresenter_ViewChanged;
+                    scrollPresenter.ScrollStarting -= ScrollPresenter_ScrollStarting;
+                    scrollPresenter.ZoomStarting -= ScrollPresenter_ZoomStarting;
                     scrollPresenter.ScrollAnimationStarting -= ScrollPresenter_ScrollAnimationStarting;
                     scrollPresenter.ZoomAnimationStarting -= ScrollPresenter_ZoomAnimationStarting;
                     if (scrollPresenterPointerWheelChangedEventHandler != null)
@@ -2256,8 +2272,9 @@ private void ChkLogScrollViewEvents_Checked(object sender, RoutedEventArgs e)
             {
                 scrollView.ExtentChanged += ScrollView_ExtentChanged;
                 scrollView.StateChanged += ScrollView_StateChanged;
-                scrollView.ViewChanging += ScrollView_ViewChanging;
                 scrollView.ViewChanged += ScrollView_ViewChanged;
+                scrollView.ScrollStarting += ScrollView_ScrollStarting;
+                scrollView.ZoomStarting += ScrollView_ZoomStarting;
                 scrollView.ScrollAnimationStarting += ScrollView_ScrollAnimationStarting;
                 scrollView.ZoomAnimationStarting += ScrollView_ZoomAnimationStarting;
                 if (scrollViewPointerWheelChangedEventHandler == null)
@@ -2274,8 +2291,9 @@ private void ChkLogScrollViewEvents_Unchecked(object sender, RoutedEventArgs e)
             {
                 scrollView.ExtentChanged -= ScrollView_ExtentChanged;
                 scrollView.StateChanged -= ScrollView_StateChanged;
-                scrollView.ViewChanging -= ScrollView_ViewChanging;
                 scrollView.ViewChanged -= ScrollView_ViewChanged;
+                scrollView.ScrollStarting -= ScrollView_ScrollStarting;
+                scrollView.ZoomStarting -= ScrollView_ZoomStarting;
                 scrollView.ScrollAnimationStarting -= ScrollView_ScrollAnimationStarting;
                 scrollView.ZoomAnimationStarting -= ScrollView_ZoomAnimationStarting;
                 if (scrollViewPointerWheelChangedEventHandler != null)
diff --git a/src/controls/dev/WebView2/WebView2.cpp b/src/controls/dev/WebView2/WebView2.cpp
index d6ecd9143b..a051717940 100644
--- a/src/controls/dev/WebView2/WebView2.cpp
+++ b/src/controls/dev/WebView2/WebView2.cpp
@@ -383,11 +383,16 @@ void WebView2::HandlePointerExited(const winrt::Windows::Foundation::IInspectabl
 
     if (deviceType == winrt::PointerDeviceType::Mouse)
     {
-        message = WM_MOUSELEAVE;
-        if (!m_hasMouseCapture)
+        if (m_hasMouseCapture)
         {
-            ResetMouseInputState();
+            // WM_MOUSELEAVE should not fire while we have capture, since doing so
+            // will cancel capture in the WebView.
+            m_isMouseLeaveNeeded = true;
+            return;
         }
+
+        message = WM_MOUSELEAVE;
+        ResetMouseInputState();
     }
     else
     {
@@ -405,6 +410,12 @@ void WebView2::HandlePointerEntered(const winrt::Windows::Foundation::IInspectab
     {
         OnXamlPointerMessage(WM_POINTERENTER, args);
     }
+    else
+    {
+        MUX_ASSERT(deviceType == winrt::PointerDeviceType::Mouse);
+        // If there was a queued MouseLeave, clear it now that the mouse has re-entered.
+        m_isMouseLeaveNeeded = false;
+    }
 }
 
 void WebView2::HandlePointerCanceled(const winrt::Windows::Foundation::IInspectable&, const winrt::PointerRoutedEventArgs& args)
@@ -425,6 +436,11 @@ void WebView2::ResetPointerHelper(const winrt::PointerRoutedEventArgs& args)
     {
         m_hasMouseCapture = false;
         ResetMouseInputState();
+        if (m_isMouseLeaveNeeded)
+        {
+            m_isMouseLeaveNeeded = false;
+            SendMouseLeave();
+        }
     }
     else if (deviceType == winrt::PointerDeviceType::Touch)
     {
@@ -442,6 +458,21 @@ void WebView2::ResetPointerHelper(const winrt::PointerRoutedEventArgs& args)
     }
 }
 
+void WebView2::SendMouseLeave()
+{
+    if (!m_coreWebView || !m_coreWebViewCompositionController || CoreWebView2HasInvalidState())
+    {
+        // nothing to forward input to
+        return;
+    }
+
+    m_coreWebViewCompositionController.SendMouseInput(
+        winrt::CoreWebView2MouseEventKind{ static_cast<winrt::CoreWebView2MouseEventKind>(WM_MOUSELEAVE) },
+        winrt::CoreWebView2MouseEventVirtualKeys{ static_cast<winrt::CoreWebView2MouseEventVirtualKeys>(0) },
+        0,
+        winrt::Point{ 0, 0 });
+}
+
 bool WebView2::ShouldNavigate(const winrt::Uri& uri)
 {
     return uri != nullptr && uri.RawUri() != m_stopNavigateOnUriChanged;
@@ -1670,7 +1701,7 @@ void WebView2::ConvertXamlArgsToOle32Args(const winrt::DragEventArgs& args, DWOR
     // point parameter must be modified to include the WebView's offset and be
     // in the WebView's client coordinates (Similar to how SendMouseInput works).
     winrt::Point cursorPosition_winrt{args.GetPosition(*this /* relativeTo */)};
-    cursorPosition = {static_cast<LONG>(cursorPosition_winrt.X), static_cast<LONG>(cursorPosition_winrt.Y)};
+    cursorPosition = {static_cast<LONG>(cursorPosition_winrt.X * m_rasterizationScale), static_cast<LONG>(cursorPosition_winrt.Y * m_rasterizationScale)};
 
     // Map source's AllowedOperations to dropEffect
     winrt::DataPackageOperation allowedOperations = args.AllowedOperations();
diff --git a/src/controls/dev/WebView2/WebView2.h b/src/controls/dev/WebView2/WebView2.h
index 1fb16dd472..80c1bfe6a6 100644
--- a/src/controls/dev/WebView2/WebView2.h
+++ b/src/controls/dev/WebView2/WebView2.h
@@ -208,6 +208,7 @@ class WebView2 :
     bool m_isRightMouseButtonPressed{};
     bool m_isXButton1Pressed{};
     bool m_isXButton2Pressed{};
+    bool m_isMouseLeaveNeeded{};
     bool m_hasMouseCapture{};
     std::map<int32_t, bool> m_hasTouchCapture{};
     bool m_hasPenCapture{};
@@ -262,6 +263,7 @@ class WebView2 :
     winrt::Microsoft::UI::Windowing::AppWindow m_appWindow{ nullptr };
 
     void ResetPointerHelper(const winrt::PointerRoutedEventArgs& args);
+    void SendMouseLeave();
     XamlFocusChangeInfo m_xamlFocusChangeInfo{};
 
     bool m_isVisible{};
diff --git a/src/controls/dev/dll/packages.config b/src/controls/dev/dll/packages.config
index 1fff5318cd..53e43b8554 100644
--- a/src/controls/dev/dll/packages.config
+++ b/src/controls/dev/dll/packages.config
@@ -6,7 +6,7 @@
   <package id="Microsoft.SourceLink.Common" version="1.1.1" targetFramework="native" developmentDependency="true" />
   <package id="Microsoft.SourceLink.GitHub" version="1.1.1" targetFramework="native" developmentDependency="true" />
   <package id="Microsoft.UI.Xaml" version="2.6.1" targetFramework="native" />
-  <package id="Microsoft.Web.WebView2" version="1.0.2646-prerelease" targetFramework="native" />
+  <package id="Microsoft.Web.WebView2" version="1.0.2651.64" targetFramework="native" />
   <package id="Microsoft.Windows.CppWinRT" version="2.0.230706.1" targetFramework="native" />
   <package id="Microsoft.Windows.Wil.Internal" version="0.2.115" targetFramework="native" />
   <package id="MUXCustomBuildTasks" version="1.0.125-winui3" targetFramework="native" />
diff --git a/src/controls/test/MUXControlsTestApp/App.xaml.cs b/src/controls/test/MUXControlsTestApp/App.xaml.cs
index 131dd42620..b8e9540f9c 100644
--- a/src/controls/test/MUXControlsTestApp/App.xaml.cs
+++ b/src/controls/test/MUXControlsTestApp/App.xaml.cs
@@ -36,9 +36,6 @@ public static class Program
         [DllImport("Microsoft.WindowsAppRuntime.dll", CharSet = CharSet.Unicode, ExactSpelling = true)]
         internal static extern int WindowsAppRuntime_EnsureIsLoaded();
 
-        [DllImport("Microsoft.UI.Xaml.dll")]
-        private static extern void XamlCheckProcessRequirements();
-
         [STAThread]
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "Required parameter.")]
         public static void Main(string[] args)
@@ -50,8 +47,6 @@ public static void Main(string[] args)
                 _ = WindowsAppRuntime_EnsureIsLoaded();
             }
 
-            XamlCheckProcessRequirements();
-
             WinRT.ComWrappersSupport.InitializeComWrappers();
             Microsoft.UI.Xaml.Application.Start((p) => {
                 var context = new Microsoft.UI.Dispatching.DispatcherQueueSynchronizationContext(Microsoft.UI.Dispatching.DispatcherQueue.GetForCurrentThread());
@@ -72,7 +67,7 @@ public sealed partial class App : Application
         /// <summary>
         /// AdditionalStyles.xaml file for ScrollViewer tests
         /// </summary>
-        /// 
+        ///
         private static ResourceDictionary additionStylesXaml = null;
         public static ResourceDictionary AdditionStylesXaml
         {
@@ -86,7 +81,7 @@ public static ResourceDictionary AdditionStylesXaml
                 return additionStylesXaml;
             }
         }
-        
+
         /// <summary>
         /// Initializes the singleton application object.  This is the first line of authored code
         /// executed, and as such is the logical equivalent of main() or WinMain().
@@ -202,7 +197,7 @@ public static bool DisableLongAnimations
             }
             set
             {
-#if !INNERLOOP_BUILD // The xaml files below need to be factored better into appropriate feature area projects - Tracked by Issue: 1044 
+#if !INNERLOOP_BUILD // The xaml files below need to be factored better into appropriate feature area projects - Tracked by Issue: 1044
                 if (value != DisableLongAnimations)
                 {
                     if (value)
@@ -321,13 +316,13 @@ protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs e)
                 createRoot();
             }
             else
-            {   
+            {
                 var dispatcherQueue = DispatcherQueue.GetForCurrentThread();
                 if (dispatcherQueue == null)
                 {
                     throw new Exception("DispatcherQueue not available");
                 }
-                   
+
                 System.Threading.Tasks.Task.Delay(2000).ContinueWith(
                     (t) => {
                             var ignored = dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Normal,
@@ -388,7 +383,7 @@ private void OnWindowActivated(object sender, Microsoft.UI.Xaml.WindowActivatedE
                 Log.Comment("Test window got focus.");
             }
         }
-        
+
         private static void AppendResourceToMergedDictionaries(string resource, ResourceDictionary targetDictionary = null)
         {
             ResourceDictionary resourceDictionary = new ResourceDictionary();
@@ -400,7 +395,7 @@ private static void AppendResourceToMergedDictionaries(string resource, Resource
         public static void AppendResourceDictionaryToMergedDictionaries(ResourceDictionary dictionary)
         {
             // Check for null and dictionary not present
-            if (!(dictionary is null) && 
+            if (!(dictionary is null) &&
                 !Application.Current.Resources.MergedDictionaries.Contains(dictionary))
             {
                 Application.Current.Resources.MergedDictionaries.Add(dictionary);
@@ -412,7 +407,7 @@ public static void RemoveResourceDictionaryFromMergedDictionaries(ResourceDictio
             // Check for null and dictionary is in list
             if(!(dictionary is null) &&
                 Application.Current.Resources.MergedDictionaries.Contains(dictionary))
-            { 
+            {
                 Application.Current.Resources.MergedDictionaries.Remove(dictionary);
             }
         }
diff --git a/src/controls/test/TestAppCX/packages.config b/src/controls/test/TestAppCX/packages.config
index 15cbac3d98..539e1c87fd 100644
--- a/src/controls/test/TestAppCX/packages.config
+++ b/src/controls/test/TestAppCX/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Web.WebView2" version="1.0.2646-prerelease" targetFramework="native" />
+  <package id="Microsoft.Web.WebView2" version="1.0.2651.64" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/controls/tools/CustomTasksTool/Program.cs b/src/controls/tools/CustomTasksTool/Program.cs
index b2298f69f7..fd54f87569 100644
--- a/src/controls/tools/CustomTasksTool/Program.cs
+++ b/src/controls/tools/CustomTasksTool/Program.cs
@@ -67,7 +67,7 @@ private static void TestDependencyPropertyCodeGen()
                 WinMDInput = new string[] { mostRecentProjectWinMDPath },
                 References = new string[] {
                     $@"{projectRoot}packages\Microsoft.Internal.WinUIDetails.0.1.0-ci195\lib\uap10.0\Microsoft.UI.Text.winmd",
-                    $@"{projectRoot}packages\Microsoft.Web.WebView2.1.0.2646-prerelease\lib\Microsoft.Web.WebView2.Core.winmd",
+                    $@"{projectRoot}packages\Microsoft.Web.WebView2.1.0.2651.64\lib\Microsoft.Web.WebView2.Core.winmd",
                     $@"{projectRoot}packages\Microsoft.WindowsAppSDK.Foundation.TransportPackage\1.1.0-20220628.1.develop.nightly\lib\uap10.0\Microsoft.Windows.ApplicationModel.Resources.winmd",
                     $@"{projectRoot}BuildOutput\obj\{platform}{configuration}\dxaml\xcp\dxaml\idl\winrt\merged\private\Merged\Microsoft.Foundation.winmd",
                     $@"{projectRoot}BuildOutput\obj\{platform}{configuration}\dxaml\xcp\dxaml\idl\winrt\merged\private\Merged\Microsoft.Graphics.winmd",
@@ -162,7 +162,7 @@ private static void TestDependencyPropertyCodeGen()
                     $@"{projectRoot}packages\Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage\1.2.0-CI-25151.1000.220627-1000.0\lib\uap10.0.18362\Microsoft.UI.winmd",
                     $@"{projectRoot}packages\Microsoft.WindowsAppSDK.Foundation.TransportPackage\1.1.0-20220628.1.develop.nightly\lib\uap10.0\Microsoft.Windows.ApplicationModel.Resources.winmd",
                     $@"{projectRoot}packages\Microsoft.Internal.WinUIDetails.0.1.0-ci195\lib\uap10.0\Microsoft.UI.Text.winmd",
-                    $@"{projectRoot}packages\Microsoft.Web.WebView2.1.0.2646-prerelease\lib\Microsoft.Web.WebView2.Core.winmd",
+                    $@"{projectRoot}packages\Microsoft.Web.WebView2.1.0.2651.64\lib\Microsoft.Web.WebView2.Core.winmd",
                     $@"{projectRoot}BuildOutput\obj\{platform}{configuration}\dxaml\xcp\dxaml\idl\winrt\merged\private\Merged\Microsoft.Foundation.winmd",
                     $@"{projectRoot}BuildOutput\obj\{platform}{configuration}\dxaml\xcp\dxaml\idl\winrt\merged\private\Merged\Microsoft.Graphics.winmd",
                     $@"{projectRoot}BuildOutput\obj\{platform}{configuration}\dxaml\xcp\dxaml\idl\winrt\merged\private\Merged\Microsoft.UI.winmd",
@@ -255,7 +255,7 @@ private static void TestTransformTemplate()
             var parameterValues = new Dictionary<string, string>();
             parameterValues.Add("MetadataWinmdPaths", $@"{projectRoot}\BuildOutput\obj\{platform}{configuration}\controls\dev\dll\XamlMetadataProviderGenerated.h");
             parameterValues.Add("PropertiesHeadersDirectory", $@"{projectRoot}\controls\dev\Generated");
-            parameterValues.Add("ReferenceWinmds", $@"{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.AI.MachineLearning.MachineLearningContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.AI.MachineLearning.Preview.MachineLearningPreviewContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.Activation.ActivatedEventsContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.Activation.ActivationCameraSettingsContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.Activation.ContactActivatedEventsContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.Activation.WebUISearchActivatedEventsContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.Background.BackgroundAlarmApplicationContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.Calls.Background.CallsBackgroundContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.Calls.CallsPhoneContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.Calls.CallsVoipContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.Calls.LockScreenCallContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.CommunicationBlocking.CommunicationBlockingContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.FullTrustAppContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.Preview.InkWorkspace.PreviewInkWorkspaceContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.Preview.Notes.PreviewNotesContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.Resources.Management.ResourceIndexerContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.Search.Core.SearchCoreContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.Search.SearchContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.SocialInfo.SocialInfoContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.StartupTaskContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.Wallet.WalletContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Devices.Custom.CustomDeviceContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Devices.DevicesLowLevelContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Devices.Portable.PortableDeviceContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Devices.Printers.Extensions.ExtensionsContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Devices.Printers.PrintersContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Devices.Scanners.ScannerDeviceContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Devices.SmartCards.SmartCardBackgroundTriggerContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Devices.SmartCards.SmartCardEmulatorContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Devices.Sms.LegacySmsApiContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Embedded.DeviceLockdown.DeviceLockdownContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Foundation.FoundationContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Foundation.UniversalApiContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Gaming.Input.GamingInputPreviewContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Gaming.Preview.GamesEnumerationContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Gaming.UI.GameChatOverlayContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Gaming.UI.GamingUIProviderContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Gaming.XboxLive.StorageApiContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Globalization.GlobalizationJapanesePhoneticAnalyzerContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Graphics.Printing3D.Printing3DContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Management.Deployment.Preview.DeploymentPreviewContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Management.Workplace.WorkplaceSettingsContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Media.AppBroadcasting.AppBroadcastingContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Media.AppRecording.AppRecordingContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Media.Capture.AppBroadcastContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Media.Capture.AppCaptureContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Media.Capture.AppCaptureMetadataContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Media.Capture.CameraCaptureUIContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Media.Capture.GameBarContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Media.Devices.CallControlContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Media.MediaControlContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Media.Playlists.PlaylistsContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Media.Protection.ProtectionRenewalContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Networking.Connectivity.WwanContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Networking.NetworkOperators.LegacyNetworkOperatorsContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Networking.NetworkOperators.NetworkOperatorsFdnContract.WinMD;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Networking.Sockets.ControlChannelTriggerContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Networking.XboxLive.XboxLiveSecureSocketsContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Perception.Automation.Core.PerceptionAutomationCoreContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Phone.PhoneContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Phone.StartScreen.DualSimTileContract.WinMD;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Security.EnterpriseData.EnterpriseDataContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Security.ExchangeActiveSyncProvisioning.EasContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Services.Maps.GuidanceContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Services.Maps.LocalSearchContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Services.Store.StoreContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Services.TargetedContent.TargetedContentContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Storage.Provider.CloudFilesContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.System.Profile.ProfileHardwareTokenContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.System.Profile.ProfileRetailInfoContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.System.Profile.ProfileSharedModeContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.System.Profile.SystemManufacturers.SystemManufacturersContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.System.SystemManagementContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.System.UserProfile.UserProfileContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.System.UserProfile.UserProfileLockScreenContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.UI.ApplicationSettings.ApplicationsSettingsContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.UI.Core.AnimationMetrics.AnimationMetricsContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.UI.Core.CoreWindowDialogsContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.UI.Shell.SecurityAppManagerContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.UI.ViewManagement.ViewManagementViewScalingContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.UI.WebUI.Core.WebUICommandBarContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Microsoft.UI.Xaml.Core.Direct.XamlDirectContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Microsoft.UI.Xaml.Hosting.HostingContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Web.Http.Diagnostics.HttpDiagnosticsContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage.0.9.0-CI-22435.1000.210807-1000.0\lib\uap10.0\Microsoft.Foundation.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage.0.9.0-CI-22435.1000.210807-1000.0\lib\uap10.0\Microsoft.Graphics.DirectX.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage.0.9.0-CI-22435.1000.210807-1000.0\lib\uap10.0\Microsoft.UI.Composition.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage.0.9.0-CI-22435.1000.210807-1000.0\lib\uap10.0\Microsoft.UI.Input.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage.0.9.0-CI-22435.1000.210807-1000.0\lib\uap10.0\Microsoft.UI.Hosting.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage.0.9.0-CI-22435.1000.210807-1000.0\lib\uap10.0\Microsoft.UI.Dispatching.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage.0.9.0-CI-22435.1000.210807-1000.0\lib\uap10.0\Microsoft.UI.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.ProjectReunion.Foundation.TransportPackage.0.5.0-CI-20210408-224233\lib\uap10.0\Microsoft.ApplicationModel.Resources\Microsoft.ApplicationModel.Resources.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Internal.WinUIDetails.0.1.0-ci158\lib\uap10.0\Microsoft.UI.Text.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Web.WebView2.1.0.2646-prerelease\lib\Microsoft.Web.WebView2.Core.winmd;D:\microsoft-ui-xaml-lift\BuildOutput\obj\{platform}{configuration}\dxaml\xcp\dxaml\idl\winrt\merged\private\Merged\Microsoft.Foundation.winmd;D:\microsoft-ui-xaml-lift\BuildOutput\obj\{platform}{configuration}\dxaml\xcp\dxaml\idl\winrt\merged\private\Merged\Microsoft.Graphics.DirectX.winmd;D:\microsoft-ui-xaml-lift\BuildOutput\obj\{platform}{configuration}\dxaml\xcp\dxaml\idl\winrt\merged\private\Merged\Microsoft.UI.Composition.winmd;D:\microsoft-ui-xaml-lift\BuildOutput\obj\{platform}{configuration}\dxaml\xcp\dxaml\idl\winrt\merged\private\Merged\Microsoft.UI.Dispatching.winmd;D:\microsoft-ui-xaml-lift\BuildOutput\obj\{platform}{configuration}\dxaml\xcp\dxaml\idl\winrt\merged\private\Merged\Microsoft.UI.Hosting.winmd;D:\microsoft-ui-xaml-lift\BuildOutput\obj\{platform}{configuration}\dxaml\xcp\dxaml\idl\winrt\merged\private\Merged\Microsoft.UI.Input.winmd;D:\microsoft-ui-xaml-lift\BuildOutput\obj\{platform}{configuration}\dxaml\xcp\dxaml\idl\winrt\merged\private\Merged\Microsoft.UI.winmd;D:\microsoft-ui-xaml-lift\BuildOutput\obj\{platform}{configuration}\dxaml\xcp\dxaml\idl\winrt\merged\private\Merged\Microsoft.UI.Xaml.winmd");
+            parameterValues.Add("ReferenceWinmds", $@"{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.AI.MachineLearning.MachineLearningContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.AI.MachineLearning.Preview.MachineLearningPreviewContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.Activation.ActivatedEventsContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.Activation.ActivationCameraSettingsContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.Activation.ContactActivatedEventsContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.Activation.WebUISearchActivatedEventsContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.Background.BackgroundAlarmApplicationContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.Calls.Background.CallsBackgroundContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.Calls.CallsPhoneContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.Calls.CallsVoipContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.Calls.LockScreenCallContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.CommunicationBlocking.CommunicationBlockingContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.FullTrustAppContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.Preview.InkWorkspace.PreviewInkWorkspaceContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.Preview.Notes.PreviewNotesContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.Resources.Management.ResourceIndexerContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.Search.Core.SearchCoreContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.Search.SearchContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.SocialInfo.SocialInfoContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.StartupTaskContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.ApplicationModel.Wallet.WalletContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Devices.Custom.CustomDeviceContract.winmd;{projectRoot}\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Devices.DevicesLowLevelContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Devices.Portable.PortableDeviceContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Devices.Printers.Extensions.ExtensionsContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Devices.Printers.PrintersContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Devices.Scanners.ScannerDeviceContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Devices.SmartCards.SmartCardBackgroundTriggerContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Devices.SmartCards.SmartCardEmulatorContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Devices.Sms.LegacySmsApiContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Embedded.DeviceLockdown.DeviceLockdownContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Foundation.FoundationContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Foundation.UniversalApiContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Gaming.Input.GamingInputPreviewContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Gaming.Preview.GamesEnumerationContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Gaming.UI.GameChatOverlayContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Gaming.UI.GamingUIProviderContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Gaming.XboxLive.StorageApiContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Globalization.GlobalizationJapanesePhoneticAnalyzerContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Graphics.Printing3D.Printing3DContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Management.Deployment.Preview.DeploymentPreviewContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Management.Workplace.WorkplaceSettingsContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Media.AppBroadcasting.AppBroadcastingContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Media.AppRecording.AppRecordingContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Media.Capture.AppBroadcastContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Media.Capture.AppCaptureContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Media.Capture.AppCaptureMetadataContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Media.Capture.CameraCaptureUIContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Media.Capture.GameBarContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Media.Devices.CallControlContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Media.MediaControlContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Media.Playlists.PlaylistsContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Media.Protection.ProtectionRenewalContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Networking.Connectivity.WwanContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Networking.NetworkOperators.LegacyNetworkOperatorsContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Networking.NetworkOperators.NetworkOperatorsFdnContract.WinMD;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Networking.Sockets.ControlChannelTriggerContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Networking.XboxLive.XboxLiveSecureSocketsContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Perception.Automation.Core.PerceptionAutomationCoreContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Phone.PhoneContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Phone.StartScreen.DualSimTileContract.WinMD;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Security.EnterpriseData.EnterpriseDataContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Security.ExchangeActiveSyncProvisioning.EasContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Services.Maps.GuidanceContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Services.Maps.LocalSearchContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Services.Store.StoreContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Services.TargetedContent.TargetedContentContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Storage.Provider.CloudFilesContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.System.Profile.ProfileHardwareTokenContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.System.Profile.ProfileRetailInfoContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.System.Profile.ProfileSharedModeContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.System.Profile.SystemManufacturers.SystemManufacturersContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.System.SystemManagementContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.System.UserProfile.UserProfileContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.System.UserProfile.UserProfileLockScreenContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.UI.ApplicationSettings.ApplicationsSettingsContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.UI.Core.AnimationMetrics.AnimationMetricsContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.UI.Core.CoreWindowDialogsContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.UI.Shell.SecurityAppManagerContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.UI.ViewManagement.ViewManagementViewScalingContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.UI.WebUI.Core.WebUICommandBarContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Microsoft.UI.Xaml.Core.Direct.XamlDirectContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Microsoft.UI.Xaml.Hosting.HostingContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Windows.SDK.cpp.10.0.18362.5\c\References\10.0.18362.0\Windows.Web.Http.Diagnostics.HttpDiagnosticsContract.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage.0.9.0-CI-22435.1000.210807-1000.0\lib\uap10.0\Microsoft.Foundation.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage.0.9.0-CI-22435.1000.210807-1000.0\lib\uap10.0\Microsoft.Graphics.DirectX.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage.0.9.0-CI-22435.1000.210807-1000.0\lib\uap10.0\Microsoft.UI.Composition.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage.0.9.0-CI-22435.1000.210807-1000.0\lib\uap10.0\Microsoft.UI.Input.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage.0.9.0-CI-22435.1000.210807-1000.0\lib\uap10.0\Microsoft.UI.Hosting.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage.0.9.0-CI-22435.1000.210807-1000.0\lib\uap10.0\Microsoft.UI.Dispatching.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage.0.9.0-CI-22435.1000.210807-1000.0\lib\uap10.0\Microsoft.UI.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.ProjectReunion.Foundation.TransportPackage.0.5.0-CI-20210408-224233\lib\uap10.0\Microsoft.ApplicationModel.Resources\Microsoft.ApplicationModel.Resources.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Internal.WinUIDetails.0.1.0-ci158\lib\uap10.0\Microsoft.UI.Text.winmd;D:\microsoft-ui-xaml-lift\packages\Microsoft.Web.WebView2.1.0.2651.64\lib\Microsoft.Web.WebView2.Core.winmd;D:\microsoft-ui-xaml-lift\BuildOutput\obj\{platform}{configuration}\dxaml\xcp\dxaml\idl\winrt\merged\private\Merged\Microsoft.Foundation.winmd;D:\microsoft-ui-xaml-lift\BuildOutput\obj\{platform}{configuration}\dxaml\xcp\dxaml\idl\winrt\merged\private\Merged\Microsoft.Graphics.DirectX.winmd;D:\microsoft-ui-xaml-lift\BuildOutput\obj\{platform}{configuration}\dxaml\xcp\dxaml\idl\winrt\merged\private\Merged\Microsoft.UI.Composition.winmd;D:\microsoft-ui-xaml-lift\BuildOutput\obj\{platform}{configuration}\dxaml\xcp\dxaml\idl\winrt\merged\private\Merged\Microsoft.UI.Dispatching.winmd;D:\microsoft-ui-xaml-lift\BuildOutput\obj\{platform}{configuration}\dxaml\xcp\dxaml\idl\winrt\merged\private\Merged\Microsoft.UI.Hosting.winmd;D:\microsoft-ui-xaml-lift\BuildOutput\obj\{platform}{configuration}\dxaml\xcp\dxaml\idl\winrt\merged\private\Merged\Microsoft.UI.Input.winmd;D:\microsoft-ui-xaml-lift\BuildOutput\obj\{platform}{configuration}\dxaml\xcp\dxaml\idl\winrt\merged\private\Merged\Microsoft.UI.winmd;D:\microsoft-ui-xaml-lift\BuildOutput\obj\{platform}{configuration}\dxaml\xcp\dxaml\idl\winrt\merged\private\Merged\Microsoft.UI.Xaml.winmd");
 
             test.ParameterValues = new ITaskItem[]
                 {
@@ -303,7 +303,7 @@ void AddTaskItem(string itemSpec, string implementationDll = "", bool merge = tr
             AddTaskItem($@"{projectRoot}\BuildOutput\obj\{platform}{configuration}\dxaml\phone\idl\Microsoft.UI.Xaml.Phone.winmd", "Microsoft.UI.Xaml.Phone.dll");
             AddTaskItem($@"{projectRoot}\BuildOutput\obj\{platform}{configuration}\dxaml\xcp\dxaml\idl\winrt\main\microsoft.ui.xaml.winmd");
             AddTaskItem($@"{projectRoot}\packages\Microsoft.Internal.WinUIDetails.1.7.0\lib\uap10.0\Microsoft.UI.Text.winmd", "WinUIEdit.dll");
-            AddTaskItem($@"{projectRoot}\packages\Microsoft.Web.WebView2.1.0.2646-prerelease\lib\Microsoft.Web.WebView2.Core.winmd", "Microsoft.Web.WebView2.Core.dll");
+            AddTaskItem($@"{projectRoot}\packages\Microsoft.Web.WebView2.1.0.2651.64\lib\Microsoft.Web.WebView2.Core.winmd", "Microsoft.Web.WebView2.Core.dll");
             AddTaskItem($@"{projectRoot}\BuildOutput\obj\{platform}{configuration}\dxaml\xcp\dxaml\idl\winrt\main\microsoft.ui.xaml.private.winmd");
 
             test.WinMDs = taskItemList.ToArray();
diff --git a/src/dxaml/phone/lib/LoopingSelectorAutomationPeer_Partial.cpp b/src/dxaml/phone/lib/LoopingSelectorAutomationPeer_Partial.cpp
index 752553e1a7..d967522497 100644
--- a/src/dxaml/phone/lib/LoopingSelectorAutomationPeer_Partial.cpp
+++ b/src/dxaml/phone/lib/LoopingSelectorAutomationPeer_Partial.cpp
@@ -81,7 +81,7 @@ _Check_return_ HRESULT LoopingSelectorAutomationPeer::ClearPeerMap()
     RRETURN(S_OK);
 }
 
-HRESULT LoopingSelectorAutomationPeer::RealizeItemAtIndex(INT index)
+_Check_return_ HRESULT LoopingSelectorAutomationPeer::RealizeItemAtIndex(_In_ INT index)
 {
     xaml_primitives::LoopingSelector* pOwnerNoRef = nullptr;
     IFC_RETURN(GetOwnerAsInternalPtrNoRef(&pOwnerNoRef));
diff --git a/src/dxaml/phone/lib/LoopingSelectorItemDataAutomationPeer_Partial.cpp b/src/dxaml/phone/lib/LoopingSelectorItemDataAutomationPeer_Partial.cpp
index d0e33717ca..90411f60bc 100644
--- a/src/dxaml/phone/lib/LoopingSelectorItemDataAutomationPeer_Partial.cpp
+++ b/src/dxaml/phone/lib/LoopingSelectorItemDataAutomationPeer_Partial.cpp
@@ -86,7 +86,7 @@ LoopingSelectorItemDataAutomationPeer::GetItem(_Outptr_result_maybenull_ IInspec
     RRETURN(S_OK);
 }
 
-HRESULT LoopingSelectorItemDataAutomationPeer::SetItemIndex(int index)
+HRESULT LoopingSelectorItemDataAutomationPeer::SetItemIndex(_In_ int index)
 {
     _itemIndex = index;
     RRETURN(S_OK);
diff --git a/src/dxaml/phone/lib/LoopingSelector_Partial.cpp b/src/dxaml/phone/lib/LoopingSelector_Partial.cpp
index 4a104874d2..f5a16bf2dd 100644
--- a/src/dxaml/phone/lib/LoopingSelector_Partial.cpp
+++ b/src/dxaml/phone/lib/LoopingSelector_Partial.cpp
@@ -2516,7 +2516,7 @@ _Check_return_ HRESULT LoopingSelector::AutomationClearPeerMap()
     RRETURN(hr);
 }
 
-HRESULT xaml_primitives::LoopingSelector::AutomationRealizeItemForAP(UINT32 itemIdxToRealize)
+_Check_return_ HRESULT xaml_primitives::LoopingSelector::AutomationRealizeItemForAP(UINT32 itemIdxToRealize)
 {
     wrl::ComPtr<ILoopingSelectorItem> spItem;
     IFC_RETURN(RealizeItem(itemIdxToRealize, &spItem));
diff --git a/src/dxaml/phone/lib/LoopingSelector_Partial.h b/src/dxaml/phone/lib/LoopingSelector_Partial.h
index 268babbc57..d5263b3879 100644
--- a/src/dxaml/phone/lib/LoopingSelector_Partial.h
+++ b/src/dxaml/phone/lib/LoopingSelector_Partial.h
@@ -29,7 +29,7 @@ XAML_ABI_NAMESPACE_BEGIN namespace Microsoft { namespace UI { namespace Xaml { n
             _Outptr_result_maybenull_ xaml_automation_peers::ILoopingSelectorItemAutomationPeer** ppPeer);
         _Check_return_ HRESULT AutomationTryScrollItemIntoView(_In_ IInspectable* pItem);
         _Check_return_ HRESULT AutomationClearPeerMap();
-        _Check_return_ HRESULT AutomationRealizeItemForAP(_In_ UINT32 itemIdxToRealize);
+        _Check_return_ HRESULT AutomationRealizeItemForAP(UINT32 itemIdxToRealize);
 
         // Used by LoopingSelectorItem to ScrollIntoView/Select
         _Check_return_ HRESULT AutomationScrollToVisualIdx(_In_ INT visualIdx, bool ignoreScrollingState = false);
diff --git a/src/dxaml/phone/lib/Pivot_Partial.cpp b/src/dxaml/phone/lib/Pivot_Partial.cpp
index 1185f9a229..3ad7fd8400 100644
--- a/src/dxaml/phone/lib/Pivot_Partial.cpp
+++ b/src/dxaml/phone/lib/Pivot_Partial.cpp
@@ -2238,7 +2238,7 @@ Pivot::CancelDManipAnimations()
 }
 
 _Check_return_ HRESULT
-Pivot::UpdateScrollViewerDragDirection(PivotAnimationDirection direction)
+Pivot::UpdateScrollViewerDragDirection(_In_ PivotAnimationDirection direction)
 {
     wrl::ComPtr<wfc::IVector<IInspectable*>> spItemsAsVector;
     UINT itemCount = 0;
diff --git a/src/dxaml/xcp/components/CValue/CValue.cpp b/src/dxaml/xcp/components/CValue/CValue.cpp
index 81a2a4d52b..0f2916cde9 100644
--- a/src/dxaml/xcp/components/CValue/CValue.cpp
+++ b/src/dxaml/xcp/components/CValue/CValue.cpp
@@ -910,7 +910,7 @@ const CValueCustomData& CValue::GetCustomData() const
 }
 
 void CValue::SetCustomData(
-    const CValueCustomData& customData)
+    _In_ const CValueCustomData& customData)
 {
     m_flags.m_state.m_asOne &= ~CustomDataMask;
     m_flags.m_state.m_asOne |= (customData.m_asOne & CustomDataMask);
diff --git a/src/dxaml/xcp/components/ContentRoot/PointerInputProcessor.cpp b/src/dxaml/xcp/components/ContentRoot/PointerInputProcessor.cpp
index f2d9867585..261b49dd74 100644
--- a/src/dxaml/xcp/components/ContentRoot/PointerInputProcessor.cpp
+++ b/src/dxaml/xcp/components/ContentRoot/PointerInputProcessor.cpp
@@ -42,6 +42,7 @@
 #include "Button.h"
 
 #include "PointerInputTelemetry.h"
+#include "WindowedPopupInputSiteAdapter.h"
 
 using namespace ContentRootInput;
 
@@ -1649,15 +1650,28 @@ _Check_return_ HRESULT PointerInputProcessor::ReleasePointerCapture(_In_ CDepend
 
     if (pointerPoint == nullptr)
     {
-        CXamlIslandRoot* pIslandRoot = m_inputManager.GetContentRoot()->GetXamlIslandRootNoRef();
-        if (pIslandRoot)
+        xref_ptr<CPopup> popup;
+        xref_ptr<CUIElement> capturedUIElement(static_cast<CUIElement*>(pPointerCaptureDO));
+        if (capturedUIElement)
         {
-            pointerPoint = (pIslandRoot->GetPreviousPointerPoint()).Get();
+            IFCFAILFAST(CPopupRoot::GetOpenPopupForElement(capturedUIElement, popup.ReleaseAndGetAddressOf()));
+        }
+        if (popup && popup->IsWindowed())
+        {
+            pointerPoint = popup->GetInputSiteAdapter()->GetPreviousPointerPoint().Get();
         }
         else
         {
-            CJupiterWindow* jupiterWindow = DirectUI::DXamlServices::GetCurrentJupiterWindow();
-            pointerPoint = (jupiterWindow->GetInputSiteAdapterPointerPoint()).Get();
+            CXamlIslandRoot* pIslandRoot = m_inputManager.GetContentRoot()->GetXamlIslandRootNoRef();
+            if (pIslandRoot)
+            {
+                pointerPoint = (pIslandRoot->GetPreviousPointerPoint()).Get();
+            }
+            else
+            {
+                CJupiterWindow* jupiterWindow = DirectUI::DXamlServices::GetCurrentJupiterWindow();
+                pointerPoint = (jupiterWindow->GetInputSiteAdapterPointerPoint()).Get();
+            }
         }
     }
     pArgs->m_pPointerPoint = pointerPoint;
diff --git a/src/dxaml/xcp/components/base/inc/minerror.h b/src/dxaml/xcp/components/base/inc/minerror.h
index 616e3fd2ef..946d3201d5 100644
--- a/src/dxaml/xcp/components/base/inc/minerror.h
+++ b/src/dxaml/xcp/components/base/inc/minerror.h
@@ -166,7 +166,7 @@ void __stdcall FailFastWithStowedExceptions(HRESULT hrError, ULONG cStowedExcept
     while(UNCONDITIONAL_EXPR(0))
 
 // DISPLAY_DEBUG calls out to WIL instead of using DisplayDebugMessage.  This ensures that errors are logged to WIL and are also output to the console.
-#define DISPLAY_DEBUG(hr, testString) LOG_HR_MSG((hr), (testString));
+#define DISPLAY_DEBUG(hr, testString) LOG_HR_MSG((hr), "%ls", (testString));
 
 #define DISPLAY_DIAGNOSTICS_RELEASE(diagnosticMessage) DisplayReleaseMessage((diagnosticMessage));
 
@@ -229,7 +229,7 @@ namespace Details
         else \
         { \
             OnFailure<__COUNTER__>(hr); \
-            DISPLAY_DEBUG(hr, #x) \
+            DISPLAY_DEBUG(hr, L#x) \
             goto Cleanup; \
         } \
     } \
@@ -246,7 +246,7 @@ namespace Details
         else \
         { \
             OnFailureWithExtraInfo<__COUNTER__>(hr, extraInfo); \
-            DISPLAY_DEBUG(hr, #x) \
+            DISPLAY_DEBUG(hr, L#x) \
             if (extraInfo) \
             { \
                 for (const auto& _extraInfoEntry_ : *extraInfo) \
@@ -271,7 +271,7 @@ namespace Details
         else \
         { \
             OnFailure<__COUNTER__>(hr); \
-            DISPLAY_DEBUG(hr, #x) \
+            DISPLAY_DEBUG(hr, L#x) \
             goto Cleanup; \
         } \
     } \
@@ -288,7 +288,7 @@ namespace Details
         else \
         { \
             OnFailure<__COUNTER__>(_hr_); \
-            DISPLAY_DEBUG(_hr_, #x) \
+            DISPLAY_DEBUG(_hr_, L#x) \
             return _hr_; \
         } \
     } \
@@ -305,7 +305,7 @@ namespace Details
         else \
         { \
             OnFailureWithExtraInfo<__COUNTER__>(_hr_, extraInfo); \
-            DISPLAY_DEBUG(_hr_, #x) \
+            DISPLAY_DEBUG(_hr_, L#x) \
             if (extraInfo) \
             { \
                 for (const auto& _extraInfoEntry_ : *extraInfo) \
@@ -329,7 +329,7 @@ namespace Details
         else \
         { \
             OnFailure<__COUNTER__>(_hr_); \
-            DISPLAY_DEBUG(_hr_, #x) \
+            DISPLAY_DEBUG(_hr_, L#x) \
             return _hr_; \
         } \
     } \
@@ -346,7 +346,7 @@ namespace Details
         else \
         { \
             OnFailure<__COUNTER__>(_hr_); \
-            DISPLAY_DEBUG(_hr_, #x) \
+            DISPLAY_DEBUG(_hr_, L#x) \
             return _hr_; \
         } \
     } \
@@ -361,7 +361,7 @@ namespace Details
     { \
         hr = E_OUTOFMEMORY; \
         OnNewFailure<__COUNTER__>(hr); \
-        DISPLAY_DEBUG(hr, #x) \
+        DISPLAY_DEBUG(hr, L#x) \
         goto Cleanup; \
     } \
     CHECK_MISMATCH_GOTO
@@ -375,7 +375,7 @@ namespace Details
     { \
         constexpr HRESULT _hr_ = E_OUTOFMEMORY; \
         OnNewFailure<__COUNTER__>(_hr_); \
-        DISPLAY_DEBUG(_hr_, #x) \
+        DISPLAY_DEBUG(_hr_, L#x) \
         return _hr_; \
     } \
     CHECK_MISMATCH_RETURN
@@ -390,7 +390,7 @@ namespace Details
     { \
         hr = E_POINTER; \
         OnNewFailure<__COUNTER__>(hr); \
-        DISPLAY_DEBUG(hr, #x) \
+        DISPLAY_DEBUG(hr, L#x) \
         goto Cleanup; \
     } \
     CHECK_MISMATCH_GOTO
@@ -404,7 +404,7 @@ namespace Details
     { \
         constexpr HRESULT _hr_ = E_POINTER; \
         OnNewFailure<__COUNTER__>(_hr_); \
-        DISPLAY_DEBUG(_hr_, #x) \
+        DISPLAY_DEBUG(_hr_, L#x) \
         return _hr_; \
     } \
     CHECK_MISMATCH_RETURN
@@ -419,7 +419,7 @@ namespace Details
     { \
         hr = E_HANDLE; \
         OnNewFailure<__COUNTER__>(hr); \
-        DISPLAY_DEBUG(hr, #x) \
+        DISPLAY_DEBUG(hr, L#x) \
         goto Cleanup; \
     } \
     CHECK_MISMATCH_GOTO
@@ -433,7 +433,7 @@ namespace Details
     { \
         constexpr HRESULT _hr_ = E_HANDLE; \
         OnNewFailure<__COUNTER__>(_hr_); \
-        DISPLAY_DEBUG(_hr_, #x) \
+        DISPLAY_DEBUG(_hr_, L#x) \
         return _hr_; \
     } \
     CHECK_MISMATCH_RETURN
@@ -448,7 +448,7 @@ namespace Details
     { \
         hr = E_FAIL; \
         OnNewFailure<__COUNTER__>(hr); \
-        DISPLAY_DEBUG(hr, #x) \
+        DISPLAY_DEBUG(hr, L#x) \
         goto Cleanup; \
     } \
     CHECK_MISMATCH_GOTO
@@ -462,7 +462,7 @@ namespace Details
     { \
         constexpr HRESULT _hr_ = E_FAIL; \
         OnNewFailure<__COUNTER__>(_hr_); \
-        DISPLAY_DEBUG(_hr_, #x) \
+        DISPLAY_DEBUG(_hr_, L#x) \
         return _hr_; \
     } \
     CHECK_MISMATCH_RETURN
@@ -478,7 +478,7 @@ namespace Details
         ASSERT(!"Internal Error"); \
         hr = E_UNEXPECTED; \
         OnNewFailure<__COUNTER__>(hr); \
-        DISPLAY_DEBUG(hr, #x) \
+        DISPLAY_DEBUG(hr, L#x) \
         goto Cleanup; \
     } \
     CHECK_MISMATCH_GOTO
@@ -493,7 +493,7 @@ namespace Details
         ASSERT(!"Internal Error"); \
         constexpr HRESULT _hr_ = E_UNEXPECTED; \
         OnNewFailure<__COUNTER__>(_hr_); \
-        DISPLAY_DEBUG(_hr_, #x) \
+        DISPLAY_DEBUG(_hr_, L#x) \
         return _hr_; \
     } \
     CHECK_MISMATCH_RETURN
@@ -508,7 +508,7 @@ namespace Details
     { \
         hr = E_UNEXPECTED; \
         OnNewFailure<__COUNTER__>(hr); \
-        DISPLAY_DEBUG(hr, #x) \
+        DISPLAY_DEBUG(hr, L#x) \
         goto Cleanup; \
     } \
     CHECK_MISMATCH_GOTO
@@ -522,7 +522,7 @@ namespace Details
     { \
         constexpr HRESULT _hr_ = E_UNEXPECTED; \
         OnNewFailure<__COUNTER__>(_hr_); \
-        DISPLAY_DEBUG(_hr_, #x) \
+        DISPLAY_DEBUG(_hr_, L#x) \
         return _hr_; \
     } \
     CHECK_MISMATCH_RETURN
@@ -536,7 +536,7 @@ namespace Details
     { \
         hr = y; \
         OnNewFailure<__COUNTER__>(hr); \
-        DISPLAY_DEBUG(hr, #x) \
+        DISPLAY_DEBUG(hr, L#x) \
         goto Cleanup; \
     } \
     CHECK_MISMATCH_GOTO
@@ -550,7 +550,7 @@ namespace Details
     { \
         const HRESULT _hr_ = y; \
         OnNewFailure<__COUNTER__>(_hr_); \
-        DISPLAY_DEBUG(_hr_, #x) \
+        DISPLAY_DEBUG(_hr_, L#x) \
         return _hr_; \
     } \
     CHECK_MISMATCH_RETURN
@@ -565,7 +565,7 @@ namespace Details
     { \
         hr = y; \
         OnNewFailure<__COUNTER__>(hr); \
-        DISPLAY_DEBUG(hr, #x) \
+        DISPLAY_DEBUG(hr, L#x) \
         goto Cleanup; \
     } \
     CHECK_MISMATCH_GOTO
@@ -579,7 +579,7 @@ namespace Details
     { \
         constexpr HRESULT _hr_ = y; \
         OnNewFailure<__COUNTER__>(_hr_); \
-        DISPLAY_DEBUG(_hr_, #x) \
+        DISPLAY_DEBUG(_hr_, L#x) \
         return _hr_; \
     } \
     CHECK_MISMATCH_RETURN
@@ -596,7 +596,7 @@ namespace Details
         else \
         { \
             hrTemp = hr; \
-            DISPLAY_DEBUG(hr, #x) \
+            DISPLAY_DEBUG(hr, L#x) \
         } \
     }
 
@@ -609,7 +609,7 @@ namespace Details
         hr = HRESULT_FROM_WIN32(GetLastError());                            \
         if (SUCCEEDED(hr)) hr = E_FAIL;                                     \
         OnNewFailure<__COUNTER__>(hr);                                      \
-        DISPLAY_DEBUG(hr, #x)                                              \
+        DISPLAY_DEBUG(hr, L#x)                                              \
         goto Cleanup;                                                       \
     }                                                                       \
     CHECK_MISMATCH_GOTO
@@ -621,7 +621,7 @@ namespace Details
         HRESULT _hr_ = HRESULT_FROM_WIN32(GetLastError());                  \
         if (SUCCEEDED(_hr_)) _hr_ = E_FAIL;                                 \
         OnNewFailure<__COUNTER__>(_hr_);                                    \
-        DISPLAY_DEBUG(_hr_, #x)                                            \
+        DISPLAY_DEBUG(_hr_, L#x)                                            \
         return _hr_;                                                        \
     }                                                                       \
     CHECK_MISMATCH_RETURN
@@ -665,7 +665,7 @@ namespace Details
         else \
         { \
             OnFailure<__COUNTER__>(__HR); \
-            DISPLAY_DEBUG(__HR, #x) \
+            DISPLAY_DEBUG(__HR, L#x) \
             FAIL_FAST_USING_EXISTING_ERROR_CONTEXT(__HR); \
         } \
     }
@@ -681,7 +681,7 @@ namespace Details
         else \
         { \
             OnFailure<__COUNTER__>(__HR); \
-            DISPLAY_DEBUG(__HR, #x) \
+            DISPLAY_DEBUG(__HR, L#x) \
             FAIL_FAST_USING_EXISTING_ERROR_CONTEXT(__HR); \
         } \
     }
diff --git a/src/dxaml/xcp/components/brushes/LinearGradientBrush.cpp b/src/dxaml/xcp/components/brushes/LinearGradientBrush.cpp
index 9127e994e6..2fd7fd947f 100644
--- a/src/dxaml/xcp/components/brushes/LinearGradientBrush.cpp
+++ b/src/dxaml/xcp/components/brushes/LinearGradientBrush.cpp
@@ -605,7 +605,7 @@ void CLinearGradientBrush::CreateBackingCompositionObjectForFacade(_In_ WUComp::
     *listener = nullptr;
 }
 
-void CLinearGradientBrush::PopulateBackingCompositionObjectWithFacade(WUComp::ICompositionObject* backingCO, KnownPropertyIndex facadeID)
+void CLinearGradientBrush::PopulateBackingCompositionObjectWithFacade(_In_ WUComp::ICompositionObject* backingCO, KnownPropertyIndex facadeID)
 {
     wrl::ComPtr<WUComp::ICompositionGradientBrush> backingPS;
     VERIFYHR(backingCO->QueryInterface(IID_PPV_ARGS(&backingPS)));
diff --git a/src/dxaml/xcp/components/brushes/WUCBrushManager.cpp b/src/dxaml/xcp/components/brushes/WUCBrushManager.cpp
index 4bdd7547ec..6c53745605 100644
--- a/src/dxaml/xcp/components/brushes/WUCBrushManager.cpp
+++ b/src/dxaml/xcp/components/brushes/WUCBrushManager.cpp
@@ -647,7 +647,7 @@ void WUCBrushManager::CleanUpBrushTransitions(const CUIElement& element)
     }
 }
 
-bool WUCBrushManager::HasActiveBrushTransitions(const CUIElement* element)
+bool WUCBrushManager::HasActiveBrushTransitions(_In_ const CUIElement* element)
 {
     for (auto iterator = m_wucColorBrushTransitions->begin(); iterator != m_wucColorBrushTransitions->end(); ++iterator)
     {
@@ -659,7 +659,7 @@ bool WUCBrushManager::HasActiveBrushTransitions(const CUIElement* element)
     return false;
 }
 
-bool WUCBrushManager::HasActiveBrushTransition(const CUIElement* element, ElementBrushProperty elementBrushProperty)
+bool WUCBrushManager::HasActiveBrushTransition(_In_ const CUIElement* element, ElementBrushProperty elementBrushProperty)
 {
     for (auto iterator = m_wucColorBrushTransitions->begin(); iterator != m_wucColorBrushTransitions->end(); ++iterator)
     {
diff --git a/src/dxaml/xcp/components/deferral/StyleCustomWriter.cpp b/src/dxaml/xcp/components/deferral/StyleCustomWriter.cpp
index ae399702d5..dfaa72b7f1 100644
--- a/src/dxaml/xcp/components/deferral/StyleCustomWriter.cpp
+++ b/src/dxaml/xcp/components/deferral/StyleCustomWriter.cpp
@@ -24,7 +24,7 @@
 #define STYLELOG(...)
 
 StyleCustomWriter::StyleCustomWriter(
-    _In_ ICustomWriterCallbacks* callbacks,
+    _In_ _Notnull_ ICustomWriterCallbacks* callbacks,
     _In_ std::shared_ptr<XamlSchemaContext> context,
     _In_ std::shared_ptr<ObjectWriterContext> objectWriterContext)
     : m_customWriterCallbacks(callbacks)
@@ -48,7 +48,7 @@ _Check_return_ HRESULT StyleCustomWriter::Initialize()
 }
 
 _Check_return_ HRESULT StyleCustomWriter::Create(
-    _In_ ICustomWriterCallbacks* callbacks,
+    _In_ _Notnull_ ICustomWriterCallbacks* callbacks,
     _In_ std::shared_ptr<XamlSchemaContext> context,
     _In_ std::shared_ptr<ObjectWriterContext> objectWriterContext,
     _Out_ std::unique_ptr<ICustomWriter>* ppValue)
diff --git a/src/dxaml/xcp/components/deferral/VisualStateGroupCollectionCustomRuntimeDataSerializer.cpp b/src/dxaml/xcp/components/deferral/VisualStateGroupCollectionCustomRuntimeDataSerializer.cpp
index 6c52965cae..a26315ab1b 100644
--- a/src/dxaml/xcp/components/deferral/VisualStateGroupCollectionCustomRuntimeDataSerializer.cpp
+++ b/src/dxaml/xcp/components/deferral/VisualStateGroupCollectionCustomRuntimeDataSerializer.cpp
@@ -103,6 +103,7 @@ namespace CustomRuntimeDataSerializationHelpers
         return S_OK;
     }
 
+#pragma warning(suppress: 28251) // C28251: False positive. Prefast says this is not annotated, but it is.
     template<>
     VisualTransitionTableOptimizedLookup Deserialize<VisualTransitionTableOptimizedLookup>(_In_ XamlBinaryFormatSubReader2* reader)
     {
diff --git a/src/dxaml/xcp/components/elements/sharedstubs/SharedStubs.cpp b/src/dxaml/xcp/components/elements/sharedstubs/SharedStubs.cpp
index ed2ef77c7f..af3d42833b 100644
--- a/src/dxaml/xcp/components/elements/sharedstubs/SharedStubs.cpp
+++ b/src/dxaml/xcp/components/elements/sharedstubs/SharedStubs.cpp
@@ -7,7 +7,7 @@
 #include <ErrorHelper.h>
 
 long __stdcall DirectUI::ErrorHelper::OriginateErrorUsingResourceID(long hr,unsigned int resID) { return hr; }
-long __stdcall DirectUI::ErrorHelper::OriginateErrorUsingFormattedResourceID(long hr,unsigned int resID, _In_ class xstring_ptr_view const &str, const WCHAR* param2) { return hr; }
+_Check_return_ long __stdcall DirectUI::ErrorHelper::OriginateErrorUsingFormattedResourceID(long hr,unsigned int resID, _In_ class xstring_ptr_view const &str, const WCHAR* param2) { return hr; }
 
 extern "C"
 void MicrosoftTelemetryAssertTriggeredArgs(const char *OriginatingBinary, ULONG BucketArg1, ULONG BucketArg2)
diff --git a/src/dxaml/xcp/components/gestures/inc/ElementGestureTracker.h b/src/dxaml/xcp/components/gestures/inc/ElementGestureTracker.h
index 098fd1902d..e667d89a8a 100644
--- a/src/dxaml/xcp/components/gestures/inc/ElementGestureTracker.h
+++ b/src/dxaml/xcp/components/gestures/inc/ElementGestureTracker.h
@@ -85,7 +85,7 @@ class ElementGestureTracker final
     bool IsStopped();
     bool IsInertial();
     void ProcessInertiaInteraction();
-    void SetManipulationStarting(_In_ bool bManipulationStarting);
+    void SetManipulationStarting(bool bManipulationStarting);
     bool IsManipulationStarting();
     bool IsManipulationStarted();
     bool IsPegged();
diff --git a/src/dxaml/xcp/components/graphics/EffectPolicyHelper.cpp b/src/dxaml/xcp/components/graphics/EffectPolicyHelper.cpp
index 9c31676333..c573f65849 100644
--- a/src/dxaml/xcp/components/graphics/EffectPolicyHelper.cpp
+++ b/src/dxaml/xcp/components/graphics/EffectPolicyHelper.cpp
@@ -129,7 +129,7 @@ HRESULT EffectPolicyHelper::Execute()
     return S_OK;
 }
 
-HRESULT EffectPolicyHelper::ReevaluateShadowPolicy()
+_Check_return_ HRESULT EffectPolicyHelper::ReevaluateShadowPolicy()
 {
     bool areShadowsEnabled = m_forceShadowsOn;
 
diff --git a/src/dxaml/xcp/components/graphics/ProjectedShadowManager.cpp b/src/dxaml/xcp/components/graphics/ProjectedShadowManager.cpp
index 67920ea122..133f648b65 100644
--- a/src/dxaml/xcp/components/graphics/ProjectedShadowManager.cpp
+++ b/src/dxaml/xcp/components/graphics/ProjectedShadowManager.cpp
@@ -748,7 +748,7 @@ void ThemeShadowScene::ClearCasters()
 // Estimate shadow depth from the Translate.Z value set on the caster UIElement,
 // since this is how shadow depth is set for all in-box Controls. If the popup is parented,
 // we find all popups in the ancestor chain and accumulate the Translate.Z values.
-float ThemeShadowGlobalScene::EstimateShadowDepth(CPopup* popup)
+float ThemeShadowGlobalScene::EstimateShadowDepth(_In_ CPopup* popup)
 {
     float totalDepth = 0;
     CPopup* currentPopup = popup;
diff --git a/src/dxaml/xcp/components/imaging/AsyncImageDecoder.cpp b/src/dxaml/xcp/components/imaging/AsyncImageDecoder.cpp
index dabb465bac..c8c612bb53 100644
--- a/src/dxaml/xcp/components/imaging/AsyncImageDecoder.cpp
+++ b/src/dxaml/xcp/components/imaging/AsyncImageDecoder.cpp
@@ -95,7 +95,7 @@ void AsyncImageDecoder::SharedState::CancelPresent()
 }
 
 // static
-HRESULT AsyncImageDecoder::SetupDecodeCurrentFrame(std::shared_ptr<SharedState> sharedState)
+_Check_return_ HRESULT AsyncImageDecoder::SetupDecodeCurrentFrame(std::shared_ptr<SharedState> sharedState)
 {
     uint64_t imageSourceId = sharedState->m_spDecodeParams->GetImageId();
     ImagingTelemetry::QueueOffThreadDecode(imageSourceId);
@@ -119,7 +119,7 @@ HRESULT AsyncImageDecoder::SetupDecodeCurrentFrame(std::shared_ptr<SharedState>
 }
 
 // static
-HRESULT AsyncImageDecoder::OnDecodeCurrentFrame(std::shared_ptr<SharedState> sharedState)
+_Check_return_ HRESULT AsyncImageDecoder::OnDecodeCurrentFrame(std::shared_ptr<SharedState> sharedState)
 {
     using namespace std::chrono;
 
@@ -155,7 +155,7 @@ HRESULT AsyncImageDecoder::OnDecodeCurrentFrame(std::shared_ptr<SharedState> sha
 }
 
 // static
-HRESULT AsyncImageDecoder::ScheduleNextPresent(std::shared_ptr<SharedState> sharedState)
+_Check_return_ HRESULT AsyncImageDecoder::ScheduleNextPresent(std::shared_ptr<SharedState> sharedState)
 {
     ASSERT(sharedState->m_spPresentTimer == nullptr);
     ASSERT(!sharedState->m_needsPresentAfterDecode);
@@ -199,7 +199,7 @@ HRESULT AsyncImageDecoder::ScheduleNextPresent(std::shared_ptr<SharedState> shar
 }
 
 // static
-HRESULT AsyncImageDecoder::PresentAndProceedToNextFrame(std::shared_ptr<SharedState> sharedState)
+_Check_return_ HRESULT AsyncImageDecoder::PresentAndProceedToNextFrame(std::shared_ptr<SharedState> sharedState)
 {
     if (auto imageDecodeCallback = sharedState->m_imageDecodeCallback.lock())
     {
@@ -258,7 +258,7 @@ HRESULT AsyncImageDecoder::PresentAndProceedToNextFrame(std::shared_ptr<SharedSt
 }
 
 // static
-HRESULT AsyncImageDecoder::RestartPlayback(std::shared_ptr<SharedState> sharedState)
+_Check_return_ HRESULT AsyncImageDecoder::RestartPlayback(std::shared_ptr<SharedState> sharedState)
 {
     if (sharedState->NeedMoreFrames())
     {
diff --git a/src/dxaml/xcp/components/imaging/ImageDecodeRequest.cpp b/src/dxaml/xcp/components/imaging/ImageDecodeRequest.cpp
index 9dd080b773..8b3ba8527e 100644
--- a/src/dxaml/xcp/components/imaging/ImageDecodeRequest.cpp
+++ b/src/dxaml/xcp/components/imaging/ImageDecodeRequest.cpp
@@ -42,7 +42,7 @@ ImageDecodeRequest::~ImageDecodeRequest()
     }
 }
 
-HRESULT ImageDecodeRequest::SetImageDecoder(std::unique_ptr<AsyncImageDecoder> imageDecoder)
+_Check_return_ HRESULT ImageDecodeRequest::SetImageDecoder(std::unique_ptr<AsyncImageDecoder> imageDecoder)
 {
     m_imageDecoder = std::move(imageDecoder);
 
@@ -156,7 +156,7 @@ void ImageDecodeRequest::SuspendAnimation()
     }
 }
 
-HRESULT ImageDecodeRequest::ResumeAnimation()
+_Check_return_ HRESULT ImageDecodeRequest::ResumeAnimation()
 {
     if (m_imageDecoder != nullptr)
     {
diff --git a/src/dxaml/xcp/components/lifetime/lib/ReferenceTrackerManager.cpp b/src/dxaml/xcp/components/lifetime/lib/ReferenceTrackerManager.cpp
index aa8f3cb88f..3bdb22a73b 100644
--- a/src/dxaml/xcp/components/lifetime/lib/ReferenceTrackerManager.cpp
+++ b/src/dxaml/xcp/components/lifetime/lib/ReferenceTrackerManager.cpp
@@ -290,7 +290,7 @@ ReferenceTrackerManager::OnShutdownAllPeers( )
 //+--------------------------------------------------------------------
 
 //static
-HRESULT
+_Check_return_ HRESULT
 ReferenceTrackerManager::TriggerCollection( )
 {
     // Forward the recommendation
@@ -320,7 +320,7 @@ ReferenceTrackerManager::TriggerCollection( )
 //
 //+--------------------------------------------------------------------
 //static
-HRESULT
+_Check_return_ HRESULT
 ReferenceTrackerManager::TriggerFinalization( )
 {
     // Forward the recommendation
@@ -350,7 +350,7 @@ ReferenceTrackerManager::TriggerFinalization( )
 //
 //+--------------------------------------------------------------------
 // static
-HRESULT
+_Check_return_ HRESULT
 ReferenceTrackerManager::TriggerCollectionForSuspend( )
 {
     if( This->_pReferenceTrackerHost != NULL )
@@ -706,7 +706,7 @@ ReferenceTrackerManager::ReferenceTrackingCompleted()
 }
 
 #if DBG
-HRESULT
+_Check_return_ HRESULT
 ReferenceTrackerManager::RunValidation()
 {
     IDXamlCore* pCore = DXamlServices::GetDXamlCore();
diff --git a/src/dxaml/xcp/components/math/inlined.cpp b/src/dxaml/xcp/components/math/inlined.cpp
index 324a393181..6bd1405908 100644
--- a/src/dxaml/xcp/components/math/inlined.cpp
+++ b/src/dxaml/xcp/components/math/inlined.cpp
@@ -703,7 +703,7 @@ InvalidRectF(
     _Out_ XRECTF_RB *pRect
 )
 {
-    const float inf = std::numeric_limits<float>::infinity();
+    constexpr float inf = std::numeric_limits<float>::infinity();
 
     pRect->left = inf;
     pRect->top = inf;
diff --git a/src/dxaml/xcp/components/metadata/inc/EnumDefs.g.h b/src/dxaml/xcp/components/metadata/inc/EnumDefs.g.h
index 3117fe4c40..aba6aa0c78 100644
--- a/src/dxaml/xcp/components/metadata/inc/EnumDefs.g.h
+++ b/src/dxaml/xcp/components/metadata/inc/EnumDefs.g.h
@@ -222,6 +222,7 @@ namespace DirectUI
         ConversionTargetChanged = 27,
         TextEditTextChanged = 28,
         LayoutInvalidated = 29,
+        Notification = 30,
     };
     DEFINE_ENUM_FLAG_OPERATORS(AutomationEvents);
 
diff --git a/src/dxaml/xcp/components/metadata/inc/EnumValueTable.g.h b/src/dxaml/xcp/components/metadata/inc/EnumValueTable.g.h
index b42dca0634..3cf0fe94a6 100644
--- a/src/dxaml/xcp/components/metadata/inc/EnumValueTable.g.h
+++ b/src/dxaml/xcp/components/metadata/inc/EnumValueTable.g.h
@@ -213,6 +213,7 @@ extern __declspec(selectany) const XTABLE satAutomationEvents[] =
     { XSTRING_PTR_STORAGE(L"ConversionTargetChanged"), 27 },
     { XSTRING_PTR_STORAGE(L"TextEditTextChanged"), 28 },
     { XSTRING_PTR_STORAGE(L"LayoutInvalidated"), 29 },
+    { XSTRING_PTR_STORAGE(L"Notification"), 30 },
 };
 
 extern __declspec(selectany) const XTABLE satAutomationFlowDirections[] =
diff --git a/src/dxaml/xcp/components/text/inc/TextRangeCollection.h b/src/dxaml/xcp/components/text/inc/TextRangeCollection.h
index 1668395577..3ede982f3a 100644
--- a/src/dxaml/xcp/components/text/inc/TextRangeCollection.h
+++ b/src/dxaml/xcp/components/text/inc/TextRangeCollection.h
@@ -27,8 +27,8 @@ class CTextRangeCollection final : public CCollection
 
     _Check_return_ HRESULT Append(_In_ CValue& value, _Out_opt_ uint32_t* indexOut = nullptr) override;
     _Check_return_ HRESULT Insert(_In_ uint32_t index, _In_ CValue& value) override;
-    _Check_return_ void* RemoveAt(_In_ uint32_t index) override;
-    _Check_return_ void* GetItemWithAddRef(_In_ uint32_t index) override;
+    _Check_return_ void* RemoveAt(uint32_t index) override;
+    _Check_return_ void* GetItemWithAddRef(uint32_t index) override;
     _Check_return_ HRESULT IndexOf(_In_ CValue& value, _Out_ int32_t* indexOut) override;
     _Check_return_ HRESULT MoveInternal(_In_ int32_t index, _In_ int32_t nPosition) override
     {
diff --git a/src/dxaml/xcp/control/download/download.cpp b/src/dxaml/xcp/control/download/download.cpp
index 087fe1d6f4..4bf940bbdf 100644
--- a/src/dxaml/xcp/control/download/download.cpp
+++ b/src/dxaml/xcp/control/download/download.cpp
@@ -251,7 +251,7 @@ CDownloader::ResetDownloader()
 //
 //------------------------------------------------------------------------
 
-HRESULT
+_Check_return_ HRESULT
 CDownloader::StopAllDownloads()
 {
     // TODO: We aren't handling this correctly as yet.
diff --git a/src/dxaml/xcp/core/Parser/objectwriternodelist.cpp b/src/dxaml/xcp/core/Parser/objectwriternodelist.cpp
index 46c89e7491..cf8c325238 100644
--- a/src/dxaml/xcp/core/Parser/objectwriternodelist.cpp
+++ b/src/dxaml/xcp/core/Parser/objectwriternodelist.cpp
@@ -1495,7 +1495,7 @@ void ObjectWriterNodeList::DebugFailure(
 {
 #if DBG
     xstring_ptr strIndent = xstring_ptr::EmptyString();
-    Dump(nodeList, strIndent);
+    IGNOREHR(Dump(nodeList, strIndent));
 #endif
 
     ASSERT(false);
diff --git a/src/dxaml/xcp/core/core/elements/AutomationPeer.cpp b/src/dxaml/xcp/core/core/elements/AutomationPeer.cpp
index c0653d0159..857060f06f 100644
--- a/src/dxaml/xcp/core/core/elements/AutomationPeer.cpp
+++ b/src/dxaml/xcp/core/core/elements/AutomationPeer.cpp
@@ -73,7 +73,7 @@ void CAutomationPeer::Deinit()
 //  Method:   Initialize
 //
 //------------------------------------------------------------------------
-HRESULT CAutomationPeer::InitInstance()
+_Check_return_ HRESULT CAutomationPeer::InitInstance()
 {
     m_pPatternsList = new CXcpList<IUIAProvider>();
 
@@ -1551,15 +1551,7 @@ void CAutomationPeer::RaiseNotificationEvent(
     _In_opt_ xstring_ptr displayString,
     _In_ xstring_ptr activityId)
 {
-    bool reentrancyChecksEnabled = RuntimeFeatureBehavior::GetRuntimeEnabledFeatureDetector()->IsFeatureEnabled(RuntimeFeatureBehavior::RuntimeEnabledFeature::EnableReentrancyChecks);
-    if (reentrancyChecksEnabled)
-    {
-        if (ListenerExists(UIAXcp::AESelectionItemPatternOnElementSelected))
-        {
-            VERIFYHR(GetContext()->UIARaiseNotificationEvent(this, notificationKind, notificationProcessing, displayString, activityId));
-        }
-    }
-    else
+    if (ListenerExists(UIAXcp::AENotification))
     {
         VERIFYHR(GetContext()->UIARaiseNotificationEvent(this, notificationKind, notificationProcessing, displayString, activityId));
     }
diff --git a/src/dxaml/xcp/core/core/elements/Glyphs.cpp b/src/dxaml/xcp/core/core/elements/Glyphs.cpp
index 2614b3a8e0..d2395df2e6 100644
--- a/src/dxaml/xcp/core/core/elements/Glyphs.cpp
+++ b/src/dxaml/xcp/core/core/elements/Glyphs.cpp
@@ -1412,7 +1412,7 @@ _Check_return_ HRESULT CGlyphs::DrawGlyphRun()
 // Creates TextDrawingContext if necessary.
 //
 //------------------------------------------------------------------------
-HRESULT CGlyphs::EnsureTextDrawingContext()
+_Check_return_ HRESULT CGlyphs::EnsureTextDrawingContext()
 {
     if (m_pTextDrawingContext == NULL)
     {
diff --git a/src/dxaml/xcp/core/core/elements/Popup.cpp b/src/dxaml/xcp/core/core/elements/Popup.cpp
index 3cd2131df6..85c02e2af6 100644
--- a/src/dxaml/xcp/core/core/elements/Popup.cpp
+++ b/src/dxaml/xcp/core/core/elements/Popup.cpp
@@ -1215,6 +1215,8 @@ _Check_return_ HRESULT CPopup::EnsureDCompResourcesForWindowedPopup()
                 }).Get(),
                 &m_automationProviderRequestedToken));
 
+        IFC_RETURN(m_desktopBridge->Connect(m_contentIsland.Get()));
+
         m_inputSiteAdapter = std::make_unique<WindowedPopupInputSiteAdapter>();
         CContentRoot* contentRoot = VisualTree::GetContentRootForElement(this);
         m_inputSiteAdapter->Initialize(this, m_contentIsland.Get(), contentRoot, DirectUI::DXamlServices::GetCurrentJupiterWindow());
@@ -1222,8 +1224,6 @@ _Check_return_ HRESULT CPopup::EnsureDCompResourcesForWindowedPopup()
         // Force an update of the input offset to make sure it is initialized to something and
         // propogated to the inputsite adapter.
         IFC_RETURN(UpdateTranslationFromContentRoot({}, /*forceUpdate*/ true));
-
-        IFC_RETURN(m_desktopBridge->Connect(m_contentIsland.Get()));
     }
 
     return S_OK;
diff --git a/src/dxaml/xcp/core/core/elements/TargetPropertyPath.cpp b/src/dxaml/xcp/core/core/elements/TargetPropertyPath.cpp
index d58cc8b83a..a223e06759 100644
--- a/src/dxaml/xcp/core/core/elements/TargetPropertyPath.cpp
+++ b/src/dxaml/xcp/core/core/elements/TargetPropertyPath.cpp
@@ -541,7 +541,7 @@ bool CTargetPropertyPath::IsPathFullyQualifiedPropertyName(const xstring_ptr& pa
         && path.FindChar(L'.', firstDotIndexActual) == xstring_ptr_view::npos);
 }
 
-HRESULT CTargetPropertyPath::ResolveFullyQualifiedPropertyNames(const xstring_ptr& path, XamlServiceProviderContext* serviceProviderContext)
+_Check_return_ HRESULT CTargetPropertyPath::ResolveFullyQualifiedPropertyNames(const xstring_ptr& path, XamlServiceProviderContext* serviceProviderContext)
 {
     unsigned int startIndex = 0;
     unsigned int endIndex = 0;
diff --git a/src/dxaml/xcp/core/core/elements/depends.cpp b/src/dxaml/xcp/core/core/elements/depends.cpp
index c3579fcb4f..bc4f973a2b 100644
--- a/src/dxaml/xcp/core/core/elements/depends.cpp
+++ b/src/dxaml/xcp/core/core/elements/depends.cpp
@@ -2459,7 +2459,7 @@ CDependencyObject::TryEnsureManagedPeer(
 // peer has been created for this object.  This could happen
 // on the initiative of the framework, or as a result of the
 // above EnsurePeerAndTryPeg call.
-HRESULT CDependencyObject::OnManagedPeerCreated(XUINT32 fIsCustomDOType, XUINT32 fIsManagedPeerPeggedNoRef)
+_Check_return_ HRESULT CDependencyObject::OnManagedPeerCreated(XUINT32 fIsCustomDOType, XUINT32 fIsManagedPeerPeggedNoRef)
 {
     CDependencyObject *pParent = nullptr;
 
diff --git a/src/dxaml/xcp/core/core/elements/imagesource.cpp b/src/dxaml/xcp/core/core/elements/imagesource.cpp
index 8703038cfb..5cd4f8a373 100644
--- a/src/dxaml/xcp/core/core/elements/imagesource.cpp
+++ b/src/dxaml/xcp/core/core/elements/imagesource.cpp
@@ -375,7 +375,7 @@ void CImageSource::DisconnectImageOperation()
 //      Marks the image source as dirty for rendering.
 //
 //------------------------------------------------------------------------
-HRESULT
+_Check_return_ HRESULT
 CImageSource::SetDirty()
 {
     // Mark this object as dirty for rendering.
@@ -399,7 +399,7 @@ CImageSource::SetDirty()
     return S_OK;
 }
 
-HRESULT
+_Check_return_ HRESULT
 CImageSource::RequestMeasure()
 {
     m_fSourceNeedsMeasure = TRUE;
@@ -3486,7 +3486,7 @@ HRESULT CBitmapImage::GetAutoPlay(
     PixelFormat pixelFormat,
     bool forceUiThreadCopy,
     bool retainPlaybackState,
-    xref_ptr<ImageDecodeParams>& decodeParams
+    _Out_ xref_ptr<ImageDecodeParams>& decodeParams
     )
 {
     auto core = GetContext();
diff --git a/src/dxaml/xcp/core/dll/VisualTree.cpp b/src/dxaml/xcp/core/dll/VisualTree.cpp
index f62d805849..f61d5318e7 100644
--- a/src/dxaml/xcp/core/dll/VisualTree.cpp
+++ b/src/dxaml/xcp/core/dll/VisualTree.cpp
@@ -395,7 +395,7 @@ CFullWindowMediaRoot* VisualTree::GetFullWindowMediaRoot()
 //      Returns the main rendertargetbitmap root for this visual tree.
 //
 //------------------------------------------------------------------------
-CRenderTargetBitmapRoot* VisualTree::GetRenderTargetBitmapRoot()
+_Check_return_ CRenderTargetBitmapRoot* VisualTree::GetRenderTargetBitmapRoot()
 {
     if (m_pCoreNoRef->IsInBackgroundTask() && !m_shutdownInProgress)
     {
diff --git a/src/dxaml/xcp/core/dll/xcpcore.cpp b/src/dxaml/xcp/core/dll/xcpcore.cpp
index 9d021279f5..64e561ff30 100644
--- a/src/dxaml/xcp/core/dll/xcpcore.cpp
+++ b/src/dxaml/xcp/core/dll/xcpcore.cpp
@@ -5598,7 +5598,7 @@ CUIAWindow* CCoreServices::GetUIAWindowForElementRootNoRef(_In_ CDependencyObjec
     CXamlIslandRoot* xamlIslandRoot = do_pointer_cast<CXamlIslandRoot>(elementRoot);
     if (xamlIslandRoot)
     {
-        return xamlIslandRoot->GetUIAWindowNoRef();
+        return xamlIslandRoot->GetUIAWindowNoRef(true /* onlyGet */);
     }
 
     if (UseUiaOnMainWindow() && m_pBrowserHost)
diff --git a/src/dxaml/xcp/core/imaging/ImagingProvider/LoadedImageSurface.cpp b/src/dxaml/xcp/core/imaging/ImagingProvider/LoadedImageSurface.cpp
index ed6bbcd191..2dea48f5a0 100644
--- a/src/dxaml/xcp/core/imaging/ImagingProvider/LoadedImageSurface.cpp
+++ b/src/dxaml/xcp/core/imaging/ImagingProvider/LoadedImageSurface.cpp
@@ -216,7 +216,7 @@ _Check_return_ HRESULT CLoadedImageSurface::GetImageDescription(ImageCache &imag
     return S_OK;
 }
 
-_Check_return_ HRESULT CLoadedImageSurface::InitFromUri(xstring_ptr uri)
+_Check_return_ HRESULT CLoadedImageSurface::InitFromUri(_In_ xstring_ptr uri)
 {
     IFCEXPECTRC_RETURN(!m_closed, RO_E_CLOSED);
 
diff --git a/src/dxaml/xcp/core/inc/ObjectWriterNode.h b/src/dxaml/xcp/core/inc/ObjectWriterNode.h
index 9573f27f21..ba95273d6f 100644
--- a/src/dxaml/xcp/core/inc/ObjectWriterNode.h
+++ b/src/dxaml/xcp/core/inc/ObjectWriterNode.h
@@ -529,7 +529,7 @@ class ObjectWriterNode
     std::shared_ptr<XamlTextSyntax> m_spTextSyntaxConverter;
     std::shared_ptr<XamlBinaryFormatSubReader2> m_spSubReader;
     xstring_ptr m_strValue;
-    UINT32 m_intValue;
+    UINT32 m_intValue = 0;
     std::vector<std::pair<bool,xstring_ptr>> m_vecResourceList;
 };
 
diff --git a/src/dxaml/xcp/core/inc/Popup.h b/src/dxaml/xcp/core/inc/Popup.h
index b9e2e220fa..dc1d07d8bc 100644
--- a/src/dxaml/xcp/core/inc/Popup.h
+++ b/src/dxaml/xcp/core/inc/Popup.h
@@ -320,6 +320,7 @@ class CPopup : public CFrameworkElement
     wrl::ComPtr<ixp::IPointerPoint> GetPreviousPointerPoint();
 
     wrl::ComPtr<ixp::IIslandInputSitePartner> GetIslandInputSite() const;
+    WindowedPopupInputSiteAdapter* GetInputSiteAdapter() { return m_inputSiteAdapter.get(); };
 
     // https://task.ms/48749483
     // TODO: Remove once XAML creates Windowed popups without a DesktopSiteBridge. This is a
diff --git a/src/dxaml/xcp/core/inc/RenderTargetBitmap.h b/src/dxaml/xcp/core/inc/RenderTargetBitmap.h
index e91d7bb329..da717b9304 100644
--- a/src/dxaml/xcp/core/inc/RenderTargetBitmap.h
+++ b/src/dxaml/xcp/core/inc/RenderTargetBitmap.h
@@ -64,7 +64,7 @@ class CRenderTargetBitmap final
 
     _Ret_notnull_ CRenderTargetElementData* GetRenderTargetElementData() const override;
 
-    void CleanupDeviceRelatedResourcesRecursive(_In_ bool cleanupDComp) override;
+    void CleanupDeviceRelatedResourcesRecursive(bool cleanupDComp) override;
 
     void AbortPixelWaitExecutors(HRESULT resultHR) override;
 
diff --git a/src/dxaml/xcp/core/inc/XamlIslandRoot.h b/src/dxaml/xcp/core/inc/XamlIslandRoot.h
index a90bccbd09..0f84e64c1d 100644
--- a/src/dxaml/xcp/core/inc/XamlIslandRoot.h
+++ b/src/dxaml/xcp/core/inc/XamlIslandRoot.h
@@ -84,7 +84,7 @@ class CXamlIslandRoot final : public CPanel
     void ClientPhysicalToScreenPhysical(_Inout_ POINT& pt);
     void ScreenPhysicalToClientPhysical(_Inout_ POINT& pt);
 
-    CUIAWindow* GetUIAWindowNoRef();
+    CUIAWindow* GetUIAWindowNoRef(bool onlyGet = false);
     HRESULT UIAClientsAreListening(_In_ UIAXcp::APAutomationEvents automationEvent) const;
 
     VisualTree* GetVisualTreeNoRef();
diff --git a/src/dxaml/xcp/core/native/inc/MediaPlayerPresenter.h b/src/dxaml/xcp/core/native/inc/MediaPlayerPresenter.h
index 9da2e3c075..8f15ba773a 100644
--- a/src/dxaml/xcp/core/native/inc/MediaPlayerPresenter.h
+++ b/src/dxaml/xcp/core/native/inc/MediaPlayerPresenter.h
@@ -171,7 +171,7 @@ class CMediaPlayerPresenter final : public CFrameworkElement, public IPLMListene
         return HasRenderSize() && HasVideo() && HasFirstFrameBasedOnState();
     }
 
-    _Check_return_ HRESULT HandleError(_In_ HRESULT hr);
+    _Check_return_ HRESULT HandleError(HRESULT hr);
 
     _Check_return_ HRESULT RegisterForUpdate();
     _Check_return_ HRESULT UnregisterForUpdate();
diff --git a/src/dxaml/xcp/core/native/media/MediaPlayerPresenter.cpp b/src/dxaml/xcp/core/native/media/MediaPlayerPresenter.cpp
index 899073eb3a..f671dd152c 100644
--- a/src/dxaml/xcp/core/native/media/MediaPlayerPresenter.cpp
+++ b/src/dxaml/xcp/core/native/media/MediaPlayerPresenter.cpp
@@ -656,7 +656,7 @@ _Check_return_ HRESULT CMediaPlayerPresenter::UpdateRenderingAndPowerSettings()
     return S_OK;
 }
 
-HRESULT CMediaPlayerPresenter::UpdatePowerSettings()
+_Check_return_ HRESULT CMediaPlayerPresenter::UpdatePowerSettings()
 {
     bool mediaPlaying = false;
     MediaPlayerExtension_MediaPlayerCastingRenderLocation castingRenderLocation = MediaPlayerExtension_MediaPlayerCastingRenderLocation::None;
diff --git a/src/dxaml/xcp/core/native/text/Common/D2DTextDrawingContext.cpp b/src/dxaml/xcp/core/native/text/Common/D2DTextDrawingContext.cpp
index c0918e851a..072dd8485e 100644
--- a/src/dxaml/xcp/core/native/text/Common/D2DTextDrawingContext.cpp
+++ b/src/dxaml/xcp/core/native/text/Common/D2DTextDrawingContext.cpp
@@ -2603,13 +2603,18 @@ void D2DTextDrawingContext::InvalidateRegion(
     // During the second iteration move remaining lines to empty spots in the collection
     // to ensure there are no gaps.
     //
+    //  Note: There is a oddity here in that it appears that RichEdit will request rendering of lines
+    //        outside of the invalidated area.  This ends up with us having duplicated line requests in
+    //        this collection.  This doesn't seem to hurt anything but possibly some performance, but 
+    //        maybe when we get around to incorporating the new RichEdit, we can clean this up.
     newSize = m_lines.GetCount();
     origin.x = origin.y = 0;
     for (XUINT32 i = 0, collectionSize = m_lines.GetCount(); i < collectionSize; i++)
     {
         LineData * pLineData = &m_lines[i];
         pLineData->Transform.Transform(&origin, &transformedOrigin, 1);
-        if (DoesRectContainPoint(*pRegion, transformedOrigin))
+        XRECTF_RB lineRect = { transformedOrigin.x, transformedOrigin.y, pLineData->Width, pLineData->Thickness };
+        if (DoRectsIntersect(*pRegion, lineRect))
         {
             newSize--;
             pLineData->BrushSource.reset();
diff --git a/src/dxaml/xcp/core/native/text/Controls/PrivateTextInputSettings.cpp b/src/dxaml/xcp/core/native/text/Controls/PrivateTextInputSettings.cpp
index 8dd821a5e8..77e9920895 100644
--- a/src/dxaml/xcp/core/native/text/Controls/PrivateTextInputSettings.cpp
+++ b/src/dxaml/xcp/core/native/text/Controls/PrivateTextInputSettings.cpp
@@ -47,8 +47,8 @@ CTextInputPrivateSettings::~CTextInputPrivateSettings()
 
 
 void CTextInputPrivateSettings::Create(
-    CTextBoxBase *pTextBox,
-    CTextInputPrivateSettings **ppPrivateTextInputSettings)
+    _In_ CTextBoxBase *pTextBox,
+    _Outptr_ CTextInputPrivateSettings **ppPrivateTextInputSettings)
 {
     Microsoft::WRL::ComPtr<CTextInputPrivateSettings> spPrivateTextInputSettings;
 
@@ -60,7 +60,7 @@ void CTextInputPrivateSettings::Create(
     *ppPrivateTextInputSettings = spPrivateTextInputSettings.Detach();
 }
 
-_Check_return_ HRESULT CTextInputPrivateSettings::Initialize(ITextServices2 *pTextServices)
+_Check_return_ HRESULT CTextInputPrivateSettings::Initialize(_In_ ITextServices2 *pTextServices)
 {
     bool bIsEnabled = false;
     bool bIsDefault = false;
@@ -169,7 +169,7 @@ _Check_return_ HRESULT CTextInputPrivateSettings::OnSpellCheckEnabledChanged(
 //
 //------------------------------------------------------------------------
 _Check_return_ HRESULT CTextInputPrivateSettings::OnTextPredictionEnabledChanged(
-BOOL bIsTextPredictionEnabled)
+    BOOL bIsTextPredictionEnabled)
 {
     if (IsPureNumberIS(m_inputScope))
     {
@@ -183,7 +183,7 @@ BOOL bIsTextPredictionEnabled)
 }
 
 _Check_return_ HRESULT CTextInputPrivateSettings::OnCandidateWindowAlignmentChanged(
-    _In_ BOOL bIsCandidateWindowAlignAtBottom)
+    BOOL bIsCandidateWindowAlignAtBottom)
 {
 
     if (bIsCandidateWindowAlignAtBottom)
diff --git a/src/dxaml/xcp/core/native/text/Controls/PrivateTextInputSettings.h b/src/dxaml/xcp/core/native/text/Controls/PrivateTextInputSettings.h
index 6151fc16eb..01195d0b96 100644
--- a/src/dxaml/xcp/core/native/text/Controls/PrivateTextInputSettings.h
+++ b/src/dxaml/xcp/core/native/text/Controls/PrivateTextInputSettings.h
@@ -36,13 +36,13 @@ class CTextInputPrivateSettings :
     void Teardown();
 
     _Check_return_ HRESULT OnSpellCheckEnabledChanged(
-        _In_ BOOL isSpellCheckEnabled);
+        BOOL isSpellCheckEnabled);
 
     _Check_return_ HRESULT OnTextPredictionEnabledChanged(
-        _In_ BOOL bIsTextPredictionEnabled);
+        BOOL bIsTextPredictionEnabled);
 
     _Check_return_ HRESULT OnCandidateWindowAlignmentChanged(
-        _In_ BOOL bIsCandidateWindowAlignAtBottom);
+        BOOL bIsCandidateWindowAlignAtBottom);
 
     _Check_return_ HRESULT UpdateSIPSettings(_In_ bool disable);
     _Check_return_ HRESULT NotifyFocusEnter();
diff --git a/src/dxaml/xcp/core/native/text/Controls/TextBoxView.cpp b/src/dxaml/xcp/core/native/text/Controls/TextBoxView.cpp
index 4138274e81..ea00c53192 100644
--- a/src/dxaml/xcp/core/native/text/Controls/TextBoxView.cpp
+++ b/src/dxaml/xcp/core/native/text/Controls/TextBoxView.cpp
@@ -838,9 +838,9 @@ _Check_return_ HRESULT CTextBoxView::TxGetParaFormat(
 //
 //---------------------------------------------------------------------------
 bool CTextBoxView::TxCreateCaret(
-    _In_ XHANDLE bitmap,
-    _In_ XINT32 width,
-    _In_ XINT32 height
+    XHANDLE bitmap,
+    XINT32 width,
+    XINT32 height
     )
 {
     if (m_isRendering)
@@ -885,8 +885,8 @@ void CTextBoxView::ResetCaretElement()
 //
 //---------------------------------------------------------------------------
 bool CTextBoxView::TxSetCaretPos(
-    _In_ XINT32 x,
-    _In_ XINT32 y
+    XINT32 x,
+    XINT32 y
     )
 {
     m_caretRect.X = static_cast<XFLOAT>(x);
@@ -901,7 +901,7 @@ bool CTextBoxView::TxSetCaretPos(
 //      ITextServices callback, called when caret visibility changes.
 //
 //---------------------------------------------------------------------------
-_Check_return_ bool CTextBoxView::TxShowCaret(_In_ BOOL isCaretVisible)
+_Check_return_ bool CTextBoxView::TxShowCaret(BOOL isCaretVisible)
 {
     HRESULT hr = S_OK;
 
diff --git a/src/dxaml/xcp/core/native/text/Controls/TextBoxView.h b/src/dxaml/xcp/core/native/text/Controls/TextBoxView.h
index 10173c78ec..e9d8470418 100644
--- a/src/dxaml/xcp/core/native/text/Controls/TextBoxView.h
+++ b/src/dxaml/xcp/core/native/text/Controls/TextBoxView.h
@@ -86,8 +86,8 @@ class CTextBoxView final : public CFrameworkElement, public IGripper
     _Check_return_ HRESULT UpdateVisibility() override;
 
     // ITextHost
-    bool TxCreateCaret(_In_ XHANDLE bitmap, _In_ XINT32 width, _In_ XINT32 height);
-    bool TxSetCaretPos(_In_ XINT32 x, _In_ XINT32 y);
+    bool TxCreateCaret(XHANDLE bitmap, XINT32 width, XINT32 height);
+    bool TxSetCaretPos(XINT32 x, XINT32 y);
     HRESULT TxGetClientRect(_Out_ XRECT_RB *pClientRect);
     HRESULT TxGetViewportRect(_Out_ XRECT_RB *pViewportRect);
     HRESULT TxGetContentPadding(_Out_ XRECT_RB *pContentPadding);
@@ -173,7 +173,7 @@ class CTextBoxView final : public CFrameworkElement, public IGripper
     bool IsCaretInViewport() const;
     bool IsPixelSnapped() const { return m_pixelSnapped; }
 
-    _Check_return_ bool TxShowCaret(_In_ BOOL isCaretVisible);
+    _Check_return_ bool TxShowCaret(BOOL isCaretVisible);
     _Check_return_ HRESULT ShowOrHideCaret();
     _Check_return_ HRESULT ShowCaretElement();
     _Check_return_ HRESULT HideCaretElement();
diff --git a/src/dxaml/xcp/core/native/text/Controls/TextServicesHost.h b/src/dxaml/xcp/core/native/text/Controls/TextServicesHost.h
index a473da8c4a..26f86a70ee 100644
--- a/src/dxaml/xcp/core/native/text/Controls/TextServicesHost.h
+++ b/src/dxaml/xcp/core/native/text/Controls/TextServicesHost.h
@@ -54,14 +54,14 @@ class TextServicesHost final : public ITextHost2,
     virtual void TxInvalidateRect(LPCRECT prc, BOOL fMode) final;
     virtual void TxViewChange(BOOL fUpdate) final;
     virtual BOOL TxCreateCaret(
-        _In_ HBITMAP bitmap,
-        _In_ INT width,
-        _In_ INT height
+        HBITMAP bitmap,
+        INT width,
+        INT height
         ) final;
-    virtual BOOL TxShowCaret(_In_ BOOL isCaretVisible) final;
+    virtual BOOL TxShowCaret(BOOL isCaretVisible) final;
     virtual BOOL TxSetCaretPos(
-        _In_ INT x,
-        _In_ INT y
+        INT x,
+        INT y
         ) final;
     virtual BOOL TxSetTimer(
         _In_ UINT id,
diff --git a/src/dxaml/xcp/core/text/RichTextServices/xcp/PALFontAndScriptServices.cpp b/src/dxaml/xcp/core/text/RichTextServices/xcp/PALFontAndScriptServices.cpp
index 8f01d11c25..5ff6281362 100644
--- a/src/dxaml/xcp/core/text/RichTextServices/xcp/PALFontAndScriptServices.cpp
+++ b/src/dxaml/xcp/core/text/RichTextServices/xcp/PALFontAndScriptServices.cpp
@@ -40,7 +40,7 @@ PALFontAndScriptServices::~PALFontAndScriptServices()
 
     ReleaseInterface(m_pInstalledFontCollection);
 
-    m_pUltimateFallbackFontFamily = NULL;
+    ReleaseInterface(m_pUltimateFallbackFontFamily);
 
     ReleaseInterface(m_pPALFontAndScriptServices);
 }
@@ -108,11 +108,11 @@ void PALFontAndScriptServices::ResetSystemFontCollection()
     ReleaseInterface(m_pInstalledFontCollection);
     ReleaseInterface(m_pUltimateFont);
 
-    // This ideally should be released via ref-counting, but it never was the expectation
-    // that callers of GetUltimateFallbackFontFamily need to release the object. So it
-    // is held with a single reference count by m_pInstalledFontCollection instead, and
-    // released when that goes away.
-    m_pUltimateFallbackFontFamily = nullptr;
+    // Now that we load the Ultimate font fallback family from a different font collection
+    // than the one that is kept around (one that doesn't contain downloadable fonts), we
+    // need to ensure the life time of the family because the font collection will go away
+    // and not keep it around.
+    ReleaseInterface(m_pUltimateFallbackFontFamily);
 }
 
 HRESULT PALFontAndScriptServices::ClearDefaultLanguageString()
@@ -253,20 +253,38 @@ HRESULT PALFontAndScriptServices::GetUltimateFallbackFontFamily(
     _Outptr_ CCompositeFontFamily **ppUltimateCompositeFontFamily
 )
 {
-    HRESULT              hr                  = S_OK;
-    IFontCollection     *pFontCollection     = NULL;
+    HRESULT hr  = S_OK;
 
     if (m_pUltimateFallbackFontFamily == NULL)
     {
-        IFC(PALFontAndScriptServices::GetSystemFontCollection(&pFontCollection));
-        IFC(m_pInstalledFontCollection->LookupDefaultFontFamily(&m_pUltimateFallbackFontFamily));
+        // It is possible that our ultimate font fallback, may not be properly installed on the system.  When this 
+        // occurs, DWrite will return from  IDWriteFontFamily::GetFirstMatchingFont an S_OK result and a NULL Font.  
+        // This occurs because DWite thinks the font is a downloadable one.  To get around this, we will create a new
+        // font collection that excludes downloadable fonts and get our composite family from that.  That will ensure
+        // that what ever font is selected is currently available.
+
+        xref_ptr<PALText::IFontCollection> pFontCollection;
+        IFC(m_pPALFontAndScriptServices->CreateSystemFontCollection(false /*includeDownloadedFonts*/ , pFontCollection.ReleaseAndGetAddressOf()));
+
+        xref_ptr<CTypefaceCollection> typefaceCollection;
+        IFC(CTypefaceCollection::CreatePALWrapper(this,
+            pFontCollection,
+            NULL, //Fallback font collection. We do not need a fallback
+            //font collection since this is the system font collection.
+            typefaceCollection.ReleaseAndGetAddressOf()));
+       
+        IFC(typefaceCollection->LookupDefaultFontFamily(&m_pUltimateFallbackFontFamily));
+        // In general, we don't addref the font family returned from LookupDefaultFontFamily because we assume the
+        // the typeface collection will remain around and thus ensure the lifetime of the family.  However, we don't
+        // want to carry that weight for the fallback font family, so we will addreff it and release in the destructor.
+        AddRefInterface(m_pUltimateFallbackFontFamily);
+
         XCP_FAULT_ON_FAILURE(m_pUltimateFallbackFontFamily->GetNumberofFontLookups() != 0);
     }
 
     *ppUltimateCompositeFontFamily = m_pUltimateFallbackFontFamily;
 
 Cleanup:
-    ReleaseInterface(pFontCollection);
     RRETURN(hr);
 }
 
diff --git a/src/dxaml/xcp/core/text/shaping/inc/ShapingTypes.h b/src/dxaml/xcp/core/text/shaping/inc/ShapingTypes.h
index 63e7ec8729..5f4b56ef92 100644
--- a/src/dxaml/xcp/core/text/shaping/inc/ShapingTypes.h
+++ b/src/dxaml/xcp/core/text/shaping/inc/ShapingTypes.h
@@ -45,8 +45,8 @@ typedef INT*            PINT;
 typedef wchar_t         WCHAR;
 typedef WCHAR*          PWCHAR;
 typedef const WCHAR*    PCWCHAR;
-typedef WCHAR*          LPWSTR;
-typedef const WCHAR*    LPCWSTR;
+typedef _Null_terminated_ WCHAR*          LPWSTR;
+typedef _Null_terminated_ const WCHAR*    LPCWSTR;
 typedef unsigned long long ULONGLONG;
 
 typedef unsigned long   LCHAR;
diff --git a/src/dxaml/xcp/dxaml/idl/winrt/core/microsoft.ui.xaml.coretypes.idl b/src/dxaml/xcp/dxaml/idl/winrt/core/microsoft.ui.xaml.coretypes.idl
index 581fd37d76..c3d3b8e791 100644
--- a/src/dxaml/xcp/dxaml/idl/winrt/core/microsoft.ui.xaml.coretypes.idl
+++ b/src/dxaml/xcp/dxaml/idl/winrt/core/microsoft.ui.xaml.coretypes.idl
@@ -883,6 +883,9 @@ namespace Microsoft.UI.Xaml.Automation.Peers
         ConversionTargetChanged,
         TextEditTextChanged,
         LayoutInvalidated,
+        [feature(Feature_ExperimentalApi)]
+        [contract(Microsoft.UI.Xaml.WinUIContract, 7)]
+        Notification,
     };
 
     [contract(Microsoft.UI.Xaml.WinUIContract, 1)]
diff --git a/src/dxaml/xcp/dxaml/lib/AppBar_Partial.cpp b/src/dxaml/xcp/dxaml/lib/AppBar_Partial.cpp
index 4b323c17a0..2ae83c3dc4 100644
--- a/src/dxaml/xcp/dxaml/lib/AppBar_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/AppBar_Partial.cpp
@@ -1413,7 +1413,7 @@ AppBar::HasNonLabeledDynamicPrimaryCommand(_Out_ bool* hasNonLabeledDynamicPrima
 
 // If the appbar is inline, check to see if opening in the default direction would cause the appbar to appear partially
 // offscreen.
-_Check_return_ HRESULT AppBar::HasSpaceForAppBarToOpenDown(bool* hasSpace)
+_Check_return_ HRESULT AppBar::HasSpaceForAppBarToOpenDown(_Out_ bool* hasSpace)
 {
     ASSERT(m_Mode == AppBarMode_Inline);
 
diff --git a/src/dxaml/xcp/dxaml/lib/AutomationPeer_Partial.cpp b/src/dxaml/xcp/dxaml/lib/AutomationPeer_Partial.cpp
index e5d7e8ef5d..332f54fdcd 100644
--- a/src/dxaml/xcp/dxaml/lib/AutomationPeer_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/AutomationPeer_Partial.cpp
@@ -3952,7 +3952,7 @@ _Check_return_ HRESULT AutomationPeerFactory::GenerateRawElementProviderRuntimeI
     RRETURN(hr);
 }
 
-HRESULT AutomationPeer::BoxArrayOfHStrings(Automation::CValue* pReturnVal, XINT32 nLength, HSTRING* phsArray)
+_Check_return_ HRESULT AutomationPeer::BoxArrayOfHStrings(Automation::CValue* pReturnVal, XINT32 nLength, HSTRING* phsArray)
 {
     HRESULT hr = S_OK;
     Automation::CValue* pValueArray = NULL;
@@ -4013,7 +4013,7 @@ _Check_return_ HRESULT AutomationPeer::RaiseEventIfListener(
     RRETURN(hr);
 }
 
-HRESULT AutomationPeer::BoxArrayOfRawElementProviderSimple(Automation::CValue* pReturnVal, XINT32 nLength, xaml_automation::Provider::IIRawElementProviderSimple** pRepsArray)
+_Check_return_ HRESULT AutomationPeer::BoxArrayOfRawElementProviderSimple(Automation::CValue* pReturnVal, XINT32 nLength, xaml_automation::Provider::IIRawElementProviderSimple** pRepsArray)
 {
     HRESULT hr = S_OK;
     CDependencyObject** pDoArray = NULL;
diff --git a/src/dxaml/xcp/dxaml/lib/CommandBar_Partial.cpp b/src/dxaml/xcp/dxaml/lib/CommandBar_Partial.cpp
index 4d5c3822c5..4154b0254d 100644
--- a/src/dxaml/xcp/dxaml/lib/CommandBar_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/CommandBar_Partial.cpp
@@ -2467,7 +2467,7 @@ bool CommandBar::HasPrimaryCommands()
 // This function checks that there is room for both things.
 //
 _Check_return_ HRESULT
-CommandBar::GetShouldOpenUp(bool* shouldOpenUp)
+CommandBar::GetShouldOpenUp(_Out_ bool* shouldOpenUp)
 {
     // Bottom appbars always open up.  All other appbars by default open down.
     *shouldOpenUp = (GetMode() == AppBarMode_Bottom);
@@ -2553,7 +2553,7 @@ _Check_return_ HRESULT CommandBar::HasNonLabeledDynamicPrimaryCommand(_Out_ bool
     return S_OK;
 }
 
-_Check_return_ HRESULT CommandBar::HasSpaceForOverflowPopupToOpenDown(bool* hasSpace)
+_Check_return_ HRESULT CommandBar::HasSpaceForOverflowPopupToOpenDown(_Out_ bool* hasSpace)
 {
     ASSERT(GetMode() == AppBarMode_Inline);
 
diff --git a/src/dxaml/xcp/dxaml/lib/CueStyler.cpp b/src/dxaml/xcp/dxaml/lib/CueStyler.cpp
index 676a9b9cb8..f3a6f71339 100644
--- a/src/dxaml/xcp/dxaml/lib/CueStyler.cpp
+++ b/src/dxaml/xcp/dxaml/lib/CueStyler.cpp
@@ -1589,7 +1589,7 @@ CCueStyler::ConvertUserColor(_In_ wm::ClosedCaptioning::ClosedCaptionColor color
 // Helper to determine if the font string is a "font style"
 // if not it will be treated as a real font family name
 bool
-CCueStyler::IsW3CFontStyle(LPWSTR fontStyle)
+CCueStyler::IsW3CFontStyle(_In_ LPWSTR fontStyle)
 {
     if (fontStyle != nullptr)
     {
diff --git a/src/dxaml/xcp/dxaml/lib/CustomXamlResourceLoaderWrapper.cpp b/src/dxaml/xcp/dxaml/lib/CustomXamlResourceLoaderWrapper.cpp
index 451950903f..77d8f0a701 100644
--- a/src/dxaml/xcp/dxaml/lib/CustomXamlResourceLoaderWrapper.cpp
+++ b/src/dxaml/xcp/dxaml/lib/CustomXamlResourceLoaderWrapper.cpp
@@ -79,7 +79,7 @@ _Check_return_ HRESULT CustomXamlResourceLoaderWrapper::GetResource(
     RRETURN(hr);
 }
 
-xaml::Resources::ICustomXamlResourceLoader* CustomXamlResourceLoaderWrapper::GetLoader()
+_Check_return_ xaml::Resources::ICustomXamlResourceLoader* CustomXamlResourceLoaderWrapper::GetLoader()
 {
     return m_pWinrtLoader;
 }
diff --git a/src/dxaml/xcp/dxaml/lib/DropOperationTarget.cpp b/src/dxaml/xcp/dxaml/lib/DropOperationTarget.cpp
index c0f6d9c80d..b30537f03d 100644
--- a/src/dxaml/xcp/dxaml/lib/DropOperationTarget.cpp
+++ b/src/dxaml/xcp/dxaml/lib/DropOperationTarget.cpp
@@ -13,6 +13,53 @@ using namespace DirectUI;
 extern __declspec(selectany) const WCHAR SynchronousDragDropActionName[] = L"Windows.Foundation.IAsyncAction DropOperationTarget.RaiseDragDropEventActionAsync";
 typedef DXamlAsyncActionBase<Microsoft::WRL::AsyncCausalityOptions<SynchronousDragDropActionName>> SynchronousDragDropAction;
 
+// When we communicate with DataExchangeHost via cross process calls (e.g. to get drag arg values), COM will use an inner message
+// loop and pump messages.  If DataExchangeHost hands off too many drag event callbacks to the UI thread too fast, this inner
+// message loop can process additional drag events reentrantly, which will/can corrupt our drag data.  When this occurs, we need to defer 
+// the processing of the reentrant event until after the current event handling has completed.  This structure is used to hold
+// on to the event data until it can be processed.
+struct DirectUI::PendingDragDropActionData
+{
+    DragDropMessageType type;
+    Microsoft::WRL::ComPtr<SynchronousDragDropAction> spDragDropAction;
+    ctl::ComPtr<DropOperationTarget> spDropOperationTarget;
+    ctl::ComPtr<mui::DragDrop::IDragInfo> spDragInfo;
+    Microsoft::WRL::ComPtr<RaiseDragDropEventAsyncOperation> spRaiseDragDropEventAsyncOperation;
+
+    PendingDragDropActionData(
+        SynchronousDragDropAction* dragDropAction,
+        DragDropMessageType messageType,
+        DropOperationTarget* dropOperationTarget,
+        mui::DragDrop::IDragInfo* dragInfo,
+        RaiseDragDropEventAsyncOperation* raiseDragDropEventAsyncOperation) :
+        spDragDropAction(dragDropAction),
+        type(messageType),
+        spDropOperationTarget(dropOperationTarget),
+        spDragInfo(dragInfo),
+        spRaiseDragDropEventAsyncOperation(raiseDragDropEventAsyncOperation)
+    {
+    }
+
+    _Check_return_ HRESULT Invoke()
+    {
+        IFC_RETURN(spDragDropAction->StartOperation());
+        IFC_RETURN(spDropOperationTarget->ProcessDragDropEventAction(type, spDragInfo.Get(), spRaiseDragDropEventAsyncOperation.Get()));
+        spDragDropAction->CoreFireCompletion();
+        return S_OK;
+    }
+};
+
+// Thread local data used to manage a quue of pending drag events due to reentrancy.
+thread_local bool DropOperationTarget::tls_actionInProgress = false;
+thread_local std::unique_ptr<PendingDragDropActionQueue> DropOperationTarget::tls_pendingActions;
+
+// DataExchangeHost does not guarentee that leave event for one drop target will be ahead of
+// the enter event for another drop target on the same thread.  If the come in the wrong order
+// it will/can corrupt our drag data.  This thread local variable, allows us to keep track
+// of which drop target we currently think we are inside of so we can make sure we process these
+// events in the right order.
+thread_local ctl::ComPtr<DropOperationTarget> DropOperationTarget::tls_activeDropOperationTarget;
+
 _Check_return_ HRESULT
 DropOperationTarget::QueryInterfaceImpl(
     _In_ REFIID iid,
@@ -34,6 +81,11 @@ DropOperationTarget::QueryInterfaceImpl(
 HRESULT DropOperationTarget::Initialize(_In_ CXamlIslandRoot* hitTestRootIsland)
 {
     m_hitTestRootIslandWeak = xref::get_weakref(hitTestRootIsland);
+    if (!tls_pendingActions)
+    {
+        tls_pendingActions = std::make_unique<PendingDragDropActionQueue>();
+    }
+
     return S_OK;
 }
 
@@ -165,6 +217,47 @@ HRESULT DropOperationTarget::RaiseDragDropEventActionAsync(
     _In_ mui::DragDrop::IDragInfo* pDragInfo,
     _In_opt_ RaiseDragDropEventAsyncOperation* pRaiseDragDropEventAsyncOperation,
     _Outptr_ wf::IAsyncAction** ppReturnValue)
+{
+    // We always create the SynchronousDragDropAction as we need to return that (even from the nested call), but if we are
+    // already in the process of processing one of them (or one is in flight through the dispatcher), then we will will use
+    // the dispatcher to schedule it to be processed when the current item(s) is complete.
+    static unsigned actionId = 0;
+    Microsoft::WRL::ComPtr<SynchronousDragDropAction> syncDragDropAction;
+    IFC_RETURN(Microsoft::WRL::MakeAndInitialize<SynchronousDragDropAction>(&syncDragDropAction, ++actionId, nullptr /* dispatcher */));
+    
+    // When starting an action, we will end up accessing properties on the DragInfo object.  This becomes problematic because
+    // this can cause a cross procss COM call which will pump messages and we could get a second drag/drop event while we
+    // are still processing this one.  when this happens we will queue up the second (or third) async action and start/process
+    // it when we call ourselves back via the dispacher.  This allows us to return the current "completed" action to the data transfer
+    // code before we start (and complete) the second (or third) actions.
+    if (tls_actionInProgress || !tls_pendingActions->empty())
+    {
+        // This will be the first pending entry so dispatch the handler for it.
+        if (tls_pendingActions->empty())
+        {
+            IFC_RETURN(QueuePendingActionCallback());
+        }
+
+        // Create a pending item and add it to the queue
+        tls_pendingActions->emplace_front(std::make_unique<PendingDragDropActionData>(syncDragDropAction.Get(), type, this, pDragInfo, pRaiseDragDropEventAsyncOperation));
+    }
+    else
+    {
+        // There were no other actions running (or dispatched) so we can just start this one.
+        IFC_RETURN(syncDragDropAction->StartOperation());
+        IFC_RETURN(ProcessDragDropEventAction( type, pDragInfo, pRaiseDragDropEventAsyncOperation));
+        syncDragDropAction->CoreFireCompletion();
+    }
+
+    *ppReturnValue = syncDragDropAction.Detach();
+    return S_OK;
+}
+
+HRESULT DropOperationTarget::ProcessDragDropEventAction(
+    _In_ DragDropMessageType type,
+    _In_ mui::DragDrop::IDragInfo* pDragInfo,
+    _In_opt_ RaiseDragDropEventAsyncOperation* pRaiseDragDropEventAsyncOperation
+    )
 {
     IFCPTR_RETURN(pDragInfo);
 
@@ -172,6 +265,40 @@ HRESULT DropOperationTarget::RaiseDragDropEventActionAsync(
     auto dxamlCore = DXamlCore::GetCurrent();
     if (!dxamlCore) return S_OK;
 
+    // Indicate that we are processing an action so we can catch reentrancy
+    tls_actionInProgress = true;
+    auto resetInProgress = wil::scope_exit([]()
+        {
+            tls_actionInProgress = false;
+        });
+
+    // It does not appear that drag/drop guarentees the order in when we get events when multiple content islands are involved.  We
+    // will sometimes get the leave for one island before the enter for the next, but sometimes we will get the enter for new island
+    // and even an over, before we get the leave for the old one.  This latter scenario can corrupt our drag/drop state and prevent 
+    // us from properly raising events.  So to combat this, we will track our current drop operation target and if we get and enter for
+    // a new one without having gotten a leave for the current one, we will artificially generate the leave before processing the enter.
+    // Conversly, if we get a leave for a drop operation target that isn't current, we will ignore it.
+
+    if (tls_activeDropOperationTarget.Get() != this)
+    {
+        if (tls_activeDropOperationTarget)
+        {
+            if (type == DragDropMessageType::DragLeave)
+            {
+                // We must have generated a leave event so ignore this one.
+                return S_OK;
+            }
+            // We must have a enter, but we haven't left the previous island yet, so generate a leave.
+            ASSERT(type == DragDropMessageType::DragEnter);
+            IFC_RETURN(tls_activeDropOperationTarget->ProcessDragDropEventAction(DragDropMessageType::DragLeave, pDragInfo, nullptr));
+        }
+        tls_activeDropOperationTarget = this;
+    }
+    if (type == DragDropMessageType::DragLeave || type == DragDropMessageType::Drop) 
+    {
+        tls_activeDropOperationTarget = nullptr;
+    }
+
     wf::Point point = {};
     XPOINTF pointF = {};
     ctl::ComPtr<xaml_controls::IListViewBase> spCapturedListViewBase;
@@ -181,6 +308,15 @@ HRESULT DropOperationTarget::RaiseDragDropEventActionAsync(
 
     IFC_RETURN(pDragInfo->get_Position(&point));
 
+    // If we are in a popup or some other secondary windows, then adjust our point to be relative to our content root.
+    if (m_dragDropPointTransform)
+    {
+        auto rawPoint = point;
+        BOOLEAN result;
+        IFC_RETURN(m_dragDropPointTransform->TryTransform(rawPoint, &point, &result));
+        if (!result) IFC_RETURN(E_FAIL);
+    }
+
     // Forward the position to the captured ListViewBase. In M1, XAML is still responsible for rendering the drag visual
     // this will be removed once WinRT API supports setting the DragUI.
     IFC_RETURN(dxamlCore->GetDragDrop()->GetCapturedDragSource(&spCapturedListViewBase));
@@ -219,20 +355,55 @@ HRESULT DropOperationTarget::RaiseDragDropEventActionAsync(
         m_acceptedOperation = acceptedOperation;
     }
 
+    return S_OK;
+}
 
-    // We can handle drag events synchronously, but we still need to return an async action.
-    // Let's build one that completes synchronously.
+HRESULT DropOperationTarget::QueuePendingActionCallback()
+{
+    ctl::ComPtr<DirectUI::IDispatcher> spDispatcher;
+    if (SUCCEEDED(DXamlCore::GetCurrent()->GetXamlDispatcher(&spDispatcher)) && spDispatcher)
     {
-        static unsigned actionId = 0;
-        Microsoft::WRL::ComPtr<SynchronousDragDropAction> syncDragDropAction;
+        IFC_RETURN(spDispatcher->RunAsync(MakeCallback(this, &DropOperationTarget::RaisePendingDragDropEventAction)));
+    }
+    return S_OK;
+}
 
-        IFC_RETURN(Microsoft::WRL::MakeAndInitialize<SynchronousDragDropAction>(&syncDragDropAction, ++actionId, nullptr /* dispatcher */));
-        IFC_RETURN(syncDragDropAction->StartOperation());
-        syncDragDropAction->CoreFireCompletion();
+HRESULT DropOperationTarget::RaisePendingDragDropEventAction()
+{
+    // This shouldn't ever happen, but if we don't have any pending actions, then we don't 
+    // need to do anything.
+    ASSERT(!tls_pendingActions->empty());
+    if (tls_pendingActions->empty())
+    {
+        return S_OK;
+    }
 
-        *ppReturnValue = syncDragDropAction.Detach();
+    // If we are still processing the previous action, then reschedule.
+    if (tls_actionInProgress)
+    {
+        IFC_RETURN(QueuePendingActionCallback());
+        return S_OK;
     }
 
+    // Get the next action
+    std::unique_ptr<PendingDragDropActionData> pendingAction;
+    pendingAction.swap(tls_pendingActions->front());
+    tls_pendingActions->pop_front();
+
+    // If there are still more actions to process, then reschedule to handle the next one.
+    // We do this, rather than processing the all, becuase thereis an additional re-entrancy
+    // problem with non drag drop messages, so this gives them a chance to execute between
+    // drag/drop actions reducing the likelihood they will occur during the action via
+    // reentrancy.  Note, this doesn't not elivate the secondary reentrancy issue, but instead
+    // just attempts to reduce the number of times it is encountered.
+    if (!tls_pendingActions->empty())
+    {
+        IFC_RETURN(QueuePendingActionCallback());
+    }
+
+    // Process the action
+    IFC_RETURN(pendingAction->Invoke());
+
     return S_OK;
 }
 
diff --git a/src/dxaml/xcp/dxaml/lib/DropOperationTarget.h b/src/dxaml/xcp/dxaml/lib/DropOperationTarget.h
index 40c0a49f84..18acf035dd 100644
--- a/src/dxaml/xcp/dxaml/lib/DropOperationTarget.h
+++ b/src/dxaml/xcp/dxaml/lib/DropOperationTarget.h
@@ -3,13 +3,21 @@
 
 #pragma once
 #include "fwd/microsoft.ui.input.dragdrop.h"
+#include "PointerPointTransform.h"
 
 namespace DirectUI
 {
     class RaiseDragDropEventAsyncOperation;
+    struct PendingDragDropActionData;
+#if XCP_MONITOR
+    using PendingDragDropActionQueue = std::deque<std::unique_ptr<PendingDragDropActionData>, ::XcpAllocation::LeakIgnoringAllocator<std::unique_ptr<PendingDragDropActionData>>>;
+#else
+    using PendingDragDropActionQueue = std::deque<std::unique_ptr<PendingDragDropActionData>>;
+#endif
 
-    class DropOperationTarget:
-        public mui::DragDrop::IDropOperationTarget, 
+
+    class DropOperationTarget :
+        public mui::DragDrop::IDropOperationTarget,
         public ctl::ComBase
     {
         BEGIN_INTERFACE_MAP(DropOperationTarget, ctl::ComBase)
@@ -48,12 +56,32 @@ namespace DirectUI
             _In_opt_ mui::DragDrop::IDragUIOverride* pDragUIOverride,
             _Deref_out_ wf::IAsyncOperation<wadt::DataPackageOperation>** returnValue);
 
+        _Check_return_ HRESULT ProcessDragDropEventAction(
+             _In_ DragDropMessageType type,
+            _In_ mui::DragDrop::IDragInfo* pDragInfo,
+            _In_opt_ RaiseDragDropEventAsyncOperation* pRaiseDragDropEventAsyncOperation = nullptr);
+
         void CheckIfAcceptedOperationShouldBeReset(_In_ IInspectable* sourceAsInspectable);
         void SetAcceptedOperationSetterUIElement(_In_ IInspectable* sourceAsInspectable);
         void SetAcceptedOperation(_In_ IInspectable* sourceAsInspectable,
                                   _In_ wadt::DataPackageOperation acceptedOperation);
 
+        void SetDragDropPointTransform(ctl::ComPtr<DirectUI::PointerPointTransform>& transform)
+        {
+            m_dragDropPointTransform = transform;
+        }
+
+        HRESULT RaisePendingDragDropEventAction();
+        HRESULT QueuePendingActionCallback();
+
     private:
+        // Indicates that we are currently processing an action and may receive reentrant messages
+        static thread_local bool tls_actionInProgress;
+        // List of actions that have been queued due to reentrancy
+        static thread_local std::unique_ptr<PendingDragDropActionQueue> tls_pendingActions;
+        // The currently active drop operation target
+        static thread_local ctl::ComPtr<DropOperationTarget> tls_activeDropOperationTarget;
+
         // When this is set to true, the Accepted Operation will be reset
         bool m_shouldResetAcceptedOperation = false;
         // Cache the UIElement which sets the AcceptedOperation
@@ -62,6 +90,8 @@ namespace DirectUI
         DirectUI::DataPackageOperation m_acceptedOperation = DirectUI::DataPackageOperation::DataPackageOperation_None;
         // Provided in the case of Islands, to record the root element to hit test from
         xref::weakref_ptr<CXamlIslandRoot> m_hitTestRootIslandWeak;
+        // Point transform for windowed components (e.g. popups).
+        ctl::ComPtr<DirectUI::PointerPointTransform> m_dragDropPointTransform;
     };
 }
 
diff --git a/src/dxaml/xcp/dxaml/lib/FrameworkElementAutomationPeer_partial.cpp b/src/dxaml/xcp/dxaml/lib/FrameworkElementAutomationPeer_partial.cpp
index 7d63532d7d..1e584cf72c 100644
--- a/src/dxaml/xcp/dxaml/lib/FrameworkElementAutomationPeer_partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/FrameworkElementAutomationPeer_partial.cpp
@@ -767,7 +767,7 @@ _Check_return_ HRESULT FrameworkElementAutomationPeer::GetAnnotationsCoreImpl(_O
     return S_OK;
 }
 
-void FrameworkElementAutomationPeer::SetControlType(xaml_automation_peers::AutomationControlType controlType)
+void FrameworkElementAutomationPeer::SetControlType(_In_ xaml_automation_peers::AutomationControlType controlType)
 {
     m_ControlType = controlType;
 }
diff --git a/src/dxaml/xcp/dxaml/lib/ListViewBase_Partial.cpp b/src/dxaml/xcp/dxaml/lib/ListViewBase_Partial.cpp
index 17765eb8fd..c9014113cb 100644
--- a/src/dxaml/xcp/dxaml/lib/ListViewBase_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/ListViewBase_Partial.cpp
@@ -655,7 +655,7 @@ IFACEMETHODIMP ListViewBase::OnApplyTemplate()
 
 // make sure to call this after an arrange has occurred, since that is the moment the ItemsHost
 // will have updated its ItemBounds fully.
-HRESULT ListViewBase::UpdateClip()
+_Check_return_ HRESULT ListViewBase::UpdateClip()
 {
     HRESULT hr = S_OK;
     ctl::ComPtr<IPanel> spItemsHost;
diff --git a/src/dxaml/xcp/dxaml/lib/MediaTransportControls_Partial.h b/src/dxaml/xcp/dxaml/lib/MediaTransportControls_Partial.h
index 8f9ef679d3..8923d2148a 100644
--- a/src/dxaml/xcp/dxaml/lib/MediaTransportControls_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/MediaTransportControls_Partial.h
@@ -442,7 +442,7 @@ namespace DirectUI
                                     _In_ IInspectable* pSender,
                                     _In_ xaml_input::IPointerRoutedEventArgs* pArgs);
         _Check_return_ HRESULT UpdateFullScreenMode(
-                                    _In_ BOOLEAN isFullWindow);
+                                    BOOLEAN isFullWindow);
         _Check_return_ HRESULT GetFullScreenView(
                                     _Outptr_opt_ wuv::IApplicationView3** ppAppView);
         _Check_return_ HRESULT GetMiniView(
diff --git a/src/dxaml/xcp/dxaml/lib/MediaTransportControls_partial.cpp b/src/dxaml/xcp/dxaml/lib/MediaTransportControls_partial.cpp
index 89d4c011cc..fc94e8d9d5 100644
--- a/src/dxaml/xcp/dxaml/lib/MediaTransportControls_partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/MediaTransportControls_partial.cpp
@@ -2342,7 +2342,7 @@ MediaTransportControls::OnCCSelectionButtonClick()
         if (!m_tpAvailableCCTracksMenuFlyout)
         {
             IFC(ctl::make<MenuFlyout>(&spNewMenuFlyout));
-            IFC(spNewMenuFlyout->put_ShouldConstrainToRootBounds(TRUE));
+            IFC(spNewMenuFlyout->put_ShouldConstrainToRootBounds(FALSE));
             SetPtrValue(m_tpAvailableCCTracksMenuFlyout, spNewMenuFlyout.Get());
             IFC(m_tpCCSelectionButton.Cast<Button>()->put_Flyout(m_tpAvailableCCTracksMenuFlyout.Cast<MenuFlyout>()));
         }
@@ -2374,7 +2374,7 @@ MediaTransportControls::OnPlaybackRateButtonClick()
         if (!m_tpAvailablePlaybackRateMenuFlyout)
         {
             IFC(ctl::make<MenuFlyout>(&spNewMenuFlyout));
-            IFC(spNewMenuFlyout->put_ShouldConstrainToRootBounds(TRUE));
+            IFC(spNewMenuFlyout->put_ShouldConstrainToRootBounds(FALSE));
             SetPtrValue(m_tpAvailablePlaybackRateMenuFlyout, spNewMenuFlyout.Get());
             IFC(m_tpPlaybackRateButton.Cast<Button>()->put_Flyout(m_tpAvailablePlaybackRateMenuFlyout.Cast<MenuFlyout>()));
         }
@@ -6262,7 +6262,7 @@ MediaTransportControls::GetFullWindow(_Out_ BOOLEAN *value)
     return hr;
 }
 
-HRESULT MediaTransportControls::SetMediaPlayerElementFullWindow(ctl::ComPtr<xaml_controls::IMediaPlayerElement> spMediaPlayer, BOOLEAN value)
+_Check_return_ HRESULT MediaTransportControls::SetMediaPlayerElementFullWindow(ctl::ComPtr<xaml_controls::IMediaPlayerElement> spMediaPlayer, BOOLEAN value)
 {
 #if false // DISABLE_FULL_WINDOW
     IFC_RETURN(spMediaPlayer->put_IsFullWindow(value));
diff --git a/src/dxaml/xcp/dxaml/lib/StackPanel_Partial.cpp b/src/dxaml/xcp/dxaml/lib/StackPanel_Partial.cpp
index 72b6d08a63..b4a015e7bc 100644
--- a/src/dxaml/xcp/dxaml/lib/StackPanel_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/StackPanel_Partial.cpp
@@ -595,8 +595,8 @@ StackPanel::GetInsertionIndexesImpl(
 //------------------------------------------------------------------------
 _Check_return_ HRESULT
 StackPanel::GetLastItemIndexInViewport(
-    IScrollInfo* pScrollInfo,
-    INT* pResult)
+    _In_opt_ IScrollInfo* pScrollInfo,
+    _Inout_ INT* pResult)
 {
     HRESULT hr = S_OK;
     ctl::ComPtr<wfc::IVector<xaml::UIElement*>> spChildren = NULL;
diff --git a/src/dxaml/xcp/dxaml/lib/TextElement_Partial.cpp b/src/dxaml/xcp/dxaml/lib/TextElement_Partial.cpp
index 604b34514d..4b4e1de40d 100644
--- a/src/dxaml/xcp/dxaml/lib/TextElement_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/TextElement_Partial.cpp
@@ -218,7 +218,7 @@ TextElement::GetOrCreateAutomationPeer(xaml_automation_peers::IAutomationPeer**
     RRETURN(hr);
 }
 
-_Check_return_ HRESULT TextElement::OnCreateAutomationPeer(xaml_automation_peers::IAutomationPeer** ppAutomationPeer)
+_Check_return_ HRESULT TextElement::OnCreateAutomationPeer(_Outptr_ xaml_automation_peers::IAutomationPeer** ppAutomationPeer)
 {
     RRETURN(S_FALSE);
 }
diff --git a/src/dxaml/xcp/dxaml/lib/TimePicker_Partial.cpp b/src/dxaml/xcp/dxaml/lib/TimePicker_Partial.cpp
index 1a0b4403cc..3ac25e5e6c 100644
--- a/src/dxaml/xcp/dxaml/lib/TimePicker_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/TimePicker_Partial.cpp
@@ -1344,7 +1344,7 @@ TimePicker::GeneratePeriods()
 }
 
 // Clears the ItemsSource  properties of the selectors.
-HRESULT
+_Check_return_ HRESULT
 TimePicker::ClearSelectors()
 {
     HRESULT hr = S_OK;
diff --git a/src/dxaml/xcp/dxaml/lib/ToolTip_Partial.cpp b/src/dxaml/xcp/dxaml/lib/ToolTip_Partial.cpp
index db19ec727c..8b1fcd28e5 100644
--- a/src/dxaml/xcp/dxaml/lib/ToolTip_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/ToolTip_Partial.cpp
@@ -2206,7 +2206,7 @@ _Check_return_ HRESULT ToolTip::RepositionPopup()
 }
 
 _Check_return_ HRESULT
-ToolTip::HandlePointInSafeZone(const POINT& position)
+ToolTip::HandlePointInSafeZone(_In_ const POINT& position)
 {
     if (auto visualTree = VisualTree::GetForElementNoRef(GetHandle()))
     {
@@ -2218,7 +2218,7 @@ ToolTip::HandlePointInSafeZone(const POINT& position)
 }
 
 _Check_return_ HRESULT
-ToolTip::HandlePointInSafeZone(const wf::Point& point)
+ToolTip::HandlePointInSafeZone(_In_ const wf::Point& point)
 {
     ctl::ComPtr<xaml::IDependencyObject> owner;
     IFC_RETURN(m_wrOwner.As(&owner));
diff --git a/src/dxaml/xcp/dxaml/lib/WindowedPopupInputSiteAdapter.cpp b/src/dxaml/xcp/dxaml/lib/WindowedPopupInputSiteAdapter.cpp
index 2098dff352..0d088c18b2 100644
--- a/src/dxaml/xcp/dxaml/lib/WindowedPopupInputSiteAdapter.cpp
+++ b/src/dxaml/xcp/dxaml/lib/WindowedPopupInputSiteAdapter.cpp
@@ -7,6 +7,12 @@
 #include "GeneralTransform.h"
 #include "InputSiteAdapter.h"
 #include "WindowedPopupInputSiteAdapter.h"
+#include "DropOperationTarget.h"
+
+WindowedPopupInputSiteAdapter::~WindowedPopupInputSiteAdapter()
+{
+    IGNOREHR(m_dragDropManager->remove_TargetRequested(m_dropTargetRequestedToken));
+}
 
 void WindowedPopupInputSiteAdapter::Initialize(_In_ CPopup* popup, _In_ ixp::IContentIsland* contentIsland, _In_ CContentRoot* contentRoot, _In_ CJupiterWindow* jupiterWindow)
 {
@@ -27,6 +33,17 @@ void WindowedPopupInputSiteAdapter::Initialize(_In_ CPopup* popup, _In_ ixp::ICo
 
     // Windowed popups do not ever take activation.
     IFCFAILFAST(m_inputPointerSource2->put_ActivationBehavior(ixp::InputPointerActivationBehavior_NoActivate));
+
+    // Set up the popup as a potential drop target
+    wrl::ComPtr<mui::DragDrop::IDragDropManagerStatics> dragDropManagerStatics;
+    IFCFAILFAST(ActivationFactoryCache::GetActivationFactoryCache()->GetDragDropManagerStatics(&dragDropManagerStatics));
+
+    IFCFAILFAST(dragDropManagerStatics->GetForIsland(contentIsland, &m_dragDropManager));
+
+    // Callback object is not agile; this is intended for XAML objects that are thread affine
+    auto callback = wrl::Callback<wf::ITypedEventHandler<mui::DragDrop::DragDropManager*, mui::DragDrop::DropOperationTargetRequestedEventArgs*>>(this, &WindowedPopupInputSiteAdapter::OnDropTargetRequested);
+    IFCFAILFAST(m_dragDropManager->add_TargetRequested(callback.Get(), &m_dropTargetRequestedToken));
+
 }
 
 _Check_return_ HRESULT WindowedPopupInputSiteAdapter::OnDirectManipulationHitTest(_In_ ixp::IPointerEventArgs* args)
@@ -42,6 +59,21 @@ _Check_return_ HRESULT WindowedPopupInputSiteAdapter::OnDirectManipulationHitTes
     return S_OK;
 }
 
+_Check_return_ HRESULT WindowedPopupInputSiteAdapter::OnDropTargetRequested(_In_ mui::DragDrop::IDragDropManager* /*sender*/, _In_ mui::DragDrop::IDropOperationTargetRequestedEventArgs* args)
+{
+    ctl::ComPtr<DirectUI::DropOperationTarget> dropTarget;
+
+    auto contentRoot = GetContentRoot();
+    if (contentRoot)
+    {
+        IFC_RETURN(ctl::make<DirectUI::DropOperationTarget>(contentRoot->GetXamlIslandRootNoRef(), &dropTarget));
+
+        dropTarget->SetDragDropPointTransform(m_pointerPointTransformFromContentRoot);
+        IFC_RETURN(args->SetTarget(dropTarget.Get()));
+    }
+    return S_OK;
+}
+
 _Check_return_ HRESULT WindowedPopupInputSiteAdapter::SetTransformFromContentRoot(_In_ xaml_media::IGeneralTransform* transform, _In_ wf::Point* offset)
 {
     FAIL_FAST_ASSERT(m_pointerPointTransformFromContentRoot != nullptr);
diff --git a/src/dxaml/xcp/dxaml/lib/WindowedPopupInputSiteAdapter.h b/src/dxaml/xcp/dxaml/lib/WindowedPopupInputSiteAdapter.h
index 56dc7c0388..815c5a02e2 100644
--- a/src/dxaml/xcp/dxaml/lib/WindowedPopupInputSiteAdapter.h
+++ b/src/dxaml/xcp/dxaml/lib/WindowedPopupInputSiteAdapter.h
@@ -8,6 +8,7 @@
 #include <fwd/microsoft.ui.xaml.h>
 #include <microsoft.ui.input.experimental.h>
 #include "NamespaceAliases.h"
+#include "InputSiteAdapter.h"
 
 class CJupiterWindow;
 class CContentRoot;
@@ -19,15 +20,20 @@ namespace DirectUI {class PointerPointTransform;}
 class WindowedPopupInputSiteAdapter : public InputSiteAdapter
 {
 public:
+    ~WindowedPopupInputSiteAdapter();
+
     void Initialize(_In_ CPopup* popup, _In_ ixp::IContentIsland* contentIsland, _In_ CContentRoot* contentRoot, _In_ CJupiterWindow* jupiterWindow);
 
     _Check_return_ HRESULT SetTransformFromContentRoot(_In_ xaml_media::IGeneralTransform* transform, _In_ wf::Point* offset);
-
+ 
     bool ReplayPointerUpdate() override;
 
 protected:
     _Check_return_ HRESULT OnDirectManipulationHitTest(_In_ ixp::IPointerEventArgs* args) override;
     _Check_return_ HRESULT OnPointerMessage(const UINT uMsg, _In_ ixp::IPointerEventArgs* args) override;
+    _Check_return_ HRESULT OnDropTargetRequested(_In_ mui::DragDrop::IDragDropManager*, _In_ mui::DragDrop::IDropOperationTargetRequestedEventArgs* args);
+
+
 
 private:
     _Check_return_ HRESULT GetTransformedPointerPoint(_In_ ixp::IPointerEventArgs* args, _Out_ ixp::IPointerPoint** transformedPointerPoint);
@@ -36,4 +42,9 @@ class WindowedPopupInputSiteAdapter : public InputSiteAdapter
 
     // This popup controls the lifetime of this WindowedPopupInputSiteAdapter, and we'll never outlive the popup.
     CPopup* m_windowedPopupNoRef{};
+
+    // Drag drop manager for the window's input site
+    ctl::ComPtr<mui::DragDrop::IDragDropManager> m_dragDropManager;
+
+    EventRegistrationToken m_dropTargetRequestedToken = {};
 };
\ No newline at end of file
diff --git a/src/dxaml/xcp/dxaml/lib/XamlSourceFocusNavigationRequest_Partial.cpp b/src/dxaml/xcp/dxaml/lib/XamlSourceFocusNavigationRequest_Partial.cpp
index 77d84cfb1b..f6a2c6116a 100644
--- a/src/dxaml/xcp/dxaml/lib/XamlSourceFocusNavigationRequest_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/XamlSourceFocusNavigationRequest_Partial.cpp
@@ -68,8 +68,8 @@ XamlSourceFocusNavigationRequest::get_ReasonImpl(_Out_ xaml_hosting::XamlSourceF
 
 _Check_return_ HRESULT
 XamlSourceFocusNavigationRequestFactory::CreateInstanceImpl(
-    xaml_hosting::XamlSourceFocusNavigationReason reason,
-    xaml_hosting::IXamlSourceFocusNavigationRequest** ppResult)
+    _In_ xaml_hosting::XamlSourceFocusNavigationReason reason,
+    _Outptr_ xaml_hosting::IXamlSourceFocusNavigationRequest** ppResult)
 {
     ctl::ComPtr<XamlSourceFocusNavigationRequest> request;
     IFC_RETURN(ctl::make<XamlSourceFocusNavigationRequest>(reason, &request));
@@ -79,9 +79,9 @@ XamlSourceFocusNavigationRequestFactory::CreateInstanceImpl(
 
 _Check_return_ HRESULT
 XamlSourceFocusNavigationRequestFactory::CreateInstanceWithHintRectImpl(
-    xaml_hosting::XamlSourceFocusNavigationReason reason,
-    wf::Rect origin,
-    xaml_hosting::IXamlSourceFocusNavigationRequest** ppResult)
+    _In_ xaml_hosting::XamlSourceFocusNavigationReason reason,
+    _In_ wf::Rect origin,
+    _Outptr_ xaml_hosting::IXamlSourceFocusNavigationRequest** ppResult)
 {
     ctl::ComPtr<XamlSourceFocusNavigationRequest> request;
     IFC_RETURN(ctl::make<XamlSourceFocusNavigationRequest>(reason, origin, &request));
@@ -91,10 +91,10 @@ XamlSourceFocusNavigationRequestFactory::CreateInstanceWithHintRectImpl(
 
 _Check_return_ HRESULT
 XamlSourceFocusNavigationRequestFactory::CreateInstanceWithHintRectAndCorrelationIdImpl(
-    xaml_hosting::XamlSourceFocusNavigationReason reason,
-    wf::Rect origin,
-    GUID correlationId,
-    xaml_hosting::IXamlSourceFocusNavigationRequest** ppResult)
+    _In_ xaml_hosting::XamlSourceFocusNavigationReason reason,
+    _In_ wf::Rect origin,
+    _In_ GUID correlationId,
+    _Outptr_ xaml_hosting::IXamlSourceFocusNavigationRequest** ppResult)
 {
     ctl::ComPtr<XamlSourceFocusNavigationRequest> request;
     IFC_RETURN(ctl::make<XamlSourceFocusNavigationRequest>(reason, origin, correlationId, &request));
diff --git a/src/dxaml/xcp/inc/UIAEnums.g.h b/src/dxaml/xcp/inc/UIAEnums.g.h
index 48e31fa80c..ba3407bf67 100644
--- a/src/dxaml/xcp/inc/UIAEnums.g.h
+++ b/src/dxaml/xcp/inc/UIAEnums.g.h
@@ -224,6 +224,7 @@ enum APAutomationEvents
     AEConversionTargetChanged,
     AETextEditTextChanged,
     AELayoutInvalidated,
+    AENotification,
 };
 
 //------------------------------------------------------------------------
diff --git a/src/dxaml/xcp/inc/cvalue.h b/src/dxaml/xcp/inc/cvalue.h
index 55db26fe18..80265b1c20 100644
--- a/src/dxaml/xcp/inc/cvalue.h
+++ b/src/dxaml/xcp/inc/cvalue.h
@@ -735,7 +735,7 @@ class CValue
 
     // Releases previously held value, converts HSTRING to xstring_ptr and sets the value.
     _Check_return_ HRESULT SetString(
-        _In_ HSTRING value);
+        HSTRING value);
 
     // Releases previously held value, moves xstring_ptr to this CValue.
     void SetString(
diff --git a/src/dxaml/xcp/pal/inc/paltext.h b/src/dxaml/xcp/pal/inc/paltext.h
index 19b218cf13..e587acb616 100644
--- a/src/dxaml/xcp/pal/inc/paltext.h
+++ b/src/dxaml/xcp/pal/inc/paltext.h
@@ -738,6 +738,11 @@ namespace PALText
         virtual HRESULT CreateFontFallbackBuilder(
             _Outptr_ PALText::IFontFallbackBuilder **ppFontFallbackBuilder
             ) = 0;
+
+        virtual HRESULT CreateSystemFontCollection(
+            bool includeDownloadedFonts,
+            PALText::IFontCollection** fontCollection
+        ) = 0;
     };
 }
 
diff --git a/src/dxaml/xcp/pal/win/DWriteFontAndScriptServices.cpp b/src/dxaml/xcp/pal/win/DWriteFontAndScriptServices.cpp
index 56f369ae58..7410f590fc 100644
--- a/src/dxaml/xcp/pal/win/DWriteFontAndScriptServices.cpp
+++ b/src/dxaml/xcp/pal/win/DWriteFontAndScriptServices.cpp
@@ -100,6 +100,13 @@ HRESULT DWriteFontAndScriptServices::EnsureSystemFontCollection()
 {
     if (m_systemFontCollection == nullptr)
     {
+        CreateSystemFontCollection(true /*includeDownloadableFonts*/, m_systemFontCollection.ReleaseAndGetAddressOf());
+    }
+    return S_OK;
+}
+
+_Check_return_ HRESULT DWriteFontAndScriptServices::CreateSystemFontCollection(bool includeDownloadedFonts, PALText::IFontCollection** fontCollection)
+{
         Microsoft::WRL::ComPtr<IDWriteFontCollection2> dWriteFontCollection;
         if (s_customSystemFontCollection != nullptr)
         {
@@ -108,13 +115,14 @@ HRESULT DWriteFontAndScriptServices::EnsureSystemFontCollection()
         else
         {
             DWRITE_FONT_FAMILY_MODEL fontFamilyModel = ShouldUseTypographicFontModel() ? DWRITE_FONT_FAMILY_MODEL_TYPOGRAPHIC : DWRITE_FONT_FAMILY_MODEL_WEIGHT_STRETCH_STYLE;
-            IFC_RETURN(m_dwriteFactory->GetSystemFontCollection(/*includeDownloadableFonts*/ true, fontFamilyModel, dWriteFontCollection.GetAddressOf()));
+            IFC_RETURN(m_dwriteFactory->GetSystemFontCollection(includeDownloadedFonts, fontFamilyModel, dWriteFontCollection.GetAddressOf()));
         }
-        IFC_RETURN(DWriteFontCollection::Create(dWriteFontCollection.Get(), m_systemFontCollection.ReleaseAndGetAddressOf()));
-    }
-    return S_OK;
+        IFC_RETURN(DWriteFontCollection::Create(dWriteFontCollection.Get(), fontCollection));
+
+        return S_OK;
 }
 
+
 bool DWriteFontAndScriptServices::ShouldUseTypographicFontModel()
 {
     if (!RuntimeFeatureBehavior::GetRuntimeEnabledFeatureDetector()->IsFeatureEnabled(RuntimeFeatureBehavior::RuntimeEnabledFeature::ForceDWriteTypographicModel))
diff --git a/src/dxaml/xcp/pal/win/inc/DWriteFontAndScriptServices.h b/src/dxaml/xcp/pal/win/inc/DWriteFontAndScriptServices.h
index 4f91c12b29..fd092c0c31 100644
--- a/src/dxaml/xcp/pal/win/inc/DWriteFontAndScriptServices.h
+++ b/src/dxaml/xcp/pal/win/inc/DWriteFontAndScriptServices.h
@@ -184,6 +184,8 @@ class DWriteFontAndScriptServices : public CXcpObjectBase<IPALFontAndScriptServi
     Microsoft::WRL::ComPtr<IDWriteTextAnalyzer> m_dwriteTextAnalyzer;
 
     HRESULT EnsureSystemFontCollection();
+    
+    HRESULT CreateSystemFontCollection(bool includeDownloadedFOnts, PALText::IFontCollection** fontCollection);
 
     // Release resources associated with the DWriteFontAndScriptServices.
     ~DWriteFontAndScriptServices() override;
diff --git a/src/dxaml/xcp/plat/win/browserdesktop/WinThreadPool.cpp b/src/dxaml/xcp/plat/win/browserdesktop/WinThreadPool.cpp
index b1e835cf8d..88196a7a44 100644
--- a/src/dxaml/xcp/plat/win/browserdesktop/WinThreadPool.cpp
+++ b/src/dxaml/xcp/plat/win/browserdesktop/WinThreadPool.cpp
@@ -237,7 +237,7 @@ CWinWorkItemFactory::~CWinWorkItemFactory()
 // the factory, which can have new work queued to it
 //
 // ----------------------------------------------------
-HRESULT
+_Check_return_ HRESULT
 CWinWorkItemFactory::CancelAndCleanupAllWork()
 {
     if (m_pCleanupGroup != NULL)
@@ -255,7 +255,7 @@ CWinWorkItemFactory::CancelAndCleanupAllWork()
 // Sets up the threadpool environment and cleanup group
 //
 //--------------------------------------------------------
-HRESULT
+_Check_return_ HRESULT
 CWinWorkItemFactory::Initialize()
 {
     HRESULT hr = S_OK;
diff --git a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Xaml.Automation.Peers.cs b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Xaml.Automation.Peers.cs
index 86b3129070..4550b440be 100644
--- a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Xaml.Automation.Peers.cs
+++ b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Xaml.Automation.Peers.cs
@@ -1558,6 +1558,7 @@ public enum AutomationControlType
         FlipView,
     }
 
+    [Platform("Feature_ExperimentalApi", typeof(Microsoft.UI.Xaml.WinUIContract), Microsoft.UI.Xaml.WinUIContract.LatestVersion)]
     [NativeName("APAutomationEvents")]
     [NativeCategory(EnumCategory.AutomationEnum)]
     [EnumFlags(HasTypeConverter = true, IsTypeConverter = true, NativeUsesNumericValues = false)]
@@ -1624,6 +1625,9 @@ public enum AutomationEvents
         TextEditTextChanged,
         [NativeValueName("AELayoutInvalidated")]
         LayoutInvalidated,
+        [NativeValueName("AENotification")]
+        [VelocityFeature("Feature_ExperimentalApi")]
+        Notification,
     }
 
     [NativeName("APPatternInterface")]
diff --git a/src/eng/Version.Details.xml b/src/eng/Version.Details.xml
index 538d115bd0..df20fd08fd 100644
--- a/src/eng/Version.Details.xml
+++ b/src/eng/Version.Details.xml
@@ -2,27 +2,27 @@
 <!-- Copyright (c) Microsoft Corporation. Licensed under the MIT License. See LICENSE in the project root for license information. -->
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.WindowsAppSDK.Foundation.TransportPackage" Version="1.6.0-20240807.0.release">
+    <Dependency Name="Microsoft.WindowsAppSDK.Foundation.TransportPackage" Version="1.6.0-20240821.0.release">
       <Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDK</Uri>
-      <Sha>6a0b9dcf278e67147e5ac3ae1961853a87c36209</Sha>
+      <Sha>71b031a9b43c2a15c57133c4141fbf45f7ecd54b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage" Version="1.6.4-CI-26107.1007.240806-0649.0">
+    <Dependency Name="Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage" Version="1.6.4-CI-26107.1009.240820-1034.0">
       <Uri>https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP</Uri>
       <Sha>2755c21b3b1bad26019e8a8d721f1675c2685720</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Internal.InteractiveExperiences" Version="1.6.4-CI-26107.1007.240806-0649.0">
+    <Dependency Name="Microsoft.Internal.InteractiveExperiences" Version="1.6.4-CI-26107.1009.240820-1034.0">
       <Uri>https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP</Uri>
       <Sha>2755c21b3b1bad26019e8a8d721f1675c2685720</Sha>
     </Dependency>
     <!-- Microsoft-WinUI-SDK subdirectory in WindowsAppSDKClosed (MSBuild and Visual Studio extensions for building, deploying, and debugging packaged applications.)  -->
-    <Dependency Name="Microsoft.Build.Msix" Version="1.6.0-preview1.20240806.1">
+    <Dependency Name="Microsoft.Build.Msix" Version="1.6.0-stable.20240815.1">
       <Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKClosed</Uri>
-      <Sha>83c84efeaeb446672487167978254004791e55cd</Sha>
+      <Sha>7bfb1cc50ee677ea7e99599de28f842bac2f93e5</Sha>
     </Dependency>
     <!-- Closed source binary (ex PTLS and WinUIEdit) -->
-    <Dependency Name="Microsoft.Internal.WinUIDetails" Version="1.610.0-preview1.20240806.1">
+    <Dependency Name="Microsoft.Internal.WinUIDetails" Version="1.610.0-stable.20240815.1">
       <Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKClosed</Uri>
-      <Sha>83c84efeaeb446672487167978254004791e55cd</Sha>
+      <Sha>7bfb1cc50ee677ea7e99599de28f842bac2f93e5</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
diff --git a/src/eng/versions.props b/src/eng/versions.props
index 8330174ea3..756e83ac92 100644
--- a/src/eng/versions.props
+++ b/src/eng/versions.props
@@ -66,9 +66,9 @@
     <!-- For compat reasons, this should always be .NET 6, as it controls the .NET version the Microsoft.WinUI.dll CSWinRT projection assembly targets. -->
     <WindowsAppSdkTargetFrameworkMoniker>net6.0-windows$(WindowsAppSdkTargetPlatformVersion)</WindowsAppSdkTargetFrameworkMoniker>
     <SamplesTargetFrameworkMoniker>$(WindowsAppSdkTargetFrameworkMoniker)</SamplesTargetFrameworkMoniker>
-    <MicrosoftCsWinRTPackageVersion>2.1.0-prerelease.240605.1</MicrosoftCsWinRTPackageVersion>
-    <MicrosoftWindowsSDKNetRefPackVersionSuffixOverride>36-preview</MicrosoftWindowsSDKNetRefPackVersionSuffixOverride>
-    <WebView2PackageVersion>1.0.2646-prerelease</WebView2PackageVersion>
+    <MicrosoftCsWinRTPackageVersion>2.1.1</MicrosoftCsWinRTPackageVersion>
+    <MicrosoftWindowsSDKNetRefPackVersionSuffixOverride>38</MicrosoftWindowsSDKNetRefPackVersionSuffixOverride>
+    <WebView2PackageVersion>1.0.2651.64</WebView2PackageVersion>
     <dotNetSdkChannel>8.0.1xx</dotNetSdkChannel>
     <dotNetSdkVNextChannel>9.0.xx</dotNetSdkVNextChannel>
     <CppWinRTVersion>2.0.230706.1</CppWinRTVersion>
diff --git a/src/global.json b/src/global.json
index 103e652b8a..0dd7ac9720 100644
--- a/src/global.json
+++ b/src/global.json
@@ -9,9 +9,8 @@
     "msbuild-sdks_EngCommon": "Used by Maestro for managing packages/dependencies"
   },
   "sdk": {
-    "version": "6.0.424",
-    "rollForward": "latestMajor",
-    "allowPrerelease": true
+    "version": "6.0.425",
+    "rollForward": "latestMajor"
   },
   "msbuild-sdks": {
     "Microsoft.Build.NoTargets": "3.3.0",
diff --git a/src/packages.config b/src/packages.config
index 8c392e6e73..a0b0701087 100644
--- a/src/packages.config
+++ b/src/packages.config
@@ -9,7 +9,7 @@
   <!-- mini_installer.exe for Anaheim Edge
        Only used for tests: If a WebView2 test runs and the WebView2 runtime is not installed, the mini_instller installs the browser.
        Packages in this feed are created by the WinUI team from official installers published by Edge. -->
-  <package id="Microsoft.UI.DCPP.Dependencies.Edge" version="128.0.2646.0" />
+  <package id="Microsoft.UI.DCPP.Dependencies.Edge" version="128.0.2653.0" />
   <!-- Windows SDK as a NuGet package for c++ projects -->
   <package id="Microsoft.Windows.SDK.cpp" version="10.0.22621.755" />
   <!-- Windows SDK as a NuGet package for C# UWP projects -->
@@ -19,13 +19,13 @@
   <!-- Metapackage for all the necessary components of .Net Native -->
   <package id="Microsoft.NETCore.UniversalWindowsPlatform" version="6.2.11" />
   <!-- Test framework -->
-  <package id="Microsoft.Taef" version="10.72.220819001" />
+  <package id="Microsoft.Taef" version="10.94.240624002" />
   <package id="Microsoft.Diagnostics.Tracing.TraceEvent" version="2.0.45" />
   <package id="MUXCustomBuildTasks" version="1.0.125-winui3" targetFramework="native" />
   <!-- WIL -->
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.230202.1" targetFramework="native" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231028.1" targetFramework="native" />
   <!-- Runtime for c#/winrt.  Keep this in sync with \Samples\WinUIGallery\WinUIGallery\standalone.props -->
-  <package id="Microsoft.Windows.CsWinRT" version="2.1.0-prerelease.240605.1" />
+  <package id="Microsoft.Windows.CsWinRT" version="2.1.1" />
   <!-- For MUXControlsTestApp? -->
   <package id="Microsoft.SourceLink.AzureRepos.Git" version="1.1.0" />
   <!-- We don't compile against the CRT version that requires these forwarders, but TAEF does,
@@ -43,5 +43,5 @@
   <!-- Project Caching implementations. -->
   <package id="Microsoft.MSBuildCache.Local" version="0.1.268-preview" />
   <package id="Microsoft.MSBuildCache.AzurePipelines" version="0.1.268-preview" />
-  <package id="Microsoft.Web.WebView2" version="1.0.2646-prerelease" targetFramework="native" />
+  <package id="Microsoft.Web.WebView2" version="1.0.2651.64" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CSharpAppPass1.cs b/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CSharpAppPass1.cs
index 672379c20a..ec7d455f1c 100644
--- a/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CSharpAppPass1.cs
+++ b/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CSharpAppPass1.cs
@@ -45,15 +45,7 @@ public override string TransformText()
 namespace ");
             this.Write(this.ToStringHelper.ToStringWithCulture(Model.CodeInfo.ClassName.Namespace));
             this.Write("\r\n{\r\n#if !DISABLE_XAML_GENERATED_MAIN\r\n    /// <summary>\r\n    /// Program class\r\n" +
-                    "    /// </summary>\r\n    public static class Program\r\n    {\r\n");
-  if (ProjectInfo.IsWin32App) { 
-            this.Write(@"        [global::System.Runtime.InteropServices.DllImport(""Microsoft.ui.xaml.dll"")]
-        [global::System.Runtime.InteropServices.DefaultDllImportSearchPaths(global::System.Runtime.InteropServices.DllImportSearchPath.SafeDirectories)]
-        private static extern void XamlCheckProcessRequirements();
-
-");
-  } 
-            this.Write("        ");
+                    "    /// </summary>\r\n    public static class Program\r\n    {\r\n        ");
             this.Write(this.ToStringHelper.ToStringWithCulture(GeneratedCodeAttribute));
             this.Write("\r\n        ");
             this.Write(this.ToStringHelper.ToStringWithCulture(DebuggerNonUserCodeAttribute));
@@ -62,9 +54,6 @@ namespace ");
             this.Write("        [global::System.STAThreadAttribute]\r\n");
   } 
             this.Write("        static void Main(string[] args)\r\n        {\r\n");
-  if (ProjectInfo.IsWin32App) { 
-            this.Write("            XamlCheckProcessRequirements();\r\n            \r\n");
-  } 
   if (ProjectInfo.UsingCSWinRT) { 
             this.Write("            global::WinRT.ComWrappersSupport.InitializeComWrappers();\r\n");
   }
diff --git a/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CSharpAppPass1.tt b/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CSharpAppPass1.tt
index 7241927fdc..ece0543263 100644
--- a/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CSharpAppPass1.tt
+++ b/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CSharpAppPass1.tt
@@ -22,12 +22,6 @@ namespace <#=Model.CodeInfo.ClassName.Namespace#>
     /// </summary>
     public static class Program
     {
-<#  if (ProjectInfo.IsWin32App) { #>
-        [global::System.Runtime.InteropServices.DllImport("Microsoft.ui.xaml.dll")]
-        [global::System.Runtime.InteropServices.DefaultDllImportSearchPaths(global::System.Runtime.InteropServices.DllImportSearchPath.SafeDirectories)]
-        private static extern void XamlCheckProcessRequirements();
-
-<#  } #>
         <#=GeneratedCodeAttribute#>
         <#=DebuggerNonUserCodeAttribute#>
 <#  if (ProjectInfo.IsWin32App) { #>
@@ -35,10 +29,6 @@ namespace <#=Model.CodeInfo.ClassName.Namespace#>
 <#  } #>
         static void Main(string[] args)
         {
-<#  if (ProjectInfo.IsWin32App) { #>
-            XamlCheckProcessRequirements();
-            
-<#  } #>
 <#  if (ProjectInfo.UsingCSWinRT) { #>
             global::WinRT.ComWrappersSupport.InitializeComWrappers();
 <#  }#>
diff --git a/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CppWinRT/CppWinRT_AppPass2.cs b/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CppWinRT/CppWinRT_AppPass2.cs
index fd9130ca16..7a796d941c 100644
--- a/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CppWinRT/CppWinRT_AppPass2.cs
+++ b/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CppWinRT/CppWinRT_AppPass2.cs
@@ -68,23 +68,7 @@ public override string TransformText()
                     "ISABLE_XAML_GENERATED_MAIN\r\nint __stdcall wWinMain(HINSTANCE, HINSTANCE, PWSTR, " +
                     "int)\r\n{\r\n");
   if (ProjectInfo.IsWin32App) { 
-            this.Write(@"    {
-        void (WINAPI *pfnXamlCheckProcessRequirements)();
-        auto module = ::LoadLibrary(L""Microsoft.ui.xaml.dll"");
-        if (module)
-        {
-            pfnXamlCheckProcessRequirements = reinterpret_cast<decltype(pfnXamlCheckProcessRequirements)>(GetProcAddress(module, ""XamlCheckProcessRequirements""));
-            if (pfnXamlCheckProcessRequirements)
-            {
-                (*pfnXamlCheckProcessRequirements)();
-            }
-
-            ::FreeLibrary(module);
-        }
-    }
-
-    winrt::init_apartment(winrt::apartment_type::single_threaded);
-");
+            this.Write("    winrt::init_apartment(winrt::apartment_type::single_threaded);\r\n");
   } else { 
             this.Write("    winrt::init_apartment();\r\n");
   }
diff --git a/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CppWinRT/CppWinRT_AppPass2.tt b/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CppWinRT/CppWinRT_AppPass2.tt
index 1ea8f7b27b..a44cd3bfc9 100644
--- a/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CppWinRT/CppWinRT_AppPass2.tt
+++ b/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CppWinRT/CppWinRT_AppPass2.tt
@@ -60,21 +60,6 @@ extern "C"
 int __stdcall wWinMain(HINSTANCE, HINSTANCE, PWSTR, int)
 {
 <#  if (ProjectInfo.IsWin32App) { #>
-    {
-        void (WINAPI *pfnXamlCheckProcessRequirements)();
-        auto module = ::LoadLibrary(L"Microsoft.ui.xaml.dll");
-        if (module)
-        {
-            pfnXamlCheckProcessRequirements = reinterpret_cast<decltype(pfnXamlCheckProcessRequirements)>(GetProcAddress(module, "XamlCheckProcessRequirements"));
-            if (pfnXamlCheckProcessRequirements)
-            {
-                (*pfnXamlCheckProcessRequirements)();
-            }
-
-            ::FreeLibrary(module);
-        }
-    }
-
     winrt::init_apartment(winrt::apartment_type::single_threaded);
 <#  } else { #>
     winrt::init_apartment();
diff --git a/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CppWinRT/CppWinRT_PageBinding.cs b/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CppWinRT/CppWinRT_PageBinding.cs
index dda9b89810..a52cbb40ae 100644
--- a/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CppWinRT/CppWinRT_PageBinding.cs
+++ b/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CppWinRT/CppWinRT_PageBinding.cs
@@ -737,8 +737,8 @@ private void Output_Connect_TwoWayBinding(BindAssignment ba)
 
 this.Write(this.ToStringHelper.ToStringWithCulture(ba.ConnectionIdElement.ReferenceExpression));
 
-this.Write(".LostFocus(\r\n                    [weakThis{ weak_from_this() }, this] (IInspectab" +
-        "le const& sender, ");
+this.Write(".LostFocus(\r\n                    [weakThis{ this->weak_from_this() }, this] (IIns" +
+        "pectable const& sender, ");
 
 this.Write(this.ToStringHelper.ToStringWithCulture(Projection(KnownNamespaces.Xaml)));
 
@@ -767,8 +767,9 @@ private void Output_Connect_TwoWayBinding(BindAssignment ba)
 
 this.Write(this.ToStringHelper.ToStringWithCulture(ba.MemberName));
 
-this.Write("Property(),\r\n                    [weakThis{ weak_from_this() }, this] (Dependency" +
-        "Object const& sender, DependencyProperty const& prop)\r\n                    {\r\n");
+this.Write("Property(),\r\n                    [weakThis{ this->weak_from_this() }, this] (Depe" +
+        "ndencyObject const& sender, DependencyProperty const& prop)\r\n                   " +
+        " {\r\n");
 
      } 
 this.Write("                        if (auto strongThis{ weakThis.lock() })\r\n                " +
@@ -848,7 +849,7 @@ void  Output_NullCheckedEventAssignment(BoundEventAssignment evt)
 
 this.Write(this.ToStringHelper.ToStringWithCulture(evt.MemberName));
 
-this.Write("([weakThis{ weak_from_this() }, this](");
+this.Write("([weakThis{ this->weak_from_this() }, this](");
 
 this.Write(this.ToStringHelper.ToStringWithCulture(evt.Parameters.Declaration()));
 
diff --git a/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CppWinRT/CppWinRT_PageBinding.tt b/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CppWinRT/CppWinRT_PageBinding.tt
index fc052b8f42..5a5372599b 100644
--- a/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CppWinRT/CppWinRT_PageBinding.tt
+++ b/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CppWinRT/CppWinRT_PageBinding.tt
@@ -589,7 +589,7 @@
 <#+     Output_ApiInformationCall_Push(ba.ApiInformation, Indent.None); #>
 <#+     if (ba.NeedsLostFocusForTwoWay) { #>
                 <#=ba.ConnectionIdElement.ReferenceExpression#>.LostFocus(
-                    [weakThis{ weak_from_this() }, this] (IInspectable const& sender, <#=Projection(KnownNamespaces.Xaml)#>::RoutedEventArgs const& e)
+                    [weakThis{ this->weak_from_this() }, this] (IInspectable const& sender, <#=Projection(KnownNamespaces.Xaml)#>::RoutedEventArgs const& e)
                     {
 <#+     } else { #>
 <#+             // Although it looks strange that we are capturing both `this` and a weak pointer to `this`, #>
@@ -603,7 +603,7 @@
 <#+             // Instead, we capture both `this` and a weak pointer to `this`, and only use the former if a valid #>
 <#+             // strong pointer can be derived from the latter thus guaranteeing that `this` can be safely used. #>
                 <#=ba.ConnectionIdElement.ReferenceExpression#>.RegisterPropertyChangedCallback(<#=ba.MemberDeclaringType.CppWinRTLocalElseRef()#>::<#=ba.MemberName#>Property(),
-                    [weakThis{ weak_from_this() }, this] (DependencyObject const& sender, DependencyProperty const& prop)
+                    [weakThis{ this->weak_from_this() }, this] (DependencyObject const& sender, DependencyProperty const& prop)
                     {
 <#+     } #>
                         if (auto strongThis{ weakThis.lock() })
@@ -654,7 +654,7 @@
 <#+                 // #>
 <#+                 // Instead, we capture both `this` and a weak pointer to `this`, and only use the former if a valid #>
 <#+                 // strong pointer can be derived from the latter thus guaranteeing that `this` can be safely used. #>
-                    targetElement.<#=evt.MemberName#>([weakThis{ weak_from_this() }, this](<#=evt.Parameters.Declaration()#>)
+                    targetElement.<#=evt.MemberName#>([weakThis{ this->weak_from_this() }, this](<#=evt.Parameters.Declaration()#>)
                     {
 <#+     PushIndent(Indent.ThreeTabs);#>
             if (auto strongThis{ weakThis.lock() })
diff --git a/src/src/projection/Directory.Build.props b/src/src/projection/Directory.Build.props
index 2f8cee505b..82fb24f573 100644
--- a/src/src/projection/Directory.Build.props
+++ b/src/src/projection/Directory.Build.props
@@ -19,10 +19,6 @@
     <!-- Causes loading of cswinrt projection (Microsoft.Web.WebView2.Core.Projection.dll) from CWV2 SDK package,
          needed by cswinrt's CoreCompile target. -->
     <WebView2EnableCsWinRTProjection>true</WebView2EnableCsWinRTProjection>
-
-    <!-- Workaround for CWV2 SDK package bug referencing the winrt implementation binary (Microsoft.Web.WebView2.Core.dll)
-         when TargetPlatform=AnyCPU (as in this project). We don't need it for the cswinrt projection, set flag to  avoid loading it. --> 
-    <WebView2EnableCsWinRTProjectionExcludeCoreRef>true</WebView2EnableCsWinRTProjectionExcludeCoreRef>
   </PropertyGroup>
 
   <ItemGroup>
@@ -49,8 +45,6 @@
       Microsoft.UI.Private;
       Microsoft.UI.Text;
       Microsoft.UI.Xaml;
-      Windows.UI.Xaml.Interop;
-      Windows.UI.Text;
     </WinUI_CSWinRTIncludes>
 
     <!-- Windows App SDK targets 17763, but [attributename] is defined in Windows SDK 19041,
@@ -61,27 +55,25 @@
       Windows.Foundation.Metadata.AttributeName;
     </WinUI_CSWinRTIncludes>
 
-      <!-- Bug 25974595: MUXC types mistakenly use WUX.ContentProperty attribute -->
+    <!-- These types are custom type mappings, but WinUI happened to project them.
+         They should be removed at some point. -->
     <WinUI_CSWinRTIncludes>
       $(WinUI_CSWinRTIncludes);
-      Windows.UI.Xaml.Markup.ContentPropertyAttribute;
-      Windows.UI.Xaml.Data.BindableAttribute;
+      Windows.UI.Xaml.Interop.IBindableIterable;
+      Windows.UI.Xaml.Interop.IBindableVector;
+      Windows.UI.Xaml.Interop.INotifyCollectionChanged;
+      Windows.UI.Xaml.Interop.NotifyCollectionChangedAction;
+      Windows.UI.Xaml.Interop.INotifyCollectionChangedEventArgs;
+      Windows.UI.Xaml.Interop.INotifyCollectionChangedEventArgsFactory;
+      Windows.UI.Xaml.Interop.NotifyCollectionChangedEventArgs;
+      Windows.UI.Xaml.Interop.NotifyCollectionChangedEventHandler;
     </WinUI_CSWinRTIncludes>
 
-    <!-- Exclude duplicated text types (exist in SDK interop assembly as well as our own winmd) -->
-    <WinUI_CSWinRTExcludes>
-        Windows.UI.Text.Core;
-        Windows.UI.Text.FontStretch;
-        Windows.UI.Text.FontStyle;
-        Windows.UI.Text.FontWeight;
-        Windows.UI.Text.UnderlineType;
-    </WinUI_CSWinRTExcludes>
-        <!-- Exclude text types that have been moved to new namespace -->
+    <!-- Exclude type that moved to the Windows SDK projection. -->
     <WinUI_CSWinRTExcludes>
       $(WinUI_CSWinRTExcludes);
-      Windows.UI.Text.FontWeights;
-      Windows.UI.Text.IFontWeights;
-      Windows.UI.Text.IFontWeightsStatics;
+      Windows.UI.Xaml.Interop.IBindableVectorView;
     </WinUI_CSWinRTExcludes>
+
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/src/projection/WindowsUITypeForwarders.cs b/src/src/projection/WindowsUITypeForwarders.cs
new file mode 100644
index 0000000000..06aff2476b
--- /dev/null
+++ b/src/src/projection/WindowsUITypeForwarders.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using Windows.UI.Text;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Interop;
+using Windows.UI.Xaml.Markup;
+using System.Runtime.CompilerServices;
+
+// Forward all public Windows.UI types formerly provided by the WinUI projection assembly to the public Windows SDK projection assembly
+[assembly: TypeForwardedToAttribute(typeof(CaretType))]
+[assembly: TypeForwardedToAttribute(typeof(ContentLinkInfo))]
+[assembly: TypeForwardedToAttribute(typeof(FindOptions))]
+[assembly: TypeForwardedToAttribute(typeof(FormatEffect))]
+[assembly: TypeForwardedToAttribute(typeof(HorizontalCharacterAlignment))]
+[assembly: TypeForwardedToAttribute(typeof(ITextCharacterFormat))]
+[assembly: TypeForwardedToAttribute(typeof(ITextDocument))]
+[assembly: TypeForwardedToAttribute(typeof(ITextParagraphFormat))]
+[assembly: TypeForwardedToAttribute(typeof(ITextRange))]
+[assembly: TypeForwardedToAttribute(typeof(ITextSelection))]
+[assembly: TypeForwardedToAttribute(typeof(LetterCase))]
+[assembly: TypeForwardedToAttribute(typeof(LineSpacingRule))]
+[assembly: TypeForwardedToAttribute(typeof(LinkType))]
+[assembly: TypeForwardedToAttribute(typeof(MarkerAlignment))]
+[assembly: TypeForwardedToAttribute(typeof(MarkerStyle))]
+[assembly: TypeForwardedToAttribute(typeof(MarkerType))]
+[assembly: TypeForwardedToAttribute(typeof(ParagraphAlignment))]
+[assembly: TypeForwardedToAttribute(typeof(ParagraphStyle))]
+[assembly: TypeForwardedToAttribute(typeof(PointOptions))]
+[assembly: TypeForwardedToAttribute(typeof(RangeGravity))]
+// RichEditMathMode is implemented on Windows 19041 and later and is available in those projections.
+// WinUI depends on the Windows 17763 projection, so we can't declare a direct forwarding.
+// In addition, doing a quick analysis, there is an MUX version of this type which is the one used
+// in WinUI scenarios.  Due to this, not delcaring this as an explicit type forwarding.
+// [assembly: TypeForwardedToAttribute(typeof(RichEditMathMode))]
+[assembly: TypeForwardedToAttribute(typeof(RichEditTextDocument))]
+[assembly: TypeForwardedToAttribute(typeof(RichEditTextRange))]
+[assembly: TypeForwardedToAttribute(typeof(SelectionOptions))]
+[assembly: TypeForwardedToAttribute(typeof(SelectionType))]
+[assembly: TypeForwardedToAttribute(typeof(TabAlignment))]
+[assembly: TypeForwardedToAttribute(typeof(TabLeader))]
+[assembly: TypeForwardedToAttribute(typeof(TextConstants))]
+[assembly: TypeForwardedToAttribute(typeof(TextDecorations))]
+[assembly: TypeForwardedToAttribute(typeof(TextGetOptions))]
+[assembly: TypeForwardedToAttribute(typeof(TextRangeUnit))]
+[assembly: TypeForwardedToAttribute(typeof(TextScript))]
+[assembly: TypeForwardedToAttribute(typeof(TextSetOptions))]
+[assembly: TypeForwardedToAttribute(typeof(VerticalCharacterAlignment))]
+[assembly: TypeForwardedToAttribute(typeof(BindableAttribute))]
+[assembly: TypeForwardedToAttribute(typeof(BindableVectorChangedEventHandler))]
+[assembly: TypeForwardedToAttribute(typeof(IBindableIterator))]
+[assembly: TypeForwardedToAttribute(typeof(IBindableObservableVector))]
+[assembly: TypeForwardedToAttribute(typeof(IBindableVectorView))]
+[assembly: TypeForwardedToAttribute(typeof(ContentPropertyAttribute))]
\ No newline at end of file