From 7198c4e69019516fb08ecb3937492ffff5fe9702 Mon Sep 17 00:00:00 2001
From: reunion-maestro-bot <reunion-maestro-bot@microsoft.com>
Date: Tue, 24 Oct 2023 19:40:38 +0000
Subject: [PATCH] Syncing content from committish release/1.4.2

---
 .../dev/CommandBarFlyout/CommandBarFlyout.cpp |  19 +++
 .../CommandBarFlyoutCommandBar.cpp            |  34 +++-
 .../CommandBarFlyoutCommandBar.h              |  10 ++
 .../dev/NavigationView/NavigationView.cpp     |  52 ++++++
 .../dev/NavigationView/NavigationView.xaml    |   5 +-
 .../FocusBehaviorTests.cs                     | 154 ++++++++++++++++++
 ...HierarchicalNavigationViewDataBinding.xaml |  11 +-
 .../HierarchicalNavigationViewMarkup.xaml     |   1 +
 .../HierarchicalNavigationViewMarkup.xaml.cs  |  10 ++
 .../TabView/InteractionTests/TabViewTests.cs  |  58 +++++++
 controls/dev/TabView/TabView.cpp              |  31 +++-
 controls/dev/TabView/TabViewItem.cpp          |  67 +++++---
 controls/dev/TabView/TestUI/TabViewPage.xaml  |   1 +
 .../dev/dll/Microsoft.UI.Xaml.Common.targets  |   8 +-
 controls/dev/inc/velocity.h                   |   3 +-
 .../WinUICppDesktopSampleAppTests.cs          |   1 +
 .../components/mrt/ModernResourceProvider.cpp |  62 ++++++-
 .../mrt/inc/ModernResourceProvider.h          |   8 +-
 dxaml/xcp/core/core/elements/Popup.cpp        |  87 +++++++++-
 dxaml/xcp/core/inc/Popup.h                    |   3 +
 eng/Version.Details.xml                       |   8 +-
 packages.config                               |   2 +-
 22 files changed, 583 insertions(+), 52 deletions(-)

diff --git a/controls/dev/CommandBarFlyout/CommandBarFlyout.cpp b/controls/dev/CommandBarFlyout/CommandBarFlyout.cpp
index fa3bb42982..68a4a26a21 100644
--- a/controls/dev/CommandBarFlyout/CommandBarFlyout.cpp
+++ b/controls/dev/CommandBarFlyout/CommandBarFlyout.cpp
@@ -7,9 +7,14 @@
 #include "CommandBarFlyoutCommandBar.h"
 #include "Vector.h"
 #include "RuntimeProfiler.h"
+#include "velocity.h"
+#include <FrameworkUdk/Containment.h>
 
 #include "CommandBarFlyout.properties.cpp"
 
+// Bug 46607274: [1.4 servicing] Microsoft.UI.Xaml.Controls.dll!CommandBarFlyoutCommandBar::EnsureLocalizedControlTypes impacting context menu performance
+#define WINAPPSDK_CHANGEID_46607274 46607274
+
 // Change to 'true' to turn on debugging outputs in Output window
 bool CommandBarFlyoutTrace::s_IsDebugOutputEnabled{ false };
 bool CommandBarFlyoutTrace::s_IsVerboseDebugOutputEnabled{ false };
@@ -307,6 +312,20 @@ winrt::Control CommandBarFlyout::CreatePresenter()
 {
     auto commandBar = winrt::make_self<CommandBarFlyoutCommandBar>();
 
+    if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_46607274>())
+    {
+        // Localized string resource lookup is more expensive on MRTCore. Do the lookup ahead of time and reuse it for all
+        // the CommandBarFlyoutCommandBar::EnsureLocalizedControlTypes calls in response to PrimaryCommands/SecondCommands
+        // changed events.
+        commandBar->CacheLocalizedStringResources();
+    }
+    auto const scopeGuard = WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_46607274>()
+        ? wil::scope_exit(std::function<void()>([commandBar]()
+            {
+                commandBar->ClearLocalizedStringResourceCache();
+            }))
+        : wil::scope_exit(std::function<void()>([](){}));
+
     SharedHelpers::CopyVector(m_primaryCommands, commandBar->PrimaryCommands());
     SharedHelpers::CopyVector(m_secondaryCommands, commandBar->SecondaryCommands());
 
diff --git a/controls/dev/CommandBarFlyout/CommandBarFlyoutCommandBar.cpp b/controls/dev/CommandBarFlyout/CommandBarFlyoutCommandBar.cpp
index 0a2a925fe3..b96d96c097 100644
--- a/controls/dev/CommandBarFlyout/CommandBarFlyoutCommandBar.cpp
+++ b/controls/dev/CommandBarFlyout/CommandBarFlyoutCommandBar.cpp
@@ -895,17 +895,47 @@ void CommandBarFlyoutCommandBar::EnsureLocalizedControlTypes()
     }
 }
 
+void CommandBarFlyoutCommandBar::CacheLocalizedStringResources()
+{
+    m_localizedCommandBarFlyoutAppBarButtonControlType = ResourceAccessor::GetLocalizedStringResource(SR_CommandBarFlyoutAppBarButtonLocalizedControlType);
+    m_localizedCommandBarFlyoutAppBarToggleButtonControlType = ResourceAccessor::GetLocalizedStringResource(SR_CommandBarFlyoutAppBarToggleButtonLocalizedControlType);
+    m_areLocalizedStringResourcesCached = true;
+}
+
+void CommandBarFlyoutCommandBar::ClearLocalizedStringResourceCache()
+{
+    m_areLocalizedStringResourcesCached = false;
+    m_localizedCommandBarFlyoutAppBarButtonControlType.clear();
+    m_localizedCommandBarFlyoutAppBarToggleButtonControlType.clear();
+}
+
 void CommandBarFlyoutCommandBar::SetKnownCommandLocalizedControlTypes(winrt::ICommandBarElement const& command)
 {
     COMMANDBARFLYOUT_TRACE_VERBOSE(*this, TRACE_MSG_METH, METH_NAME, this);
 
     if (auto const& appBarButton = command.try_as<winrt::AppBarButton>())
     {
-        winrt::AutomationProperties::SetLocalizedControlType(appBarButton, ResourceAccessor::GetLocalizedStringResource(SR_CommandBarFlyoutAppBarButtonLocalizedControlType));
+        if (m_areLocalizedStringResourcesCached)
+        {
+            MUX_ASSERT(!m_localizedCommandBarFlyoutAppBarButtonControlType.empty());
+            winrt::AutomationProperties::SetLocalizedControlType(appBarButton, m_localizedCommandBarFlyoutAppBarButtonControlType);
+        }
+        else
+        {
+            winrt::AutomationProperties::SetLocalizedControlType(appBarButton, ResourceAccessor::GetLocalizedStringResource(SR_CommandBarFlyoutAppBarButtonLocalizedControlType));
+        }
     }
     else if (auto const& appBarToggleButton = command.try_as<winrt::AppBarToggleButton>())
     {
-        winrt::AutomationProperties::SetLocalizedControlType(appBarToggleButton, ResourceAccessor::GetLocalizedStringResource(SR_CommandBarFlyoutAppBarToggleButtonLocalizedControlType));
+        if (m_areLocalizedStringResourcesCached)
+        {
+            MUX_ASSERT(!m_localizedCommandBarFlyoutAppBarToggleButtonControlType.empty());
+            winrt::AutomationProperties::SetLocalizedControlType(appBarToggleButton, m_localizedCommandBarFlyoutAppBarToggleButtonControlType);
+        }
+        else
+        {
+            winrt::AutomationProperties::SetLocalizedControlType(appBarToggleButton, ResourceAccessor::GetLocalizedStringResource(SR_CommandBarFlyoutAppBarToggleButtonLocalizedControlType));
+        }
     }
 }
 
