From a7cc34079da375f3380a09d1eb75870a700923c2 Mon Sep 17 00:00:00 2001
From: reunion-maestro-bot <reunion-maestro-bot@microsoft.com>
Date: Tue, 13 Feb 2024 01:54:39 +0000
Subject: [PATCH] Syncing content from committish release/1.5-preview1

---
 .../AnnotatedScrollBar/AnnotatedScrollBar.cpp |  11 +-
 .../CommandBarFlyout_themeresources.xaml      |  14 +-
 .../InteractionTests/CommonStylesTests.cs     |  22 ++
 .../MenuFlyout_themeresources.xaml            |   4 +-
 .../CommonStyles/TestUI/CommonStylesPage.xaml |  14 +
 .../TestUI/CommonStylesPage.xaml.cs           |  11 +
 .../TestUI/ContentDialogPage.xaml.cs          |   2 +-
 controls/dev/Generated/InfoBar.properties.cpp |  30 +-
 controls/dev/Generated/InfoBar.properties.h   |  12 +
 controls/dev/InfoBar/InfoBar.cpp              |  21 ++
 controls/dev/InfoBar/InfoBar.h                |   4 +
 controls/dev/InfoBar/InfoBar.idl              |   4 +
 controls/dev/InfoBar/InfoBar.xaml             |  12 +-
 controls/dev/ItemContainer/ItemContainer.xaml |   1 -
 .../TestUI/ItemContainerSummaryPage.xaml      |  37 ++-
 controls/dev/ItemsView/ItemsView.xaml         |   2 +-
 .../NavigationView_themeresources.xaml        |   4 +-
 controls/dev/SelectorBar/SelectorBar.xaml     |  30 +-
 .../SelectorBar_themeresources.xaml           |  29 +-
 .../WebView2/TestUI/WebView2BasicPage.xaml.cs | 130 ++++----
 controls/dev/WebView2/WebView2.h              |   2 +-
 controls/dev/dll/packages.config              |   4 +-
 controls/dev/inc/CppWinRTHelpers.h            |  10 +-
 .../Themes/DisableAnimationsStyles.xaml       |   2 +-
 controls/test/TestAppCX/packages.config       |   2 +-
 controls/tools/CustomTasksTool/Program.cs     |   8 +-
 .../KeytipAutomaticPlacementAlgorithm.cpp     |  11 +
 .../components/ContentRoot/ContentRoot.cpp    |  15 +-
 .../UIBridgeFocus/FocusController.cpp         |  33 +-
 dxaml/xcp/components/metadata/inc/Indexes.g.h |   1 +
 dxaml/xcp/core/core/elements/Popup.cpp        |   8 +-
 dxaml/xcp/core/core/elements/StackPanel.cpp   |  25 +-
 dxaml/xcp/core/core/elements/depends.cpp      |  11 -
 dxaml/xcp/core/inc/Popup.h                    |   2 +-
 dxaml/xcp/core/inc/XamlIslandRoot.h           |   6 +-
 .../core/native/text/Controls/TextBoxBase.h   |   1 +
 .../core/microsoft.ui.xaml.coretypes.idl      |   2 -
 .../core/microsoft.ui.xaml.coretypes2.idl     |  17 +-
 .../dxaml/lib/AccessKeyManager_partial.cpp    |  10 +-
 dxaml/xcp/dxaml/lib/CommandBar_Partial.cpp    |   7 +-
 dxaml/xcp/dxaml/lib/ContentDialog_Partial.cpp |  19 +-
 dxaml/xcp/dxaml/lib/DXamlCore.cpp             |  11 +-
 .../dxaml/lib/DisplayOrientationHelper.cpp    |  43 +--
 .../xcp/dxaml/lib/DisplayOrientationHelper.h  |   2 +-
 dxaml/xcp/dxaml/lib/JupiterWindow.cpp         |   4 +-
 dxaml/xcp/dxaml/lib/JupiterWindow.h           |   2 +-
 .../dxaml/lib/ListViewBaseItem_Partial.cpp    |   5 +-
 .../lib/ListViewBase_Partial_Interaction.cpp  |   2 +-
 .../xcp/dxaml/lib/TextControlFlyoutHelper.cpp |  29 +-
 .../xcp/dxaml/lib/ToolTipService_Partial.cpp  |  28 --
 .../dxaml/lib/WindowsXamlManager_Partial.cpp  | 294 +++++++++++-------
 .../dxaml/lib/WindowsXamlManager_Partial.h    |  32 +-
 dxaml/xcp/dxaml/lib/XamlIsland_Partial.cpp    | 137 +++++++-
 dxaml/xcp/dxaml/lib/XamlIsland_Partial.h      |   3 +
 dxaml/xcp/dxaml/lib/XamlRoot_Partial.cpp      |  24 ++
 dxaml/xcp/dxaml/lib/synonyms.g.h              |   4 +-
 .../FrameworkApplication.g.cpp                |  10 +-
 .../FrameworkApplication.g.h                  |  17 +-
 .../WindowsXamlManager.g.cpp                  |  41 +--
 .../WindowsXamlManager.g.h                    |  35 +--
 ...mlShutdownCompletedOnThreadEventArgs.g.cpp |   4 +-
 ...XamlShutdownCompletedOnThreadEventArgs.g.h |  15 +-
 dxaml/xcp/dxaml/themes/generic.xaml           |   2 +
 .../XamlOM/Model/Microsoft.UI.Xaml.Hosting.cs |  14 +-
 .../XamlOM/Model/Microsoft.UI.Xaml.cs         |   7 +-
 eng/Version.Details.xml                       |  16 +-
 eng/versions.props                            |   2 +-
 packages.config                               |   4 +-
 ...ft.UI.Xaml.Markup.Compiler.interop.targets |   6 +-
 69 files changed, 897 insertions(+), 486 deletions(-)

diff --git a/controls/dev/AnnotatedScrollBar/AnnotatedScrollBar.cpp b/controls/dev/AnnotatedScrollBar/AnnotatedScrollBar.cpp
index cd5c0e2d70..f6c14b2480 100644
--- a/controls/dev/AnnotatedScrollBar/AnnotatedScrollBar.cpp
+++ b/controls/dev/AnnotatedScrollBar/AnnotatedScrollBar.cpp
@@ -299,11 +299,14 @@ void AnnotatedScrollBar::QueueLayoutLabels(unsigned int millisecondWait)
     
     if (!m_labelsDebounce.test_and_set())
     {
-        auto strongThis = get_strong(); // ensure object lifetime during coroutines
-        auto runLayoutLabelsAction = [&, strongThis]()
+        auto weakThis = get_weak();
+        auto runLayoutLabelsAction = [weakThis]()
         {
-            strongThis->m_labelsDebounce.clear();
-            strongThis->LayoutLabels();
+            if (auto strongThis = weakThis.get())
+            {
+                strongThis->m_labelsDebounce.clear();
+                strongThis->LayoutLabels();
+            }
         };
 
         SharedHelpers::ScheduleActionAfterWait(runLayoutLabelsAction, millisecondWait);
diff --git a/controls/dev/CommandBarFlyout/CommandBarFlyout_themeresources.xaml b/controls/dev/CommandBarFlyout/CommandBarFlyout_themeresources.xaml
index 7117e4e27f..01c44209c1 100644
--- a/controls/dev/CommandBarFlyout/CommandBarFlyout_themeresources.xaml
+++ b/controls/dev/CommandBarFlyout/CommandBarFlyout_themeresources.xaml
@@ -310,7 +310,7 @@
     </Setter>
   </Style>
   <Style x:Key="CommandBarFlyoutAppBarButtonStyle" TargetType="AppBarButton" BasedOn="{StaticResource CommandBarFlyoutAppBarButtonStyleBase}">
-    <Setter Property="KeyboardAcceleratorPlacementMode" Value="Hidden" />
+      <Setter Property="KeyboardAcceleratorPlacementMode" Value="Hidden" />
   </Style>
   <Style x:Key="CommandBarFlyoutAppBarToggleButtonStyleBase" TargetType="AppBarToggleButton">
     <Setter Property="Background" Value="{ThemeResource CommandBarFlyoutAppBarButtonBackground}" />
@@ -1048,13 +1048,13 @@
                       </ItemsPanelTemplate>
                     </ItemsControl.ItemsPanel>
                   </ItemsControl>
-                  <Button x:Name="MoreButton" Foreground="{TemplateBinding Foreground}" Style="{StaticResource CommandBarFlyoutEllipsisButtonStyle}" Grid.Column="1" Control.IsTemplateKeyTipTarget="True" IsAccessKeyScope="True" IsTabStop="False" CornerRadius="{TemplateBinding CornerRadius}" Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.EffectiveOverflowButtonVisibility}">
-                    <Button.RenderTransform>
-                      <TranslateTransform x:Name="MoreButtonTransform" />
-                    </Button.RenderTransform>
+                  <Button x:Name="MoreButton" Foreground="{TemplateBinding Foreground}" Style="{StaticResource CommandBarFlyoutEllipsisButtonStyle}" Grid.Column="1" Control.IsTemplateKeyTipTarget="True" IsAccessKeyScope="True" IsTabStop="False" CornerRadius="{TemplateBinding CornerRadius}" Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.EffectiveOverflowButtonVisibility}" AllowFocusOnInteraction="False">
+                            <Button.RenderTransform>
+                                <TranslateTransform x:Name="MoreButtonTransform" />
+                            </Button.RenderTransform>
                     <FontIcon x:Name="EllipsisIcon" HorizontalAlignment="Center" VerticalAlignment="Center" FontFamily="{ThemeResource SymbolThemeFontFamily}" FontSize="16" Glyph="&#xE712;" />
-                  </Button>
-                </Grid>
+                        </Button>
+                    </Grid>
                 <Popup x:Name="OverflowPopup" ShouldConstrainToRootBounds="False">
                   <!-- The name OuterOverflowContentRoot is treated specially by the system and causes a shadow placed on this
                                          an element with this name to fade in. We don't want this for this style, so we need a different template part name -->
diff --git a/controls/dev/CommonStyles/InteractionTests/CommonStylesTests.cs b/controls/dev/CommonStyles/InteractionTests/CommonStylesTests.cs
index f1939a50cb..69031eb196 100644
--- a/controls/dev/CommonStyles/InteractionTests/CommonStylesTests.cs
+++ b/controls/dev/CommonStyles/InteractionTests/CommonStylesTests.cs
@@ -344,6 +344,28 @@ public void ScrollGroupedGridViewWithMandatorySnapPointsTest()
             }
         }
 
+        [TestMethod]
+        public void ListViewBaseItemPageNavigationTest()
+        {
+            using (var setup = new TestSetupHelper("CommonStyles Tests"))
+            {
+                Log.Comment("Click on NavigateToNewPageButton");
+                var button = new Button(FindElement.ByName("NavigateToNewPageButton"));
+
+                InputHelper.ScrollToElement(button);
+                Wait.ForIdle();
+
+                // LeftClick is required in order for PointerCapture to happen
+                InputHelper.LeftClick(button);
+                Wait.ForIdle();
+
+                Log.Comment("Verify successful page navigation");
+                var buttonNavigateToGridView = FindElement.ById("navigateToGridView");
+                Verify.IsNotNull(buttonNavigateToGridView, "GridViewPage is expected to be loaded.");
+            }
+        }
+
+
         private bool TryWaitForEditValues(string editName, string editValue)
         {
             UIObject editUIObject = FindElement.ById(editName);
diff --git a/controls/dev/CommonStyles/MenuFlyout_themeresources.xaml b/controls/dev/CommonStyles/MenuFlyout_themeresources.xaml
index e73566a250..67372439b4 100644
--- a/controls/dev/CommonStyles/MenuFlyout_themeresources.xaml
+++ b/controls/dev/CommonStyles/MenuFlyout_themeresources.xaml
@@ -383,7 +383,7 @@
               <ContentPresenter x:Name="IconContent" Content="{TemplateBinding Icon}" />
             </Viewbox>
             <TextBlock x:Name="TextBlock" Text="{TemplateBinding Text}" TextTrimming="{ThemeResource MenuFlyoutItemTextTrimming}" Foreground="{TemplateBinding Foreground}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-            <TextBlock x:Name="KeyboardAcceleratorTextBlock" Grid.Column="1" Style="{ThemeResource CaptionTextBlockStyle}" Text="{TemplateBinding KeyboardAcceleratorTextOverride}" MinWidth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KeyboardAcceleratorTextMinWidth}" Margin="24,4,0,0" Foreground="{ThemeResource MenuFlyoutItemKeyboardAcceleratorTextForeground}" HorizontalAlignment="Right" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Visibility="Collapsed" AutomationProperties.AccessibilityView="Raw" />
+            <TextBlock x:Name="KeyboardAcceleratorTextBlock" Grid.Column="1" Style="{ThemeResource CaptionTextBlockStyle}" Text="{TemplateBinding KeyboardAcceleratorTextOverride}" MinWidth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KeyboardAcceleratorTextMinWidth}" Margin="24,4,0,0" Foreground="{ThemeResource MenuFlyoutItemKeyboardAcceleratorTextForeground}" TextAlignment="Right" HorizontalAlignment="Right" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Visibility="Collapsed" AutomationProperties.AccessibilityView="Raw" />
           </Grid>
         </ControlTemplate>
       </Setter.Value>
@@ -912,4 +912,4 @@
       </Setter.Value>
     </Setter>
   </Style>
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/controls/dev/CommonStyles/TestUI/CommonStylesPage.xaml b/controls/dev/CommonStyles/TestUI/CommonStylesPage.xaml
index 93c579a5c8..84ee172d61 100644
--- a/controls/dev/CommonStyles/TestUI/CommonStylesPage.xaml
+++ b/controls/dev/CommonStyles/TestUI/CommonStylesPage.xaml
@@ -293,6 +293,20 @@
                         </Button.Resources>
                         <FontIcon Glyph="&#xE781;" />
                     </Button>
+                    <GridView x:Name="MiscellaneousGridView" ItemsSource="{x:Bind miscellaneousGridViewSource}" Margin="10">
+                        <GridView.ItemTemplate>
+                            <DataTemplate>
+                                <Grid>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="30" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <TextBlock Text="{Binding}" VerticalAlignment="Center"/>
+                                    <Button Grid.Row="1" x:Name="NavigateToNewPageButton" AutomationProperties.Name="NavigateToNewPageButton" Content="Navigate To New Page" Click="NavigateToNewPageButton_Click"/>
+                                </Grid>
+                            </DataTemplate>
+                        </GridView.ItemTemplate>
+                    </GridView>
                 </StackPanel>
                 <StackPanel Style="{ThemeResource CompactPanelStyle}">
                     <TextBlock  Text="ListViewItem/GridViewItem testing area" Style="{ThemeResource StandardGroupHeader}"/>
diff --git a/controls/dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs b/controls/dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs
index 9bd57e40e7..ae0710d662 100644
--- a/controls/dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs
+++ b/controls/dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs
@@ -47,6 +47,11 @@ public sealed partial class CommonStylesPage : TestPage
     {
         ObservableCollection<FontFamily> fonts = new ObservableCollection<FontFamily>();
 
+        private string[] miscellaneousGridViewSource =
+        {
+            "GridView Item #1",
+        };
+
         public CommonStylesPage()
         {
             this.InitializeComponent();
@@ -54,6 +59,12 @@ public CommonStylesPage()
             fonts.Add(new FontFamily("Courier New"));
             fonts.Add(new FontFamily("Times New Roman"));
         }
+
+        private void NavigateToNewPageButton_Click(object sender, RoutedEventArgs e)
+        {
+            Frame.NavigateWithoutAnimation(typeof(GridViewPage), 0);
+        }
+
         private void SliderDensityTest_Click(object sender, RoutedEventArgs e)
         {
             string expectSliderPreContentMargin = "14";
diff --git a/controls/dev/CommonStyles/TestUI/ContentDialogPage.xaml.cs b/controls/dev/CommonStyles/TestUI/ContentDialogPage.xaml.cs
index d1b2e215b1..40cf59dde5 100644
--- a/controls/dev/CommonStyles/TestUI/ContentDialogPage.xaml.cs
+++ b/controls/dev/CommonStyles/TestUI/ContentDialogPage.xaml.cs
@@ -32,8 +32,8 @@ private void ShowBorderThickness_Click(object sender, RoutedEventArgs e)
                 BorderThickness = new Thickness(10, 20, 10, 20),
                 CloseButtonText = "CloseButton",
                 BorderBrush = new SolidColorBrush(Color.FromArgb(255, 255, 0, 0)),
-                XamlRoot = this.XamlRoot
             };
+            dialog.XamlRoot = this.XamlRoot;
             _ = CreateContentDialog().ShowAsync();
         }
 
diff --git a/controls/dev/Generated/InfoBar.properties.cpp b/controls/dev/Generated/InfoBar.properties.cpp
index 2ba3cbf7f5..08a1d291c1 100644
--- a/controls/dev/Generated/InfoBar.properties.cpp
+++ b/controls/dev/Generated/InfoBar.properties.cpp
@@ -47,7 +47,7 @@ void InfoBarProperties::EnsureProperties()
                 winrt::name_of<winrt::InfoBar>(),
                 false /* isAttached */,
                 ValueHelper<winrt::ButtonBase>::BoxedDefaultValue(),
-                nullptr);
+                winrt::PropertyChangedCallback(&OnActionButtonPropertyChanged));
     }
     if (!s_CloseButtonCommandProperty)
     {
@@ -157,7 +157,7 @@ void InfoBarProperties::EnsureProperties()
                 winrt::name_of<winrt::InfoBar>(),
                 false /* isAttached */,
                 ValueHelper<winrt::hstring>::BoxedDefaultValue(),
-                nullptr);
+                winrt::PropertyChangedCallback(&OnMessagePropertyChanged));
     }
     if (!s_SeverityProperty)
     {
@@ -190,7 +190,7 @@ void InfoBarProperties::EnsureProperties()
                 winrt::name_of<winrt::InfoBar>(),
                 false /* isAttached */,
                 ValueHelper<winrt::hstring>::BoxedDefaultValue(),
-                nullptr);
+                winrt::PropertyChangedCallback(&OnTitlePropertyChanged));
     }
 }
 
@@ -212,6 +212,14 @@ void InfoBarProperties::ClearProperties()
     s_TitleProperty = nullptr;
 }
 
+void InfoBarProperties::OnActionButtonPropertyChanged(
+    winrt::DependencyObject const& sender,
+    winrt::DependencyPropertyChangedEventArgs const& args)
+{
+    auto owner = sender.as<winrt::InfoBar>();
+    winrt::get_self<InfoBar>(owner)->OnActionButtonPropertyChanged(args);
+}
+
 void InfoBarProperties::OnIconSourcePropertyChanged(
     winrt::DependencyObject const& sender,
     winrt::DependencyPropertyChangedEventArgs const& args)
@@ -244,6 +252,14 @@ void InfoBarProperties::OnIsOpenPropertyChanged(
     winrt::get_self<InfoBar>(owner)->OnIsOpenPropertyChanged(args);
 }
 
+void InfoBarProperties::OnMessagePropertyChanged(
+    winrt::DependencyObject const& sender,
+    winrt::DependencyPropertyChangedEventArgs const& args)
+{
+    auto owner = sender.as<winrt::InfoBar>();
+    winrt::get_self<InfoBar>(owner)->OnMessagePropertyChanged(args);
+}
+
 void InfoBarProperties::OnSeverityPropertyChanged(
     winrt::DependencyObject const& sender,
     winrt::DependencyPropertyChangedEventArgs const& args)
@@ -252,6 +268,14 @@ void InfoBarProperties::OnSeverityPropertyChanged(
     winrt::get_self<InfoBar>(owner)->OnSeverityPropertyChanged(args);
 }
 
+void InfoBarProperties::OnTitlePropertyChanged(
+    winrt::DependencyObject const& sender,
+    winrt::DependencyPropertyChangedEventArgs const& args)
+{
+    auto owner = sender.as<winrt::InfoBar>();
+    winrt::get_self<InfoBar>(owner)->OnTitlePropertyChanged(args);
+}
+
 void InfoBarProperties::ActionButton(winrt::ButtonBase const& value)
 {
     [[gsl::suppress(con)]]
diff --git a/controls/dev/Generated/InfoBar.properties.h b/controls/dev/Generated/InfoBar.properties.h
index c0350ff35a..c07d4952cf 100644
--- a/controls/dev/Generated/InfoBar.properties.h
+++ b/controls/dev/Generated/InfoBar.properties.h
@@ -95,6 +95,10 @@ class InfoBarProperties
     static void EnsureProperties();
     static void ClearProperties();
 
+    static void OnActionButtonPropertyChanged(
+        winrt::DependencyObject const& sender,
+        winrt::DependencyPropertyChangedEventArgs const& args);
+
     static void OnIconSourcePropertyChanged(
         winrt::DependencyObject const& sender,
         winrt::DependencyPropertyChangedEventArgs const& args);
@@ -111,7 +115,15 @@ class InfoBarProperties
         winrt::DependencyObject const& sender,
         winrt::DependencyPropertyChangedEventArgs const& args);
 
+    static void OnMessagePropertyChanged(
+        winrt::DependencyObject const& sender,
+        winrt::DependencyPropertyChangedEventArgs const& args);
+
     static void OnSeverityPropertyChanged(
         winrt::DependencyObject const& sender,
         winrt::DependencyPropertyChangedEventArgs const& args);
+
+    static void OnTitlePropertyChanged(
+        winrt::DependencyObject const& sender,
+        winrt::DependencyPropertyChangedEventArgs const& args);
 };