diff --git a/controls/dev/CommandBarFlyout/CommandBarFlyoutCommandBar.h b/controls/dev/CommandBarFlyout/CommandBarFlyoutCommandBar.h
index 0ce35e5e84..097d14b4a7 100644
--- a/controls/dev/CommandBarFlyout/CommandBarFlyoutCommandBar.h
+++ b/controls/dev/CommandBarFlyout/CommandBarFlyoutCommandBar.h
@@ -46,6 +46,9 @@ class CommandBarFlyoutCommandBar :
 
     void OnPropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args);
 
+    void CacheLocalizedStringResources();
+    void ClearLocalizedStringResourceCache();
+
 private:
     void AttachEventHandlers();
     void DetachEventHandlers();
@@ -127,4 +130,11 @@ class CommandBarFlyoutCommandBar :
     // The one built into Popup is too high up in the Visual tree to be animated by a custom animation.
     winrt::ContentExternalBackdropLink m_backdropLink{ nullptr };
     winrt::ContentExternalBackdropLink m_overflowPopupBackdropLink{ nullptr };
+
+    // Localized string caches. Looking these up from MRTCore is expensive, so we don't want to put the lookups in a
+    // loop. Instead, look them up once, cache them, use the cached values, then clear the cache. The values in these
+    // caches are only valid after CacheLocalizedStringResources and before ClearLocalizedStringResourceCache.
+    bool m_areLocalizedStringResourcesCached{ false };
+    winrt::hstring m_localizedCommandBarFlyoutAppBarButtonControlType{};
+    winrt::hstring m_localizedCommandBarFlyoutAppBarToggleButtonControlType{};
 };
diff --git a/controls/dev/NavigationView/NavigationView.cpp b/controls/dev/NavigationView/NavigationView.cpp
index 0ffb250ce8..ce5e6e7b34 100644
--- a/controls/dev/NavigationView/NavigationView.cpp
+++ b/controls/dev/NavigationView/NavigationView.cpp
@@ -28,6 +28,11 @@
 #include "NavigationViewItemExpandingEventArgs.h"
 #include "NavigationViewItemCollapsedEventArgs.h"
 #include "InspectingDataSource.h"
+#include "velocity.h"
+#include <FrameworkUdk/Containment.h>
+
+// Bug 46697123: [1.4 servicing] - Tab/Shift+Tab Navigation is very very confusing with List Views
+#define WINAPPSDK_CHANGEID_46697123 46697123
 
 // General items
 static constexpr auto c_togglePaneButtonName = L"TogglePaneButton"sv;
@@ -2885,6 +2890,53 @@ void NavigationView::OnRepeaterGettingFocus(const winrt::IInspectable& sender, c
                         args.Handled(true);
                     }
                 }
+                else if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_46697123>() &&
+                         !isFocusOutsideCurrentRootRepeater)
+                {
+                    // Tab or Shift-Tab from within the same root repeater should move focus outside it
+                    auto navigationViewItemBase = args.NewFocusedElement().try_as<winrt::NavigationViewItemBase>(); 
+                    if (navigationViewItemBase &&
+                       (args.Direction() == winrt::FocusNavigationDirection::Previous ||
+                        args.Direction() == winrt::FocusNavigationDirection::Next))
+                    {
+                        // We need to find the next tab stop outside the root repeater.
+                        // winrt::FocusManager::FindNextElement will at first give us NavigationViewItems
+                        // within the root repeater. This is why we need to set IsTabStop = false for 
+                        // the found the elements within the root repeater so that FindNextElement eventually
+                        // finds an element outside the root repeater.
+                        std::vector<winrt::NavigationViewItemBase> containersWithTabFocusOff{};
+
+                        const winrt::FindNextElementOptions options;
+                        options.SearchRoot(this->XamlRoot().Content());
+                        
+                        auto nextElement = winrt::FocusManager::FindNextElement(args.Direction(), options);
+                        while (auto nvib = nextElement.try_as<winrt::NavigationViewItemBase>())
+                        {
+                            // Verify the item is in the root repeater we are trying to leave
+                            if (newRootItemsRepeater == GetParentRootItemsRepeaterForContainer(nvib))
+                            {
+                                nvib.IsTabStop(false);
+                                // Keep track of the container so that we can re-enable tab stop once focus leaves
+                                containersWithTabFocusOff.push_back(nvib);
+                                nextElement = winrt::FocusManager::FindNextElement(args.Direction(), options);
+                            }
+                            else
+                            {
+                                break;
+                            }
+                        }
+                        
+                        for (auto nvib : containersWithTabFocusOff)
+                        {
+                            nvib.IsTabStop(true);
+                        }
+
+                        if (args.TrySetNewFocusedElement(nextElement))
+                        {
+                            args.Handled(true);
+                        }
+                    }
+                }
             }
         }
     }
diff --git a/controls/dev/NavigationView/NavigationView.xaml b/controls/dev/NavigationView/NavigationView.xaml
index 16a8362130..afbfd038ec 100644
--- a/controls/dev/NavigationView/NavigationView.xaml
+++ b/controls/dev/NavigationView/NavigationView.xaml
@@ -361,7 +361,10 @@
                       <controls:ItemsRepeaterScrollHost HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                         <ScrollViewer x:Name="MenuItemsScrollViewer" TabNavigation="Local" VerticalScrollBarVisibility="Auto">
                           <!-- Left nav ItemsRepeater -->
-                          <controls:ItemsRepeater x:Name="MenuItemsHost" AutomationProperties.Name="{TemplateBinding AutomationProperties.Name}" AutomationProperties.AccessibilityView="Content">
+                          <controls:ItemsRepeater 
+                            x:Name="MenuItemsHost" 
+                            AutomationProperties.Name="{TemplateBinding AutomationProperties.Name}" 
+                            AutomationProperties.AccessibilityView="Content">
                             <controls:ItemsRepeater.Layout>
                               <controls:StackLayout />
                             </controls:ItemsRepeater.Layout>
diff --git a/controls/dev/NavigationView/NavigationView_InteractionTests/FocusBehaviorTests.cs b/controls/dev/NavigationView/NavigationView_InteractionTests/FocusBehaviorTests.cs
index f55e39bed9..463668df11 100644
--- a/controls/dev/NavigationView/NavigationView_InteractionTests/FocusBehaviorTests.cs
+++ b/controls/dev/NavigationView/NavigationView_InteractionTests/FocusBehaviorTests.cs
@@ -291,6 +291,160 @@ string GetSelectedItem()
             }
         }
 