diff --git a/controls/dev/InfoBar/InfoBar.cpp b/controls/dev/InfoBar/InfoBar.cpp
index bd4802efa7..fbcf69c362 100644
--- a/controls/dev/InfoBar/InfoBar.cpp
+++ b/controls/dev/InfoBar/InfoBar.cpp
@@ -71,6 +71,7 @@ void InfoBar::OnApplyTemplate()
     UpdateIconVisibility();
     UpdateCloseButton();
     UpdateForeground();
+    UpdateContentPosition();
 }
 
 void InfoBar::OnCloseButtonClick(winrt::IInspectable const& sender, winrt::RoutedEventArgs const& args)
@@ -122,6 +123,21 @@ void InfoBar::OnIsOpenPropertyChanged(const winrt::DependencyPropertyChangedEven
     }
 }
 
+void InfoBar::OnTitlePropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args)
+{
+    UpdateContentPosition();
+}
+
+void InfoBar::OnMessagePropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args)
+{
+    UpdateContentPosition();
+}
+
+void InfoBar::OnActionButtonPropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args)
+{
+    UpdateContentPosition();
+}
+
 void InfoBar::OnSeverityPropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args)
 {
     UpdateSeverity();
@@ -250,6 +266,11 @@ void InfoBar::UpdateForeground()
     winrt::VisualStateManager::GoToState(*this, ReadLocalValue(winrt::Control::ForegroundProperty()) == winrt::DependencyProperty::UnsetValue() ? L"ForegroundNotSet" : L"ForegroundSet", false);
 }
 
+void InfoBar::UpdateContentPosition()
+{
+    // If we don't have either a title or a message, then the content should move up
+    winrt::VisualStateManager::GoToState(*this, Title().empty() && Message().empty() && !ActionButton() ? L"NoBannerContent" : L"BannerContent", false);
+}
 const winrt::hstring InfoBar::GetSeverityLevelResourceName(winrt::InfoBarSeverity severity)
 {
     switch (severity)
diff --git a/controls/dev/InfoBar/InfoBar.h b/controls/dev/InfoBar/InfoBar.h
index 6f37491d21..75ca42e199 100644
--- a/controls/dev/InfoBar/InfoBar.h
+++ b/controls/dev/InfoBar/InfoBar.h
@@ -30,6 +30,9 @@ class InfoBar :
     void OnIconSourcePropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args);
     void OnIsIconVisiblePropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args);
     void OnIsClosablePropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args);
+    void OnTitlePropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args);
+    void OnActionButtonPropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args);
+    void OnMessagePropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args);
 
 private:
     void OnCloseButtonClick(winrt::IInspectable const& sender, winrt::RoutedEventArgs const& args);
@@ -43,6 +46,7 @@ class InfoBar :
     void UpdateIconVisibility();
     void UpdateCloseButton();
     void UpdateForeground();
+    void UpdateContentPosition();
 
     const winrt::hstring GetCloseButtonResourceName(winrt::InfoBarSeverity severity);
     const winrt::hstring GetSeverityLevelResourceName(winrt::InfoBarSeverity severity);
diff --git a/controls/dev/InfoBar/InfoBar.idl b/controls/dev/InfoBar/InfoBar.idl
index 40c79c4998..ff9104fc1f 100644
--- a/controls/dev/InfoBar/InfoBar.idl
+++ b/controls/dev/InfoBar/InfoBar.idl
@@ -56,7 +56,10 @@ unsealed runtimeclass InfoBar : Microsoft.UI.Xaml.Controls.Control
     [MUX_PROPERTY_CHANGED_CALLBACK(TRUE)]
     Boolean IsOpen{ get; set; };
 
+    [MUX_PROPERTY_CHANGED_CALLBACK(TRUE)]
     String Title{ get; set; };
+
+    [MUX_PROPERTY_CHANGED_CALLBACK(TRUE)]
     String Message{ get; set; };
 
     [MUX_DEFAULT_VALUE("winrt::InfoBarSeverity::Informational")]
@@ -78,6 +81,7 @@ unsealed runtimeclass InfoBar : Microsoft.UI.Xaml.Controls.Control
     Microsoft.UI.Xaml.Input.ICommand CloseButtonCommand{ get; set; };
     Object CloseButtonCommandParameter{ get; set; };
 
+    [MUX_PROPERTY_CHANGED_CALLBACK(TRUE)]
     Microsoft.UI.Xaml.Controls.Primitives.ButtonBase ActionButton{ get; set; };
 
     Object Content{ get; set; };
diff --git a/controls/dev/InfoBar/InfoBar.xaml b/controls/dev/InfoBar/InfoBar.xaml
index d73ee43dc6..1f03688968 100644
--- a/controls/dev/InfoBar/InfoBar.xaml
+++ b/controls/dev/InfoBar/InfoBar.xaml
@@ -81,6 +81,14 @@
                   </VisualState.Setters>
                 </VisualState>
               </VisualStateGroup>
+              <VisualStateGroup>
+                <VisualState x:Name="BannerContent"/>
+                <VisualState x:Name="NoBannerContent">
+                  <VisualState.Setters>
+                    <Setter Target="ContentArea.(Grid.Row)" Value="0"/>
+                  </VisualState.Setters>
+                </VisualState>
+              </VisualStateGroup>
             </VisualStateManager.VisualStateGroups>
             <!-- Background is used here so that it overrides the severity status color if set. -->
             <Grid HorizontalAlignment="Stretch" MinHeight="{ThemeResource InfoBarMinHeight}" Background="{TemplateBinding Background}" CornerRadius="{TemplateBinding CornerRadius}" Padding="{StaticResource InfoBarContentRootPadding}">
@@ -115,7 +123,7 @@
                   </ContentPresenter.Resources>
                 </ContentPresenter>
               </primitives:InfoBarPanel>
-              <ContentPresenter Grid.Column="1" Grid.Row="1" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
+              <ContentPresenter x:Name="ContentArea" Grid.Column="1" Grid.Row="1" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" VerticalAlignment="Center"/>
               <Button Name="CloseButton" Grid.Column="2" Command="{TemplateBinding CloseButtonCommand}" CommandParameter="{TemplateBinding CloseButtonCommandParameter}" Style="{TemplateBinding CloseButtonStyle}">
                 <Button.Resources>
                   <ResourceDictionary>
@@ -175,4 +183,4 @@
       </Setter.Value>
     </Setter>
   </Style>
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/controls/dev/ItemContainer/ItemContainer.xaml b/controls/dev/ItemContainer/ItemContainer.xaml
index 4501c9e4fe..369db4d085 100644
--- a/controls/dev/ItemContainer/ItemContainer.xaml
+++ b/controls/dev/ItemContainer/ItemContainer.xaml
@@ -126,7 +126,6 @@
                 Opacity="0" />
             <Rectangle
                 x:Name="PART_CommonVisual"
-                Fill="{ThemeResource ItemContainerBackground}"
                 Stroke="{ThemeResource ItemContainerBorderBrush}"
                 StrokeThickness="{ThemeResource ItemContainerSelectedInnerThickness}"
                 HorizontalAlignment="Stretch"
diff --git a/controls/dev/ItemContainer/TestUI/ItemContainerSummaryPage.xaml b/controls/dev/ItemContainer/TestUI/ItemContainerSummaryPage.xaml
index 39ce3d25aa..141a540319 100644
--- a/controls/dev/ItemContainer/TestUI/ItemContainerSummaryPage.xaml
+++ b/controls/dev/ItemContainer/TestUI/ItemContainerSummaryPage.xaml
@@ -50,20 +50,12 @@
         </ScrollViewer>
 
         <Grid Grid.Column="1" Background="{ThemeResource LayerFillColorDefaultBrush}" Padding="24">
-            <Grid.Resources>
-                <Style TargetType="controls:ItemContainer" BasedOn="{StaticResource TestItemContainerStyle}" />
-                <Style x:Key="TestItemContainerStyle" TargetType="controls:ItemContainer">
-                    <Setter Property="Height" Value="120" />
-                    <Setter Property="Width" Value="180" />
-                    <Setter Property="Background" Value="LightGray" />
-                    <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
-                </Style>
-            </Grid.Resources>
             <ScrollViewer>
                 <StackPanel Spacing="8">
                     <TextBlock Text="ItemContainer with ItemInvoked Event" Style="{ThemeResource SubtitleTextBlockStyle}" />
                     <controls:ItemContainer 
                         x:Name="RoutedEventsItemContainer"
+                        Width="180"
                         HorizontalAlignment="Left">
                         <Image Source="Assets/LargeWisteria.jpg"/>
                     </controls:ItemContainer>
@@ -81,17 +73,40 @@
 
                     <controls:ItemContainer 
                         x:Name="ItemContainerWithButtons"
-                        Height="120"
                         Width="180"
                         HorizontalAlignment="Left">
+                        <ItemContainer.Resources>
+                            <ResourceDictionary>
+                                <ResourceDictionary.ThemeDictionaries>
+                                    <ResourceDictionary x:Key="Light">
+                                        <SolidColorBrush x:Key="ItemContainerBackground" Color="Red" />
+                                    </ResourceDictionary>
+                                    <ResourceDictionary x:Key="Default">
+                                        <SolidColorBrush x:Key="ItemContainerBackground" Color="Red" />
+                                    </ResourceDictionary>
+                                </ResourceDictionary.ThemeDictionaries>
+                            </ResourceDictionary>
+                        </ItemContainer.Resources>
                         <Grid>
-                            <Image x:Name="ItemContainerImage" Source="Assets/LargeWisteria.jpg" />
+                            <StackPanel>
+                                <Image x:Name="ItemContainerImage" Source="Assets/LargeWisteria.jpg" />
+                                <TextBlock Margin="4">Text in ItemContainer</TextBlock>
+                            </StackPanel>
+                            
                             <ToggleButton x:Name="HeartButton" Click="HeartButton_Click" ClickMode="Press" FontFamily="{ThemeResource SymbolThemeFontFamily}" Content="&#xEB51;" HorizontalAlignment="Left" VerticalAlignment="Top"/>
                         </Grid>
                     </controls:ItemContainer>
 
                     <TextBlock Text="Default ItemContainer in StackPanel" Style="{ThemeResource SubtitleTextBlockStyle}" Margin="0,24,0,0" />
                     <StackPanel Spacing="8" Orientation="Horizontal">
+                        <StackPanel.Resources>
+                            <Style TargetType="controls:ItemContainer" BasedOn="{StaticResource TestItemContainerStyle}" />
+                            <Style x:Key="TestItemContainerStyle" TargetType="controls:ItemContainer">
+                                <Setter Property="Height" Value="120" />
+                                <Setter Property="Width" Value="180" />
+                                <Setter Property="Background" Value="LightGray" />
+                            </Style>
+                        </StackPanel.Resources>
                         <controls:ItemContainer />
                         <controls:ItemContainer />
                         <controls:ItemContainer />
diff --git a/controls/dev/ItemsView/ItemsView.xaml b/controls/dev/ItemsView/ItemsView.xaml
index 7fe950211f..f8ac105313 100644
--- a/controls/dev/ItemsView/ItemsView.xaml
+++ b/controls/dev/ItemsView/ItemsView.xaml
@@ -23,7 +23,6 @@
             BorderThickness="{TemplateBinding BorderThickness}"
             CornerRadius="{TemplateBinding CornerRadius}"
             HorizontalAnchorRatio="NaN"
-            Padding="{TemplateBinding Padding}"
             TabNavigation="{TemplateBinding TabNavigation}"
             XYFocusKeyboardNavigation="{TemplateBinding XYFocusKeyboardNavigation}">
             <controls:ItemsRepeater
@@ -33,6 +32,7 @@
               ItemsSource="{TemplateBinding ItemsSource}"
               ItemTemplate="{TemplateBinding ItemTemplate}"
               Layout="{TemplateBinding Layout}"
+              Margin="{TemplateBinding Padding}"
               VerticalAlignment="Top"
               XYFocusKeyboardNavigation="{TemplateBinding XYFocusKeyboardNavigation}"/>
           </controls:ScrollView>
diff --git a/controls/dev/NavigationView/NavigationView_themeresources.xaml b/controls/dev/NavigationView/NavigationView_themeresources.xaml
index 8e9e886a8c..9424310780 100644
--- a/controls/dev/NavigationView/NavigationView_themeresources.xaml
+++ b/controls/dev/NavigationView/NavigationView_themeresources.xaml
@@ -172,7 +172,7 @@
       <StaticResource x:Key="NavigationViewItemBorderBrushSelectedPointerOver" ResourceKey="SystemControlHighlightAltTransparentRevealBorderBrush" />
       <StaticResource x:Key="NavigationViewItemBorderBrushSelectedPressed" ResourceKey="SystemControlHighlightAltTransparentRevealBorderBrush" />
       <StaticResource x:Key="NavigationViewItemBorderBrushSelectedDisabled" ResourceKey="SystemControlTransparentBrush" />
-      <StaticResource x:Key="NavigationViewItemSeparatorForeground" ResourceKey="SystemControlForegroundBaseLowBrush" />
+      <StaticResource x:Key="NavigationViewItemSeparatorForeground" ResourceKey="SystemColorWindowTextColorBrush" />
       <StaticResource x:Key="NavigationViewItemHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
       <SolidColorBrush x:Key="NavigationViewSelectionIndicatorForeground" Color="{ThemeResource SystemColorHighlightTextColor}" />
       <StaticResource x:Key="NavigationViewContentGridBorderBrush" ResourceKey="SystemControlTransparentBrush" />
@@ -188,7 +188,7 @@
       <StaticResource x:Key="TopNavigationViewItemBackgroundSelected" ResourceKey="SystemControlHighlightListLowRevealBackgroundBrush" />
       <StaticResource x:Key="TopNavigationViewItemBackgroundSelectedPointerOver" ResourceKey="SubtleFillColorTransparentBrush" />
       <StaticResource x:Key="TopNavigationViewItemBackgroundSelectedPressed" ResourceKey="SubtleFillColorTransparentBrush" />
-      <StaticResource x:Key="TopNavigationViewItemSeparatorForeground" ResourceKey="SystemControlForegroundBaseLowBrush" />
+      <StaticResource x:Key="TopNavigationViewItemSeparatorForeground" ResourceKey="SystemColorWindowTextColorBrush" />
       <StaticResource x:Key="NavigationViewButtonBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
       <StaticResource x:Key="NavigationViewButtonBackgroundPressed" ResourceKey="SystemControlHighlightListMediumBrush" />
       <StaticResource x:Key="NavigationViewButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
diff --git a/controls/dev/SelectorBar/SelectorBar.xaml b/controls/dev/SelectorBar/SelectorBar.xaml
index 9edc55fd7b..b928003fb5 100644
--- a/controls/dev/SelectorBar/SelectorBar.xaml
+++ b/controls/dev/SelectorBar/SelectorBar.xaml
@@ -11,6 +11,7 @@
         <Setter Property="VerticalAlignment" Value="Top"/>
         <Setter Property="IsTabStop" Value="False"/>
         <Setter Property="TabNavigation" Value="Once"/>
+        <Setter Property="Padding" Value="{ThemeResource SelectorBarPadding}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:SelectorBar">
@@ -29,7 +30,8 @@
                             ItemsSource="{TemplateBinding Items}"
                             TabNavigation="{TemplateBinding TabNavigation}"
                             MaxWidth="{TemplateBinding MaxWidth}"
-                            MaxHeight="{TemplateBinding MaxHeight}">
+                            MaxHeight="{TemplateBinding MaxHeight}"
+                            Padding="{TemplateBinding Padding}">
                             <controls:ItemsView.Layout>
                                 <controls:StackLayout Orientation="Horizontal"/>
                             </controls:ItemsView.Layout>
@@ -47,10 +49,11 @@
         <Setter Property="Foreground" Value="{ThemeResource SelectorBarItemForeground}"/>
         <Setter Property="BorderBrush" Value="{ThemeResource SelectorBarItemBorderBrush}"/>
         <Setter Property="BorderThickness" Value="{ThemeResource SelectorBarItemBorderThickness}"/>
-        <Setter Property="Padding" Value="{StaticResource ButtonPadding}"/>
+        <Setter Property="Padding" Value="{StaticResource SelectorBarItemPadding}"/>
         <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/>
         <Setter Property="HorizontalAlignment" Value="Left"/>
         <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="FocusVisualMargin" Value="{ThemeResource SelectorBarItemFocusVisualMargin}"/>
         <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}"/>
         <Setter Property="FontWeight" Value="Normal"/>
         <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}"/>
@@ -72,6 +75,9 @@
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_TextVisual" Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SelectorBarItemForegroundPointerOver}"/>
                                         </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_IconVisual" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SelectorBarItemForegroundPointerOver}"/>
+                                        </ObjectAnimationUsingKeyFrames>
                                         <PointerUpThemeAnimation Storyboard.TargetName="PART_ContainerRoot"/>
                                     </Storyboard>
                                 </VisualState>
@@ -83,6 +89,9 @@
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_TextVisual" Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SelectorBarItemForegroundPressed}"/>
                                         </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_IconVisual" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SelectorBarItemForegroundPressed}"/>
+                                        </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="SelectedNormal">
@@ -93,6 +102,9 @@
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_TextVisual" Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SelectorBarItemForegroundSelected}"/>
                                         </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_IconVisual" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SelectorBarItemForegroundSelected}"/>
+                                        </ObjectAnimationUsingKeyFrames>
                                         <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PillTransform" Storyboard.TargetProperty="ScaleX">
                                             <SplineDoubleKeyFrame KeyTime="{StaticResource ComboBoxItemScaleAnimationDuration}" Value="4" KeySpline="0,0,0,1"/>
                                         </DoubleAnimationUsingKeyFrames>
@@ -106,6 +118,9 @@
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_TextVisual" Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SelectorBarItemForegroundPointerOver}"/>
                                         </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_IconVisual" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SelectorBarItemForegroundPointerOver}"/>
+                                        </ObjectAnimationUsingKeyFrames>
                                         <PointerUpThemeAnimation Storyboard.TargetName="PART_ContainerRoot"/>
                                         <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PillTransform" Storyboard.TargetProperty="ScaleX">
                                             <SplineDoubleKeyFrame KeyTime="{StaticResource ComboBoxItemScaleAnimationDuration}" Value="4" KeySpline="0,0,0,1"/>
@@ -120,6 +135,9 @@
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_TextVisual" Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SelectorBarItemForegroundPointerOver}"/>
                                         </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_IconVisual" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SelectorBarItemForegroundPointerOver}"/>
+                                        </ObjectAnimationUsingKeyFrames>
                                         <PointerUpThemeAnimation Storyboard.TargetName="PART_ContainerRoot"/>
                                         <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PillTransform" Storyboard.TargetProperty="ScaleX">
                                             <SplineDoubleKeyFrame KeyTime="{StaticResource ComboBoxItemScaleAnimationDuration}" Value="4" KeySpline="0,0,0,1"/>
@@ -157,12 +175,18 @@
                             Grid.Column="1"
                             Orientation="Horizontal"
                             Margin="{TemplateBinding Padding}"
+                            Spacing="{ThemeResource SelectorBarItemSpacing}"
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
                             <ContentPresenter x:Name="PART_IconVisual"
                                 Content="{TemplateBinding Icon}"
                                 Margin="{ThemeResource SelectorBarItemIconVisualMargin}"
-                                Foreground="{TemplateBinding Foreground}"/>
+                                Foreground="{TemplateBinding Foreground}"
+                                RenderTransformOrigin="0.5,0.5">
+                                <ContentPresenter.RenderTransform>
+                                    <ScaleTransform x:Name="IconTransform" ScaleX="{ThemeResource SelectorBarItemIconScale}" ScaleY="{ThemeResource SelectorBarItemIconScale}"/>
+                                </ContentPresenter.RenderTransform>
+                            </ContentPresenter>
                             <TextBlock x:Name="PART_TextVisual"
                                 Text="{TemplateBinding Text}"
                                 FontFamily="{TemplateBinding FontFamily}"
diff --git a/controls/dev/SelectorBar/SelectorBar_themeresources.xaml b/controls/dev/SelectorBar/SelectorBar_themeresources.xaml
index fff6f0d7ef..cb208f39a2 100644
--- a/controls/dev/SelectorBar/SelectorBar_themeresources.xaml
+++ b/controls/dev/SelectorBar/SelectorBar_themeresources.xaml
@@ -23,12 +23,15 @@
             <StaticResource x:Key="SelectorBarItemBackgroundSelected" ResourceKey="SystemControlTransparentBrush"/>
             <StaticResource x:Key="SelectorBarItemBackgroundPressed" ResourceKey="SystemControlTransparentBrush"/>
             <StaticResource x:Key="SelectorBarItemBackgroundDisabled" ResourceKey="SystemControlTransparentBrush"/>
+            <Thickness x:Key="SelectorBarPadding">0,4</Thickness>
             <Thickness x:Key="SelectorBarBorderThickness">1</Thickness>
             <Thickness x:Key="SelectorBarItemBorderThickness">1</Thickness>
             <Thickness x:Key="SelectorBarSelectedInnerThickness">1</Thickness>
-            <Thickness x:Key="SelectorBarItemIconVisualMargin">2,0</Thickness>
-            <Thickness x:Key="SelectorBarItemTextVisualMargin">2,0</Thickness>
-            <Thickness x:Key="SelectorBarItemSelectionVisualMargin">0,1,0,3</Thickness>
+            <Thickness x:Key="SelectorBarItemIconVisualMargin">-2,0</Thickness>
+            <Thickness x:Key="SelectorBarItemTextVisualMargin">0</Thickness>
+            <Thickness x:Key="SelectorBarItemPadding">12,10,12,7</Thickness>
+            <Thickness x:Key="SelectorBarItemSelectionVisualMargin">0</Thickness>
+            <Thickness x:Key="SelectorBarItemFocusVisualMargin">-2</Thickness>
         </ResourceDictionary>
         <ResourceDictionary x:Key="HighContrast">
             <StaticResource x:Key="SelectorBarBackground" ResourceKey="SystemControlTransparentBrush"/>