+        [TestMethod]
+        public void TabNavigationHierarchicalTest()
+        {
+            var testScenarios = RegressionTestScenario.BuildLeftNavRegressionTestScenarios();
+            foreach (var testScenario in testScenarios)
+            {
+                using (var setup = new TestSetupHelper(new[] { "NavigationView Tests", "HierarchicalNavigationView Markup Test" }))
+                {
+                    Button togglePaneButton = new Button(FindElement.ById("TogglePaneButton"));
+                    Button getSelectItemButton = new Button(FindElement.ByName("GetSelectedItemLabelButton"));
+
+                    VerifyTabNavigationWithoutMenuItemSelected();
+                    VerifyTabNavigationWithMenuItemSelected();
+                    VerifyTabNavigationWithSettingsItemVisible();
+
+                    void VerifyTabNavigationWithoutMenuItemSelected()
+                    {
+                        Log.Comment("Verify Tab navigation without a selected menu item");
+
+                        getSelectItemButton.Invoke();
+                        Wait.ForIdle();
+
+                        Verify.AreEqual("No Item Selected", GetSelectedItem());
+
+                        UIObject menuItem1 = FindElement.ByName("Menu Item 1");
+                        UIObject menuItem29 = FindElement.ByName("Menu Item 29 (Selectable)");
+
+                        // Set focus on the pane's toggle button.
+                        togglePaneButton.SetFocus();
+                        Wait.ForIdle();
+
+                        Log.Comment("Verify that pressing tab while TogglePaneButton has focus moves to Menu Item 1.");
+                        KeyboardHelper.PressKey(Key.Tab);
+                        Wait.ForIdle();
+                        Verify.IsTrue(menuItem1.HasKeyboardFocus);
+
+                        Log.Comment("Verify that pressing tab while Menu Item 1 has focus moves to 'Get Selected Item Label' Button item");
+                        KeyboardHelper.PressKey(Key.Tab);
+                        Wait.ForIdle();
+                        Verify.IsTrue(getSelectItemButton.HasKeyboardFocus);
+
+                        Log.Comment("Verify that pressing SHIFT+tab will move focus to Menu Item 29");
+                        KeyboardHelper.PressKey(Key.Tab, ModifierKey.Shift, 1);
+                        Wait.ForIdle();
+                        Verify.IsTrue(menuItem29.HasKeyboardFocus);
+
+                        Log.Comment("Verify that pressing SHIFT+tab will move focus to the TogglePaneButton");
+                        KeyboardHelper.PressKey(Key.Tab, ModifierKey.Shift, 1);
+                        Wait.ForIdle();
+                        Verify.IsTrue(togglePaneButton.HasKeyboardFocus);
+                    }
+
+                    void VerifyTabNavigationWithMenuItemSelected()
+                    {
+                        Log.Comment("Verify Tab navigation with a selected menu item");
+
+                        Log.Comment("Expand Menu Item 15.");
+                        UIObject menuItem15 = FindElement.ByName("Menu Item 15");
+                        InputHelper.LeftClick(menuItem15);
+
+                        Log.Comment("Select Menu Item 16.");
+                        UIObject menuItem16 = FindElement.ByName("Menu Item 16");
+                        InputHelper.LeftClick(menuItem16);
+
+                        getSelectItemButton.Invoke();
+                        Wait.ForIdle();
+
+                        Verify.AreEqual("Menu Item 16", GetSelectedItem());
+
+                        // Set focus on the pane's toggle button.
+                        togglePaneButton.SetFocus();
+                        Wait.ForIdle();
+
+                        Log.Comment("Verify that pressing tab while TogglePaneButton has focus moves to Menu Item 16.");
+                        KeyboardHelper.PressKey(Key.Tab);
+                        Wait.ForIdle();
+                        Verify.IsTrue(menuItem16.HasKeyboardFocus);
+
+                        Log.Comment("Verify that pressing tab while Menu Item 16 has focus moves to 'Get Selected Item Label' Button item");
+                        KeyboardHelper.PressKey(Key.Tab);
+                        Wait.ForIdle();
+                        Verify.IsTrue(getSelectItemButton.HasKeyboardFocus);
+
+                        Log.Comment("Verify that pressing SHIFT+tab will move focus to Menu Item 16");
+                        KeyboardHelper.PressKey(Key.Tab, ModifierKey.Shift, 1);
+                        Wait.ForIdle();
+                        Verify.IsTrue(menuItem16.HasKeyboardFocus);
+
+                        Log.Comment("Verify that pressing SHIFT+tab will move focus to the TogglePaneButton");
+                        KeyboardHelper.PressKey(Key.Tab, ModifierKey.Shift, 1);
+                        Wait.ForIdle();
+                        Verify.IsTrue(togglePaneButton.HasKeyboardFocus);
+
+                        Log.Comment("Verify that pressing tab from parent of item will move focus to 'Get Selected Item Label' Button item");
+                        KeyboardHelper.PressKey(Key.Down, ModifierKey.None, 3);
+                        Wait.ForIdle();
+                        Verify.IsTrue(menuItem15.HasKeyboardFocus);
+
+                        KeyboardHelper.PressKey(Key.Tab);
+                        Wait.ForIdle();
+                        Verify.IsTrue(getSelectItemButton.HasKeyboardFocus);
+                    }
+
+                    void VerifyTabNavigationWithSettingsItemVisible()
+                    {
+                        Log.Comment("Verify tab navigation with settings item visible.");
+
+                        Log.Comment("Check IsSettingsVisible");
+                        CheckBox checkBoxIsSettingsVisible = FindElement.ByName<CheckBox>("Settings Item Visibility");
+                        checkBoxIsSettingsVisible.Check();
+                        Wait.ForIdle();
+
+                        UIObject settingsItem = FindElement.ByName("Settings");
+
+                        getSelectItemButton.Invoke();
+                        Wait.ForIdle();
+
+                        Verify.AreEqual("Menu Item 16", GetSelectedItem());
+
+                        UIObject menuItem16 = FindElement.ByName("Menu Item 16");
+
+                        // Set focus on the pane's toggle button.
+                        togglePaneButton.SetFocus();
+                        Wait.ForIdle();
+
+                        Log.Comment("Verify that pressing tab while TogglePaneButton has focus moves to Menu Item 16.");
+                        KeyboardHelper.PressKey(Key.Tab);
+                        Wait.ForIdle();
+                        Verify.IsTrue(menuItem16.HasKeyboardFocus);
+
+                        Log.Comment("Verify that pressing tab while Menu Item 16 has focus moves to Settings item");
+                        KeyboardHelper.PressKey(Key.Tab);
+                        Wait.ForIdle();
+                        Verify.IsTrue(settingsItem.HasKeyboardFocus);
+
+                        Log.Comment("Verify that pressing SHIFT+tab will move focus to Menu Item 16");
+                        KeyboardHelper.PressKey(Key.Tab, ModifierKey.Shift, 1);
+                        Wait.ForIdle();
+                        Verify.IsTrue(menuItem16.HasKeyboardFocus);
+
+                        Log.Comment("Verify that pressing SHIFT+tab will move focus to the TogglePaneButton");
+                        KeyboardHelper.PressKey(Key.Tab, ModifierKey.Shift, 1);
+                        Wait.ForIdle();
+                        Verify.IsTrue(togglePaneButton.HasKeyboardFocus);
+                    }
+                }
+
+                string GetSelectedItem()
+                {
+                    return new TextBlock(FindElement.ByName("SelectedItemLabel")).DocumentText;
+                }
+            }
+        }
+
         [TestMethod]
         public void CanDoSelectionChangedOfItemTemplate()
         {
diff --git a/controls/dev/NavigationView/TestUI/Hierarchical/HierarchicalNavigationViewDataBinding.xaml b/controls/dev/NavigationView/TestUI/Hierarchical/HierarchicalNavigationViewDataBinding.xaml
index adffb807ce..fee03a5844 100644
--- a/controls/dev/NavigationView/TestUI/Hierarchical/HierarchicalNavigationViewDataBinding.xaml
+++ b/controls/dev/NavigationView/TestUI/Hierarchical/HierarchicalNavigationViewDataBinding.xaml
@@ -17,8 +17,15 @@
     </Page.Resources>
 
     <Grid>
-        <muxcontrols:NavigationView x:Name="navview" MenuItemsSource="{x:Bind categories, Mode=OneWay}" MenuItemTemplate="{StaticResource NavigationViewMenuItem}"
-                                    ItemInvoked="{x:Bind ClickedItem}" Expanding="OnItemExpanding" Collapsed="OnItemCollapsed" SelectionChanged="OnSelectionChanged" PaneDisplayMode="Left">
+        <muxcontrols:NavigationView 
+            x:Name="navview" 
+            MenuItemsSource="{x:Bind categories, Mode=OneWay}" 
+            MenuItemTemplate="{StaticResource NavigationViewMenuItem}"
+            ItemInvoked="{x:Bind ClickedItem}" 
+            Expanding="OnItemExpanding" 
+            Collapsed="OnItemCollapsed" 
+            SelectionChanged="OnSelectionChanged" 
+            PaneDisplayMode="Left">
             <StackPanel Margin="10,10,0,0" Spacing="5">
                 <TextBlock x:Name="SelectedItemLabel" AutomationProperties.Name="SelectedItemLabel" Text="uninitialized"/>
                 <Button Content="Get Selected Item Label" x:Name="GetSelectedItemLabelButton" AutomationProperties.Name="GetSelectedItemLabelButton" Click="PrintSelectedItem"/>
diff --git a/controls/dev/NavigationView/TestUI/Hierarchical/HierarchicalNavigationViewMarkup.xaml b/controls/dev/NavigationView/TestUI/Hierarchical/HierarchicalNavigationViewMarkup.xaml
index 384465af1f..9d940b5d1d 100644
--- a/controls/dev/NavigationView/TestUI/Hierarchical/HierarchicalNavigationViewMarkup.xaml
+++ b/controls/dev/NavigationView/TestUI/Hierarchical/HierarchicalNavigationViewMarkup.xaml
@@ -89,6 +89,7 @@
                 <TextBlock x:Name="IsChildSelectedLabel" AutomationProperties.Name="IsChildSelectedLabel" Text="uninitialized"/>
                 <Button AutomationProperties.Name="PrintTopLevelIsChildSelectedItemsButton" Content="Print TopLevel IsChildSelected Items" Click="PrintTopLevelIsChildSelectedItems"/>
                 <Button Content="Select Second Item" Click="SelectSecondItem"/>
+                <CheckBox Content="Settings Item Visibility" x:Name="CheckBoxIsSettingsVisible" Checked="OnCheckedIsSettingsVisible" Unchecked="OnUncheckedIsSettingsVisible"/>
                 <!-- Components that get updated when item is expanded or collapsed -->
                 <StackPanel x:Name="ExpandCollapseRelatedComponents" Margin="0,10,0,10">
                     <Grid x:Name="ExpandingEventStates">
diff --git a/controls/dev/NavigationView/TestUI/Hierarchical/HierarchicalNavigationViewMarkup.xaml.cs b/controls/dev/NavigationView/TestUI/Hierarchical/HierarchicalNavigationViewMarkup.xaml.cs
index fdddacc06f..4550d66af4 100644
--- a/controls/dev/NavigationView/TestUI/Hierarchical/HierarchicalNavigationViewMarkup.xaml.cs
+++ b/controls/dev/NavigationView/TestUI/Hierarchical/HierarchicalNavigationViewMarkup.xaml.cs
@@ -17,6 +17,16 @@ public HierarchicalNavigationViewMarkup()
             this.InitializeComponent();
         }
 
+        private void OnCheckedIsSettingsVisible(object sender, RoutedEventArgs e)
+        {
+            navview.IsSettingsVisible = true;
+        }
+
+        private void OnUncheckedIsSettingsVisible(object sender, RoutedEventArgs e)
+        {
+            navview.IsSettingsVisible = false;
+        }
+
         private void ClickedItem(object sender, NavigationViewItemInvokedEventArgs e)
         {
         }
diff --git a/controls/dev/TabView/InteractionTests/TabViewTests.cs b/controls/dev/TabView/InteractionTests/TabViewTests.cs
index a3b4cb66c2..e8ff8dfc1b 100644
--- a/controls/dev/TabView/InteractionTests/TabViewTests.cs
+++ b/controls/dev/TabView/InteractionTests/TabViewTests.cs
@@ -1096,6 +1096,55 @@ static void VerifyAddButtonMoves(UIObject tabToDrag, UIObject tabToDragTo, UIObj
             }
         }
 
+        [TestMethod]
+        [TestProperty("Description", "Verifies that tapping the scroll increase repeat button once causes an incremental scroll.")]
+        [TestProperty("RegressionBug", "46527670")]
+        public void VerifyScrollRepeatButtons()
+        {
+            using (var setup = new TestSetupHelper("TabView Tests"))
+            {
+                Log.Comment("Enumerating TabView's children:");
+                UIObject tabView = FindElement.ByName("Tabs");
+                Verify.IsNotNull(tabView);
+
+                EnumerateChildren(tabView);
+
+                Verify.IsFalse(AreScrollButtonsVisible(), "Scroll repeat buttons should not be visible");
+
+                Log.Comment("Adding 10 new tabs to show the scroll repeat buttons.");
+                Button addTabButton = FindElement.ByName<Button>("Add New Tab");
+
+                for (int i = 0; i < 10; i++)
+                {
+                    addTabButton.InvokeAndWait();
+                }
+
+                ElementCache.Refresh();
+
+                Log.Comment("Enumerating TabView's children again:");
+                EnumerateChildren(tabView);
+
+                Verify.IsTrue(AreScrollButtonsVisible(), "Scroll repeat buttons should be visible now");
+                Verify.IsFalse(IsScrollDecreaseButtonEnabled(), "Scroll decrease repeat button should be disabled");
+                Verify.IsTrue(IsScrollIncreaseButtonEnabled(), "Scroll increase repeat button should be enabled");
+
+                Log.Comment("Add Button Bounding Rect: X=" + addTabButton.BoundingRectangle.X + ", Y=" + addTabButton.BoundingRectangle.Y + ", W=" + addTabButton.BoundingRectangle.Width + ", H=" + addTabButton.BoundingRectangle.Height);
+
+                // Since the scroll repeat buttons have no accessibility visibility, the neighboring Add Tab button is used, with a negative horizontal offset to reach the scroll increase repeat button.
+                addTabButton.Tap(-addTabButton.BoundingRectangle.Width, addTabButton.BoundingRectangle.Height * 0.5);
+                Wait.ForIdle();
+
+                bool newIsScrollDecreaseButtonEnabled = IsScrollDecreaseButtonEnabled();
+                bool newIsScrollIncreaseButtonEnabled = IsScrollIncreaseButtonEnabled();
+
+                Log.Comment("New scroll decrease repeat button status: " + newIsScrollDecreaseButtonEnabled);
+                Log.Comment("New scroll increase repeat button status: " + newIsScrollIncreaseButtonEnabled);
+
+                Verify.IsTrue(newIsScrollDecreaseButtonEnabled, "Scroll decrease repeat button should be enabled");
+                Verify.IsTrue(newIsScrollIncreaseButtonEnabled, "Scroll increase repeat button should be enabled");
+            }
+        }
+
         public void PressButtonAndVerifyText(String buttonName, String textBlockName, String expectedText)
         {
             Button button = FindElement.ByName<Button>(buttonName);
@@ -1118,5 +1167,14 @@ Button FindCloseButton(UIObject tabItem)
             Log.Comment("Did not find close button for object " + tabItem.Name);
             return null;
         }
+
+        private void EnumerateChildren(UIObject root)
+        {
+            foreach (UIObject child in root.Children)
+            {
+                Log.Comment("Children Enumeration: Name=" + child.Name + ", ClassName=" + child.ClassName);
+                EnumerateChildren(child);
+            }
+        }
     }
 }
diff --git a/controls/dev/TabView/TabView.cpp b/controls/dev/TabView/TabView.cpp
index b89d8d9a1a..4075a038ce 100644
--- a/controls/dev/TabView/TabView.cpp
+++ b/controls/dev/TabView/TabView.cpp
@@ -12,6 +12,15 @@
 #include "SharedHelpers.h"
 #include <Vector.h>
 #include "velocity.h"
+#include <FrameworkUdk/Containment.h>
+
+// Bug 46832679: [1.4 servicing] - When tapping a tabs' scroll button in File Explorer, the tabs are scrolled continuously
+#define WINAPPSDK_CHANGEID_46832679 46832679
+
+#include <FrameworkUdk/Containment.h>
+
+// Bug 46770740: I can still see a thin line under the active tab in file explorer
+#define WINAPPSDK_CHANGEID_46770740 46770740
 
 static constexpr double c_tabMinimumWidth = 48.0;
 static constexpr double c_tabMaximumWidth = 200.0;