@@ -49,12 +52,15 @@
             <StaticResource x:Key="SelectorBarItemBackgroundSelected" ResourceKey="SystemControlTransparentBrush"/>
             <StaticResource x:Key="SelectorBarItemBackgroundPressed" ResourceKey="SystemControlTransparentBrush"/>
             <StaticResource x:Key="SelectorBarItemBackgroundDisabled" ResourceKey="SystemControlTransparentBrush"/>
+            <Thickness x:Key="SelectorBarPadding">0,4</Thickness>
             <Thickness x:Key="SelectorBarBorderThickness">1</Thickness>
             <Thickness x:Key="SelectorBarItemBorderThickness">1</Thickness>
             <Thickness x:Key="SelectorBarSelectedInnerThickness">1</Thickness>
-            <Thickness x:Key="SelectorBarItemIconVisualMargin">2,0</Thickness>
-            <Thickness x:Key="SelectorBarItemTextVisualMargin">2,0</Thickness>
-            <Thickness x:Key="SelectorBarItemSelectionVisualMargin">0,1,0,3</Thickness>
+            <Thickness x:Key="SelectorBarItemIconVisualMargin">-2,0</Thickness>
+            <Thickness x:Key="SelectorBarItemTextVisualMargin">0</Thickness>
+            <Thickness x:Key="SelectorBarItemPadding">12,10,12,7</Thickness>
+            <Thickness x:Key="SelectorBarItemSelectionVisualMargin">0</Thickness>
+            <Thickness x:Key="SelectorBarItemFocusVisualMargin">-2</Thickness>
         </ResourceDictionary>
         <ResourceDictionary x:Key="Light">
             <StaticResource x:Key="SelectorBarBackground" ResourceKey="SystemControlTransparentBrush"/>
@@ -75,17 +81,22 @@
             <StaticResource x:Key="SelectorBarItemBackgroundSelected" ResourceKey="SystemControlTransparentBrush"/>
             <StaticResource x:Key="SelectorBarItemBackgroundPressed" ResourceKey="SystemControlTransparentBrush"/>
             <StaticResource x:Key="SelectorBarItemBackgroundDisabled" ResourceKey="SystemControlTransparentBrush"/>
+            <Thickness x:Key="SelectorBarPadding">0,4</Thickness>
             <Thickness x:Key="SelectorBarBorderThickness">1</Thickness>
             <Thickness x:Key="SelectorBarItemBorderThickness">1</Thickness>
             <Thickness x:Key="SelectorBarSelectedInnerThickness">1</Thickness>
-            <Thickness x:Key="SelectorBarItemIconVisualMargin">2,0</Thickness>
-            <Thickness x:Key="SelectorBarItemTextVisualMargin">2,0</Thickness>
-            <Thickness x:Key="SelectorBarItemSelectionVisualMargin">0,1,0,3</Thickness>
+            <Thickness x:Key="SelectorBarItemIconVisualMargin">-2,0</Thickness>
+            <Thickness x:Key="SelectorBarItemTextVisualMargin">0</Thickness>
+            <Thickness x:Key="SelectorBarItemPadding">12,10,12,7</Thickness>
+            <Thickness x:Key="SelectorBarItemSelectionVisualMargin">0</Thickness>
+            <Thickness x:Key="SelectorBarItemFocusVisualMargin">-2</Thickness>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 
     <x:Double x:Key="SelectorBarItemPillHeight">3</x:Double>
     <x:Double x:Key="SelectorBarItemPillWidth">4</x:Double>
+    <x:Double x:Key="SelectorBarItemIconScale">0.8</x:Double>
+    <x:Double x:Key="SelectorBarItemSpacing">8</x:Double>
 
     <Style x:Key="SelectorBarItemPill" TargetType="Rectangle" BasedOn="{StaticResource ComboBoxItemPill}">
         <Setter Property="Fill" Value="{ThemeResource SelectorBarItemPillFill}"/>
diff --git a/controls/dev/WebView2/TestUI/WebView2BasicPage.xaml.cs b/controls/dev/WebView2/TestUI/WebView2BasicPage.xaml.cs
index 54d004b5de..b32ff9cc00 100644
--- a/controls/dev/WebView2/TestUI/WebView2BasicPage.xaml.cs
+++ b/controls/dev/WebView2/TestUI/WebView2BasicPage.xaml.cs
@@ -2033,13 +2033,19 @@ await Microsoft.Web.WebView2.Core.CoreWebView2Environment.CreateWithOptionsAsync
                             // Save the UDF path so we can delete it later
                             _customUserDataFolder = MyWebView2.CoreWebView2.Environment.UserDataFolder;
 
-                            // Check that the WebView2 has the language set by custom CoreWebView2EnvironmentOptions
+                             // Check that the WebView2 has the language set by custom CoreWebView2EnvironmentOptions
+                            //
+                            // "zh-Hans" and "zh-CN" both represent simplified Chinese, but one may be preferred in some contexts. 
+                            // When "zh-Hans" is set via CWV2EnvironmentOptions, calling JS getLanugage() on WV2Runtime
+                            // maps it to "zh-CN" on Win10, and keeps "zh-Hans" on Win11, so check for both possibilities.
                             string expectedLanguage = "\"zh-Hans\"";
+                            string expectedLanguageAlternate = "\"zh-CN\"";
+                            string expectedLanguageList = expectedLanguage + " OR " + expectedLanguageAlternate;
                             string actualLanguage = await MyWebView2.ExecuteScriptAsync("getLanguage();");
 
-                            logger.Verify((actualLanguage == expectedLanguage),
-                                          string.Format("Test {0}: Custom Environment's Language {1} did not match expected value {2}",
-                                                         selectedTest.ToString(), actualLanguage, expectedLanguage));
+                            logger.Verify((actualLanguage == expectedLanguage || actualLanguage == expectedLanguageAlternate),
+                                          string.Format("Test {0}: Custom Environment's Language {1} did not match expected value in {2}",
+                                                         selectedTest.ToString(), actualLanguage, expectedLanguageList));
                         }
                         break;
 
@@ -2062,37 +2068,33 @@ await Microsoft.Web.WebView2.Core.CoreWebView2Environment.CreateWithOptionsAsync
                                 LogFailure_Exception(logger, "TEST 1", e);
                             }
 
-                            // TODO: Investigate if null RuntimeClass parameter can be passed in WinRT/MIDL3 
-                            //       Bug 48553811: [WebView2] Calling EnsureCoreWebView2Async(null, [null])
-                            //                     throws in projection layer (both cpp/winrt and C#)
-                            //
-                            //// TEST 2: EnsureCoreWebView2Async(null) <--- should succeed for any configuration
-                            //try
-                            //{
-                            //    LogHeader("TEST 2", "Ensure again with (null), expecting: SUCCESS");
-                            //    await MyWebView2.EnsureCoreWebView2Async(null);
-                            //    WebView2Common.LoadWebPage(MyWebView2, TestPageNames[TestInfoDictionary[selectedTest]]);
-                            //    await navCompletedTask;
-                            //    LogSuccess("TEST 2");
-                            //}
-                            //catch (Exception e)
-                            //{
-                            //    LogFailure_Exception(logger, "TEST 2", e);
-                            //}
-                            //
-                            //// TEST 3: EnsureCoreWebView2Async(null, null) <--- should succeed for any configuration
-                            //try
-                            //{
-                            //    LogHeader("TEST 3", "Ensure again with (null, null), expecting: SUCCESS");
-                            //    await MyWebView2.EnsureCoreWebView2Async(null, null);
-                            //    WebView2Common.LoadWebPage(MyWebView2, TestPageNames[TestInfoDictionary[selectedTest]]);
-                            //    await navCompletedTask;
-                            //    LogSuccess("TEST 3");
-                            //}
-                            //catch (Exception e)
-                            //{
-                            //    LogFailure_Exception(logger, "TEST 3", e);
-                            //}
+                            // TEST 2: EnsureCoreWebView2Async(null) <--- should succeed for any configuration
+                            try
+                            {
+                               LogHeader("TEST 2", "Ensure again with (null), expecting: SUCCESS");
+                               await MyWebView2.EnsureCoreWebView2Async(null);
+                               WebView2Common.LoadWebPage(MyWebView2, TestPageNames[TestInfoDictionary[selectedTest]]);
+                               await navCompletedTask;
+                               LogSuccess("TEST 2");
+                            }
+                            catch (Exception e)
+                            {
+                               LogFailure_Exception(logger, "TEST 2", e);
+                            }
+                            
+                            // TEST 3: EnsureCoreWebView2Async(null, null) <--- should succeed for any configuration
+                            try
+                            {
+                               LogHeader("TEST 3", "Ensure again with (null, null), expecting: SUCCESS");
+                               await MyWebView2.EnsureCoreWebView2Async(null, null);
+                               WebView2Common.LoadWebPage(MyWebView2, TestPageNames[TestInfoDictionary[selectedTest]]);
+                               await navCompletedTask;
+                               LogSuccess("TEST 3");
+                            }
+                            catch (Exception e)
+                            {
+                               LogFailure_Exception(logger, "TEST 3", e);
+                            }
 
                             CoreWebView2Environment DefaultEnvironment = MyWebView2.CoreWebView2.Environment;
 
@@ -2197,37 +2199,33 @@ await Microsoft.Web.WebView2.Core.CoreWebView2Environment.CreateWithOptionsAsync
                                 LogFailure_Exception(logger, "TEST 1", e);
                             }
 
-                            // TODO: Investigate if null RuntimeClass parameter can be passed in WinRT/MIDL3 
-                            //       Bug 48553811: [WebView2] Calling EnsureCoreWebView2Async(null, [null])
-                            //                     throws in projection layer (both cpp/winrt and C#)
-                            //
-                            //// TEST 2: EnsureCoreWebView2Async(null) <--- should succeed for any configuration
-                            //try
-                            //{
-                            //    LogHeader("TEST 2", "Ensure again with (null), expecting: SUCCESS");
-                            //    await MyWebView2.EnsureCoreWebView2Async(null);
-                            //    WebView2Common.LoadWebPage(MyWebView2, TestPageNames[TestInfoDictionary[selectedTest]]);
-                            //    await navCompletedTask;
-                            //    LogSuccess("TEST 2");
-                            //}
-                            //catch (Exception e)
-                            //{
-                            //    LogFailure_Exception(logger, "TEST 2", e);
-                            //}
-                            //
-                            //// TEST 3: EnsureCoreWebView2Async(null, null) <--- should succeed for any configuration
-                            //try
-                            //{
-                            //    LogHeader("TEST 3", "Ensure again with (null, null), expecting: SUCCESS");
-                            //    await MyWebView2.EnsureCoreWebView2Async(null, null);
-                            //    WebView2Common.LoadWebPage(MyWebView2, TestPageNames[TestInfoDictionary[selectedTest]]);
-                            //    await navCompletedTask;
-                            //    LogSuccess("TEST 3");
-                            //}
-                            //catch (Exception e)
-                            //{
-                            //    LogFailure_Exception(logger, "TEST 3", e);
-                            //}
+                            // TEST 2: EnsureCoreWebView2Async(null) <--- should succeed for any configuration
+                            try
+                            {
+                               LogHeader("TEST 2", "Ensure again with (null), expecting: SUCCESS");
+                               await MyWebView2.EnsureCoreWebView2Async(null);
+                               WebView2Common.LoadWebPage(MyWebView2, TestPageNames[TestInfoDictionary[selectedTest]]);
+                               await navCompletedTask;
+                               LogSuccess("TEST 2");
+                            }
+                            catch (Exception e)
+                            {
+                               LogFailure_Exception(logger, "TEST 2", e);
+                            }
+                            
+                            // TEST 3: EnsureCoreWebView2Async(null, null) <--- should succeed for any configuration
+                            try
+                            {
+                               LogHeader("TEST 3", "Ensure again with (null, null), expecting: SUCCESS");
+                               await MyWebView2.EnsureCoreWebView2Async(null, null);
+                               WebView2Common.LoadWebPage(MyWebView2, TestPageNames[TestInfoDictionary[selectedTest]]);
+                               await navCompletedTask;
+                               LogSuccess("TEST 3");
+                            }
+                            catch (Exception e)
+                            {
+                               LogFailure_Exception(logger, "TEST 3", e);
+                            }
 
                             // TEST 4: EnsureCoreWebView2Async(CustomEnvironment) <--- should fail (different ControllerOptions)
                             try
diff --git a/controls/dev/WebView2/WebView2.h b/controls/dev/WebView2/WebView2.h
index 04d5a84e53..5faaf0311a 100644
--- a/controls/dev/WebView2/WebView2.h
+++ b/controls/dev/WebView2/WebView2.h
@@ -54,7 +54,7 @@ class CoreWebView2InitializedEventArgs :
 // Derive from DeriveFromPanelHelper_base so that we get access to Children collection in Panel.
 // (In case we have to show the "Missing Anaheim Warning").
 class WebView2 :
-    public ReferenceTracker<WebView2, DeriveFromPanelHelper_base, winrt::WebView2, IHwndComponentHost>,
+    public ReferenceTracker<WebView2, DeriveFromPanelHelper_base, winrt::WebView2, winrt::IWebView22, IHwndComponentHost>,
     public WebView2Properties
 {
 
diff --git a/controls/dev/dll/packages.config b/controls/dev/dll/packages.config
index 6c73e6c265..3c1aec4124 100644
--- a/controls/dev/dll/packages.config
+++ b/controls/dev/dll/packages.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Build.Tasks.Git" version="1.1.1" targetFramework="native" developmentDependency="true" />
   <package id="Microsoft.CodeAnalysis.BinSkim" version="1.3.9" targetFramework="native" />
@@ -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.1823.32" targetFramework="native" />
+  <package id="Microsoft.Web.WebView2" version="1.0.2210.55" 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/controls/dev/inc/CppWinRTHelpers.h b/controls/dev/inc/CppWinRTHelpers.h
index 1aa5e22a4a..5f9751e162 100644
--- a/controls/dev/inc/CppWinRTHelpers.h
+++ b/controls/dev/inc/CppWinRTHelpers.h
@@ -366,9 +366,13 @@ inline bool SetFocus(winrt::DependencyObject const& object, winrt::FocusState fo
 
 // This type exists for types that in metadata derive from FrameworkElement but internally want to derive from Panel
 // to get "protected" Children.
-// Using it is just like any other winrt::implementation::FooT type *except* that you must pass an additional parameter
-// which is the winrt::Foo type. Most times you will be using ReferenceTracker too so that pattern would look like:
-// class YourType : ReferenceTracker<YourType, DeriveFromPanelHelper_base, winrt::YourType>  <--- note the extra winrt::YourType here that's normally not needed.
+//
+// Using it is just like any other winrt::implementation::FooT type *except* that you must pass some additional parameters: 
+// (1) The winrt::Foo type AND
+// (2) Any versioned interfaces winrt::IFoo2, winrt::IFoo3, etc that the type implements
+//
+// Most times you will be using ReferenceTracker too so that pattern would look like:
+// class YourType : ReferenceTracker<YourType, DeriveFromPanelHelper_base, winrt::YourType, winrt::IYourType2>  <--- note the extra winrt::YourType here that's normally not needed.
 template <typename D, typename T, typename ... I>
 struct __declspec(empty_bases) DeriveFromPanelHelper_base : winrt::Microsoft::UI::Xaml::Controls::PanelT<D, winrt::default_interface<T>, winrt::composable, I...>
 {
diff --git a/controls/test/MUXControlsTestApp/Themes/DisableAnimationsStyles.xaml b/controls/test/MUXControlsTestApp/Themes/DisableAnimationsStyles.xaml
index 680333059b..71c0add038 100644
--- a/controls/test/MUXControlsTestApp/Themes/DisableAnimationsStyles.xaml
+++ b/controls/test/MUXControlsTestApp/Themes/DisableAnimationsStyles.xaml
@@ -245,7 +245,7 @@
                                             </ItemsPanelTemplate>
                                         </ItemsControl.ItemsPanel>
                                     </ItemsControl>
-                                    <Button x:Name="MoreButton" Foreground="{TemplateBinding Foreground}" Style="{StaticResource CommandBarFlyoutEllipsisButtonStyle}" Grid.Column="1" Control.IsTemplateKeyTipTarget="True" IsAccessKeyScope="True" IsTabStop="False" CornerRadius="{TemplateBinding CornerRadius}" Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.EffectiveOverflowButtonVisibility}">
+                                    <Button x:Name="MoreButton" Foreground="{TemplateBinding Foreground}" Style="{StaticResource CommandBarFlyoutEllipsisButtonStyle}" Grid.Column="1" Control.IsTemplateKeyTipTarget="True" IsAccessKeyScope="True" IsTabStop="False" CornerRadius="{TemplateBinding CornerRadius}" Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.EffectiveOverflowButtonVisibility}" AllowFocusOnInteraction="False">
                                         <Button.RenderTransform>
                                             <TranslateTransform x:Name="MoreButtonTransform" />
                                         </Button.RenderTransform>
diff --git a/controls/test/TestAppCX/packages.config b/controls/test/TestAppCX/packages.config
index 4f07ffdeaf..b17c14e9b2 100644
--- a/controls/test/TestAppCX/packages.config
+++ b/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.1823.32" targetFramework="native" />
+  <package id="Microsoft.Web.WebView2" version="1.0.2210.55" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/controls/tools/CustomTasksTool/Program.cs b/controls/tools/CustomTasksTool/Program.cs
index d151fed307..fd98d425fd 100644
--- a/controls/tools/CustomTasksTool/Program.cs
+++ b/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.1823.32\lib\Microsoft.Web.WebView2.Core.winmd",
+                    $@"{projectRoot}packages\Microsoft.Web.WebView2.1.0.2210.55\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.1823.32\lib\Microsoft.Web.WebView2.Core.winmd",
+                    $@"{projectRoot}packages\Microsoft.Web.WebView2.1.0.2210.55\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.1823.32\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.2210.55\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.1823.32\lib\Microsoft.Web.WebView2.Core.winmd", "Microsoft.Web.WebView2.Core.dll");
+            AddTaskItem($@"{projectRoot}\packages\Microsoft.Web.WebView2.1.0.2210.55\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/dxaml/xcp/components/AccessKeys/KeyTips/KeytipAutomaticPlacementAlgorithm.cpp b/dxaml/xcp/components/AccessKeys/KeyTips/KeytipAutomaticPlacementAlgorithm.cpp
index 58fff3b384..ca454a7b45 100644
--- a/dxaml/xcp/components/AccessKeys/KeyTips/KeytipAutomaticPlacementAlgorithm.cpp
+++ b/dxaml/xcp/components/AccessKeys/KeyTips/KeytipAutomaticPlacementAlgorithm.cpp
@@ -605,6 +605,17 @@ XRECTF_RB ScreenBoundsHelper::GetScreenBounds(const XRECTF_RB& elementBounds)
         &displayAreaStatics));
     ctl::ComPtr<ixp::IDisplayArea> displayArea;
     FAIL_FAST_IF_FAILED(displayAreaStatics->GetFromRect(elementRect, ixp::DisplayAreaFallback::DisplayAreaFallback_None, &displayArea));
+    if (displayArea == nullptr)
+    {
+        // The DisplayAreaFallback.None option tells GetFromRect to set displayArea to nullptr when there's no display
+        // that intersects with the rect, so let's handle that gracefully.  For example, this can happen when the Xaml
+        // window is completely off-screen. (http://task.ms/47632057)
+
+        // screenBounds is our fallback, and for supported WinAppSDK scenarios, this will always be infinite bounds.
+        // This means the KeyTips won't be constrained to any particular rect.
+        return m_screenBounds;
+    }
+
     wgr::RectInt32 workArea;
     FAIL_FAST_IF_FAILED(displayArea->get_WorkArea(&workArea));
 