@@ -403,13 +412,17 @@ void TabView::UnhookEventsAndClearFields()
     m_addButtonColumn.set(nullptr);
     m_rightContentColumn.set(nullptr);
     m_tabContainerGrid.set(nullptr);
-    m_shadowReceiver.set(nullptr);
     m_listView.set(nullptr);
     m_addButton.set(nullptr);
     m_itemsPresenter.set(nullptr);
     m_scrollViewer.set(nullptr);
     m_scrollDecreaseButton.set(nullptr);
     m_scrollIncreaseButton.set(nullptr);
+
+    if (!WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_46770740>())
+    {
+        m_shadowReceiver.set(nullptr);
+    }
 }
 
 void TabView::OnTabWidthModePropertyChanged(const winrt::DependencyPropertyChangedEventArgs&)
@@ -570,6 +583,14 @@ void TabView::OnScrollViewerLoaded(const winrt::IInspectable&, const winrt::Rout
             const auto decreaseButton = SharedHelpers::FindInVisualTreeByName(scrollViewer, L"ScrollDecreaseButton").as<winrt::RepeatButton>();
             if (decreaseButton)
             {
+                if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_46832679>() &&
+                    decreaseButton.ManipulationMode() == winrt::ManipulationModes::System)
+                {
+                    // Changing the scroll RepeatButton's ManipulationMode property from the default System to None so that touch input does not
+                    // initiate an unnecessary DManip manipulation, thereby avoiding bug 46832679.
+                    decreaseButton.ManipulationMode(winrt::ManipulationModes::None);
+                }
+
                 // Do localization for the scroll decrease button
                 const auto toolTip = winrt::ToolTipService::GetToolTip(decreaseButton);
                 if (!toolTip)
@@ -588,6 +609,14 @@ void TabView::OnScrollViewerLoaded(const winrt::IInspectable&, const winrt::Rout
             const auto increaseButton = SharedHelpers::FindInVisualTreeByName(scrollViewer, L"ScrollIncreaseButton").as<winrt::RepeatButton>();
             if (increaseButton)
             {
+                if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_46832679>() &&
+                    increaseButton.ManipulationMode() == winrt::ManipulationModes::System)
+                {
+                    // Changing the scroll RepeatButton's ManipulationMode property from the default System to None so that touch input does not
+                    // initiate an unnecessary DManip manipulation, thereby avoiding bug 46832679.
+                    increaseButton.ManipulationMode(winrt::ManipulationModes::None);
+                }
+
                 // Do localization for the scroll increase button
                 const auto toolTip = winrt::ToolTipService::GetToolTip(increaseButton);
                 if (!toolTip)
diff --git a/controls/dev/TabView/TabViewItem.cpp b/controls/dev/TabView/TabViewItem.cpp
index 98d72a5cef..0d154c6212 100644
--- a/controls/dev/TabView/TabViewItem.cpp
+++ b/controls/dev/TabView/TabViewItem.cpp
@@ -9,6 +9,10 @@
 #include "ResourceAccessor.h"
 #include "XamlControlsResources.h"
 #include "SharedHelpers.h"
+#include <FrameworkUdk/Containment.h>
+
+// Bug 46770740: I can still see a thin line under the active tab in file explorer
+#define WINAPPSDK_CHANGEID_46770740 46770740
 
 TabViewItem::TabViewItem()
 {
@@ -85,25 +89,28 @@ void TabViewItem::OnApplyTemplate()
 
     if (tabView)
     {
-        if (internalTabView)
-        {          
-            m_shadow = winrt::ThemeShadow{};
+        if (!WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_46770740>())
+        {
+            if (internalTabView)
+            {          
+                m_shadow = winrt::ThemeShadow{};
 
-            double shadowDepth = unbox_value<double>(SharedHelpers::FindInApplicationResources(c_tabViewShadowDepthName, box_value(c_tabShadowDepth)));
+                double shadowDepth = unbox_value<double>(SharedHelpers::FindInApplicationResources(c_tabViewShadowDepthName, box_value(c_tabShadowDepth)));
 
-            const auto currentTranslation = Translation();
-            const auto translation = winrt::float3{ currentTranslation.x, currentTranslation.y, static_cast<float>(shadowDepth) };
-            Translation(translation);
+                const auto currentTranslation = Translation();
+                const auto translation = winrt::float3{ currentTranslation.x, currentTranslation.y, static_cast<float>(shadowDepth) };
+                Translation(translation);
 
-            // Set separate shadow for TabDragVisualContainer.
-            m_tabDragVisualContainer.set(GetTemplateChildT<winrt::UIElement>(s_tabDragVisualContainer, controlProtected));
+                // Set separate shadow for TabDragVisualContainer.
+                m_tabDragVisualContainer.set(GetTemplateChildT<winrt::UIElement>(s_tabDragVisualContainer, controlProtected));
 
-            if (const auto tabDragVisualContainer = m_tabDragVisualContainer.get())
-            {
-                tabDragVisualContainer.Translation(translation);
-            }         
+                if (const auto tabDragVisualContainer = m_tabDragVisualContainer.get())
+                {
+                    tabDragVisualContainer.Translation(translation);
+                }         
 
-            UpdateShadow();
+                UpdateShadow();
+            }
         }
         m_tabDragStartingRevoker = tabView.TabDragStarting(winrt::auto_revoke, { this, &TabViewItem::OnTabDragStarting });
         m_tabDragCompletedRevoker = tabView.TabDragCompleted(winrt::auto_revoke, { this, &TabViewItem::OnTabDragCompleted });
@@ -175,7 +182,10 @@ void TabViewItem::OnIsSelectedPropertyChanged(const winrt::DependencyObject& sen
         SetValue(winrt::Canvas::ZIndexProperty(), box_value(0));
     }
 
-    UpdateShadow();
+    if (!WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_46770740>())
+    {
+        UpdateShadow();
+    }
     UpdateWidthModeVisualState();
 
     UpdateCloseButton();
@@ -202,27 +212,30 @@ void TabViewItem::UpdateForeground()
 
 void TabViewItem::UpdateShadow()
 {
-    if (IsSelected())
+    if (!WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_46770740>())
     {
-        if (m_isCheckingforDrag && m_isBeingDragged)
+        if (IsSelected())
         {
-            if (const auto tabDragVisualContainer = m_tabDragVisualContainer.get())
+            if (m_isCheckingforDrag && m_isBeingDragged)
             {
-                tabDragVisualContainer.Shadow(m_shadow.as<winrt::ThemeShadow>());
+                if (const auto tabDragVisualContainer = m_tabDragVisualContainer.get())
+                {
+                    tabDragVisualContainer.Shadow(m_shadow.as<winrt::ThemeShadow>());
 
-                // Disable shadow on Tab Strip.
-                Shadow(nullptr);
+                    // Disable shadow on Tab Strip.
+                    Shadow(nullptr);
+                }
+            }
+            else if (!m_isBeingDragged)
+            {
+                Shadow(m_shadow.as<winrt::ThemeShadow>());
             }
         }
-        else if (!m_isBeingDragged)
+        else
         {
-            Shadow(m_shadow.as<winrt::ThemeShadow>());
+            Shadow(nullptr);
         }
     }
-    else
-    {
-         Shadow(nullptr);
-    }
 }
 
 
diff --git a/controls/dev/TabView/TestUI/TabViewPage.xaml b/controls/dev/TabView/TestUI/TabViewPage.xaml
index 69aeb862d8..49214946ec 100644
--- a/controls/dev/TabView/TestUI/TabViewPage.xaml
+++ b/controls/dev/TabView/TestUI/TabViewPage.xaml
@@ -137,6 +137,7 @@
 
                 <controls:TabView
                     x:Name="Tabs"
+                    AutomationProperties.Name="Tabs"
                     TabWidthMode="Equal"
                     CanDragTabs="True"
                     SelectionChanged="TabViewSelectionChanged"
diff --git a/controls/dev/dll/Microsoft.UI.Xaml.Common.targets b/controls/dev/dll/Microsoft.UI.Xaml.Common.targets
index a36aed2fa9..bd3bf361f4 100644
--- a/controls/dev/dll/Microsoft.UI.Xaml.Common.targets
+++ b/controls/dev/dll/Microsoft.UI.Xaml.Common.targets
@@ -37,7 +37,7 @@
       <AdditionalOptions>%(AdditionalOptions) /noattributename</AdditionalOptions>
     </Midl>
     <Link>
-      <AdditionalDependencies>user32.lib;mincore.lib;dxguid.lib;dcomp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>user32.lib;mincore.lib;dxguid.lib;dcomp.lib;$(FrameworkUdkLibPath)\Microsoft.Internal.FrameworkUdk.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <!-- Microsoft.winmd will contain the definition of both public, preview and private types. -->
       <WindowsMetadataFile>$(OutDir)$(ProjectWinMDName)</WindowsMetadataFile>
       <GenerateMapFile>true</GenerateMapFile>
@@ -305,7 +305,7 @@
   <PropertyGroup>
     <GenerateXamlFileBeforeTargets>BeforeBuildGenerateSources;CompileXaml;Prep_ComputeProcessXamlFiles;CompilePageRequiringCustomCompilation</GenerateXamlFileBeforeTargets>
   </PropertyGroup>
-  <!-- MergeXamlConfig is using msbuild task batching, each BatchMergeXaml below is executed multilple times. 
+  <!-- MergeXamlConfig is using msbuild task batching, each BatchMergeXaml below is executed multilple times.
         https://docs.microsoft.com/en-us/visualstudio/msbuild/item-metadata-in-task-batching?view=vs-2019 -->
   <Target Name="GenerateGenericResourceFile" DependsOnTargets="CategorizeSharedPages" BeforeTargets="$(GenerateXamlFileBeforeTargets)" Inputs="@(StylePage)" Outputs="$(OutDir)generic.xaml">
     <Message Text="Generating generic resources XAML file " />
@@ -327,7 +327,7 @@
       to only set a property if the target actually runs. -->
     <CreateProperty Value="True">
       <Output TaskParameter="ValueSetByTask" PropertyName="ThemeResourceFileNeedsCompilation" />
-    </CreateProperty>    
+    </CreateProperty>
   </Target>
   <!-- Controls styles were missing in packaged generic.xaml file. Merge MUX Generic.xaml with MUXC Generic.xaml and ThemeResource.xaml -->
   <Target Name="MergeMuxMuxcGenericResourceFiles" AfterTargets="GenerateThemeResourceFile" Inputs="$(ScriptPath)GenerateMergedXaml.ps1;$(MUXProjectRoot)dxaml\xcp\dxaml\themes\generic.xaml;$(OutDir)generic.xaml;$(OutDir)themeresources.xaml" Outputs="$(TempRoot)\generic.xaml">
@@ -654,5 +654,5 @@
         <AdditionalOptions>%(Link.AdditionalOptions) /sourcelink:"$(SourceLink)"</AdditionalOptions>
       </Link>
     </ItemGroup>
-  </Target>  
+  </Target>
 </Project>
diff --git a/controls/dev/inc/velocity.h b/controls/dev/inc/velocity.h
index 9a14494b09..7ac7575e88 100644
--- a/controls/dev/inc/velocity.h
+++ b/controls/dev/inc/velocity.h
@@ -7,7 +7,7 @@
 #endif
 
 // wil does not work well with code analysis enabled so we disable some warnings:
-#pragma warning(push) 
+#pragma warning(push)
 #pragma warning(disable : 6001)
 #pragma warning(disable : 6319)
 #pragma warning(disable : 6387)
@@ -21,6 +21,7 @@
 #pragma warning(disable : 26812)
 
 #include <wil/ResultMacros.h>
+#include "wil/result.h"
 using namespace wil::details;
 #include <wil/Staging.h>
 
diff --git a/controls/test/MUXControls.Test/ScenarioAppTests/WinUICppDesktopSampleAppTests.cs b/controls/test/MUXControls.Test/ScenarioAppTests/WinUICppDesktopSampleAppTests.cs
index eeaf275e24..392cfcd8b1 100644
--- a/controls/test/MUXControls.Test/ScenarioAppTests/WinUICppDesktopSampleAppTests.cs
+++ b/controls/test/MUXControls.Test/ScenarioAppTests/WinUICppDesktopSampleAppTests.cs
@@ -1233,6 +1233,7 @@ public void WindowChromeTitlebarSizeChangeTest()
         }
 
         [TestMethod]
+        [TestProperty("TestPass:MinOSVer", WindowsOSVersion._19H1)] // 46636362: Temporarily disabled from a test failure in RS5, stemming from system CoreMessaging.
         [Description("Window Chrome tests : Test if no titlebar is provided and Window Chrome is enabled, caption buttons still appear on right and a default titlebar area is given which covers entire non client area")]
         public void WindowChromeNullTitlebarTest()
         {
diff --git a/dxaml/xcp/components/mrt/ModernResourceProvider.cpp b/dxaml/xcp/components/mrt/ModernResourceProvider.cpp
index 8007072fc7..e0662c5256 100644
--- a/dxaml/xcp/components/mrt/ModernResourceProvider.cpp
+++ b/dxaml/xcp/components/mrt/ModernResourceProvider.cpp
@@ -19,6 +19,7 @@
 #include <theming\inc\FrameworkTheming.h>
 #include <theming\inc\Theme.h>
 #include <UriXStringGetters.h>
+#include <FrameworkUdk/Containment.h>
 
 #include "ModernResourceProvider.h"
 #include "MRTKnownQualifierNames.h"
@@ -27,8 +28,14 @@
 constexpr wchar_t c_resourcesPriName[] = L"resources.pri";
 constexpr wchar_t c_frameworkPackageNamePrefix[] = L"Microsoft.WindowsAppRuntime";
 constexpr int c_frameworkPackageNamePrefixLength = ARRAY_SIZE(c_frameworkPackageNamePrefix) - 1;
+constexpr wchar_t c_cbsPackageNamePrefix[] = L"Microsoft.WindowsAppRuntime.CBS";
+constexpr int c_cbsPackageNamePrefixLength = ARRAY_SIZE(c_cbsPackageNamePrefix) - 1;
 constexpr wchar_t c_winuiComponentName[] = L"Microsoft.UI.Xaml/";
 
+// Bug 46497947: WinUI 3 File Explorer displays languages inconsistently when preferred languages differ from Windows display language
+// Bug 46751006: [WinAppSDK 1.4] WinUI 3 File Explorer displays languages inconsistently when preferred languages differ from Windows display language
+#define WINAPPSDK_CHANGEID_46751006 46751006
+
 // NTSTATUS code copied from ntstatus.h
 // ntstatus.h and windows.h do not play nicely together; including them both
 // results in a spew of macro redefinition warnings. In theory we can avoid this
@@ -61,6 +68,21 @@ namespace
                                      TRUE) == CSTR_EQUAL);
     }
 
+    // Detect if the specified package is the ProjectReunion CBS package
+    // by checking its name.  The CBS should be used exclusively by OS
+    // components, so this doubles as a check if we're running as part
+    // of an OS experience.
+    bool IsProjectReunionCBSPackage(const wchar_t* packageFamilyName)
+    {
+        int nameLength{ static_cast<int>(wcslen(packageFamilyName)) };
+        return (nameLength >= c_cbsPackageNamePrefixLength) &&
+            (CompareStringOrdinal(packageFamilyName,
+                c_cbsPackageNamePrefixLength,
+                c_cbsPackageNamePrefix,
+                c_cbsPackageNamePrefixLength,
+                TRUE) == CSTR_EQUAL);
+    }
+
     bool IsProjectReunionFrameworkPackageResource(const xstring_ptr& resourceName)
     {
         return (wcsncmp(resourceName.GetBuffer(), c_winuiComponentName, ARRAY_SIZE(c_winuiComponentName) - 1) == 0);
@@ -149,7 +171,7 @@ HRESULT ModernResourceProvider::Create(
     }
 
     xstring_ptr frameworkPackageResourcesPriPath;
-    IFC_RETURN(ProbeForFrameworkPackageResourcesPri(&frameworkPackageResourcesPriPath));
+    IFC_RETURN(ProbeForFrameworkPackageResourcesPri(&frameworkPackageResourcesPriPath, resourceProvider->m_shouldUseSystemLanguage));
     if (!frameworkPackageResourcesPriPath.IsNullOrEmpty())
     {
         IFC_RETURN(resourceManagerFactory->CreateInstance(
@@ -394,11 +416,28 @@ HRESULT ModernResourceProvider::UpdateLanguageAndLayoutDirectionQualifiers()
         wrl_wrappers::HStringReference(RuntimeClass_Windows_Globalization_ApplicationLanguages).Get(),
         &applicationLanguagesStatics));
 
-    // Current language is the first element of Windows.Globalization.ApplicationLanguages.Languages
-    wrl::ComPtr<wfc::IVectorView<HSTRING>> languages;
     wrl_wrappers::HString primaryLanguageName;
-    IFC_RETURN(applicationLanguagesStatics->get_Languages(languages.ReleaseAndGetAddressOf()));
-    IFC_RETURN(languages->GetAt(0, primaryLanguageName.GetAddressOf()));
+
+    if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_46751006>() && m_shouldUseSystemLanguage)
+    {
+        // If using the CBS package, we want to use the Windows display language
+        // (the language used by OS components), not the first of the user's preferred
+        // languages from ApplicationLanguages.Languages.
+        // They can be different, and because
+        // Windows components use the Windows display language, can lead to an
+        // inconsistent language experience if WinUI 3 always uses
+        // ApplicationLanguages.Languages.
+        wchar_t lpLocaleName[LOCALE_NAME_MAX_LENGTH];
+        IFC_RETURN(GetUserDefaultLocaleName(lpLocaleName, LOCALE_NAME_MAX_LENGTH));
+        primaryLanguageName.Attach(wrl_wrappers::HStringReference(lpLocaleName).Get());
+    }
+    else
+    {
+        // Current language is the first element of Windows.Globalization.ApplicationLanguages.Languages
+        wrl::ComPtr<wfc::IVectorView<HSTRING>> languages;
+        IFC_RETURN(applicationLanguagesStatics->get_Languages(languages.ReleaseAndGetAddressOf()));
+        IFC_RETURN(languages->GetAt(0, primaryLanguageName.GetAddressOf()));
+    }
 
     wrl::ComPtr<wg::ILanguageFactory> languageFactory;
     IFC_RETURN(wf::GetActivationFactory(
@@ -769,10 +808,15 @@ HRESULT ModernResourceProvider::PrepareModernResourceName(
 }
 
 /* static */ _Check_return_ HRESULT
-ModernResourceProvider::ProbeForFrameworkPackageResourcesPri(_Out_ xstring_ptr* frameworkPackageResourcePriPath)
+ModernResourceProvider::ProbeForFrameworkPackageResourcesPri(_Out_ xstring_ptr* frameworkPackageResourcePriPath, _Out_ bool& isUsingCbsPackage)
 {
     *frameworkPackageResourcePriPath = xstring_ptr::EmptyString();
 
+    if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_46751006>())
+    {
+        isUsingCbsPackage = false;
+    }
+
     const UINT32 c_filter{ PACKAGE_FILTER_HEAD | PACKAGE_FILTER_DIRECT | PACKAGE_FILTER_STATIC | PACKAGE_FILTER_DYNAMIC | PACKAGE_INFORMATION_BASIC };
     std::uint32_t packageCount{};
     const PACKAGE_INFO* packageGraph{};
@@ -783,6 +827,12 @@ ModernResourceProvider::ProbeForFrameworkPackageResourcesPri(_Out_ xstring_ptr*
         for (std::uint32_t index=0; index < packageCount; index++)
         {
             const PACKAGE_INFO& packageInfo{ packageGraph[index] };
+
+            if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_46751006>() && IsProjectReunionCBSPackage(packageInfo.packageFamilyName))
+            {
+                isUsingCbsPackage = true;
+            }
+
             if (IsProjectReunionFrameworkPackage(packageInfo.packageFamilyName))
             {
                 auto frameworkPackagePath{ packageInfo.path };
diff --git a/dxaml/xcp/components/mrt/inc/ModernResourceProvider.h b/dxaml/xcp/components/mrt/inc/ModernResourceProvider.h
index e925f6fce0..8496e6fd25 100644
--- a/dxaml/xcp/components/mrt/inc/ModernResourceProvider.h
+++ b/dxaml/xcp/components/mrt/inc/ModernResourceProvider.h
@@ -64,7 +64,7 @@ class ModernResourceProvider final : public IPALResourceProvider, private CRefer
         );
 
     static _Check_return_ HRESULT ProbeForAppResourcesPri(_Out_ xstring_ptr* appResourcePriPath);
-    static _Check_return_ HRESULT ProbeForFrameworkPackageResourcesPri(_Out_ xstring_ptr* frameworkPackageResourcePriPath);
+    static _Check_return_ HRESULT ProbeForFrameworkPackageResourcesPri(_Out_ xstring_ptr* frameworkPackageResourcePriPath, _Out_ bool& isUsingCbsPackage);
 
     _Check_return_ HRESULT InitializeContext();
 
@@ -94,4 +94,10 @@ class ModernResourceProvider final : public IPALResourceProvider, private CRefer
     wrl::ComPtr<mwar::IResourceContext> m_frameworkPackageResourceContext;
 
     xref_ptr<CommonResourceProvider> m_pFallbackResourceProvider;
+
+    // Note: any usage of m_shouldUseSystemLanguage should be contained behind 46751006
+    // If running as an OS component and using the CBS package,
+    // we should localize using the Windows display language
+    // instead of the user's preferred language list
+    bool m_shouldUseSystemLanguage = false;
 };
diff --git a/dxaml/xcp/core/core/elements/Popup.cpp b/dxaml/xcp/core/core/elements/Popup.cpp
index c46e0fd30c..db9bde268a 100644
--- a/dxaml/xcp/core/core/elements/Popup.cpp
+++ b/dxaml/xcp/core/core/elements/Popup.cpp
@@ -53,6 +53,9 @@ using namespace Focus;
 // Bug 46074461: [MTP 23-9B]- [Win11_23H2_ClientEnterprise_X64][Manual Testing] - File Explorer- List of Sort/View options are seen transparent and overlapping with the Explorer folder icons in the background.
 #define WINAPPSDK_CHANGEID_46074461 46074461
 
+// Bug 46702704: Cannot scroll ComboBox items by touch after second expand
+#define WINAPPSDK_CHANGEID_46702704 46702704
+
 // Windowed popup's window class
 ATOM CPopup::s_windowedPopupWindowClass = 0;
 
@@ -481,11 +484,25 @@ _Check_return_ HRESULT CPopup::Open()
             IFC_RETURN(EnsureWindowForWindowedPopup());
         }
 
+        if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_46702704>())
+        {
+            // Initial phase of popup addition to open popup list: just add the popup to the m_pOpenPopups list and add-ref it.
+            // This phase is performed *before* the AddChild call just below so that CUIElement::EnterImpl for any 
+            // ScrollViewer finds the correct HWND to hand off to DManip through GetElementInputWindow().
+            IFC_RETURN(pPopupRoot->StartAdditionToOpenPopupList(this));
+        }
+
         HRESULT hr = pPopupRoot->AddChild(m_pChild);
         if (FAILED(hr))
         {
             // AddChild failed, set the associated flag back.
             m_pChild->SetAssociated(true, nullptr /* Association owner needed only for shareable, non-parent aware DOs */);
+
+            if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_46702704>())
+            {
+                // Undo the addition performed by the StartAdditionToOpenPopupList call above.
+                IGNOREHR(pPopupRoot->UndoAdditionToOpenPopupList(this));
+            }
         }
         IFC_RETURN(hr);
 
@@ -494,7 +511,15 @@ _Check_return_ HRESULT CPopup::Open()
             IFC_RETURN(AddOverlayElementToPopupRoot());
         }
 
-        IFC_RETURN(pPopupRoot->AddToOpenPopupList(this));
+        if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_46702704>())
+        {
+            // Final phase of popup addition to open popup list: peg managed peer, updates themes and rendering trees.
+            IFC_RETURN(pPopupRoot->CompleteAdditionToOpenPopupList(this));
+        }
+        else
+        {
+            IFC_RETURN(pPopupRoot->AddToOpenPopupList(this));
+        }
 
         if (IsWindowed())
         {
@@ -882,7 +907,7 @@ _Check_return_ HRESULT CPopup::Close(bool forceCloseforTreeReset)
 
     // The PopupAutomationPeer will be null from calling UIElement::GetOrCreateAutomationPeer() if Popup
     // is the closed state and the existing PopupAutomationPeer will invalidate the owner from
-    // CUIElement::OnCreateAutomationPeer() that shouldn�t be referenced from other AutomationPeer.
+    // CUIElement::OnCreateAutomationPeer() that shouldn't be referenced from other AutomationPeer.
     // The below calling SetAPParent(null) ensures the disconnect the relationship between PopupAutomationPeer
     // and Popup child's AutomationPeer when Popup is closed.
     {
@@ -4128,6 +4153,24 @@ _Check_return_ HRESULT CPopupRoot::ArrangeOverride(XSIZEF finalSize, XSIZEF& new
 //
 //------------------------------------------------------------------------
 _Check_return_ HRESULT CPopupRoot::AddToOpenPopupList(_Inout_ CPopup* pPopup)
+{
+    IFC_RETURN(StartAdditionToOpenPopupList(pPopup));
+    IFC_RETURN(CompleteAdditionToOpenPopupList(pPopup));
+
+    return S_OK;
+}
+
+
+//------------------------------------------------------------------------
+//
+//  Method:   StartAdditionToOpenPopupList
+//
+//  Synopsis:
+//      Initial phase: the provided popup simply gets added to the list of open popups.
+//      Then add-ref'ed - the equivalent release being in either UndoAdditionToOpenPopupList or RemoveFromOpenPopupList.
+//
+//------------------------------------------------------------------------
+_Check_return_ HRESULT CPopupRoot::StartAdditionToOpenPopupList(_In_ CPopup* pPopup)
 {
     IFCPTR_RETURN(pPopup);
     ASSERT(pPopup->m_pChild && pPopup->m_fIsOpen);
@@ -4145,6 +4188,46 @@ _Check_return_ HRESULT CPopupRoot::AddToOpenPopupList(_Inout_ CPopup* pPopup)
     //any other native ref.
     pPopup->AddRef();
 
+    return S_OK;
+}
+
+//------------------------------------------------------------------------
+//
+//  Method:   UndoAdditionToOpenPopupList
+//
+//  Synopsis:
+//      Undo the addition done by StartAdditionToOpenPopupList above.
+//
+//------------------------------------------------------------------------
+_Check_return_ HRESULT CPopupRoot::UndoAdditionToOpenPopupList(_In_ CPopup* pPopup)
+{
+    ASSERT(WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_46702704>());
+
+    IFCPTR_RETURN(pPopup);
+
+    if (m_pOpenPopups != nullptr && ContainsOpenOrUnloadingPopup(pPopup))
+    {
+        IFC_RETURN(m_pOpenPopups->Remove(pPopup, FALSE));
+        pPopup->Release();
+    }
+
+    return S_OK;
+}
+
+//------------------------------------------------------------------------
+//
+//  Method:   CompleteAdditionToOpenPopupList
+//
+//  Synopsis:
+//      Final phase: peg managed peer, update themes and rendering trees.
+//
+//------------------------------------------------------------------------
+_Check_return_ HRESULT CPopupRoot::CompleteAdditionToOpenPopupList(_Inout_ CPopup* pPopup)
+{
+    IFCPTR_RETURN(pPopup);
+    ASSERT(pPopup->m_pChild && pPopup->m_fIsOpen);
+    ASSERT(ContainsOpenOrUnloadingPopup(pPopup));
+
     // Open popup should not be GC'd. Hold a ref on the managed peer.
     IFC_RETURN(pPopup->PegManagedPeer());
 
diff --git a/dxaml/xcp/core/inc/Popup.h b/dxaml/xcp/core/inc/Popup.h
index 4379384929..77e0802150 100644
--- a/dxaml/xcp/core/inc/Popup.h
+++ b/dxaml/xcp/core/inc/Popup.h
@@ -728,6 +728,9 @@ class CPopupRoot final : public CPanel
     bool SkipNameRegistrationForChildren() override {  return true;   }
 
     _Check_return_ HRESULT AddToOpenPopupList(_Inout_ CPopup *pPopup);
+    _Check_return_ HRESULT StartAdditionToOpenPopupList(_In_ CPopup* pPopup);
+    _Check_return_ HRESULT UndoAdditionToOpenPopupList(_In_ CPopup* pPopup);
+    _Check_return_ HRESULT CompleteAdditionToOpenPopupList(_Inout_ CPopup* pPopup);
 
     _Check_return_ HRESULT RemoveFromOpenPopupList(_Inout_ CPopup *pPopup, bool bAsyncRelease);
 
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 9afb5df1a0..b3cd905c92 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -2,15 +2,15 @@
 <!-- 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.4.0-20230728.0">
+    <Dependency Name="Microsoft.WindowsAppSDK.Foundation.TransportPackage" Version="1.4.0-20231006.1">
       <Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDK</Uri>
-      <Sha>8a25a992470565d260c6145c31fc1af0185bc8f1</Sha>
+      <Sha>0584534e260a81ebf0a37c37db6faf3dfc82f078</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage" Version="1.4.3-CI-22624.1040.230911-2114.0">
+    <Dependency Name="Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage" Version="1.4.3-CI-22624.1046.231005-0944.0">
       <Uri>https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP</Uri>
       <Sha>17b52d8f7c1921025a2d5aeef064d74602e155e9</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Internal.InteractiveExperiences" Version="1.4.3-CI-22624.1040.230911-2114.0">
+    <Dependency Name="Microsoft.Internal.InteractiveExperiences" Version="1.4.3-CI-22624.1046.231005-0944.0">
       <Uri>https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP</Uri>
       <Sha>17b52d8f7c1921025a2d5aeef064d74602e155e9</Sha>
     </Dependency>
diff --git a/packages.config b/packages.config
index 5e5393438a..fd0edebd4a 100644
--- a/packages.config
+++ b/packages.config
@@ -36,7 +36,7 @@
   <!-- Microsoft-WinUI-SDK repo (MSBuild and Visual Studio extensions for building, deploying, and debugging packaged applications.)  -->
   <package id="Microsoft.Build.Msix" version="1.4.0-zmain.230310.1" />
   <!-- Localized MUI and resw files -->
-  <package id="Microsoft.Internal.WinUILocalizationResources" version="230310.0.0" />
+  <package id="Microsoft.Internal.WinUILocalizationResources" version="230926.0.0" />
   <!-- Windows SDK build tools (e.g. makeappx.exe) -->
   <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.756" />
   <!-- AbiWinRt to convert winmd files to ABI headers -->