diff --git a/dxaml/xcp/components/ContentRoot/ContentRoot.cpp b/dxaml/xcp/components/ContentRoot/ContentRoot.cpp
index 0458c143dc..f2b3795358 100644
--- a/dxaml/xcp/components/ContentRoot/ContentRoot.cpp
+++ b/dxaml/xcp/components/ContentRoot/ContentRoot.cpp
@@ -426,19 +426,22 @@ HWND CContentRoot::GetHostingHWND() const
 {
     if (m_type == Type::CoreWindow)
     {
+        // Scenario 1: The control is hosted inside of a CoreWindow. We can retrieve its HWND.
         const auto hostingCoreWindowHWND = static_cast<HWND>(m_coreServices.GetHostSite()->GetXcpControlWindow());
         return hostingCoreWindowHWND;
     }
     else if (m_type == Type::XamlIslandRoot)
     {
-        if (m_xamlIslandRoot)
+        // Scenario 2: The caller is hosted in a DesktopWindowXamlSource. We can retrieve the hosting
+        // bridge's HWND directly.
+
+        HWND dwxsHwnd = m_xamlIslandRoot->GetBridgeHostingHWND(); 
+        if (dwxsHwnd)
         {
-            // Callers of this method via XamlRoot.get_HostWindow are looking for the window with a size and position.
-            // BUG: WebView2 setup code might be conflating the positioning and input HWNDs.
-            // Right now these HWNDs are the same, but this will change shortly and we might need a new
-            // API on XamlRoot to provide the IslandInputSite from where the input HWND can be retrieved.
-            return m_xamlIslandRoot->GetPositioningHWND();
+            return dwxsHwnd;
         }
+
+        // Scenario 3: The caller is hosted in a XamlIsland. We should return null (see XamlRoot_Partial).
     }
     else
     {
diff --git a/dxaml/xcp/components/UIBridgeFocus/FocusController.cpp b/dxaml/xcp/components/UIBridgeFocus/FocusController.cpp
index afb6ad127b..5818f69764 100644
--- a/dxaml/xcp/components/UIBridgeFocus/FocusController.cpp
+++ b/dxaml/xcp/components/UIBridgeFocus/FocusController.cpp
@@ -183,21 +183,48 @@ HRESULT FocusController::DepartFocus(
 
     switch(xamlReason)
     {
+        case xaml_hosting::XamlSourceFocusNavigationReason::XamlSourceFocusNavigationReason_Programmatic:
+            ixpReason = ixp::FocusNavigationReason::FocusNavigationReason_Programmatic;
+            break;
+        case xaml_hosting::XamlSourceFocusNavigationReason::XamlSourceFocusNavigationReason_Restore:
+            ixpReason = ixp::FocusNavigationReason::FocusNavigationReason_Restore;
+            break;
         case xaml_hosting::XamlSourceFocusNavigationReason::XamlSourceFocusNavigationReason_First:
             ixpReason = ixp::FocusNavigationReason::FocusNavigationReason_First;
             break;
         case xaml_hosting::XamlSourceFocusNavigationReason::XamlSourceFocusNavigationReason_Last:
             ixpReason = ixp::FocusNavigationReason::FocusNavigationReason_Last;
             break;
+        case xaml_hosting::XamlSourceFocusNavigationReason::XamlSourceFocusNavigationReason_Up:
+            ixpReason = ixp::FocusNavigationReason::FocusNavigationReason_Up;
+            break;
+        case xaml_hosting::XamlSourceFocusNavigationReason::XamlSourceFocusNavigationReason_Down:
+            ixpReason = ixp::FocusNavigationReason::FocusNavigationReason_Down;
+            break;
+        case xaml_hosting::XamlSourceFocusNavigationReason::XamlSourceFocusNavigationReason_Left:
+            ixpReason = ixp::FocusNavigationReason::FocusNavigationReason_Left;
+            break;
+        case xaml_hosting::XamlSourceFocusNavigationReason::XamlSourceFocusNavigationReason_Right:
+            ixpReason = ixp::FocusNavigationReason::FocusNavigationReason_Right;
+            break;
     }
 
+    ABI::Windows::Foundation::Rect hintRect;
+    IFC_RETURN(request->get_HintRect(&hintRect));
+    GUID correlationId;
+    IFC_RETURN(request->get_CorrelationId(&correlationId));
+    wrl::ComPtr<ixp::IFocusNavigationRequest> ixpRequest;
+
+    wrl::ComPtr<ixp::IFocusNavigationRequestStatics> focusNavigationRequestStatics;
+    wf::GetActivationFactory(Microsoft::WRL::Wrappers::HStringReference(RuntimeClass_Microsoft_UI_Input_FocusNavigationRequest).Get(), &focusNavigationRequestStatics);
+    IFCFAILFAST(focusNavigationRequestStatics->CreateWithHintRectAndId(ixpReason, hintRect, correlationId, &ixpRequest));
+
     wrl::ComPtr<ixp::IInputFocusController2> inputFocusController2;
     IFC_RETURN(m_inputObjectFocusable.As(&inputFocusController2));
     ixp::FocusNavigationResult result;
-    IFC_RETURN(inputFocusController2->DepartFocus(ixpReason, &result));
+    IFC_RETURN(inputFocusController2->DepartFocus(ixpRequest.Get(), &result));
 
-    // IXP focus APIs under construction, so result is meaningless right now,
-    // but Xaml may want to do something with this
+    // WinUI may wish to respond to the result (Moved/NotMoved/NoFocusableElements) here in some way
 
     return S_OK;
 }
diff --git a/dxaml/xcp/components/metadata/inc/Indexes.g.h b/dxaml/xcp/components/metadata/inc/Indexes.g.h
index 82f82b053c..eda8ab04c1 100644
--- a/dxaml/xcp/components/metadata/inc/Indexes.g.h
+++ b/dxaml/xcp/components/metadata/inc/Indexes.g.h
@@ -4046,6 +4046,7 @@ enum class KnownMethodIndex: UINT16
     ElementCompositionPreview_SetIsTranslationEnabled,
     ElementCompositionPreview_GetPointerPositionPropertySet,
     WindowsXamlManager_InitializeForCurrentThread,
+    WindowsXamlManager_GetForCurrentThread,
     XamlIslandRoot_SetScreenOffsetOverride,
     XamlIslandRoot_TrySetFocus,
     XamlIslandRoot_GetIslandFromElement,
diff --git a/dxaml/xcp/core/core/elements/Popup.cpp b/dxaml/xcp/core/core/elements/Popup.cpp
index 37ad2c360a..eed80edea4 100644
--- a/dxaml/xcp/core/core/elements/Popup.cpp
+++ b/dxaml/xcp/core/core/elements/Popup.cpp
@@ -1044,7 +1044,11 @@ _Check_return_ HRESULT CPopup::EnsureWindowForWindowedPopup()
         // island. If not, release all the window-related resources and re-create them.
         //
         CXamlIslandRoot* island = GetAssociatedXamlIslandNoRef();
-        if (m_previousXamlIslandHwnd != island->GetPositioningHWND())
+
+        UINT64 currentXamlIslandId;
+        IFC_RETURN(island->GetContentIsland()->get_Id(&currentXamlIslandId));
+
+        if (m_previousXamlIslandId != currentXamlIslandId)
         {
             // The PopupWindowSiteBridge needs to be explicitly IClosable::Close()ed, otherwise it will leak. This is because
             // the bridge's underlying hwnd has a ref count on it, and until we destroy that hwnd (via IClosable::Close)) the
@@ -1058,7 +1062,7 @@ _Check_return_ HRESULT CPopup::EnsureWindowForWindowedPopup()
             m_desktopBridge.Reset();
             m_windowedPopupWindow = NULL;
 
-            m_previousXamlIslandHwnd = island->GetPositioningHWND();
+            m_previousXamlIslandId = currentXamlIslandId;
         }
 
         if (!m_popupWindowBridge)
diff --git a/dxaml/xcp/core/core/elements/StackPanel.cpp b/dxaml/xcp/core/core/elements/StackPanel.cpp
index 393fc182ba..9f911f9511 100644
--- a/dxaml/xcp/core/core/elements/StackPanel.cpp
+++ b/dxaml/xcp/core/core/elements/StackPanel.cpp
@@ -29,6 +29,7 @@ CStackPanel::MeasureOverride(XSIZEF availableSize, XSIZEF& desiredSize)
 
     auto children = GetUnsortedChildren();
     UINT32 childrenCount = children.GetCount();
+    UINT32 visibleChildrenCount = 0;
 
     for (XUINT32 childIndex = 0; childIndex < childrenCount; childIndex++)
     {
@@ -48,14 +49,19 @@ CStackPanel::MeasureOverride(XSIZEF availableSize, XSIZEF& desiredSize)
             stackDesiredSize.width += currentChild->GetLayoutStorage()->m_desiredSize.width;
             stackDesiredSize.height = std::max(stackDesiredSize.height, currentChild->GetLayoutStorage()->m_desiredSize.height);
         }
+
+        if (currentChild->IsVisible())
+        {
+            visibleChildrenCount++;
+        }
     }
 
     stackDesiredSize.width += combinedThickness.width;
     stackDesiredSize.height += combinedThickness.height;
 
-    if (childrenCount > 1)
+    if (visibleChildrenCount > 1)
     {
-        const float combinedSpacing = GetSpacing() * (childrenCount - 1);
+        const float combinedSpacing = GetSpacing() * (visibleChildrenCount - 1);
         if (m_orientation == DirectUI::Orientation::Vertical)
         {
             stackDesiredSize.height += combinedSpacing;
@@ -104,13 +110,16 @@ CStackPanel::ArrangeOverride(XSIZEF finalSize, XSIZEF& newFinalSize)
         IFC_RETURN(currentChild->Arrange(arrangeRect));
 
         // Offset the rect for the next child.
-        if (m_orientation == DirectUI::Orientation::Vertical)
-        {
-            arrangeRect.Y += arrangeRect.Height + spacing;
-        }
-        else
+        if (currentChild->IsVisible())
         {
-            arrangeRect.X += arrangeRect.Width + spacing;
+            if (m_orientation == DirectUI::Orientation::Vertical)
+            {
+                arrangeRect.Y += arrangeRect.Height + spacing;
+            }
+            else
+            {
+                arrangeRect.X += arrangeRect.Width + spacing;
+            }
         }
     }
 
diff --git a/dxaml/xcp/core/core/elements/depends.cpp b/dxaml/xcp/core/core/elements/depends.cpp
index 6e4e2f4ba3..741771f9d9 100644
--- a/dxaml/xcp/core/core/elements/depends.cpp
+++ b/dxaml/xcp/core/core/elements/depends.cpp
@@ -356,17 +356,6 @@ HWND CDependencyObject::GetElementPositioningWindow()
         {
             return spPopup->GetPopupPositioningWindow();
         }
-
-        if (GetContext()->HasXamlIslandRoots())
-        {
-            // If this element is in a XamlIslandRoot tree, return the HWND for that island
-            auto root = GetContext()->GetRootForElement(this);
-            auto xamlIslandRoot = do_pointer_cast<CXamlIslandRoot>(root);
-            if (xamlIslandRoot)
-            {
-                return xamlIslandRoot->GetPositioningHWND();
-            }
-        }
     }
 
     // Default return value is the Jupiter window
diff --git a/dxaml/xcp/core/inc/Popup.h b/dxaml/xcp/core/inc/Popup.h
index 43d45370f3..8b952df750 100644
--- a/dxaml/xcp/core/inc/Popup.h
+++ b/dxaml/xcp/core/inc/Popup.h
@@ -537,7 +537,7 @@ class CPopup : public CFrameworkElement
     // Remember the last island that opened this popup. A popup can move between islands between closing and reopening.
     // Xaml uses a single shared context menu for all its TextBoxes, for example. If this popup is associated with a
     // different island then the content bridge and input site adapter needs to be re-created.
-    HWND m_previousXamlIslandHwnd {};
+    UINT64 m_previousXamlIslandId = 0;
 
     // The Popup.SystemBackdrop set on this popup. We will call its OnTargetDisconnected when the SystemBackdrop
     // property changes. Note that by the time we get to the CPopup::SetValue override, the new value has already
diff --git a/dxaml/xcp/core/inc/XamlIslandRoot.h b/dxaml/xcp/core/inc/XamlIslandRoot.h
index 92eddf9e0e..d89e8b97aa 100644
--- a/dxaml/xcp/core/inc/XamlIslandRoot.h
+++ b/dxaml/xcp/core/inc/XamlIslandRoot.h
@@ -71,7 +71,7 @@ class CXamlIslandRoot final : public CPanel
     void NWPropagateDirtyFlag(DirtyFlags flags) override;
 
     wrl::ComPtr<ixp::IIslandInputSitePartner> GetIslandInputSite() const { return m_islandInputSite; }
-    HWND GetPositioningHWND() const { return m_contentBridgeWindow; }
+    HWND GetBridgeHostingHWND() const { return m_contentBridgeWindow; }
 
     wrl::ComPtr<ixp::IPointerPoint> GetPreviousPointerPoint();
 
@@ -104,7 +104,7 @@ class CXamlIslandRoot final : public CPanel
 
     _Check_return_ HRESULT NotifyThemeChangedCore(_In_ Theming::Theme theme, _In_ bool fForceRefresh = false) final;
 
-    void SetIslandInputSite(_In_ ixp::IIslandInputSitePartner* islandInputSite);
+    void SetIslandInputSite(_In_opt_ ixp::IIslandInputSitePartner *islandInputSite);
 
     _Check_return_ HRESULT get_DragDropManager(_COM_Outptr_result_maybenull_ mui::DragDrop::IDragDropManager** manager);
 
@@ -265,6 +265,7 @@ class CXamlIslandRoot final : public CPanel
 
     // Drag Drop
     _Check_return_ HRESULT RegisterIslandDropTarget();
+    _Check_return_ HRESULT UnregisterIslandDropTarget();
     Microsoft::WRL::ComPtr<mui::DragDrop::IDragDropManager> m_dragDropManager;
     EventRegistrationToken m_dropTargetRequestedToken = {};
 
@@ -310,7 +311,6 @@ class CXamlIslandRoot final : public CPanel
     wrl::ComPtr<ixp::IInputActivationListener> m_inputActivationListener;
     wrl::ComPtr<ixp::IDesktopChildSiteBridge> m_contentBridgeDW;
     wrl::ComPtr<ixp::IContentIslandEnvironment> m_topLevelHost;
-    wrl::ComPtr<ixp::IContentCoordinateConverter> m_coordinateConverter;
     wrl::ComPtr<ixp::IInputPreTranslateKeyboardSourceHandler> m_preTranslateHandler;
 
     EventRegistrationToken m_characterReceivedToken = {};
diff --git a/dxaml/xcp/core/native/text/Controls/TextBoxBase.h b/dxaml/xcp/core/native/text/Controls/TextBoxBase.h
index 441fd4fc21..6040256963 100644
--- a/dxaml/xcp/core/native/text/Controls/TextBoxBase.h
+++ b/dxaml/xcp/core/native/text/Controls/TextBoxBase.h
@@ -100,6 +100,7 @@ class CTextBoxBase : public CControl
     _Check_return_ HRESULT TextBoxToClient(_Inout_ XPOINT* point, bool applyRasterizationScale = false);
     _Check_return_ HRESULT ScreenToTextBox(_Inout_ XPOINT* point, bool roundUp = false);
     _Check_return_ HRESULT ClientToTextBox(_Inout_ XPOINTF* point);
+    ixp::IContentCoordinateConverter *GetCoordinateConverter();
 
     virtual _Check_return_ HRESULT TxGetMaxLength(_Out_ XUINT32 *pLength);
     virtual _Check_return_ HRESULT TxGetPasswordChar(_Out_ WCHAR *pChar);
diff --git a/dxaml/xcp/dxaml/idl/winrt/core/microsoft.ui.xaml.coretypes.idl b/dxaml/xcp/dxaml/idl/winrt/core/microsoft.ui.xaml.coretypes.idl
index b7f989f5ce..a168f16b03 100644
--- a/dxaml/xcp/dxaml/idl/winrt/core/microsoft.ui.xaml.coretypes.idl
+++ b/dxaml/xcp/dxaml/idl/winrt/core/microsoft.ui.xaml.coretypes.idl
@@ -56,7 +56,6 @@ namespace Microsoft.UI.Xaml
 {
 
     [contract(Microsoft.UI.Xaml.WinUIContract, 6)]
-    [feature(Feature_ExperimentalApi)]
     [webhosthidden]
     enum DispatcherShutdownMode
     {
@@ -5252,7 +5251,6 @@ namespace Microsoft.UI.Xaml.Media.Media3D
 namespace Microsoft.UI.Xaml.Hosting
 {
     [contract(Microsoft.UI.Xaml.WinUIContract, 6)]
-    [feature(Feature_ExperimentalApi)]
     [webhosthidden]
     runtimeclass XamlShutdownCompletedOnThreadEventArgs
     {
diff --git a/dxaml/xcp/dxaml/idl/winrt/core/microsoft.ui.xaml.coretypes2.idl b/dxaml/xcp/dxaml/idl/winrt/core/microsoft.ui.xaml.coretypes2.idl
index 4990cba5f2..f46b8ff7ad 100644
--- a/dxaml/xcp/dxaml/idl/winrt/core/microsoft.ui.xaml.coretypes2.idl
+++ b/dxaml/xcp/dxaml/idl/winrt/core/microsoft.ui.xaml.coretypes2.idl
@@ -2654,6 +2654,11 @@ namespace Microsoft.UI.Xaml
             event Windows.Foundation.TypedEventHandler<Object,Microsoft.UI.Xaml.ResourceManagerRequestedEventArgs> ResourceManagerRequested;
         }
     
+        [contract(Microsoft.UI.Xaml.WinUIContract, 6)]
+        {
+            Microsoft.UI.Xaml.DispatcherShutdownMode DispatcherShutdownMode;
+        }
+    
         [contract(Microsoft.UI.Xaml.WinUIContract, 1)]
         [feature(Feature_UwpSupportApi)]
         [overridable_name("Microsoft.UI.Xaml.IApplicationOverridesFeature_UwpSupportApi")]
@@ -2674,13 +2679,6 @@ namespace Microsoft.UI.Xaml
             overridable void OnBackgroundActivated(Windows.ApplicationModel.Activation.BackgroundActivatedEventArgs args);
             overridable void OnWindowCreated(Microsoft.UI.Xaml.WindowCreatedEventArgs args);
         }
-    
-        [contract(Microsoft.UI.Xaml.WinUIContract, 6)]
-        [feature(Feature_ExperimentalApi)]
-        [interface_name("Microsoft.UI.Xaml.IApplicationFeature_ExperimentalApi")]
-        {
-            Microsoft.UI.Xaml.DispatcherShutdownMode DispatcherShutdownMode;
-        }
     };
 
     [contract(Microsoft.UI.Xaml.WinUIContract, 1)]
@@ -4209,12 +4207,9 @@ namespace Microsoft.UI.Xaml.Hosting
         static Microsoft.UI.Xaml.Hosting.WindowsXamlManager InitializeForCurrentThread();
     
         [contract(Microsoft.UI.Xaml.WinUIContract, 6)]
-        [feature(Feature_ExperimentalApi)]
-        [static_name("Microsoft.UI.Xaml.Hosting.IWindowsXamlManagerStaticsFeature_ExperimentalApi")]
-        [interface_name("Microsoft.UI.Xaml.Hosting.IWindowsXamlManagerFeature_ExperimentalApi")]
         {
             event Windows.Foundation.TypedEventHandler<Microsoft.UI.Xaml.Hosting.WindowsXamlManager,Microsoft.UI.Xaml.Hosting.XamlShutdownCompletedOnThreadEventArgs> XamlShutdownCompletedOnThread;
-            static Boolean IsXamlRunningOnCurrentThread{ get; };
+            static Microsoft.UI.Xaml.Hosting.WindowsXamlManager GetForCurrentThread();
         }
     };
 
diff --git a/dxaml/xcp/dxaml/lib/AccessKeyManager_partial.cpp b/dxaml/xcp/dxaml/lib/AccessKeyManager_partial.cpp
index ebf55c365c..804f9ccfff 100644
--- a/dxaml/xcp/dxaml/lib/AccessKeyManager_partial.cpp
+++ b/dxaml/xcp/dxaml/lib/AccessKeyManager_partial.cpp
@@ -59,7 +59,7 @@ namespace AccessKeys {
         return S_OK;
     }
 
-    _Check_return_ HRESULT AKOnIsActiveChanged(_In_ CFocusManager* focusManager,_In_ IInspectable* sender, _Out_ IInspectable* args)
+    _Check_return_ HRESULT AKOnIsActiveChanged(_In_opt_ CFocusManager* focusManager,_In_ IInspectable* sender, _Out_ IInspectable* args)
     {
         DXamlCore* const dxamlCore = DXamlCore::GetCurrent();
         CCoreServices* const core = dxamlCore->GetHandle();
@@ -67,7 +67,13 @@ namespace AccessKeys {
         
         IFC_RETURN(UpdateIsDisplayModeEnabled(&didDisplayModeForThreadChange));
 
-        IFC_RETURN(focusManager->OnAccessKeyDisplayModeChanged());
+        // It is possible that that the Xaml Island is shutting down (for example, if the access
+        // key closes the parent window).  In this case we probably won't have a focus manager,
+        // so don't bother telling it the mode changes.
+        if (focusManager)
+        {
+            IFC_RETURN(focusManager->OnAccessKeyDisplayModeChanged());
+        }
 
         core->GetInputServices()->GetKeyTipManager().AccessKeyModeChanged();
 
diff --git a/dxaml/xcp/dxaml/lib/CommandBar_Partial.cpp b/dxaml/xcp/dxaml/lib/CommandBar_Partial.cpp
index 26168ded0a..62506474e0 100644
--- a/dxaml/xcp/dxaml/lib/CommandBar_Partial.cpp
+++ b/dxaml/xcp/dxaml/lib/CommandBar_Partial.cpp
@@ -1369,6 +1369,11 @@ CommandBar::OnOpeningImpl(_In_ IInspectable* pArgs)
 
         if (firstItemIterator)
         {
+            // Since the menu is being opened with the Expand Button, then we want to set focus using the
+            // same focus state as was used to interact with the expand button itself.
+            CContentRoot* contentRoot = VisualTree::GetContentRootForElement(GetHandle());
+            auto focusState = static_cast<xaml::FocusState>(CFocusManager::GetFocusStateFromInputDeviceType(contentRoot->GetInputManager().GetLastInputDeviceType()));
+
             BOOLEAN hasCurrent = FALSE;
             BOOLEAN succeeded = FALSE;
             IFC_RETURN(firstItemIterator->get_HasCurrent(&hasCurrent));
@@ -1380,7 +1385,7 @@ CommandBar::OnOpeningImpl(_In_ IInspectable* pArgs)
                 ctl::ComPtr<IControl> itemAsControl = firstItem.AsOrNull<IControl>();
                 if (itemAsControl)
                 {
-                    IFC_RETURN(itemAsControl.Cast<Control>()->Focus(xaml::FocusState_Programmatic, &succeeded));
+                    IFC_RETURN(itemAsControl.Cast<Control>()->Focus(focusState, &succeeded));
                 }
                 IFC_RETURN(firstItemIterator->MoveNext(&hasCurrent));
             }
diff --git a/dxaml/xcp/dxaml/lib/ContentDialog_Partial.cpp b/dxaml/xcp/dxaml/lib/ContentDialog_Partial.cpp
index db5fa1b1b1..1771b95544 100644
--- a/dxaml/xcp/dxaml/lib/ContentDialog_Partial.cpp
+++ b/dxaml/xcp/dxaml/lib/ContentDialog_Partial.cpp
@@ -798,17 +798,20 @@ ContentDialog::HideAfterDeferralWorker(bool isCanceled, xaml_controls::ContentDi
     }
     else
     {
-        ctl::ComPtr<ContentDialogMetadata> metadata;
-        if (const auto xamlRoot = XamlRoot::GetImplementationForElementStatic(this))
+        // Since we are hiding the dialog, we know the root existed when we showed it.  So if it is not there
+        // now, we are shutting down.
+        if (const auto xamlRoot = XamlRoot::GetImplementationForElementStatic(this, false /* createIfNotExist */))
         {
+            ctl::ComPtr<ContentDialogMetadata> metadata;
             IFC_RETURN(xamlRoot->GetContentDialogMetadata(&metadata));
-        }
-
 #if DBG
-        bool isOpen = false;
-        IFC_RETURN(metadata->IsOpen(this, &isOpen));
-        ASSERT(isOpen);
+            bool isOpen = false;
+            IFC_RETURN(metadata->IsOpen(this, &isOpen));
+            ASSERT(isOpen);
 #endif
+            IFC_RETURN(metadata->RemoveOpenDialog(this));
+        }
+
 
         auto asyncOperationNoRef = static_cast<ContentDialogShowAsyncOperation*>(m_tpCurrentAsyncOperation.Get());
         IFC_RETURN(asyncOperationNoRef->SetResults(result));
@@ -852,8 +855,6 @@ ContentDialog::HideAfterDeferralWorker(bool isCanceled, xaml_controls::ContentDi
             IFC_RETURN(m_tpPopup->put_IsOpen(FALSE));
         }
 
-        IFC_RETURN(metadata->RemoveOpenDialog(this));
-
         IFC_RETURN(BackButtonIntegration_UnregisterListener(this));
 
         IFC_RETURN(DirectUI::ElementSoundPlayerService::RequestInteractionSoundForElementStatic(xaml::ElementSoundKind_Hide, this));
diff --git a/dxaml/xcp/dxaml/lib/DXamlCore.cpp b/dxaml/xcp/dxaml/lib/DXamlCore.cpp
index be17a2baec..9a8c79de90 100644
--- a/dxaml/xcp/dxaml/lib/DXamlCore.cpp
+++ b/dxaml/xcp/dxaml/lib/DXamlCore.cpp
@@ -324,9 +324,18 @@ DXamlCore::GetAssociatedWindowNoRef(
         return S_FALSE;
     }
 
+    // Retrieve the hosting HWND from the XamlRoot. 
+    // As above, it is possible that the element is hosted inside of a XamlIsland, which means that
+    // it will have a XamlRoot but not a hosting HWND. This is essentially equivalent to a UIElement
+    // being created in code behind, as a XamlIsland is used to host Xaml content inside of an app
+    // without using a Xaml window. In this case, this function cannot proceed but should not throw
+    // an exception as the UIElement will not have an associated Xaml window.
     HWND xamlHwnd;
     IFC_RETURN(xamlRoot->get_HostWindow(&xamlHwnd));
-    IFCHNDL_RETURN(xamlHwnd);
+    if (!xamlHwnd)
+    {
+        return S_FALSE;
+    }
 
     // In a desktop context, the HostWindow actually refers to the DesktopWindowXamlSource window where the xaml lives.
     HWND parentHwnd = ::GetParent(xamlHwnd);
diff --git a/dxaml/xcp/dxaml/lib/DisplayOrientationHelper.cpp b/dxaml/xcp/dxaml/lib/DisplayOrientationHelper.cpp
index 624a7989d5..1c89681aa0 100644
--- a/dxaml/xcp/dxaml/lib/DisplayOrientationHelper.cpp
+++ b/dxaml/xcp/dxaml/lib/DisplayOrientationHelper.cpp
@@ -20,6 +20,9 @@ _Check_return_ HRESULT
     CCoreServices* coreServices = DXamlServices::GetHandle();
     if (coreServices->GetInitializationType() != InitializationType::IslandsOnly)
     {
+        // Note: This branch is meant to address UWP scenarios, and can be removed once test
+        // dependency on the CoreWindow is resolved.
+        
         ctl::ComPtr<wgrd::IDisplayInformation> displayInformation;
         wgrd::DisplayOrientations currentDisplayOrientation = wgrd::DisplayOrientations_None;
         GetUWPDisplayInformation(displayInformation);
@@ -47,23 +50,22 @@ _Check_return_ HRESULT
     }
     else
     {
-        UINT rotationValue;
-        if(SUCCEEDED(GetWin32DisplayOrientation(dependencyObject, rotationValue)))
+        auto rotationValue = ixp::ContentDisplayOrientations_None;
+        if (SUCCEEDED(GetIslandDisplayOrientation(dependencyObject, rotationValue)))
         {
             // Map to XamlDisplayOrientation type
             switch(rotationValue)
             {
-                case DMDO_DEFAULT:
-                    // Currently assuming that DMDO_DEFAULT (natural orientation of the device) is always landscape.
+                case ixp::ContentDisplayOrientations_Landscape:
                     currentOrientation = Orientation::Landscape;
                     break;
-                case DMDO_180:
+                case ixp::ContentDisplayOrientations_LandscapeFlipped:
                     currentOrientation = Orientation::LandscapeFlipped;
                     break;
-                case DMDO_90:
+                case ixp::ContentDisplayOrientations_Portrait:
                     currentOrientation = Orientation::Portrait;
                     break;
-                case DMDO_270:
+                case ixp::ContentDisplayOrientations_PortraitFlipped:
                     currentOrientation = Orientation::PortraitFlipped;
                     break;
                 default:
@@ -77,31 +79,20 @@ _Check_return_ HRESULT
 }
 
 _Check_return_ HRESULT 
-    GetWin32DisplayOrientation(_In_ CDependencyObject* dependencyObject, _Out_ UINT& rotationValue)
+    GetIslandDisplayOrientation(_In_ CDependencyObject* dependencyObject, _Out_ ixp::ContentDisplayOrientations rotationValue)
     {
         IFCPTR_RETURN(dependencyObject);
         CXamlIslandRoot* xamlIslandRoot = VisualTree::GetXamlIslandRootForElement(dependencyObject);
-        if(xamlIslandRoot)
+        if (xamlIslandRoot)
         {
-            HWND backingHwnd = xamlIslandRoot->GetPositioningHWND();
-            HMONITOR myMonitor = MonitorFromWindow(backingHwnd, MONITOR_DEFAULTTONEAREST);
-            if(myMonitor != NULL)
+            wrl::ComPtr<ixp::IContentIslandEnvironment> islandEnvironment = xamlIslandRoot->GetContentIslandEnvironment();
+            
+            if (islandEnvironment)
             {
-                MONITORINFOEX monitorInfo = {};
-                monitorInfo.cbSize = sizeof(monitorInfo);
-                GetMonitorInfo(myMonitor, &monitorInfo);
+                wrl::ComPtr<ixp::IContentIslandEnvironment2> islandEnvironment2;
+                IFCFAILFAST(islandEnvironment.As(&islandEnvironment2));
 
-                DEVMODEW devMode = {};
-                devMode.dmSize = sizeof(devMode);
-                devMode.dmSpecVersion = DM_SPECVERSION;
-
-                EnumDisplaySettings(monitorInfo.szDevice, ENUM_CURRENT_SETTINGS, &devMode);
-
-                if (devMode.dmFields & DM_DISPLAYORIENTATION)
-                {
-                    rotationValue = devMode.dmDisplayOrientation;
-                    return S_OK;
-                }
+                IFC_RETURN(islandEnvironment2->get_CurrentOrientation(&rotationValue));
             }
         }
 
diff --git a/dxaml/xcp/dxaml/lib/DisplayOrientationHelper.h b/dxaml/xcp/dxaml/lib/DisplayOrientationHelper.h
index 6519748ecf..08af87363d 100644
--- a/dxaml/xcp/dxaml/lib/DisplayOrientationHelper.h
+++ b/dxaml/xcp/dxaml/lib/DisplayOrientationHelper.h
@@ -20,7 +20,7 @@ namespace XamlDisplay
         GetDisplayOrientation(_In_ CDependencyObject* dependencyObject, _Out_ Orientation& orientation);
 
     _Check_return_ HRESULT 
-        GetWin32DisplayOrientation(_In_ CDependencyObject* dependencyObject, _Out_ UINT& rotationValue);
+        GetIslandDisplayOrientation(_In_ CDependencyObject* dependencyObject, _Out_ ixp::ContentDisplayOrientations rotationValue);
 
     _Check_return_ HRESULT 
         GetUWPDisplayInformation(_Out_ ctl::ComPtr<wgrd::IDisplayInformation>& displayInformation);
diff --git a/dxaml/xcp/dxaml/lib/JupiterWindow.cpp b/dxaml/xcp/dxaml/lib/JupiterWindow.cpp
index 80c88e500d..76aca36dab 100644
--- a/dxaml/xcp/dxaml/lib/JupiterWindow.cpp
+++ b/dxaml/xcp/dxaml/lib/JupiterWindow.cpp
@@ -1631,9 +1631,9 @@ bool CJupiterWindow::ShouldSetUseCoreDragDrop(bool useCoreDragDrop)
     }
 }
 
-_Check_return_ HRESULT CJupiterWindow::EnableIslandDragDropMode()
+_Check_return_ HRESULT CJupiterWindow::SetIslandDragDropMode(bool value)
 {
-    SetUseCoreDragDrop(true);
+    SetUseCoreDragDrop(value);
     return S_OK;
 }
 
diff --git a/dxaml/xcp/dxaml/lib/JupiterWindow.h b/dxaml/xcp/dxaml/lib/JupiterWindow.h
index 2f2ecc5386..c0ac7b117d 100644
--- a/dxaml/xcp/dxaml/lib/JupiterWindow.h
+++ b/dxaml/xcp/dxaml/lib/JupiterWindow.h
@@ -134,7 +134,7 @@ class CJupiterWindow : public ::ABI::Microsoft::Internal::FrameworkUdk::ICoreWin
         _In_ LPARAM lParam,
         _In_opt_ CContentRoot* contentRoot);
 
-    _Check_return_ HRESULT EnableIslandDragDropMode();
+    _Check_return_ HRESULT SetIslandDragDropMode(bool value);
 
     void SetPointerCapture();
     void ReleasePointerCapture();
diff --git a/dxaml/xcp/dxaml/lib/ListViewBaseItem_Partial.cpp b/dxaml/xcp/dxaml/lib/ListViewBaseItem_Partial.cpp
index 6117225c56..bef7e0ed85 100644
--- a/dxaml/xcp/dxaml/lib/ListViewBaseItem_Partial.cpp
+++ b/dxaml/xcp/dxaml/lib/ListViewBaseItem_Partial.cpp
@@ -1148,7 +1148,10 @@ IFACEMETHODIMP ListViewBaseItem::OnPointerCaptureLost(
         m_tpLastTouchPressedArgs.Clear();
     }
 
-    if (isVisualStateChangePending)
+    CDependencyObject* pHandle = GetHandle();
+    if (isVisualStateChangePending && 
+        pHandle &&
+        !pHandle->IsProcessingEnterLeave())
     {
         IFC(ChangeVisualState(true));
     }
diff --git a/dxaml/xcp/dxaml/lib/ListViewBase_Partial_Interaction.cpp b/dxaml/xcp/dxaml/lib/ListViewBase_Partial_Interaction.cpp
index 0129c2a69b..3bafea209b 100644
--- a/dxaml/xcp/dxaml/lib/ListViewBase_Partial_Interaction.cpp
+++ b/dxaml/xcp/dxaml/lib/ListViewBase_Partial_Interaction.cpp
@@ -881,7 +881,7 @@ IFACEMETHODIMP ListViewBase::OnKeyDown(
                 mode != xaml_controls::ListViewSelectionMode_None)
             {
                 IFC_RETURN(GetKeyboardModifiers(&modifiers));
-                if (IsFlagSet(modifiers, wsy::VirtualKeyModifiers_Control))
+                if (modifiers ==  wsy::VirtualKeyModifiers_Control)
                 {
                     UINT itemCount = 0;
                     ctl::ComPtr<wfc::IObservableVector<IInspectable*>> spItems;
diff --git a/dxaml/xcp/dxaml/lib/TextControlFlyoutHelper.cpp b/dxaml/xcp/dxaml/lib/TextControlFlyoutHelper.cpp
index 05855909a9..3203d5634d 100644
--- a/dxaml/xcp/dxaml/lib/TextControlFlyoutHelper.cpp
+++ b/dxaml/xcp/dxaml/lib/TextControlFlyoutHelper.cpp
@@ -15,12 +15,35 @@ using namespace DirectUI;
 using namespace DirectUISynonyms;
 using namespace std::placeholders;
 
-bool TextControlFlyoutHelper::IsGettingFocus(_In_opt_ CFlyoutBase* flyout, _In_ CFrameworkElement* owner)
+bool TextControlFlyoutHelper::IsGettingFocus(_In_opt_ CFlyoutBase * flyout, _In_ CFrameworkElement * owner)
 {
-    auto activeFlyout = DXamlCore::GetCurrent()->GetTextControlFlyout(flyout);
-    return activeFlyout && activeFlyout->IsGettingFocus() && (activeFlyout->GetActiveOwnerNoRef() == owner);
+	// This method is a bit under named.  In addition to determining whether the specified flyout is in the
+	// process of getting focus, it also determines whether that flyout is associated with a specific 
+	// element (text block)
+
+	auto activeFlyout = DXamlCore::GetCurrent()->GetTextControlFlyout(flyout);
+
+    if (!activeFlyout || !activeFlyout->IsGettingFocus())
+    {
+	    // If we don't have an active flyout or it is not getting focus then we don't need to check the owner
+        return false;
+    }
+
+    auto activeOwner = activeFlyout->GetActiveOwnerNoRef();
+    if (activeOwner != owner)
+    {
+        if (auto richTextBlockOverflow = do_pointer_cast<CRichTextBlockOverflow>(activeOwner))
+        {
+            // RichTextBlockOverflow elements are special in that although the flyout is displaying over the
+            // RichTextBlockOverflow, the actual owner of the flyout is the primary RichText Block.
+            activeOwner = richTextBlockOverflow->m_pMaster;
+        }
+    }
+
+    return activeOwner == owner;
 }
 
+
 bool TextControlFlyoutHelper::IsOpen(_In_ CFlyoutBase* flyout)
 {
     auto activeFlyout = DXamlCore::GetCurrent()->GetTextControlFlyout(flyout);
diff --git a/dxaml/xcp/dxaml/lib/ToolTipService_Partial.cpp b/dxaml/xcp/dxaml/lib/ToolTipService_Partial.cpp
index bd1b988941..f6d55e3ce2 100644
--- a/dxaml/xcp/dxaml/lib/ToolTipService_Partial.cpp
+++ b/dxaml/xcp/dxaml/lib/ToolTipService_Partial.cpp
@@ -1379,34 +1379,6 @@ ToolTipService::OnOwnerPointerEntered(
 
         IFC(spPointerPoint->get_Position(&s_lastPointerEnteredPoint));
 
-        //
-        // Account for offsets on windowed popups
-        // The incoming spPointerPoint is relative to an InputSite. The main Xaml tree has an InputSite, but so do all
-        // windowed popups. If the ToolTip owner element is in a windowed popup, then the point we get will be relative
-        // to that windowed popup rather than relative to the main Xaml tree. We need to account for the difference.
-        //
-        ctl::ComPtr<DirectUI::DependencyObject> senderAsDO;
-        IFC(ctl::do_query_interface(senderAsDO, pSender));
-        CDependencyObject* dependencyObject = senderAsDO->GetHandle();
-        // Optimization - if there are no open popups, then the sender can't be in an open windowed popup, then there's
-        // no windowed popup offset to account for.
-        VisualTree* visualTree = VisualTree::GetForElementNoRef(dependencyObject);
-        if (visualTree->GetPopupRoot()->HasOpenOrUnloadingPopups())
-        {
-            // Getting the first ancestor popup is enough. Even for nested popups, Xaml will create the PopupSiteBridge
-            // from the DesktopChildSiteBridge for the main tree.
-            CPopup* ancestorPopup = dependencyObject->GetFirstAncestorPopup(true /* windowedPopupOnly */);
-
-            if (ancestorPopup)
-            {
-                XPOINTF_COORDS popupOffset = {};
-                IFC(ancestorPopup->GetScreenOffsetFromOwner(&popupOffset));
-                XPOINTF popupOffsetLogical = popupOffset.ToXPointF_Logical(ancestorPopup->GetWindowedPopupRasterizationScale());
-                s_lastPointerEnteredPoint.X += popupOffsetLogical.x;
-                s_lastPointerEnteredPoint.Y += popupOffsetLogical.y;
-            }
-        }
-
         // Add to list of nested owners
         IFC(ToolTipService::AddToNestedOwners(spSenderAsDO.Get()));
         IFC(static_cast<PointerRoutedEventArgs*>(pArgs)->get_OriginalSource(&spOriginalSource));
diff --git a/dxaml/xcp/dxaml/lib/WindowsXamlManager_Partial.cpp b/dxaml/xcp/dxaml/lib/WindowsXamlManager_Partial.cpp
index cbff0e332e..588b10a42b 100644
--- a/dxaml/xcp/dxaml/lib/WindowsXamlManager_Partial.cpp
+++ b/dxaml/xcp/dxaml/lib/WindowsXamlManager_Partial.cpp
@@ -26,6 +26,128 @@
 using namespace ctl;
 using namespace DirectUI;
 
+namespace DirectUI {
+
+// This class implements the "legacy" shutdown mode, which was the mode for WinAppSDK 1.4.
+// There's a private API to re-enable this.  In the future, we'll delete this.
+// It keeps track of all the non-Closed WindowsXamlManagers on the thread, and when
+// they're all gone, reports that shutdown can proceed.  (see ReadyForEarlyShutdown)
+class XamlCoreLegacyShutdown
+    : public WindowsXamlManager::XamlCore
+{
+public:
+    ~XamlCoreLegacyShutdown()
+    {
+        ASSERT(m_managers.empty());
+    }
+
+    void OnManagerCreated(_In_ WindowsXamlManager* manager) override
+    {
+        auto it = std::find(m_managers.begin(), m_managers.end(), manager);
+        if (it == m_managers.end())
+        {
+            m_managers.push_back(manager);        
+        }
+    }
+
+    void OnManagerClosed(_In_ WindowsXamlManager* manager) override
+    {
+        auto it = std::find(m_managers.begin(), m_managers.end(), manager);
+        ASSERT(it != m_managers.end());
+        if (it != m_managers.end())
+        {
+            m_managers.erase(it);
+        }
+
+        if (m_managers.empty())
+        {
+            // Deallocate the memory
+            m_managers.shrink_to_fit();
+        }
+    }
+
+    // In the legacy model, there's no concept of a single manager per thread.
+    ctl::ComPtr<DirectUI::WindowsXamlManager> GetForCurrentThread() override
+    {
+        return nullptr;
+    }
+
+    // In the legacy model, when all the managers on the thread are closed, we allow early shutdown.
+    // ("early" shutdown means that Xaml shuts down before the DispatcherQueue shuts down)
+    bool ReadyForEarlyShutdown() const override
+    {
+        return m_managers.size() == 0;
+    }
+
+    _Check_return_ HRESULT OnFrameworkShutdownStarting(
+        _In_ msy::IDispatcherQueueShutdownStartingEventArgs* args) override
+    {
+        // Make a local copy since closing these instances synchronously will change m_instances
+        std::vector<WindowsXamlManager*> managersCopy {m_managers};
+        for (WindowsXamlManager* manager : managersCopy)
+        {
+            // When the last manager closes, it will trigger a close on this XamlCore object
+            IFC_RETURN(manager->CloseImpl(true /*synchronous*/));
+        }
+        return S_OK;
+    }
+
+private:
+    // These are raw non-ref-counted pointers, the WindowsXamlManager objects add and remove themselves.
+    std::vector<DirectUI::WindowsXamlManager*> m_managers;
+};
+
+// This class implements the shutdown mode for WinAppSDK 1.5 and later.
+// In this model, there's one WindowsXamlManager per thread, and it stays alive until the DispatcherQueue shuts down.
+// Closing a WindowsXamlManager is a no-op.
+class XamlCoreNewShutdown
+    : public WindowsXamlManager::XamlCore
+{
+public:
+    ~XamlCoreNewShutdown() {}
+
+    // In this model, only one manager is allowed per thread.  Closing a manager is a no-op.
+    void OnManagerCreated(_In_ WindowsXamlManager* manager) override
+    {
+        if (m_manager.Get() != manager)
+        {
+            ASSERT(m_manager == nullptr);
+            m_manager = manager;
+        }
+    }
+    void OnManagerClosed(_In_ WindowsXamlManager* manager) override {}
+
+    ctl::ComPtr<DirectUI::WindowsXamlManager> GetForCurrentThread() override
+    {
+        return m_manager;
+    }
+
+    // In this model, we never shutdown early, we always wait for DispatcherQueue shutdown.
+    bool ReadyForEarlyShutdown() const override
+    {
+        return false;
+    }
+    
+    _Check_return_ HRESULT OnFrameworkShutdownStarting(
+        _In_ msy::IDispatcherQueueShutdownStartingEventArgs* args) override
+    {
+        auto managerStrongRef = m_manager;
+
+        // WARNING: "this" will be invalid after Close() returns!
+        this->Close();
+
+        managerStrongRef->RaiseXamlShutdownCompletedOnThreadEvent(args);
+
+        return S_OK;
+    }
+
+private:
+    // The single manager for this thread.
+    ctl::ComPtr<DirectUI::WindowsXamlManager> m_manager;
+};
+
+}
+
 WindowsXamlManager::WindowsXamlManager()
 {
 }
@@ -71,19 +193,41 @@ _Check_return_ HRESULT WindowsXamlManagerFactory::InitializeForCurrentThreadImpl
 {
     PerfXamlEvent_RAII perfXamlEvent(reinterpret_cast<uint64_t>(this), "WXM::InitializeForCurrentThread", true);
 
-    ComPtr<WindowsXamlManager> spCore;
-    IFC_RETURN(make<WindowsXamlManager>(&spCore));
-    IFC_RETURN(spCore.CopyTo(ppReturnValue));
+    IFC_RETURN(GetForCurrentThreadImpl(ppReturnValue));
 
+    if (*ppReturnValue == nullptr)
+    {
+        ComPtr<WindowsXamlManager> newManager;
+        IFC_RETURN(make<WindowsXamlManager>(&newManager));
+        IFC_RETURN(newManager.CopyTo(ppReturnValue));
+    }
+    
     return S_OK;
 }
 
-_Check_return_ HRESULT WindowsXamlManagerFactory::get_IsXamlRunningOnCurrentThreadImpl(_Out_ BOOLEAN* pValue)
+_Check_return_ HRESULT WindowsXamlManagerFactory::GetForCurrentThreadImpl(_Outptr_ xaml_hosting::IWindowsXamlManager** ppReturnValue)
 {
-    *pValue = (DXamlCore::GetCurrent() != nullptr);
+    if (ComPtr<WindowsXamlManager> manager = WindowsXamlManager::GetForCurrentThread())
+    {
+        IFC_RETURN(manager.CopyTo(ppReturnValue));
+    }
+    else
+    {
+        *ppReturnValue = nullptr;
+    }
+    
     return S_OK;
 }
 
+/*static*/ ctl::ComPtr<WindowsXamlManager> WindowsXamlManager::GetForCurrentThread()
+{
+    if (tls_xamlCore)
+    {
+        return tls_xamlCore->GetForCurrentThread();    
+    }
+    return nullptr;
+}
+
 _Check_return_ HRESULT WindowsXamlManager::XamlCore::Initialize(msy::IDispatcherQueue* dq)
 {
     m_dispatcherQueue = dq;
@@ -180,7 +324,19 @@ _Check_return_ HRESULT WindowsXamlManager::Initialize()
     {
         IFC_RETURN(CheckWindowingModelPolicy());
 
-        tls_xamlCore = std::make_shared<XamlCore>();
+        // We have a private API that allows an app to opt in to the old shutdown model.
+        // See the concrete types for more info.
+        if (FrameworkApplication::GetCurrentShutdownModel() == xaml::ShutdownModel_Version1)
+        {
+            tls_xamlCore = std::make_shared<XamlCoreLegacyShutdown>();
+        }
+        else
+        {
+            tls_xamlCore = std::make_shared<XamlCoreNewShutdown>();
+        }
+
+        tls_xamlCore->OnManagerCreated(this);
+
         IFC_RETURN(tls_xamlCore->Initialize(m_dispatcherQueue.Get()));
     }
 
@@ -194,7 +350,7 @@ _Check_return_ HRESULT WindowsXamlManager::Initialize()
         tls_xamlCore->SetState(XamlCore::State::Normal);
     }
 
-    tls_xamlCore->AddManager(this);
+    tls_xamlCore->OnManagerCreated(this);
 
     // This will make sure that it doesn't get cleared off thread in WeakReferenceSourceNoThreadId::OnFinalReleaseOffThread()
     // as it has thread-local variables and needs to be disposed off by the same thread
@@ -229,7 +385,10 @@ _Check_return_ HRESULT WindowsXamlManager::EnqueueClose()
 
 void WindowsXamlManager::RaiseXamlShutdownCompletedOnThreadEvent(_In_ msy::IDispatcherQueueShutdownStartingEventArgs* shutdownStartingArgs)
 {
-    if (m_xamlShutdownCompletedOnThreadEventSource && !m_bIsClosed)
+    ASSERT(FrameworkApplication::GetCurrentShutdownModel() == xaml::ShutdownModel_Version2);
+
+    // Note we raise this event even when Close() has been called on the object.  Close is now a no-op.
+    if (m_xamlShutdownCompletedOnThreadEventSource)
     {
         ctl::ComPtr<xaml_hosting::IWindowsXamlManager> sender;
 
@@ -246,13 +405,15 @@ void WindowsXamlManager::RaiseXamlShutdownCompletedOnThreadEvent(_In_ msy::IDisp
         IGNOREHR(m_xamlShutdownCompletedOnThreadEventSource->Raise(
             sender.Get(),
             argsInterface.Get()));
+
+        // We only fire this once per object, we don't need the event handlers anymore.
+        IGNOREHR(m_xamlShutdownCompletedOnThreadEventSource->Disconnect());
     }
 }
 
 WindowsXamlManager::XamlCore::~XamlCore()
 {
     ASSERT(m_state == State::Closed);
-    ASSERT(m_managers.empty());
 }
 
 _Check_return_ HRESULT WindowsXamlManager::XamlCore::Close()
@@ -395,7 +556,7 @@ _Check_return_ HRESULT WindowsXamlManager::CloseImpl(bool synchronous)
 
     if (m_xamlCore)
     {
-        m_xamlCore->RemoveManager(this);
+        m_xamlCore->OnManagerClosed(this);
     }
 
     if (!tls_xamlCore)
@@ -406,110 +567,25 @@ _Check_return_ HRESULT WindowsXamlManager::CloseImpl(bool synchronous)
         return S_OK;
     }
 
-    const auto shutdownModel{FrameworkApplication::GetCurrentShutdownModel()};
-    if (shutdownModel == xaml::ShutdownModel_Version1)
+    if (tls_xamlCore->ReadyForEarlyShutdown())
     {
-        // ShutdownModel_Version1 is deprecated, the app must use a private API to enable it.
-        if (tls_xamlCore->ManagerCount() == 0)
+        // This is only true in the legacy shutdown model.
+        ASSERT(FrameworkApplication::GetCurrentShutdownModel() == xaml::ShutdownModel_Version1);
+        if (synchronous)
         {
-            if (synchronous)
-            {
-                // Note we might already be in the "Closing" state.  This would mean that a Close has already been
-                // scheduled.  That's fine, we'll just close synchronously here anyway, and when the scheduled
-                // callback runs (see EnqueueClose), it will check to make sure the object still needs to be closed
-                // before doing anything.
-                tls_xamlCore->SetState(XamlCore::State::Closing);
-                IFC_RETURN(tls_xamlCore->Close());
-                tls_xamlCore = nullptr; // Close() already does this, but adding here for clarity.
-            }
-            else
-            {
-                IFC_RETURN(EnqueueClose());
-            }
+            // Note we might already be in the "Closing" state.  This would mean that a Close has already been
+            // scheduled.  That's fine, we'll just close synchronously here anyway, and when the scheduled
+            // callback runs (see EnqueueClose), it will check to make sure the object still needs to be closed
+            // before doing anything.
+            tls_xamlCore->SetState(XamlCore::State::Closing);
+            IFC_RETURN(tls_xamlCore->Close());
+            tls_xamlCore = nullptr; // Close() already does this, but adding here for clarity.
         }
-    }
-    else if (shutdownModel == xaml::ShutdownModel_Version2)
-    {
-        // For V2 (the default path) we keep the XamlCore open until DispatcherQueue shutdown.
-    }
-    else
-    {
-        IFCFAILFAST(E_UNEXPECTED);
-    }
-
-    return S_OK;
-}
-
-void WindowsXamlManager::XamlCore::AddManager(_In_ WindowsXamlManager* wxm)
-{
-    auto it = std::find(m_managers.begin(), m_managers.end(), wxm);
-    if (it == m_managers.end())
-    {
-        m_managers.push_back(wxm);
-    }
-}
-
-void WindowsXamlManager::XamlCore::RemoveManager(_In_ WindowsXamlManager* wxm)
-{
-    auto it = std::find(m_managers.begin(), m_managers.end(), wxm);
-    ASSERT(it != m_managers.end());
-    if (it != m_managers.end())
-    {
-        m_managers.erase(it);
-    }
-
-    if (m_managers.empty())
-    {
-        // Deallocate the memory
-        m_managers.shrink_to_fit();
-    }
-}
-
-_Check_return_ HRESULT WindowsXamlManager::XamlCore::OnFrameworkShutdownStarting(
-    _In_ msy::IDispatcherQueueShutdownStartingEventArgs* shutdownStartingArgs)
-{
-    const auto shutdownModel{FrameworkApplication::GetCurrentShutdownModel()};
-    if (shutdownModel == xaml::ShutdownModel_Version1)
-    {
-        // ShutdownModel_Version1 is deprecated, the app must use a private API to enable it.
-        // Make a local copy since closing these instances synchronously will change m_instances
-        std::vector<WindowsXamlManager*> managersCopy {m_managers};
-        for (WindowsXamlManager* manager : managersCopy)
-        {
-            // When the last manager closes, it will trigger a close on this XamlCore object
-            IFC_RETURN(manager->CloseImpl(true /*synchronous*/));
-        }
-    }
-    else if (shutdownModel == xaml::ShutdownModel_Version2)
-    {
-        // The default path: we wait until this event (FrameworkShutdownStarting) and then do our thread shutdown.
-
-        // Create strong refs to the remaining WindowsXamlManager objects in case some are released when we call out
-        // to app code.  Note the m_managers vector contains only managers that haven't been closed.
-        std::vector<ctl::ComPtr<WindowsXamlManager>> strongRefManagers;
-        strongRefManagers.reserve(tls_xamlCore->m_managers.size());
-
-        for (WindowsXamlManager* manager : tls_xamlCore->m_managers)
-        {
-            strongRefManagers.push_back(manager);
-        }
-        
-        // This will do the Xaml thread shutdown and remove the TLS entry.
-        tls_xamlCore->Close();
-        tls_xamlCore = nullptr; // Close() already does this, but adding here for clarity.
-
-        for (ctl::ComPtr<WindowsXamlManager> manager : strongRefManagers)
+        else
         {
-            manager->RaiseXamlShutdownCompletedOnThreadEvent(shutdownStartingArgs);
-            IFC_RETURN(manager->Close());
+            IFC_RETURN(EnqueueClose());
         }
     }
-    else
-    {
-        XAML_FAIL_FAST();
-    }
 
-    // The XamlCore on the thread must be gone at this point.
-    ASSERT(tls_xamlCore == nullptr);
     return S_OK;
-}
\ No newline at end of file
+}
diff --git a/dxaml/xcp/dxaml/lib/WindowsXamlManager_Partial.h b/dxaml/xcp/dxaml/lib/WindowsXamlManager_Partial.h
index 81a62a6b4e..8379ffe9cb 100644
--- a/dxaml/xcp/dxaml/lib/WindowsXamlManager_Partial.h
+++ b/dxaml/xcp/dxaml/lib/WindowsXamlManager_Partial.h
@@ -36,6 +36,10 @@ namespace DirectUI
             return S_OK;
         }
 
+        // Get the WindowsXamlManager for the current thread.
+        // (always returns null in legacy shutdown mode)
+        static ctl::ComPtr<WindowsXamlManager> GetForCurrentThread();
+
     private:
 
         void RaiseXamlShutdownCompletedOnThreadEvent(
@@ -43,14 +47,13 @@ namespace DirectUI
 
         ctl::ComPtr<XamlShutdownCompletedOnThreadEventSourceType> m_xamlShutdownCompletedOnThreadEventSource;
 
-        // XamlCore is a per-thread object that represents the the running Xaml Core on the thread.
-        // It tracks the WindowsXamlManager objects on the thread, and shuts down the XAML
-        // state on the thread when all WXM instances on the thread are closed.  It may outlive
-        // all the instances of WindowsXamlManager.
+        // XamlCore is a base class for the XamlCoreLegacyShutdown and XamlCoreNewShutdown classes.
+        // There is at most one of these objects per-thread, stored in tls_xamlCore.  This object manages
+        // the lifetime of the Xaml runtime on the thread.
         class XamlCore
         {
         public:
-            ~XamlCore();
+            virtual ~XamlCore();
             _Check_return_ HRESULT Initialize(msy::IDispatcherQueue* dq);
             _Check_return_ HRESULT Close();
 
@@ -61,13 +64,14 @@ namespace DirectUI
             };
             State GetState() const { return m_state; }
             void SetState(State state) { m_state = state; }
+           
+            virtual void OnManagerCreated(_In_ WindowsXamlManager* manager) = 0;
+            virtual void OnManagerClosed(_In_ WindowsXamlManager* manager) = 0;
+            virtual ctl::ComPtr<DirectUI::WindowsXamlManager> GetForCurrentThread() = 0;
+            virtual bool ReadyForEarlyShutdown() const = 0;
 
-            void AddManager(_In_ WindowsXamlManager* wxm);
-            void RemoveManager(_In_ WindowsXamlManager* wxm);
-            int ManagerCount() const { return m_managers.size(); }
-
-            _Check_return_ HRESULT OnFrameworkShutdownStarting(
-                _In_ msy::IDispatcherQueueShutdownStartingEventArgs* args);
+            virtual _Check_return_ HRESULT OnFrameworkShutdownStarting(
+                _In_ msy::IDispatcherQueueShutdownStartingEventArgs* args) = 0;
 
         private:
             wrl::ComPtr<msy::IDispatcherQueue> m_dispatcherQueue;
@@ -75,12 +79,12 @@ namespace DirectUI
             EventRegistrationToken m_frameworkShutdownStartingToken {};
             State m_state {State::Normal};
 
-            // These are raw non-ref-counted pointers, the WindowsXamlManager objects add and remove themselves.
-            std::vector<DirectUI::WindowsXamlManager*> m_managers;
-
             inline static std::atomic<int> s_instancesInProcess{};
         };
 
+        friend class XamlCoreLegacyShutdown;
+        friend class XamlCoreNewShutdown;
+
         _Check_return_ HRESULT EnqueueClose();
         _Check_return_ HRESULT CheckWindowingModelPolicy();
 
diff --git a/dxaml/xcp/dxaml/lib/XamlIsland_Partial.cpp b/dxaml/xcp/dxaml/lib/XamlIsland_Partial.cpp
index 79717021fd..bccb77b0c8 100644
--- a/dxaml/xcp/dxaml/lib/XamlIsland_Partial.cpp
+++ b/dxaml/xcp/dxaml/lib/XamlIsland_Partial.cpp
@@ -91,33 +91,63 @@ _Check_return_ HRESULT XamlIsland::Initialize()
         WRLHelper::MakeAgileCallback<wf::ITypedEventHandler<ixp::InputFocusController*, ixp::FocusNavigationRequestEventArgs*>>(
             [xamlIsland](ixp::IInputFocusController* sender, ixp::IFocusNavigationRequestEventArgs* args) -> HRESULT
             {
-                // Create Xaml FocusNavigationRequest
+                // Convert IXP FocusNavigationRequest to Xaml FocusNavigationRequest
                 wrl::ComPtr<xaml_hosting::IXamlSourceFocusNavigationRequest> xamlSourceFocusNavigationRequest;
                 wrl::ComPtr<IActivationFactory> requestActivationFactory;
                 requestActivationFactory.Attach(DirectUI::CreateActivationFactory_XamlSourceFocusNavigationRequest());
                 wrl::ComPtr<xaml_hosting::IXamlSourceFocusNavigationRequestFactory> requestFactory;
                 IFC_RETURN(requestActivationFactory.As(&requestFactory));
 
+                wrl::ComPtr<ixp::IFocusNavigationRequest> ixpRequest;
+                IFC_RETURN(args->get_Request(&ixpRequest));
+
                 // Convert IXP FocusNavigationReason to Xaml FocusNavigationReason
                 ixp::FocusNavigationReason ixpReason;
                 xaml_hosting::XamlSourceFocusNavigationReason xamlReason;
-                IFC_RETURN(args->get_Reason(&ixpReason));
+                IFC_RETURN(ixpRequest->get_Reason(&ixpReason));
                 switch (ixpReason)
                 {
+                case ixp::FocusNavigationReason::FocusNavigationReason_Programmatic:
+                    xamlReason = xaml_hosting::XamlSourceFocusNavigationReason::XamlSourceFocusNavigationReason_Programmatic;
+                    break;
+                case ixp::FocusNavigationReason::FocusNavigationReason_Restore:
+                    xamlReason = xaml_hosting::XamlSourceFocusNavigationReason::XamlSourceFocusNavigationReason_Restore;
+                    break;
                 case ixp::FocusNavigationReason::FocusNavigationReason_Left:
+                    xamlReason = xaml_hosting::XamlSourceFocusNavigationReason::XamlSourceFocusNavigationReason_Left;
+                    break;
                 case ixp::FocusNavigationReason::FocusNavigationReason_Down:
+                    xamlReason = xaml_hosting::XamlSourceFocusNavigationReason::XamlSourceFocusNavigationReason_Down;
+                    break;
                 case ixp::FocusNavigationReason::FocusNavigationReason_First:
                     xamlReason = xaml_hosting::XamlSourceFocusNavigationReason::XamlSourceFocusNavigationReason_First;
                     break;
                 case ixp::FocusNavigationReason::FocusNavigationReason_Right:
+                    xamlReason = xaml_hosting::XamlSourceFocusNavigationReason::XamlSourceFocusNavigationReason_Right;
+                    break;
                 case ixp::FocusNavigationReason::FocusNavigationReason_Up:
+                    xamlReason = xaml_hosting::XamlSourceFocusNavigationReason::XamlSourceFocusNavigationReason_Up;
+                    break;
                 case ixp::FocusNavigationReason::FocusNavigationReason_Last:
                     xamlReason = xaml_hosting::XamlSourceFocusNavigationReason::XamlSourceFocusNavigationReason_Last;
                     break;
                 }
-                
-                IFC_RETURN(requestFactory->CreateInstance(
+
+                // Get HintRect and CorrelationID from IXP FocusNavigationRequest
+                ctl::ComPtr<ABI::Windows::Foundation::IReference<ABI::Windows::Foundation::Rect>> hintRectRef;
+                IFC_RETURN(ixpRequest->get_HintRect(&hintRectRef));
+                ABI::Windows::Foundation::Rect hintRect;
+                if (hintRectRef != nullptr)
+                {
+                    IFC_RETURN(hintRectRef->get_Value(&hintRect));
+                }
+                GUID correlationId;
+                IFC_RETURN(ixpRequest->get_CorrelationId(&correlationId));
+
+                IFC_RETURN(requestFactory->CreateInstanceWithHintRectAndCorrelationId(
                     xamlReason,
+                    hintRect,
+                    correlationId,
                     &xamlSourceFocusNavigationRequest));
 
                 // Get Xaml FocusController and FocusManager
@@ -128,14 +158,69 @@ _Check_return_ HRESULT XamlIsland::Initialize()
                 CFocusManager* focusManager = VisualTree::GetFocusManagerForElement(xamlIsland->GetHandle());
 
                 // Pass IXP focus navigation on to Xaml focus navigation logic to set Xaml logical focus
-                xaml_hosting::IXamlSourceFocusNavigationResult* pResult = nullptr;
-                IFC_RETURN(spFocusController->NavigateFocus(xamlSourceFocusNavigationRequest.Get(), focusManager->GetFocusObserverNoRef(), &pResult));
+                ctl::ComPtr<xaml_hosting::IXamlSourceFocusNavigationResult> pResult = nullptr;
+                IFC_RETURN(spFocusController->NavigateFocus(xamlSourceFocusNavigationRequest.Get(), focusManager->GetFocusObserverNoRef(), pResult.GetAddressOf()));
+
+                // Convert Xaml focus navigation result to IXP focus navigation result
+                boolean wasFocusMoved;
+                IFC_RETURN(pResult->get_WasFocusMoved(&wasFocusMoved));
+                ixp::FocusNavigationResult ixpResult = wasFocusMoved ? ixp::FocusNavigationResult::FocusNavigationResult_Moved : ixp::FocusNavigationResult::FocusNavigationResult_NotMoved;
+                IFC_RETURN(args->put_Result(ixpResult));
 
-                // Convert Xaml focus navigation result to Ixp focus navigation result (this value is ignored right now, IXP focus API still under construction)
-                args->put_Result(ixp::FocusNavigationResult::FocusNavigationResult_Moved);
                 return S_OK;
             }).Get(), &m_focusNavigationRequestedToken));
 
+    // Note: This is needed for ScrollViewer initialization.
+    // CUIElement::CanDMContainerInitialize looks for a valid input window, and CanDMContainerInitialize
+    // is needed before CInputServices::InitializeDirectManipulationContainers can activate DM for a
+    // ScrollViewer.
+    wrl::ComPtr<ixp::IContentIsland> contentIsland = m_pXamlIslandCore->GetContentIsland();
+    wrl::ComPtr<ixp::IContentIsland2> contentIsland2;
+    IFCFAILFAST(contentIsland.As(&contentIsland2));
+
+    // Right now, the InputSite only has a valid HWND once the island has connected. This means that
+    // we wait to set it on the XamlIslandRoot until the connected event. Once velocity key
+    // 45720437 has been flipped on, we can remove this and set the input site on initialization.
+    // http://task.ms/48681310: Once we flip this InputSite velocity key in Xaml, we can set the InputSite as
+    // soon as the XamlIsland is initialized and won't have to wait for connection.
+
+    ctl::WeakRefPtr wrThis;
+    IFC_RETURN(ctl::AsWeak(this, &wrThis));
+
+    IFCFAILFAST(contentIsland2->add_Connected(
+        WRLHelper::MakeAgileCallback<wf::IEventHandler<ixp::ContentIsland *>>(
+            [wrThis](IInspectable *, ixp::IContentIsland * /* content */) mutable -> HRESULT
+            {
+                ctl::ComPtr<XamlIsland> spThis;
+                IFC_RETURN(wrThis.As(&spThis));
+
+                if (spThis)
+                {
+                    IFC_RETURN(spThis->SetInputSite());
+                }
+
+                return S_OK;
+            })
+            .Get(),
+        &m_islandConnectedToken));
+
+    IFCFAILFAST(contentIsland2->add_Disconnected(
+        WRLHelper::MakeAgileCallback<wf::IEventHandler<ixp::ContentIsland *>>(
+            [wrThis](IInspectable *, ixp::IContentIsland * /* content */) mutable -> HRESULT
+            {
+                ctl::ComPtr<XamlIsland> spThis;
+                IFC_RETURN(wrThis.As(&spThis));
+
+                if (spThis && spThis->m_pXamlIslandCore)
+                {
+                    spThis->m_pXamlIslandCore->SetIslandInputSite(nullptr);
+                }
+
+                return S_OK;
+            })
+            .Get(),
+        &m_islandDisconnectedToken));
+
     return S_OK;
 }
 
@@ -248,6 +333,20 @@ _Check_return_ xaml_hosting::IXamlIslandRoot* XamlIsland::GetXamlIslandRootNoRef
     return m_spXamlIsland.Get();
 }
 
+_Check_return_ HRESULT XamlIsland::SetInputSite()
+{
+    wrl::ComPtr<ixp::IContentIslandPartner> contentIslandPartner;
+    wrl::ComPtr<ixp::IContentIsland> contentIsland = m_pXamlIslandCore->GetContentIsland();
+    IFCFAILFAST(contentIsland.As(&contentIslandPartner));
+
+    wrl::ComPtr<ixp::IIslandInputSitePartner> islandInputSitePartner;
+    IFCFAILFAST(contentIslandPartner->get_IslandInputSite(&islandInputSitePartner));
+
+    m_pXamlIslandCore->SetIslandInputSite(islandInputSitePartner.Get());
+
+    return S_OK;
+}
+
 IFACEMETHODIMP XamlIsland::Close()
 {
     if (m_bClosed)
@@ -275,6 +374,28 @@ IFACEMETHODIMP XamlIsland::Close()
         m_focusNavigationRequestedToken.value = 0;
     }
 
+    // http://task.ms/48681310: Once velocity key 45720437 has been flipped on, we will no longer
+    // have to set the InputSite on connection and this can be removed.
+    if (m_islandConnectedToken.value != 0)
+    {
+        wrl::ComPtr<ixp::IContentIsland> contentIsland = m_pXamlIslandCore->GetContentIsland();
+        wrl::ComPtr<ixp::IContentIsland2> contentIsland2;
+        IFCFAILFAST(contentIsland.As(&contentIsland2));
+
+        IFCFAILFAST(contentIsland2->remove_Connected(m_islandConnectedToken));
+        m_islandConnectedToken.value = 0;
+    }
+
+    if (m_islandDisconnectedToken.value != 0)
+    {
+        wrl::ComPtr<ixp::IContentIsland> contentIsland = m_pXamlIslandCore->GetContentIsland();
+        wrl::ComPtr<ixp::IContentIsland2> contentIsland2;
+        IFCFAILFAST(contentIsland.As(&contentIsland2));
+
+        IFCFAILFAST(contentIsland2->remove_Disconnected(m_islandDisconnectedToken));
+        m_islandDisconnectedToken.value = 0;
+    }
+
     if (m_spXamlIsland.Get() != nullptr)
     {
         auto frameworkApplication = FrameworkApplication::GetCurrentNoRef();
diff --git a/dxaml/xcp/dxaml/lib/XamlIsland_Partial.h b/dxaml/xcp/dxaml/lib/XamlIsland_Partial.h
index af7b2f581b..938fa4be65 100644
--- a/dxaml/xcp/dxaml/lib/XamlIsland_Partial.h
+++ b/dxaml/xcp/dxaml/lib/XamlIsland_Partial.h
@@ -37,6 +37,7 @@ namespace DirectUI
         _Check_return_ HRESULT put_SystemBackdropImpl(_In_opt_ xaml::Media::ISystemBackdrop * iSystemBackdrop);
 
         _Check_return_ xaml_hosting::IXamlIslandRoot *GetXamlIslandRootNoRef();
+        _Check_return_ HRESULT SetInputSite();
 
     protected:
         _Check_return_ HRESULT Initialize() override;
@@ -51,6 +52,8 @@ namespace DirectUI
         CXamlIslandRoot * m_pXamlIslandCore;
         ctl::ComPtr<ABI::Microsoft::UI::Input::IInputFocusController2> m_inputFocusController2;
         EventRegistrationToken m_focusNavigationRequestedToken = {};
+        EventRegistrationToken m_islandConnectedToken = {};
+        EventRegistrationToken m_islandDisconnectedToken = {};
 
         ctl::ComPtr<xaml::Media::ISystemBackdrop> m_systemBackdrop;
     };
diff --git a/dxaml/xcp/dxaml/lib/XamlRoot_Partial.cpp b/dxaml/xcp/dxaml/lib/XamlRoot_Partial.cpp
index 8e098305e9..b310c227b0 100644
--- a/dxaml/xcp/dxaml/lib/XamlRoot_Partial.cpp
+++ b/dxaml/xcp/dxaml/lib/XamlRoot_Partial.cpp
@@ -228,6 +228,30 @@ _Check_return_ HRESULT XamlRoot::get_HostWindow(_Out_ HWND* pValue)
     {
         auto cr = m_visualTree->GetContentRootNoRef();
         HWND hwnd = cr->GetHostingHWND();
+
+        if (!hwnd)
+        {
+            // The caller is hosted in a XamlIsland. Ideally, we would return null here, as
+            // we can't guarantee that the XamlIsland is hosted in an HWND bridge and can't access that
+            // HWND if it is. Any calls to method should instead include an equivalent call to the
+            // ContentIsland if we return null.
+
+            // Bug https://task.ms/48685229: For now, there are still calls to this method that cannot be
+            // easily replaced with a ContentIsland API, specifically in WebView2.cpp. This means that we
+            // have to return a hosting HWND even in the XamlIsland scenario. The InputSite gives us a
+            // way to retrieve this HWND as long as InputSite velocity key 45720437 is disabled. Once
+            // this key is enabled for this repo, this will no longer be the case, as the InputSite will
+            // return an HWND that works for input but not for hosting or positioning. At this point,
+            // we will return null and callers will need to make an equivalent call to the ContentIsland.
+            wrl::ComPtr<ixp::IIslandInputSitePartner> inputSite = 
+            GetVisualTreeNoRef()->GetContentRootNoRef()->GetXamlIslandRootNoRef()->GetIslandInputSite();
+
+            if (inputSite)
+            {
+                hwnd = CInputServices::GetUnderlyingInputHwndFromIslandInputSite(inputSite.Get());
+            }
+        }
+
         *pValue = hwnd;
     }
 
diff --git a/dxaml/xcp/dxaml/lib/synonyms.g.h b/dxaml/xcp/dxaml/lib/synonyms.g.h
index 4b51d62228..a19374bf4a 100644
--- a/dxaml/xcp/dxaml/lib/synonyms.g.h
+++ b/dxaml/xcp/dxaml/lib/synonyms.g.h
@@ -46,9 +46,9 @@ namespace DirectUISynonyms
     typedef ABI::Microsoft::UI::Xaml::IApplication IApplication;
     typedef ABI::Microsoft::UI::Xaml::IApplicationOverrides IApplicationOverrides;
     typedef ABI::Microsoft::UI::Xaml::IApplication2 IApplication2;
+    typedef ABI::Microsoft::UI::Xaml::IApplication3 IApplication3;
     typedef ABI::Microsoft::UI::Xaml::IApplicationFeature_UwpSupportApi IApplicationFeature_UwpSupportApi;
     typedef ABI::Microsoft::UI::Xaml::IApplicationOverridesFeature_UwpSupportApi IApplicationOverridesFeature_UwpSupportApi;
-    typedef ABI::Microsoft::UI::Xaml::IApplicationFeature_ExperimentalApi IApplicationFeature_ExperimentalApi;
     typedef ABI::Microsoft::UI::Xaml::IFrameworkElement IFrameworkElement;
     typedef ABI::Microsoft::UI::Xaml::IFrameworkElementOverrides IFrameworkElementOverrides;
     typedef ABI::Microsoft::UI::Xaml::IFrameworkElementProtected IFrameworkElementProtected;
@@ -565,7 +565,7 @@ namespace DirectUISynonyms
     typedef ABI::Microsoft::UI::Xaml::Hosting::IDesktopWindowXamlSourceTakeFocusRequestedEventArgs IDesktopWindowXamlSourceTakeFocusRequestedEventArgs;
     typedef ABI::Microsoft::UI::Xaml::Hosting::IElementCompositionPreview IElementCompositionPreview;
     typedef ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManager IWindowsXamlManager;
-    typedef ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManagerFeature_ExperimentalApi IWindowsXamlManagerFeature_ExperimentalApi;
+    typedef ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManager2 IWindowsXamlManager2;
     typedef ABI::Microsoft::UI::Xaml::Hosting::IXamlIslandRoot IXamlIslandRoot;
     typedef ABI::Microsoft::UI::Xaml::Hosting::IXamlShutdownCompletedOnThreadEventArgs IXamlShutdownCompletedOnThreadEventArgs;
     typedef ABI::Microsoft::UI::Xaml::Hosting::IXamlSourceFocusNavigationRequest IXamlSourceFocusNavigationRequest;
diff --git a/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FrameworkApplication.g.cpp b/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FrameworkApplication.g.cpp
index 269254064b..a0b4de9a1f 100644
--- a/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FrameworkApplication.g.cpp
+++ b/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FrameworkApplication.g.cpp
@@ -48,6 +48,10 @@ HRESULT DirectUI::FrameworkApplicationGenerated::QueryInterfaceImpl(_In_ REFIID
     {
         *ppObject = ctl::interface_cast<ABI::Microsoft::UI::Xaml::IApplication2>(this);
     }
+    else if (InlineIsEqualGUID(iid, __uuidof(ABI::Microsoft::UI::Xaml::IApplication3)))
+    {
+        *ppObject = ctl::interface_cast<ABI::Microsoft::UI::Xaml::IApplication3>(this);
+    }
 #if WI_IS_FEATURE_PRESENT(Feature_UwpSupportApi)
     else if (InlineIsEqualGUID(iid, __uuidof(ABI::Microsoft::UI::Xaml::IApplicationFeature_UwpSupportApi)) && Feature_UwpSupportApi::IsEnabled())
     {
@@ -57,12 +61,6 @@ HRESULT DirectUI::FrameworkApplicationGenerated::QueryInterfaceImpl(_In_ REFIID
     {
         *ppObject = static_cast<ABI::Microsoft::UI::Xaml::IApplicationOverridesFeature_UwpSupportApi*>(this);
     }
-#endif
-#if WI_IS_FEATURE_PRESENT(Feature_ExperimentalApi)
-    else if (InlineIsEqualGUID(iid, __uuidof(ABI::Microsoft::UI::Xaml::IApplicationFeature_ExperimentalApi)) && Feature_ExperimentalApi::IsEnabled())
-    {
-        *ppObject = ctl::interface_cast<ABI::Microsoft::UI::Xaml::IApplicationFeature_ExperimentalApi>(this);
-    }
 #endif
     else
     {
diff --git a/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FrameworkApplication.g.h b/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FrameworkApplication.g.h
index 110b87e516..7804edca6a 100644
--- a/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FrameworkApplication.g.h
+++ b/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FrameworkApplication.g.h
@@ -17,11 +17,6 @@
 #else
 #define FEATURE_UWPSUPPORTAPI_OVERRIDE
 #endif
-#if WI_IS_FEATURE_PRESENT(Feature_ExperimentalApi) 
-#define FEATURE_EXPERIMENTALAPI_OVERRIDE override
-#else
-#define FEATURE_EXPERIMENTALAPI_OVERRIDE
-#endif
 #define __FrameworkApplication_GUID "9e00ad29-1d7e-48dd-a33a-e22f902499ca"
 
 #pragma region forwarders
@@ -36,8 +31,8 @@ namespace ctl
         IFACEMETHOD(remove_ResourceManagerRequested)(_In_ EventRegistrationToken token) override { return This()->remove_ResourceManagerRequested(token); }
     };
     template<typename impl_type>
-    class interface_forwarder< ABI::Microsoft::UI::Xaml::IApplicationFeature_ExperimentalApi, impl_type> final
-        : public ctl::iinspectable_forwarder_base< ABI::Microsoft::UI::Xaml::IApplicationFeature_ExperimentalApi, impl_type>
+    class interface_forwarder< ABI::Microsoft::UI::Xaml::IApplication3, impl_type> final
+        : public ctl::iinspectable_forwarder_base< ABI::Microsoft::UI::Xaml::IApplication3, impl_type>
     {
         impl_type* This() { return this->This_helper<impl_type>(); }
         IFACEMETHOD(get_DispatcherShutdownMode)(_Out_ ABI::Microsoft::UI::Xaml::DispatcherShutdownMode* pValue) override { return This()->get_DispatcherShutdownMode(pValue); }
@@ -61,12 +56,10 @@ namespace DirectUI
         , public ABI::Microsoft::UI::Xaml::IApplicationOverrides
         , public ABI::Microsoft::UI::Xaml::IFrameworkApplicationPrivate
         , public ctl::forwarder_holder< ABI::Microsoft::UI::Xaml::IApplication2, FrameworkApplicationGenerated >
+        , public ctl::forwarder_holder< ABI::Microsoft::UI::Xaml::IApplication3, FrameworkApplicationGenerated >
 #if WI_IS_FEATURE_PRESENT(Feature_UwpSupportApi)
         , public ABI::Microsoft::UI::Xaml::IApplicationFeature_UwpSupportApi
         , public ABI::Microsoft::UI::Xaml::IApplicationOverridesFeature_UwpSupportApi
-#endif
-#if WI_IS_FEATURE_PRESENT(Feature_ExperimentalApi)
-        , public ctl::forwarder_holder< ABI::Microsoft::UI::Xaml::IApplicationFeature_ExperimentalApi, FrameworkApplicationGenerated >
 #endif
     {
         friend class DirectUI::FrameworkApplication;
@@ -78,12 +71,10 @@ namespace DirectUI
             INTERFACE_ENTRY(FrameworkApplicationGenerated, ABI::Microsoft::UI::Xaml::IApplicationOverrides)
             INTERFACE_ENTRY(FrameworkApplicationGenerated, ABI::Microsoft::UI::Xaml::IFrameworkApplicationPrivate)
             INTERFACE_ENTRY(FrameworkApplicationGenerated, ABI::Microsoft::UI::Xaml::IApplication2)
+            INTERFACE_ENTRY(FrameworkApplicationGenerated, ABI::Microsoft::UI::Xaml::IApplication3)
 #if WI_IS_FEATURE_PRESENT(Feature_UwpSupportApi)
             INTERFACE_ENTRY(FrameworkApplicationGenerated, ABI::Microsoft::UI::Xaml::IApplicationFeature_UwpSupportApi)
             INTERFACE_ENTRY(FrameworkApplicationGenerated, ABI::Microsoft::UI::Xaml::IApplicationOverridesFeature_UwpSupportApi)
-#endif
-#if WI_IS_FEATURE_PRESENT(Feature_ExperimentalApi)
-            INTERFACE_ENTRY(FrameworkApplicationGenerated, ABI::Microsoft::UI::Xaml::IApplicationFeature_ExperimentalApi)
 #endif
         END_INTERFACE_MAP(FrameworkApplicationGenerated, ctl::WeakReferenceSource)
 
diff --git a/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/WindowsXamlManager.g.cpp b/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/WindowsXamlManager.g.cpp
index 87dc3b8ffc..3aaaecef49 100644
--- a/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/WindowsXamlManager.g.cpp
+++ b/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/WindowsXamlManager.g.cpp
@@ -35,12 +35,10 @@ HRESULT DirectUI::WindowsXamlManagerGenerated::QueryInterfaceImpl(_In_ REFIID ii
     {
         *ppObject = static_cast<ABI::Windows::Foundation::IClosable*>(this);
     }
-#if WI_IS_FEATURE_PRESENT(Feature_ExperimentalApi)
-    else if (InlineIsEqualGUID(iid, __uuidof(ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManagerFeature_ExperimentalApi)) && Feature_ExperimentalApi::IsEnabled())
+    else if (InlineIsEqualGUID(iid, __uuidof(ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManager2)))
     {
-        *ppObject = ctl::interface_cast<ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManagerFeature_ExperimentalApi>(this);
+        *ppObject = ctl::interface_cast<ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManager2>(this);
     }
-#endif
     else
     {
         RRETURN(ctl::WeakReferenceSource::QueryInterfaceImpl(iid, ppObject));
@@ -64,8 +62,6 @@ HRESULT DirectUI::WindowsXamlManagerGenerated::EventAddPreValidation(_In_ void*
     return S_OK;
 }
 // Events.
-#if WI_IS_FEATURE_PRESENT(Feature_ExperimentalApi)
-
 _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::WindowsXamlManagerGenerated::add_XamlShutdownCompletedOnThread(_In_ ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::Hosting::WindowsXamlManager*, ABI::Microsoft::UI::Xaml::Hosting::XamlShutdownCompletedOnThreadEventArgs*>* pValue, _Out_ EventRegistrationToken* ptToken)
 {
     HRESULT hr = S_OK;
@@ -96,7 +92,6 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::WindowsXamlManagerGenerated::
 Cleanup:
     RRETURN(hr);
 }
-#endif
 
 // Methods.
 
@@ -106,12 +101,10 @@ HRESULT DirectUI::WindowsXamlManagerFactory::QueryInterfaceImpl(_In_ REFIID iid,
     {
         *ppObject = static_cast<ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManagerStatics*>(this);
     }
-#if WI_IS_FEATURE_PRESENT(Feature_ExperimentalApi)
-    else if (InlineIsEqualGUID(iid, __uuidof(ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManagerStaticsFeature_ExperimentalApi)))
+    else if (InlineIsEqualGUID(iid, __uuidof(ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManagerStatics2)))
     {
-        *ppObject = static_cast<ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManagerStaticsFeature_ExperimentalApi*>(this);
+        *ppObject = static_cast<ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManagerStatics2*>(this);
     }
-#endif
     else
     {
         RRETURN(ctl::AbstractActivationFactory::QueryInterfaceImpl(iid, ppObject));
@@ -133,15 +126,6 @@ _Check_return_ HRESULT DirectUI::WindowsXamlManagerFactory::CheckActivationAllow
 // Attached properties.
 
 // Static properties.
-IFACEMETHODIMP DirectUI::WindowsXamlManagerFactory::get_IsXamlRunningOnCurrentThread(_Out_ BOOLEAN* pValue)
-{
-    HRESULT hr = S_OK;
-    ARG_VALIDRETURNPOINTER(pValue);
-    
-    IFC(get_IsXamlRunningOnCurrentThreadImpl(pValue));
-Cleanup:
-    RRETURN(hr);
-}
 
 // Static methods.
 IFACEMETHODIMP DirectUI::WindowsXamlManagerFactory::InitializeForCurrentThread(_Outptr_ ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManager** ppResult)
@@ -161,6 +145,23 @@ IFACEMETHODIMP DirectUI::WindowsXamlManagerFactory::InitializeForCurrentThread(_
     }
     RRETURN(hr);
 }
+IFACEMETHODIMP DirectUI::WindowsXamlManagerFactory::GetForCurrentThread(_Outptr_ ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManager** ppResult)
+{
+    HRESULT hr = S_OK;
+    if (EventEnabledApiFunctionCallStart())
+    {
+        XamlTelemetry::PublicApiCall(true, 0, "WindowsXamlManager_GetForCurrentThread", 0);
+    }
+    ARG_VALIDRETURNPOINTER(ppResult);
+    
+    IFC(GetForCurrentThreadImpl(ppResult));
+Cleanup:
+    if (EventEnabledApiFunctionCallStop())
+    {
+        XamlTelemetry::PublicApiCall(false, 0, "WindowsXamlManager_GetForCurrentThread", hr);
+    }
+    RRETURN(hr);
+}
 
 namespace DirectUI
 {
diff --git a/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/WindowsXamlManager.g.h b/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/WindowsXamlManager.g.h
index 1a9bc44f08..b1c5ac9255 100644
--- a/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/WindowsXamlManager.g.h
+++ b/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/WindowsXamlManager.g.h
@@ -11,12 +11,7 @@
 
 #pragma once
 
-#include <FeatureFlags.h>
-#if WI_IS_FEATURE_PRESENT(Feature_ExperimentalApi) 
-#define FEATURE_EXPERIMENTALAPI_OVERRIDE override
-#else
-#define FEATURE_EXPERIMENTALAPI_OVERRIDE
-#endif
+
 #define __WindowsXamlManager_GUID "3b953d5c-2c9f-4e49-88a7-c030616de1f0"
 
 #pragma region forwarders
@@ -29,8 +24,8 @@ namespace ctl
         impl_type* This() { return this->This_helper<impl_type>(); }
     };
     template<typename impl_type>
-    class interface_forwarder< ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManagerFeature_ExperimentalApi, impl_type> final
-        : public ctl::iinspectable_forwarder_base< ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManagerFeature_ExperimentalApi, impl_type>
+    class interface_forwarder< ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManager2, impl_type> final
+        : public ctl::iinspectable_forwarder_base< ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManager2, impl_type>
     {
         impl_type* This() { return this->This_helper<impl_type>(); }
         IFACEMETHOD(add_XamlShutdownCompletedOnThread)(_In_ ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::Hosting::WindowsXamlManager*, ABI::Microsoft::UI::Xaml::Hosting::XamlShutdownCompletedOnThreadEventArgs*>* pValue, _Out_ EventRegistrationToken* pToken) override { return This()->add_XamlShutdownCompletedOnThread(pValue, pToken); }
@@ -47,9 +42,7 @@ namespace DirectUI
         public ctl::WeakReferenceSource
         , public ctl::forwarder_holder< ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManager, WindowsXamlManagerGenerated >
         , public ABI::Windows::Foundation::IClosable
-#if WI_IS_FEATURE_PRESENT(Feature_ExperimentalApi)
-        , public ctl::forwarder_holder< ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManagerFeature_ExperimentalApi, WindowsXamlManagerGenerated >
-#endif
+        , public ctl::forwarder_holder< ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManager2, WindowsXamlManagerGenerated >
     {
         friend class DirectUI::WindowsXamlManager;
 
@@ -58,9 +51,7 @@ namespace DirectUI
         BEGIN_INTERFACE_MAP(WindowsXamlManagerGenerated, ctl::WeakReferenceSource)
             INTERFACE_ENTRY(WindowsXamlManagerGenerated, ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManager)
             INTERFACE_ENTRY(WindowsXamlManagerGenerated, ABI::Windows::Foundation::IClosable)
-#if WI_IS_FEATURE_PRESENT(Feature_ExperimentalApi)
-            INTERFACE_ENTRY(WindowsXamlManagerGenerated, ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManagerFeature_ExperimentalApi)
-#endif
+            INTERFACE_ENTRY(WindowsXamlManagerGenerated, ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManager2)
         END_INTERFACE_MAP(WindowsXamlManagerGenerated, ctl::WeakReferenceSource)
 
     public:
@@ -68,19 +59,15 @@ namespace DirectUI
         ~WindowsXamlManagerGenerated() override;
 
         // Event source typedefs.
-#if WI_IS_FEATURE_PRESENT(Feature_ExperimentalApi)
         typedef CEventSource<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::Hosting::WindowsXamlManager*, ABI::Microsoft::UI::Xaml::Hosting::XamlShutdownCompletedOnThreadEventArgs*>, ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManager, ABI::Microsoft::UI::Xaml::Hosting::IXamlShutdownCompletedOnThreadEventArgs> XamlShutdownCompletedOnThreadEventSourceType;
-#endif
 
 
         // Properties.
 
         // Events.
-#if WI_IS_FEATURE_PRESENT(Feature_ExperimentalApi)
         virtual _Check_return_ HRESULT GetXamlShutdownCompletedOnThreadEventSourceNoRef(_Outptr_ XamlShutdownCompletedOnThreadEventSourceType** ppEventSource) = 0;
         _Check_return_ HRESULT STDMETHODCALLTYPE add_XamlShutdownCompletedOnThread(_In_ ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::Hosting::WindowsXamlManager*, ABI::Microsoft::UI::Xaml::Hosting::XamlShutdownCompletedOnThreadEventArgs*>* pValue, _Out_ EventRegistrationToken* pToken);
         _Check_return_ HRESULT STDMETHODCALLTYPE remove_XamlShutdownCompletedOnThread(_In_ EventRegistrationToken token);
-#endif
 
         // Methods.
 
@@ -108,22 +95,17 @@ namespace DirectUI
     class __declspec(novtable) WindowsXamlManagerFactory:
        public ctl::AbstractActivationFactory
         , public ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManagerStatics
-#if WI_IS_FEATURE_PRESENT(Feature_ExperimentalApi)
-        , public ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManagerStaticsFeature_ExperimentalApi
-#endif
+        , public ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManagerStatics2
     {
         BEGIN_INTERFACE_MAP(WindowsXamlManagerFactory, ctl::AbstractActivationFactory)
             INTERFACE_ENTRY(WindowsXamlManagerFactory, ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManagerStatics)
-#if WI_IS_FEATURE_PRESENT(Feature_ExperimentalApi)
-            INTERFACE_ENTRY(WindowsXamlManagerFactory, ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManagerStaticsFeature_ExperimentalApi)
-#endif
+            INTERFACE_ENTRY(WindowsXamlManagerFactory, ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManagerStatics2)
         END_INTERFACE_MAP(WindowsXamlManagerFactory, ctl::AbstractActivationFactory)
 
     public:
         // Factory methods.
 
         // Static properties.
-        IFACEMETHOD(get_IsXamlRunningOnCurrentThread)(_Out_ BOOLEAN* pValue) FEATURE_EXPERIMENTALAPI_OVERRIDE;
 
         // Dependency properties.
 
@@ -131,6 +113,7 @@ namespace DirectUI
 
         // Static methods.
         IFACEMETHOD(InitializeForCurrentThread)(_Outptr_ ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManager** ppResult) override;
+        IFACEMETHOD(GetForCurrentThread)(_Outptr_ ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManager** ppResult) override;
 
         // Static events.
 
@@ -143,9 +126,9 @@ namespace DirectUI
     private:
 
         // Customized static properties.
-         _Check_return_ HRESULT get_IsXamlRunningOnCurrentThreadImpl(_Out_ BOOLEAN* pValue); 
 
         // Customized static  methods.
          _Check_return_ HRESULT InitializeForCurrentThreadImpl(_Outptr_ ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManager** ppResult); 
+         _Check_return_ HRESULT GetForCurrentThreadImpl(_Outptr_ ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManager** ppResult); 
     };
 }
diff --git a/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlShutdownCompletedOnThreadEventArgs.g.cpp b/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlShutdownCompletedOnThreadEventArgs.g.cpp
index 9a74bc8fc7..1d0e2f2956 100644
--- a/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlShutdownCompletedOnThreadEventArgs.g.cpp
+++ b/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlShutdownCompletedOnThreadEventArgs.g.cpp
@@ -27,12 +27,10 @@ HRESULT DirectUI::XamlShutdownCompletedOnThreadEventArgsGenerated::QueryInterfac
     {
         *ppObject = static_cast<DirectUI::XamlShutdownCompletedOnThreadEventArgs*>(this);
     }
-#if WI_IS_FEATURE_PRESENT(Feature_ExperimentalApi)
-    else if (InlineIsEqualGUID(iid, __uuidof(ABI::Microsoft::UI::Xaml::Hosting::IXamlShutdownCompletedOnThreadEventArgs)) && Feature_ExperimentalApi::IsEnabled())
+    else if (InlineIsEqualGUID(iid, __uuidof(ABI::Microsoft::UI::Xaml::Hosting::IXamlShutdownCompletedOnThreadEventArgs)))
     {
         *ppObject = ctl::interface_cast<ABI::Microsoft::UI::Xaml::Hosting::IXamlShutdownCompletedOnThreadEventArgs>(this);
     }
-#endif
     else
     {
         RRETURN(ctl::WeakReferenceSource::QueryInterfaceImpl(iid, ppObject));
diff --git a/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlShutdownCompletedOnThreadEventArgs.g.h b/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlShutdownCompletedOnThreadEventArgs.g.h
index 871f5b846c..957ee893ca 100644
--- a/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlShutdownCompletedOnThreadEventArgs.g.h
+++ b/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlShutdownCompletedOnThreadEventArgs.g.h
@@ -11,16 +11,10 @@
 
 #pragma once
 
-#include <FeatureFlags.h>
-#if WI_IS_FEATURE_PRESENT(Feature_ExperimentalApi) 
-#define FEATURE_EXPERIMENTALAPI_OVERRIDE override
-#else
-#define FEATURE_EXPERIMENTALAPI_OVERRIDE
-#endif
+
 #define __XamlShutdownCompletedOnThreadEventArgs_GUID "c21339b3-e8f2-42b1-b5fc-335b78e66879"
 
 #pragma region forwarders
-#if WI_IS_FEATURE_PRESENT(Feature_ExperimentalApi)
 namespace ctl
 {
     template<typename impl_type>
@@ -31,7 +25,6 @@ namespace ctl
         IFACEMETHOD(GetDispatcherQueueDeferral)(_Outptr_ ABI::Windows::Foundation::IDeferral** ppResult) override { return This()->GetDispatcherQueueDeferral(ppResult); }
     };
 }
-#endif
 #pragma endregion
 
 namespace DirectUI
@@ -40,20 +33,14 @@ namespace DirectUI
 
     class __declspec(novtable) XamlShutdownCompletedOnThreadEventArgsGenerated:
         public ctl::WeakReferenceSource
-#if WI_IS_FEATURE_PRESENT(Feature_ExperimentalApi)
         , public ctl::forwarder_holder< ABI::Microsoft::UI::Xaml::Hosting::IXamlShutdownCompletedOnThreadEventArgs, XamlShutdownCompletedOnThreadEventArgsGenerated >
-#endif
     {
         friend class DirectUI::XamlShutdownCompletedOnThreadEventArgs;
 
         INSPECTABLE_CLASS(L"Microsoft.UI.Xaml.Hosting.XamlShutdownCompletedOnThreadEventArgs");
 
         BEGIN_INTERFACE_MAP(XamlShutdownCompletedOnThreadEventArgsGenerated, ctl::WeakReferenceSource)
-#if WI_IS_FEATURE_PRESENT(Feature_ExperimentalApi)
             INTERFACE_ENTRY(XamlShutdownCompletedOnThreadEventArgsGenerated, ABI::Microsoft::UI::Xaml::Hosting::IXamlShutdownCompletedOnThreadEventArgs)
-#else
-            INTERFACE_ENTRY(DUMMYINTERFACE, IUnknown)
-#endif
         END_INTERFACE_MAP(XamlShutdownCompletedOnThreadEventArgsGenerated, ctl::WeakReferenceSource)
 
     public:
diff --git a/dxaml/xcp/dxaml/themes/generic.xaml b/dxaml/xcp/dxaml/themes/generic.xaml
index f88970e0b4..6b3a696ec0 100644
--- a/dxaml/xcp/dxaml/themes/generic.xaml
+++ b/dxaml/xcp/dxaml/themes/generic.xaml
@@ -16966,6 +16966,7 @@
                                 Grid.Column="1"
                                 Control.IsTemplateKeyTipTarget="True"
                                 IsAccessKeyScope="True"
+                                AllowFocusOnInteraction="False"
                                 Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.EffectiveOverflowButtonVisibility}">
                                 <FontIcon x:Name="EllipsisIcon"
                     VerticalAlignment="Center"
@@ -23623,6 +23624,7 @@
                             VerticalAlignment="Top"
                             Grid.Column="1"
                             Control.IsTemplateKeyTipTarget="True"
+                            AllowFocusOnInteraction="False"
                             IsAccessKeyScope="True"
                             Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CommandBarTemplateSettings.EffectiveOverflowButtonVisibility}">
                                 <FontIcon x:Name="EllipsisIcon"
diff --git a/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Xaml.Hosting.cs b/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Xaml.Hosting.cs
index 924caa28a9..041a8a4991 100644
--- a/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Xaml.Hosting.cs
+++ b/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Xaml.Hosting.cs
@@ -315,8 +315,7 @@ public Microsoft.UI.Content.DesktopChildSiteBridge SiteBridge
         }
     }
 
-    [VelocityFeature("Feature_ExperimentalApi")]
-    [Contract(typeof(WinUIContract), Microsoft.UI.Xaml.WinUIContract.LatestVersion)]
+    [Contract(typeof(WinUIContract), 6)]
     [FrameworkTypePattern]
     [TypeTable(IsExcludedFromDXaml = true, IsExcludedFromCore = true)]
     [CodeGen(partial: true)]
@@ -329,6 +328,7 @@ internal XamlShutdownCompletedOnThreadEventArgs() { }
     }
 
     [Contract(typeof(WinUIContract), 5, ForcePrimaryInterfaceGeneration = true)]
+    [Platform(2, typeof(Microsoft.UI.Xaml.WinUIContract), 6)]
     [DXamlIdlGroup("coretypes2")]
     [CodeGen(partial: true)]
     [FrameworkTypePattern]
@@ -336,7 +336,6 @@ internal XamlShutdownCompletedOnThreadEventArgs() { }
     [Guids(ClassGuid = "3b953d5c-2c9f-4e49-88a7-c030616de1f0")]
     [ThreadingModel(ThreadingModel.Both)]
     [Implements(typeof(Windows.Foundation.IClosable))]
-    [Platform("Feature_ExperimentalApi", typeof(Microsoft.UI.Xaml.WinUIContract), Microsoft.UI.Xaml.WinUIContract.LatestVersion)]
     public sealed class WindowsXamlManager
     {
         internal WindowsXamlManager() {}
@@ -346,13 +345,16 @@ public static WindowsXamlManager InitializeForCurrentThread()
             return default(WindowsXamlManager);
         }
 
-        [VelocityFeature("Feature_ExperimentalApi")]
+        [Version(2)]
         [EventHandlerType(EventHandlerKind.TypedSenderAndArgs)]
         public event Windows.Foundation.TypedEventHandler<WindowsXamlManager, XamlShutdownCompletedOnThreadEventArgs> XamlShutdownCompletedOnThread;
 
-        [VelocityFeature("Feature_ExperimentalApi")]
+        [Version(2)]
         [CodeGen(CodeGenLevel.IdlAndPartialStub)]
         [TypeTable(IsExcludedFromDXaml = true)]
-	    static public bool IsXamlRunningOnCurrentThread { get; }
+	    public static WindowsXamlManager GetForCurrentThread()
+        { 
+            return default(WindowsXamlManager);
+        }
     }
 }
diff --git a/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Xaml.cs b/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Xaml.cs
index 73dba9cbb4..c4907704d7 100644
--- a/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Xaml.cs
+++ b/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Xaml.cs
@@ -2929,8 +2929,7 @@ public interface IFrameworkApplicationPrivate
 
     [TypeTable(IsExcludedFromDXaml = true, IsExcludedFromCore = true)]
     [EnumFlags(HasTypeConverter = true)]
-    [VelocityFeature("Feature_ExperimentalApi")]
-    [Contract(typeof(WinUIContract), Microsoft.UI.Xaml.WinUIContract.LatestVersion)]
+    [Contract(typeof(WinUIContract), 6)]
     public enum DispatcherShutdownMode
     {
         OnLastWindowClose = 0,
@@ -2944,8 +2943,8 @@ public enum DispatcherShutdownMode
     [ClassFlags(IsFreeThreaded = true)]
     [ThreadingModel(ThreadingModel.Both)]
     [Platform("Feature_UwpSupportApi", typeof(Microsoft.UI.Xaml.WinUIContract), 1)]
-    [Platform("Feature_ExperimentalApi", typeof(Microsoft.UI.Xaml.WinUIContract), Microsoft.UI.Xaml.WinUIContract.LatestVersion)]
     [Platform(2, typeof(Microsoft.UI.Xaml.WinUIContract), 5)]
+    [Platform(3, typeof(Microsoft.UI.Xaml.WinUIContract), 6)]
     [Implements(typeof(Microsoft.UI.Xaml.IFrameworkApplicationStaticsPrivate), IsStaticInterface = true)]
     [Implements(typeof(Microsoft.UI.Xaml.IFrameworkApplicationPrivate))]
     [DXamlIdlGroup("coretypes2")]
@@ -3133,7 +3132,7 @@ protected virtual void OnBackgroundActivated(Windows.ApplicationModel.Activation
         }
 
         [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        [VelocityFeature("Feature_ExperimentalApi")]
+        [Version(3)]
         public DispatcherShutdownMode DispatcherShutdownMode {get; set;}
     }
 
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 35e090b449..e8a05a55ff 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -2,17 +2,17 @@
 <!-- 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.5.0-20240123.2">
+    <Dependency Name="Microsoft.WindowsAppSDK.Foundation.TransportPackage" Version="1.5.0-20240203.2">
       <Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDK</Uri>
-      <Sha>59270ef4a911b2eda7a727e94d849eceb93cc2cc</Sha>
+      <Sha>e5cca86cae13e2d76d660b92c2887207ea0d7ae3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage" Version="1.5.3-CI-26033.1001.240119-0813.1">
+    <Dependency Name="Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage" Version="1.5.3-CI-26050.1000.240201-1035.1">
       <Uri>https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP</Uri>
-      <Sha>9589050fb3de9f8f978f57c8e782daef859cfa04</Sha>
+      <Sha>2d8e71d8e93b54cebdbab98cf6c48d0393a303eb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Internal.InteractiveExperiences" Version="1.5.3-CI-26033.1001.240119-0813.1">
+    <Dependency Name="Microsoft.Internal.InteractiveExperiences" Version="1.5.3-CI-26050.1000.240201-1035.1">
       <Uri>https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP</Uri>
-      <Sha>9589050fb3de9f8f978f57c8e782daef859cfa04</Sha>
+      <Sha>2d8e71d8e93b54cebdbab98cf6c48d0393a303eb</Sha>
     </Dependency>
     <!-- Microsoft-WinUI-SDK repo (MSBuild and Visual Studio extensions for building, deploying, and debugging packaged applications.)  -->
     <Dependency Name="Microsoft.Build.Msix" Version="1.5.0-zmain.231129.0">
@@ -20,9 +20,9 @@
       <Sha>7febe557e6f0e1c3d30254648d58e7b73589a572</Sha>
     </Dependency>
     <!-- Closed source binary (ex PTLS and WinUIEdit) -->
-    <Dependency Name="Microsoft.Internal.WinUIDetails" Version="1.17.0">
+    <Dependency Name="Microsoft.Internal.WinUIDetails" Version="1.500.0">
       <Uri>https://dev.azure.com/microsoft/WinUI/_git/WinUIDetails</Uri>
-      <Sha>04b1c445cffea9f55f4d99839adce7ffafe4354a</Sha>
+      <Sha>5b3913ef8513e7bebd8fb07a98de88155e1df66d</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
diff --git a/eng/versions.props b/eng/versions.props
index 9432adfcc9..a3e119d653 100644
--- a/eng/versions.props
+++ b/eng/versions.props
@@ -73,7 +73,7 @@
     <dotNetSdkChannel>7.0.1xx</dotNetSdkChannel>
     <dotNetSdkVNextChannel>8.0.1xx</dotNetSdkVNextChannel>
     <CppWinRTVersion>2.0.230706.1</CppWinRTVersion>
-    <WebView2Version>1.0.1823.32</WebView2Version>
+    <WebView2Version>1.0.2210.55</WebView2Version>
     <Win2DWinUIVersion>0.1.0.3</Win2DWinUIVersion>
     <Win2DUWPVersion>1.25.0</Win2DUWPVersion>
     <ColorCodeVersion>2.0.13</ColorCodeVersion>
diff --git a/packages.config b/packages.config
index 6586ab02f7..f1d92425d1 100644
--- a/packages.config
+++ b/packages.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- NOTE: Several of the versions in this file must be kept
      in sync with properties in eng\versions.props -->
 <!-- Note that there are also architecture-specific pacakge config files (e.g. packages.x86.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="114.0.1823.42" />
+  <package id="Microsoft.UI.DCPP.Dependencies.Edge" version="120.0.2210.144" />
   <!-- 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 -->
diff --git a/src/XamlCompiler/Targets/Microsoft.UI.Xaml.Markup.Compiler.interop.targets b/src/XamlCompiler/Targets/Microsoft.UI.Xaml.Markup.Compiler.interop.targets
index d8fafb1675..ce0a0eab3e 100644
--- a/src/XamlCompiler/Targets/Microsoft.UI.Xaml.Markup.Compiler.interop.targets
+++ b/src/XamlCompiler/Targets/Microsoft.UI.Xaml.Markup.Compiler.interop.targets
@@ -185,9 +185,9 @@ Licensed under the MIT License. See LICENSE in the project root for license info
         <XamlCompilerExePath>$(_MuxPackageToolsFolder)..\net472\XamlCompiler.exe</XamlCompilerExePath>
     </PropertyGroup>
 
-    <UsingTask TaskName="Microsoft.UI.Xaml.Markup.Compiler.Tasks.CompileXaml"                  AssemblyFile="$(XamlCompilerTaskPath)" Override="true" />
-    <UsingTask TaskName="Microsoft.UI.Xaml.Markup.Compiler.Tasks.AddDefaultXamlLinkMetadata"   AssemblyFile="$(XamlCompilerTaskPath)" Override="true" />
-    <UsingTask TaskName="Microsoft.UI.Xaml.Markup.Compiler.Tasks.GetXamlCppIncludeDirectories" AssemblyFile="$(XamlCompilerTaskPath)" Override="true" />
+    <UsingTask TaskName="Microsoft.UI.Xaml.Markup.Compiler.Tasks.CompileXaml"                  AssemblyFile="$(XamlCompilerTaskPath)" />
+    <UsingTask TaskName="Microsoft.UI.Xaml.Markup.Compiler.Tasks.AddDefaultXamlLinkMetadata"   AssemblyFile="$(XamlCompilerTaskPath)" />
+    <UsingTask TaskName="Microsoft.UI.Xaml.Markup.Compiler.Tasks.GetXamlCppIncludeDirectories" AssemblyFile="$(XamlCompilerTaskPath)" />
 
     <UsingTask TaskName="Microsoft.UI.Xaml.Markup.Compiler.IO.InputSerializer"       AssemblyFile="$(XamlCompilerJsonTaskPath)" />
     <UsingTask TaskName="Microsoft.UI.Xaml.Markup.Compiler.IO.OutputDeserializer"       AssemblyFile="$(XamlCompilerJsonTaskPath)" />