From f478dc35d9ce4657176566136c16c4e880c18694 Mon Sep 17 00:00:00 2001
From: Martin Zikmund <martin@zikmund.dev>
Date: Mon, 15 Apr 2024 14:03:36 +0200
Subject: [PATCH] chore: Update sample pages to latest WinUI sources

---
 .../CommandBarFlyoutMainPage.xaml             |  28 +-
 .../CommandBarFlyoutMainPage.xaml.cs          |   9 +-
 .../CommandBarFlyoutPage.xaml                 | 554 ++++++++++--------
 .../CommandBarFlyoutPage.xaml.cs              | 157 +++--
 .../ExtraCommandBarFlyoutPage.xaml            | 107 ++--
 .../ExtraCommandBarFlyoutPage.xaml.cs         |  49 +-
 .../TextCommandBarFlyoutPage.xaml             | 145 ++---
 .../TextCommandBarFlyoutPage.xaml.cs          | 115 +---
 .../ScrollViewTests/ScrollViewPage.xaml.cs    |  13 -
 9 files changed, 584 insertions(+), 593 deletions(-)

diff --git a/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/CommandBarFlyoutMainPage.xaml b/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/CommandBarFlyoutMainPage.xaml
index 7a903683dd74..6ca2271bfbf2 100644
--- a/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/CommandBarFlyoutMainPage.xaml
+++ b/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/CommandBarFlyoutMainPage.xaml
@@ -1,4 +1,6 @@
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<!-- MUX Reference controls\dev\CommandBarFlyout\TestUI\CommandBarFlyoutMainPage.xaml, tag winui3/release/1.5.2, commit b91b3ce6f25c587a9e18c4e122f348f51331f18b -->
+
 <local:TestPage
     x:Class="MUXControlsTestApp.CommandBarFlyoutMainPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -9,19 +11,19 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <StackPanel>
-            <Button Content="Base CommandBarFlyout Tests" Click="OnCommandBarFlyoutTestsClicked" Margin="10" />
-            <Button Content="TextCommandBarFlyout Tests" Click="OnTextCommandBarFlyoutTestsClicked" Margin="10" />
-            <Button Content="Extra CommandBarFlyout Tests" Click="OnExtraCommandBarFlyoutTestsClicked" Margin="10" />
+	<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+		<StackPanel>
+			<Button Content="Base CommandBarFlyout Tests" Click="OnCommandBarFlyoutTestsClicked" Margin="10" />
+			<Button Content="TextCommandBarFlyout Tests" Click="OnTextCommandBarFlyoutTestsClicked" Margin="10" />
+			<Button Content="Extra CommandBarFlyout Tests" Click="OnExtraCommandBarFlyoutTestsClicked" Margin="10" />
 
-            <TextBlock Text="CommandBarFlyout OutputDebugString Level:" VerticalAlignment="Center" Margin="10, 10, 10, 1"/>
-            <ComboBox x:Name="cmbCommandBarFlyoutOutputDebugStringLevel" AutomationProperties.Name="cmbCommandBarFlyoutOutputDebugStringLevel" Margin="10, 1, 10, 10"
+			<TextBlock Text="CommandBarFlyout OutputDebugString Level:" VerticalAlignment="Center" Margin="10, 10, 10, 1"/>
+			<ComboBox x:Name="cmbCommandBarFlyoutOutputDebugStringLevel" AutomationProperties.Name="cmbCommandBarFlyoutOutputDebugStringLevel" Margin="10, 1, 10, 10"
                       HorizontalAlignment="Left" SelectedIndex="0" SelectionChanged="CmbCommandBarFlyoutOutputDebugStringLevel_SelectionChanged">
-                <ComboBoxItem>None</ComboBoxItem>
-                <ComboBoxItem>Info</ComboBoxItem>
-                <ComboBoxItem>Verbose</ComboBoxItem>
-            </ComboBox>
-        </StackPanel>
-    </Grid>
+				<ComboBoxItem>None</ComboBoxItem>
+				<ComboBoxItem>Info</ComboBoxItem>
+				<ComboBoxItem>Verbose</ComboBoxItem>
+			</ComboBox>
+		</StackPanel>
+	</Grid>
 </local:TestPage>
diff --git a/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/CommandBarFlyoutMainPage.xaml.cs b/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/CommandBarFlyoutMainPage.xaml.cs
index e3d1fc60e2ea..5e4fe140335f 100644
--- a/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/CommandBarFlyoutMainPage.xaml.cs
+++ b/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/CommandBarFlyoutMainPage.xaml.cs
@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
+// MUX Reference controls\dev\CommandBarFlyout\TestUI\CommandBarFlyoutMainPage.xaml.cs, tag winui3/release/1.5.2, commit b91b3ce6f25c587a9e18c4e122f348f51331f18b
 
 using Uno.UI.Samples.Controls;
 using Microsoft.UI.Xaml;
@@ -21,24 +22,24 @@ public CommandBarFlyoutMainPage()
 
 	public void OnCommandBarFlyoutTestsClicked(object sender, object args)
 	{
-		var rootFrame = Window.Current.Content as Frame;
+		var rootFrame = XamlRoot.Content as Frame;
 		rootFrame.NavigateWithoutAnimation(typeof(CommandBarFlyoutPage), "CommandBarFlyout Tests");
 	}
 
 	public void OnTextCommandBarFlyoutTestsClicked(object sender, object args)
 	{
-		var rootFrame = Window.Current.Content as Frame;
+		var rootFrame = XamlRoot.Content as Frame;
 		rootFrame.NavigateWithoutAnimation(typeof(TextCommandBarFlyoutPage), "TextCommandBarFlyout Tests");
 	}
 
 	public void OnExtraCommandBarFlyoutTestsClicked(object sender, object args)
 	{
-		var rootFrame = Window.Current.Content as Frame;
+		var rootFrame = XamlRoot.Content as Frame;
 		rootFrame.NavigateWithoutAnimation(typeof(ExtraCommandBarFlyoutPage), "Extra CommandBarFlyout Tests");
 	}
 	private void CmbCommandBarFlyoutOutputDebugStringLevel_SelectionChanged(object sender, SelectionChangedEventArgs e)
 	{
-#if false
+#if false // Uno specific: Not needed.
 		MUXControlsTestHooks.SetOutputDebugStringLevelForType(
             "CommandBarFlyout",
             cmbCommandBarFlyoutOutputDebugStringLevel.SelectedIndex == 1 || cmbCommandBarFlyoutOutputDebugStringLevel.SelectedIndex == 2,
diff --git a/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/CommandBarFlyoutPage.xaml b/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/CommandBarFlyoutPage.xaml
index 4e3549a77d8a..093c02f781dc 100644
--- a/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/CommandBarFlyoutPage.xaml
+++ b/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/CommandBarFlyoutPage.xaml
@@ -1,4 +1,5 @@
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<!-- MUX Reference controls\dev\CommandBarFlyout\TestUI\CommandBarFlyoutPage.xaml, tag winui3/release/1.5.2, commit b91b3ce6f25c587a9e18c4e122f348f51331f18b -->
 <local:TestPage
     x:Class="MUXControlsTestApp.CommandBarFlyoutPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -11,264 +12,333 @@
     xmlns:contract13Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,13)"
     mc:Ignorable="d">
 
-    <local:TestPage.Resources>
-        <Style x:Key="animatedCommandBarFlyoutCommandBarStyle" TargetType="muxcp:CommandBarFlyoutCommandBar" BasedOn="{StaticResource DefaultCommandBarFlyoutCommandBarStyle}">
-            <Setter Property="Background" Value="Gold" />
-        </Style>
-    </local:TestPage.Resources>
+	<local:TestPage.Resources>
+		<Style x:Key="animatedCommandBarFlyoutCommandBarStyle" TargetType="muxcp:CommandBarFlyoutCommandBar" BasedOn="{StaticResource DefaultCommandBarFlyoutCommandBarStyle}">
+			<Setter Property="Background" Value="Gold" />
+		</Style>
+	</local:TestPage.Resources>
 
-    <Grid>
-        <Grid.Background>
-            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-                <GradientStop Color="Red" Offset="0.000" />
-                <GradientStop Color="Red" Offset="0.166" />
-                <GradientStop Color="DarkOrange" Offset="0.167" />
-                <GradientStop Color="DarkOrange" Offset="0.332" />
-                <GradientStop Color="Goldenrod" Offset="0.333" />
-                <GradientStop Color="Goldenrod" Offset="0.499" />
-                <GradientStop Color="SeaGreen" Offset="0.500" />
-                <GradientStop Color="SeaGreen" Offset="0.666" />
-                <GradientStop Color="MediumBlue" Offset="0.667" />
-                <GradientStop Color="MediumBlue" Offset="0.832" />
-                <GradientStop Color="Indigo" Offset="0.833" />
-                <GradientStop Color="Indigo" Offset="1.000" />
-            </LinearGradientBrush>
-        </Grid.Background>
-        <Grid.RowDefinitions>
-            <RowDefinition />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-        <Grid.Resources>
-            <muxc:CommandBarFlyout Placement="Right" x:Name="Flyout1" AutomationProperties.AutomationId="Flyout1" Opened="OnFlyoutOpened" Closed="OnFlyoutClosed">
-                <AppBarButton x:Name="CutButton1" AutomationProperties.AutomationId="CutButton1" Label="Cut" Icon="Cut" Click="OnElementClicked"/>
-                <AppBarSeparator />
-                <AppBarButton x:Name="CopyButton1" AutomationProperties.AutomationId="CopyButton1" Label="Copy" Icon="Copy" Click="OnElementClicked" />
-                <AppBarButton x:Name="PasteButton1" AutomationProperties.AutomationId="PasteButton1" Label="Paste" Icon="Paste" Click="OnElementClicked" />
-                <AppBarButton x:Name="BoldButton1" AutomationProperties.AutomationId="BoldButton1" Label="Bold" Icon="Bold" Click="OnElementClicked" />
-                <AppBarButton x:Name="ItalicButton1" AutomationProperties.AutomationId="ItalicButton1" Label="Italic" Icon="Italic" Click="OnElementClicked" />
-                <AppBarToggleButton x:Name="UnderlineButton1" AutomationProperties.AutomationId="UnderlineButton1" Label="Underline" Icon="Underline" Click="OnElementClicked" />
-                <muxc:CommandBarFlyout.SecondaryCommands>
-                    <AppBarButton x:Name="UndoButton1" AutomationProperties.AutomationId="UndoButton1" Label="Undo" Icon="Undo" Click="OnElementClicked" />
-                    <AppBarSeparator IsTabStop="False" />
-                    <AppBarButton x:Name="RedoButton1" AutomationProperties.AutomationId="RedoButton1" Label="Redo" Icon="Redo" Click="OnElementClicked" />
-                    <AppBarButton x:Name="SelectAllButton1" AutomationProperties.AutomationId="SelectAllButton1" Label="Select all" Click="OnElementClicked" />
-                    <AppBarToggleButton x:Name="FavoriteToggleButton1" AutomationProperties.AutomationId="FavoriteToggleButton1" Label="Favorite" Icon="Favorite" Checked="OnElementChecked" Unchecked="OnElementUnchecked" />
-                </muxc:CommandBarFlyout.SecondaryCommands>
-            </muxc:CommandBarFlyout>
-            <muxc:CommandBarFlyout Placement="Right" x:Name="Flyout2" AutomationProperties.AutomationId="Flyout2" Opened="OnFlyoutOpened" Closed="OnFlyoutClosed">
-                <AppBarButton x:Name="CutButton2" AutomationProperties.AutomationId="CutButton2" Label="Cut" Icon="Cut" Click="OnElementClicked" />
-                <AppBarButton x:Name="CopyButton2" AutomationProperties.AutomationId="CopyButton2" Label="Copy" Icon="Copy" Click="OnElementClicked" />
-                <AppBarButton x:Name="PasteButton2" AutomationProperties.AutomationId="PasteButton2" Label="Paste" Icon="Paste" Click="OnElementClicked" />
-                <AppBarButton x:Name="BoldButton2" AutomationProperties.AutomationId="BoldButton2" Label="Bold" Icon="Bold" Click="OnElementClicked" />
-                <AppBarButton x:Name="ItalicButton2" AutomationProperties.AutomationId="ItalicButton2" Label="Italic" Icon="Italic" Click="OnElementClicked" />
-                <AppBarButton x:Name="UnderlineButton2" AutomationProperties.AutomationId="UnderlineButton2" Label="Underline" Icon="Underline" Click="OnElementClicked" />
-                <muxc:CommandBarFlyout.SecondaryCommands>
-                    <AppBarButton x:Name="UndoButton2" AutomationProperties.AutomationId="UndoButton2" Label="Undo" Icon="Undo" Click="OnElementClicked" />
-                    <AppBarButton x:Name="RedoButton2" AutomationProperties.AutomationId="RedoButton2" Label="Redo" Icon="Redo" Click="OnElementClicked" />
-                    <AppBarButton x:Name="SelectAllButton2" AutomationProperties.AutomationId="SelectAllButton2" Label="Select all" Click="OnElementClicked" />
-                    <AppBarButton x:Name="WideButton" AutomationProperties.AutomationId="WideButton" Label="Item with a label wider than primary items" />
-                </muxc:CommandBarFlyout.SecondaryCommands>
-            </muxc:CommandBarFlyout>
-            <muxc:CommandBarFlyout Placement="Right" x:Name="Flyout3" AutomationProperties.AutomationId="Flyout3" Opened="OnFlyoutOpened" Closed="OnFlyoutClosed">
-                <AppBarButton x:Name="CutButton3" AutomationProperties.AutomationId="CutButton3" Label="Cut" Icon="Cut" Click="OnElementClicked" />
-                <AppBarButton x:Name="CopyButton3" AutomationProperties.AutomationId="CopyButton3" Label="Copy" Icon="Copy" Click="OnElementClicked" />
-                <AppBarButton x:Name="PasteButton3" AutomationProperties.AutomationId="PasteButton3" Label="Paste" Icon="Paste" Click="OnElementClicked" />
-                <AppBarButton x:Name="BoldButton3" AutomationProperties.AutomationId="BoldButton3" Label="Bold" Icon="Bold" Click="OnElementClicked" />
-                <AppBarButton x:Name="ItalicButton3" AutomationProperties.AutomationId="ItalicButton3" Label="Italic" Icon="Italic" Click="OnElementClicked" />
-                <AppBarButton x:Name="UnderlineButton3" AutomationProperties.AutomationId="UnderlineButton3" Label="Underline" Icon="Underline" Click="OnElementClicked" />
-                <muxc:CommandBarFlyout.SecondaryCommands>
-                    <AppBarButton x:Name="UndoButton3" AutomationProperties.AutomationId="UndoButton3" Label="Undo" Icon="Undo" Click="OnElementClicked" />
-                    <AppBarButton x:Name="RedoButton3" AutomationProperties.AutomationId="RedoButton3" Label="Redo" Icon="Redo" Click="OnElementClicked" />
-                    <AppBarButton x:Name="SelectAllButton3" AutomationProperties.AutomationId="SelectAllButton3" Label="Select all" Click="OnElementClicked" />
-                    <AppBarButton Label="Do another thing" />
-                    <AppBarButton Label="Do another thing" />
-                    <AppBarButton Label="Do another thing" />
-                    <AppBarButton Label="Do another thing" />
-                    <AppBarButton Label="Do another thing" />
-                    <AppBarButton Label="Do another thing" />
-                    <AppBarButton Label="Do another thing" />
-                    <AppBarButton Label="Do another thing" />
-                    <AppBarButton Label="Do another thing" />
-                    <AppBarButton Label="Do another thing" />
-                    <AppBarButton Label="Do another thing" />
-                    <AppBarButton Label="Do another thing" />
-                    <AppBarButton Label="Do another thing" />
-                    <AppBarButton Label="Do another thing" />
-                    <AppBarButton Label="Do another thing" />
-                    <AppBarButton Label="Do another thing" />
-                    <AppBarButton Label="Do another thing" />
-                </muxc:CommandBarFlyout.SecondaryCommands>
-            </muxc:CommandBarFlyout>
-            <muxc:CommandBarFlyout Placement="Right" x:Name="Flyout4" AutomationProperties.AutomationId="Flyout4" Opened="OnFlyoutOpened" Closed="OnFlyoutClosed">
-                <AppBarButton x:Name="CutButton4" AutomationProperties.AutomationId="CutButton4" Label="Cut" Icon="Cut" Click="OnElementClicked" />
-                <AppBarButton x:Name="CopyButton4" AutomationProperties.AutomationId="CopyButton4" Label="Copy" Icon="Copy" Click="OnElementClicked" />
-                <AppBarButton x:Name="PasteButton4" AutomationProperties.AutomationId="PasteButton4" Label="Paste" Icon="Paste" Click="OnElementClicked" />
-                <AppBarButton x:Name="BoldButton4" AutomationProperties.AutomationId="BoldButton4" Label="Bold" Icon="Bold" Click="OnElementClicked" />
-                <AppBarButton x:Name="ItalicButton4" AutomationProperties.AutomationId="ItalicButton4" Label="Italic" Icon="Italic" Click="OnElementClicked" />
-                <AppBarButton x:Name="UnderlineButton4" AutomationProperties.AutomationId="UnderlineButton4" Label="Underline" Icon="Underline" Click="OnElementClicked" />
-                <muxc:CommandBarFlyout.SecondaryCommands>
-                    <AppBarButton x:Name="UndoButton4" AutomationProperties.AutomationId="UndoButton4" Label="Undo" Icon="Undo" Click="OnElementClicked" />
-                    <AppBarButton x:Name="RedoButton4" AutomationProperties.AutomationId="RedoButton4" Label="Redo" Icon="Redo" Click="OnElementClicked" />
-                    <AppBarButton x:Name="SelectAllButton4" AutomationProperties.AutomationId="SelectAllButton4" Label="Select all" Click="OnElementClicked" />
-                    <AppBarButton Label="Item with a really really really long label that will not fit in the space provided" />
-                </muxc:CommandBarFlyout.SecondaryCommands>
-            </muxc:CommandBarFlyout>
-            <muxc:CommandBarFlyout Placement="Right" x:Name="Flyout5" AutomationProperties.AutomationId="Flyout5" Opened="OnFlyoutOpened" Closed="OnFlyoutClosed">
-                <AppBarButton x:Name="CutButton5" AutomationProperties.AutomationId="CutButton5" Label="Cut" Icon="Cut" Click="OnElementClicked" />
-                <AppBarButton x:Name="CopyButton5" AutomationProperties.AutomationId="CopyButton5" Label="Copy" Icon="Copy" Click="OnElementClicked" />
-                <AppBarButton x:Name="PasteButton5" AutomationProperties.AutomationId="PasteButton5" Label="Paste" Icon="Paste" Click="OnElementClicked" />
-                <AppBarButton x:Name="BoldButton5" AutomationProperties.AutomationId="BoldButton5" Label="Bold" Icon="Bold" Click="OnElementClicked" />
-                <AppBarButton x:Name="ItalicButton5" AutomationProperties.AutomationId="ItalicButton5" Label="Italic" Icon="Italic" Click="OnElementClicked" />
-                <AppBarButton x:Name="UnderlineButton5" AutomationProperties.AutomationId="UnderlineButton5" Label="Underline" Icon="Underline" Click="OnElementClicked" />
-                <muxc:CommandBarFlyout.SecondaryCommands>
-                    <AppBarButton x:Name="ProofingButton" AutomationProperties.AutomationId="ProofingButton" Label="Proofing" Click="OnElementClicked">
-                        <AppBarButton.Flyout>
-                            <MenuFlyout>
-                                <MenuFlyoutItem AutomationProperties.Name="FirstFlyoutItem" Text="talk" />
-                                <MenuFlyoutItem Text="talks" />
-                                <MenuFlyoutItem Text="talk a" />
-                                <MenuFlyoutSeparator />
-                                <MenuFlyoutItem Text="Add to Dictionary" />
-                                <MenuFlyoutItem Text="Ignore Once" />
-                                <MenuFlyoutItem Text="Ignore All" />
-                            </MenuFlyout>
-                        </AppBarButton.Flyout>
-                    </AppBarButton>
-                    <AppBarButton x:Name="UndoButton5" AutomationProperties.AutomationId="UndoButton5" Label="Undo" Icon="Undo" Click="OnElementClicked" />
-                    <AppBarButton x:Name="RedoButton5" AutomationProperties.AutomationId="RedoButton5" Label="Redo" Icon="Redo" Click="OnElementClicked" />
-                    <AppBarButton x:Name="SelectAllButton5" AutomationProperties.AutomationId="SelectAllButton5" Label="Select all" Click="OnElementClicked" />
-                    <AppBarButton x:Name="LongLabelButton5" AutomationProperties.AutomationId="LongLabelButton5" Label="AppBarButton with long label" Visibility="Collapsed" Click="OnElementClicked" />
-                </muxc:CommandBarFlyout.SecondaryCommands>
-            </muxc:CommandBarFlyout>
-            <muxc:CommandBarFlyout Placement="Right" x:Name="Flyout6" AutomationProperties.AutomationId="Flyout6" Opened="OnFlyoutOpened" Closed="OnFlyoutClosed">
-                <muxc:CommandBarFlyout.SecondaryCommands>
-                    <AppBarButton x:Name="UndoButton6" AutomationProperties.AutomationId="UndoButton6" Label="Undo" Icon="Undo" Click="OnElementClicked" />
-                    <AppBarButton x:Name="RedoButton6" AutomationProperties.AutomationId="RedoButton6" Label="Redo" Icon="Redo" Click="OnElementClicked" />
-                    <AppBarButton x:Name="SelectAllButton6" AutomationProperties.AutomationId="SelectAllButton6" Label="Select all" Click="OnElementClicked" />
-                    <AppBarToggleButton x:Name="FavoriteToggleButton6" AutomationProperties.AutomationId="FavoriteToggleButton6" Label="Favorite" Icon="Favorite" Checked="OnElementChecked" Unchecked="OnElementUnchecked" />
-                    <AppBarButton x:Name="LongLabelButton6" AutomationProperties.AutomationId="LongLabelButton6" Label="AppBarButton with long label" Visibility="Collapsed" Click="OnElementClicked" />
-                </muxc:CommandBarFlyout.SecondaryCommands>
-            </muxc:CommandBarFlyout>
-            <muxc:CommandBarFlyout Placement="Right" x:Name="Flyout7" AutomationProperties.AutomationId="Flyout7" Opened="OnFlyoutOpened" Closed="OnFlyoutClosed">
-                <AppBarButton x:Name="CutButton7"
+	<Grid>
+		<Grid.Background>
+			<LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+				<GradientStop Color="Red" Offset="0.000" />
+				<GradientStop Color="Red" Offset="0.166" />
+				<GradientStop Color="DarkOrange" Offset="0.167" />
+				<GradientStop Color="DarkOrange" Offset="0.332" />
+				<GradientStop Color="Goldenrod" Offset="0.333" />
+				<GradientStop Color="Goldenrod" Offset="0.499" />
+				<GradientStop Color="SeaGreen" Offset="0.500" />
+				<GradientStop Color="SeaGreen" Offset="0.666" />
+				<GradientStop Color="MediumBlue" Offset="0.667" />
+				<GradientStop Color="MediumBlue" Offset="0.832" />
+				<GradientStop Color="Indigo" Offset="0.833" />
+				<GradientStop Color="Indigo" Offset="1.000" />
+			</LinearGradientBrush>
+		</Grid.Background>
+		<Grid.RowDefinitions>
+			<RowDefinition />
+			<RowDefinition Height="Auto" />
+		</Grid.RowDefinitions>
+		<Grid.Resources>
+			<muxc:CommandBarFlyout Placement="Right" x:Name="Flyout1" AutomationProperties.AutomationId="Flyout1" Opened="OnFlyoutOpened" Closed="OnFlyoutClosed">
+				<AppBarButton x:Name="CutButton1" AutomationProperties.AutomationId="CutButton1" Label="Cut" Icon="Cut" Click="OnElementClicked"/>
+				<AppBarSeparator />
+				<AppBarButton x:Name="CopyButton1" AutomationProperties.AutomationId="CopyButton1" Label="Copy" Icon="Copy" Click="OnElementClicked" />
+				<AppBarButton x:Name="PasteButton1" AutomationProperties.AutomationId="PasteButton1" Label="Paste" Icon="Paste" Click="OnElementClicked" />
+				<AppBarButton x:Name="BoldButton1" AutomationProperties.AutomationId="BoldButton1" Label="Bold" Icon="Bold" Click="OnElementClicked" />
+				<AppBarButton x:Name="ItalicButton1" AutomationProperties.AutomationId="ItalicButton1" Label="Italic" Icon="Italic" Click="OnElementClicked" />
+				<AppBarToggleButton x:Name="UnderlineButton1" AutomationProperties.AutomationId="UnderlineButton1" Label="Underline" Icon="Underline" Click="OnElementClicked" />
+				<muxc:CommandBarFlyout.SecondaryCommands>
+					<AppBarButton x:Name="UndoButton1" AutomationProperties.AutomationId="UndoButton1" Label="Undo" Icon="Undo" Click="OnElementClicked" />
+					<AppBarSeparator IsTabStop="False" />
+					<AppBarButton x:Name="RedoButton1" AutomationProperties.AutomationId="RedoButton1" Label="Redo" Icon="Redo" Click="OnElementClicked" />
+					<AppBarButton x:Name="SelectAllButton1" AutomationProperties.AutomationId="SelectAllButton1" Label="Select all" Click="OnElementClicked" />
+					<AppBarToggleButton x:Name="FavoriteToggleButton1" AutomationProperties.AutomationId="FavoriteToggleButton1" Label="Favorite" Icon="Favorite" Checked="OnElementChecked" Unchecked="OnElementUnchecked" />
+				</muxc:CommandBarFlyout.SecondaryCommands>
+			</muxc:CommandBarFlyout>
+			<muxc:CommandBarFlyout Placement="Right" x:Name="Flyout2" AutomationProperties.AutomationId="Flyout2" Opened="OnFlyoutOpened" Closed="OnFlyoutClosed">
+				<AppBarButton x:Name="CutButton2" AutomationProperties.AutomationId="CutButton2" Label="Cut" Icon="Cut" Click="OnElementClicked" />
+				<AppBarButton x:Name="CopyButton2" AutomationProperties.AutomationId="CopyButton2" Label="Copy" Icon="Copy" Click="OnElementClicked" />
+				<AppBarButton x:Name="PasteButton2" AutomationProperties.AutomationId="PasteButton2" Label="Paste" Icon="Paste" Click="OnElementClicked" />
+				<AppBarButton x:Name="BoldButton2" AutomationProperties.AutomationId="BoldButton2" Label="Bold" Icon="Bold" Click="OnElementClicked" />
+				<AppBarButton x:Name="ItalicButton2" AutomationProperties.AutomationId="ItalicButton2" Label="Italic" Icon="Italic" Click="OnElementClicked" />
+				<AppBarButton x:Name="UnderlineButton2" AutomationProperties.AutomationId="UnderlineButton2" Label="Underline" Icon="Underline" Click="OnElementClicked" />
+				<muxc:CommandBarFlyout.SecondaryCommands>
+					<AppBarButton x:Name="UndoButton2" AutomationProperties.AutomationId="UndoButton2" Label="Undo" Icon="Undo" Click="OnElementClicked" />
+					<AppBarButton x:Name="RedoButton2" AutomationProperties.AutomationId="RedoButton2" Label="Redo" Icon="Redo" Click="OnElementClicked" />
+					<AppBarButton x:Name="SelectAllButton2" AutomationProperties.AutomationId="SelectAllButton2" Label="Select all" Click="OnElementClicked" />
+					<AppBarButton x:Name="WideButton" AutomationProperties.AutomationId="WideButton" Label="Item with a label wider than primary items" />
+				</muxc:CommandBarFlyout.SecondaryCommands>
+			</muxc:CommandBarFlyout>
+			<muxc:CommandBarFlyout Placement="Right" x:Name="Flyout3" AutomationProperties.AutomationId="Flyout3" Opened="OnFlyoutOpened" Closed="OnFlyoutClosed">
+				<AppBarButton x:Name="CutButton3" AutomationProperties.AutomationId="CutButton3" Label="Cut" Icon="Cut" Click="OnElementClicked" />
+				<AppBarButton x:Name="CopyButton3" AutomationProperties.AutomationId="CopyButton3" Label="Copy" Icon="Copy" Click="OnElementClicked" />
+				<AppBarButton x:Name="PasteButton3" AutomationProperties.AutomationId="PasteButton3" Label="Paste" Icon="Paste" Click="OnElementClicked" />
+				<AppBarButton x:Name="BoldButton3" AutomationProperties.AutomationId="BoldButton3" Label="Bold" Icon="Bold" Click="OnElementClicked" />
+				<AppBarButton x:Name="ItalicButton3" AutomationProperties.AutomationId="ItalicButton3" Label="Italic" Icon="Italic" Click="OnElementClicked" />
+				<AppBarButton x:Name="UnderlineButton3" AutomationProperties.AutomationId="UnderlineButton3" Label="Underline" Icon="Underline" Click="OnElementClicked" />
+				<muxc:CommandBarFlyout.SecondaryCommands>
+					<AppBarButton x:Name="UndoButton3" AutomationProperties.AutomationId="UndoButton3" Label="Undo" Icon="Undo" Click="OnElementClicked" />
+					<AppBarButton x:Name="RedoButton3" AutomationProperties.AutomationId="RedoButton3" Label="Redo" Icon="Redo" Click="OnElementClicked" />
+					<AppBarButton x:Name="SelectAllButton3" AutomationProperties.AutomationId="SelectAllButton3" Label="Select all" Click="OnElementClicked" />
+					<AppBarButton Label="Do another thing" />
+					<AppBarButton Label="Do another thing" />
+					<AppBarButton Label="Do another thing" />
+					<AppBarButton Label="Do another thing" />
+					<AppBarButton Label="Do another thing" />
+					<AppBarButton Label="Do another thing" />
+					<AppBarButton Label="Do another thing" />
+					<AppBarButton Label="Do another thing" />
+					<AppBarButton Label="Do another thing" />
+					<AppBarButton Label="Do another thing" />
+					<AppBarButton Label="Do another thing" />
+					<AppBarButton Label="Do another thing" />
+					<AppBarButton Label="Do another thing" />
+					<AppBarButton Label="Do another thing" />
+					<AppBarButton Label="Do another thing" />
+					<AppBarButton Label="Do another thing" />
+					<AppBarButton Label="Do another thing" />
+				</muxc:CommandBarFlyout.SecondaryCommands>
+			</muxc:CommandBarFlyout>
+			<muxc:CommandBarFlyout Placement="Right" x:Name="Flyout4" AutomationProperties.AutomationId="Flyout4" Opened="OnFlyoutOpened" Closed="OnFlyoutClosed">
+				<AppBarButton x:Name="CutButton4" AutomationProperties.AutomationId="CutButton4" Label="Cut" Icon="Cut" Click="OnElementClicked" />
+				<AppBarButton x:Name="CopyButton4" AutomationProperties.AutomationId="CopyButton4" Label="Copy" Icon="Copy" Click="OnElementClicked" />
+				<AppBarButton x:Name="PasteButton4" AutomationProperties.AutomationId="PasteButton4" Label="Paste" Icon="Paste" Click="OnElementClicked" />
+				<AppBarButton x:Name="BoldButton4" AutomationProperties.AutomationId="BoldButton4" Label="Bold" Icon="Bold" Click="OnElementClicked" />
+				<AppBarButton x:Name="ItalicButton4" AutomationProperties.AutomationId="ItalicButton4" Label="Italic" Icon="Italic" Click="OnElementClicked" />
+				<AppBarButton x:Name="UnderlineButton4" AutomationProperties.AutomationId="UnderlineButton4" Label="Underline" Icon="Underline" Click="OnElementClicked" />
+				<muxc:CommandBarFlyout.SecondaryCommands>
+					<AppBarButton x:Name="UndoButton4" AutomationProperties.AutomationId="UndoButton4" Label="Undo" Icon="Undo" Click="OnElementClicked" />
+					<AppBarButton x:Name="RedoButton4" AutomationProperties.AutomationId="RedoButton4" Label="Redo" Icon="Redo" Click="OnElementClicked" />
+					<AppBarButton x:Name="SelectAllButton4" AutomationProperties.AutomationId="SelectAllButton4" Label="Select all" Click="OnElementClicked" />
+					<AppBarButton Label="Item with a really really really long label that will not fit in the space provided" />
+				</muxc:CommandBarFlyout.SecondaryCommands>
+			</muxc:CommandBarFlyout>
+			<muxc:CommandBarFlyout Placement="Right" x:Name="Flyout5" AutomationProperties.AutomationId="Flyout5" Opened="OnFlyoutOpened" Closed="OnFlyoutClosed">
+				<AppBarButton x:Name="CutButton5" AutomationProperties.AutomationId="CutButton5" Label="Cut" Icon="Cut" Click="OnElementClicked" />
+				<AppBarButton x:Name="CopyButton5" AutomationProperties.AutomationId="CopyButton5" Label="Copy" Icon="Copy" Click="OnElementClicked" />
+				<AppBarButton x:Name="PasteButton5" AutomationProperties.AutomationId="PasteButton5" Label="Paste" Icon="Paste" Click="OnElementClicked" />
+				<AppBarButton x:Name="BoldButton5" AutomationProperties.AutomationId="BoldButton5" Label="Bold" Icon="Bold" Click="OnElementClicked" />
+				<AppBarButton x:Name="ItalicButton5" AutomationProperties.AutomationId="ItalicButton5" Label="Italic" Icon="Italic" Click="OnElementClicked" />
+				<AppBarButton x:Name="UnderlineButton5" AutomationProperties.AutomationId="UnderlineButton5" Label="Underline" Icon="Underline" Click="OnElementClicked" />
+				<muxc:CommandBarFlyout.SecondaryCommands>
+					<AppBarButton x:Name="ProofingButton" AutomationProperties.AutomationId="ProofingButton" Label="Proofing" Click="OnElementClicked">
+						<AppBarButton.Flyout>
+							<MenuFlyout>
+								<MenuFlyoutItem AutomationProperties.Name="FirstFlyoutItem" Text="talk" />
+								<MenuFlyoutItem Text="talks" />
+								<MenuFlyoutItem Text="talk a" />
+								<MenuFlyoutSeparator />
+								<MenuFlyoutItem Text="Add to Dictionary" />
+								<MenuFlyoutItem Text="Ignore Once" />
+								<MenuFlyoutItem Text="Ignore All" />
+							</MenuFlyout>
+						</AppBarButton.Flyout>
+					</AppBarButton>
+					<AppBarButton x:Name="UndoButton5" AutomationProperties.AutomationId="UndoButton5" Label="Undo" Icon="Undo" Click="OnElementClicked" />
+					<AppBarButton x:Name="RedoButton5" AutomationProperties.AutomationId="RedoButton5" Label="Redo" Icon="Redo" Click="OnElementClicked" />
+					<AppBarButton x:Name="SelectAllButton5" AutomationProperties.AutomationId="SelectAllButton5" Label="Select all" Click="OnElementClicked" />
+					<AppBarButton x:Name="LongLabelButton5" AutomationProperties.AutomationId="LongLabelButton5" Label="AppBarButton with long label" Visibility="Collapsed" Click="OnElementClicked" />
+				</muxc:CommandBarFlyout.SecondaryCommands>
+			</muxc:CommandBarFlyout>
+			<muxc:CommandBarFlyout Placement="Right" x:Name="Flyout6" AutomationProperties.AutomationId="Flyout6" Opened="OnFlyoutOpened" Closed="OnFlyoutClosed">
+				<muxc:CommandBarFlyout.SecondaryCommands>
+					<AppBarButton x:Name="UndoButton6" AutomationProperties.AutomationId="UndoButton6" Label="Undo" Icon="Undo" Click="OnElementClicked" />
+					<AppBarButton x:Name="RedoButton6" AutomationProperties.AutomationId="RedoButton6" Label="Redo" Icon="Redo" Click="OnElementClicked" />
+					<AppBarButton x:Name="SelectAllButton6" AutomationProperties.AutomationId="SelectAllButton6" Label="Select all" Click="OnElementClicked" />
+					<AppBarToggleButton x:Name="FavoriteToggleButton6" AutomationProperties.AutomationId="FavoriteToggleButton6" Label="Favorite" Icon="Favorite" Checked="OnElementChecked" Unchecked="OnElementUnchecked" />
+					<AppBarButton x:Name="LongLabelButton6" AutomationProperties.AutomationId="LongLabelButton6" Label="AppBarButton with long label" Visibility="Collapsed" Click="OnElementClicked" />
+				</muxc:CommandBarFlyout.SecondaryCommands>
+			</muxc:CommandBarFlyout>
+			<muxc:CommandBarFlyout Placement="Right" x:Name="Flyout7" AutomationProperties.AutomationId="Flyout7" Opened="OnFlyoutOpened" Closed="OnFlyoutClosed">
+				<AppBarButton x:Name="CutButton7"
                     AutomationProperties.AutomationId="CutButton7"
                     Visibility="Collapsed"
                     Label="Cut" Icon="Cut" Click="OnElementClicked" />
-                <AppBarButton x:Name="CopyButton7"
+				<AppBarButton x:Name="CopyButton7"
                     AutomationProperties.AutomationId="CopyButton7"
                     IsEnabled="False"
                     Label="Copy" Icon="Copy" Click="OnElementClicked" />
-                <AppBarButton x:Name="PasteButton7"
+				<AppBarButton x:Name="PasteButton7"
                     AutomationProperties.AutomationId="PasteButton7"
                     Label="Paste" Icon="Paste" Click="OnElementClicked" />
-                <AppBarButton x:Name="BoldButton7"
+				<AppBarButton x:Name="BoldButton7"
                     AutomationProperties.AutomationId="BoldButton7"
                     Visibility="Collapsed"
                     Label="Bold" Icon="Bold" Click="OnElementClicked" />
-                <AppBarButton x:Name="ItalicButton7"
+				<AppBarButton x:Name="ItalicButton7"
                     AutomationProperties.AutomationId="ItalicButton7"                    
                     IsEnabled="False"
                     AllowFocusWhenDisabled="True"
                     Label="Italic" Icon="Italic" Click="OnElementClicked" />
-                <AppBarButton x:Name="UnderlineButton7"
+				<AppBarButton x:Name="UnderlineButton7"
                     AutomationProperties.AutomationId="UnderlineButton7"                    
                     Label="Underline" Icon="Underline" Click="OnElementClicked" />
-                <muxc:CommandBarFlyout.SecondaryCommands>
-                    <AppBarButton x:Name="UndoButton7" AutomationProperties.AutomationId="UndoButton7" Label="Undo" Icon="Undo" Click="OnElementClicked" />
-                    <AppBarButton x:Name="RedoButton7" AutomationProperties.AutomationId="RedoButton7" Label="Redo" Icon="Redo" Click="OnElementClicked" />
-                    <AppBarButton x:Name="SelectAllButton7" AutomationProperties.AutomationId="SelectAllButton7" Label="Select all" Click="OnElementClicked" />
-                </muxc:CommandBarFlyout.SecondaryCommands>
-            </muxc:CommandBarFlyout>
-            <muxc:CommandBarFlyout Placement="Right" x:Name="Flyout8" AutomationProperties.AutomationId="Flyout8" Opened="OnFlyoutOpened" Closed="OnFlyoutClosed" AlwaysExpanded="true">
-                <AppBarButton x:Name="CutButton8" AutomationProperties.AutomationId="CutButton8" Label="Cut" Icon="Cut" Click="OnElementClicked" />
-                <AppBarButton x:Name="CopyButton8" AutomationProperties.AutomationId="CopyButton8" Label="Copy" Icon="Copy" Click="OnElementClicked" />
-                <AppBarButton x:Name="PasteButton8" AutomationProperties.AutomationId="PasteButton8" Label="Paste" Icon="Paste" Click="OnElementClicked" />
-                <AppBarButton x:Name="BoldButton8" AutomationProperties.AutomationId="BoldButton8" Label="Bold" Icon="Bold" Click="OnElementClicked" />
-                <AppBarButton x:Name="ItalicButton8" AutomationProperties.AutomationId="ItalicButton8" Label="Italic" Icon="Italic" Click="OnElementClicked" />
-                <AppBarButton x:Name="UnderlineButton8" AutomationProperties.AutomationId="UnderlineButton8" Label="Underline" Icon="Underline" Click="OnElementClicked" />
-            </muxc:CommandBarFlyout>
-            <muxc:CommandBarFlyout Placement="Right" x:Name="Flyout9" AutomationProperties.AutomationId="Flyout9" Opened="OnFlyoutOpened" Closed="OnFlyoutClosed" AlwaysExpanded="true">
-                <AppBarButton x:Name="CutButton9" AutomationProperties.AutomationId="CutButton9" Label="Cut" Icon="Cut" Click="OnElementClicked" />
-                <AppBarButton x:Name="CopyButton9" AutomationProperties.AutomationId="CopyButton9" Label="Copy" Icon="Copy" Click="OnElementClicked" />
-                <AppBarButton x:Name="PasteButton9" AutomationProperties.AutomationId="PasteButton9" Label="Paste" Icon="Paste" Click="OnElementClicked" />
-                <AppBarButton x:Name="BoldButton9" AutomationProperties.AutomationId="BoldButton9" Label="Bold" Icon="Bold" Click="OnElementClicked" />
-                <AppBarButton x:Name="ItalicButton9" AutomationProperties.AutomationId="ItalicButton9" Label="Italic" Icon="Italic" Click="OnElementClicked" />
-                <AppBarButton x:Name="UnderlineButton9" AutomationProperties.AutomationId="UnderlineButton9" Label="Underline" Icon="Underline" Click="OnElementClicked" />
-                <muxc:CommandBarFlyout.SecondaryCommands>
-                    <AppBarButton x:Name="UndoButton9" AutomationProperties.AutomationId="UndoButton9" Label="Undo" Icon="Undo" Click="OnElementClicked" />
-                    <AppBarButton x:Name="RedoButton9" AutomationProperties.AutomationId="RedoButton9" Label="Redo" Icon="Redo" Click="OnElementClicked" />
-                    <AppBarButton x:Name="SelectAllButton9" AutomationProperties.AutomationId="SelectAllButton9" Label="Select all" Click="OnElementClicked" />
-                    <AppBarToggleButton x:Name="FavoriteToggleButton9" AutomationProperties.AutomationId="FavoriteToggleButton9" Label="Favorite" Icon="Favorite" Checked="OnElementChecked" Unchecked="OnElementUnchecked" />
-                </muxc:CommandBarFlyout.SecondaryCommands>
-            </muxc:CommandBarFlyout>
-            <!--<contract13Present:CommandBarFlyout Placement="Right" x:Name="Flyout10" AutomationProperties.AutomationId="Flyout10" Opened="OnFlyoutOpened" Closed="OnFlyoutClosed">
-                <AppBarButton x:Name="CutButton10" AutomationProperties.AutomationId="CutButton10" Label="Cut" Icon="Cut" Click="OnElementClicked" />
-                <AppBarButton x:Name="CopyButton10" AutomationProperties.AutomationId="CopyButton10" Label="Copy" Icon="Copy" Click="OnElementClicked" />
-                <AppBarButton x:Name="PasteButton10" AutomationProperties.AutomationId="PasteButton10" Label="Paste" Icon="Paste" Click="OnElementClicked" />
-                <AppBarButton x:Name="BoldButton10" AutomationProperties.AutomationId="BoldButton10" Label="Bold" Icon="Bold" Click="OnElementClicked" />
-                <AppBarButton x:Name="ItalicButton10" AutomationProperties.AutomationId="ItalicButton10" Label="Italic" Icon="Italic" Click="OnElementClicked" />
-                <AppBarButton x:Name="UnderlineButton10" AutomationProperties.AutomationId="UnderlineButton10" Label="Underline" Icon="Underline" Click="OnElementClicked" />
-                <contract13Present:CommandBarFlyout.SecondaryCommands>
-                    <AppBarButton x:Name="UndoButton10" AutomationProperties.AutomationId="UndoButton10" Label="Undo" Icon="Undo" Click="OnElementClicked" />
-                    <AppBarButton x:Name="RedoButton10" AutomationProperties.AutomationId="RedoButton10" Label="Redo" Icon="Redo" Click="OnElementClicked" />
-                    <AppBarButton x:Name="SelectAllButton10" AutomationProperties.AutomationId="SelectAllButton10" Label="Select all" Click="OnElementClicked" />
-                    <AppBarToggleButton x:Name="FavoriteToggleButton10" AutomationProperties.AutomationId="FavoriteToggleButton10" Label="Favorite" Icon="Favorite" Checked="OnElementChecked" Unchecked="OnElementUnchecked" />
-                </contract13Present:CommandBarFlyout.SecondaryCommands>
-            </contract13Present:CommandBarFlyout>-->
-        </Grid.Resources>
-        <ScrollViewer>
-            <StackPanel>
-                <Button x:Name="FlyoutTarget1" Content="Show CommandBarFlyout" Margin="10" Click="OnFlyoutTarget1Click" />
-                <Button x:Name="FlyoutTarget2" Content="Show expanding CommandBarFlyout" Margin="10" Click="OnFlyoutTarget2Click" />
-                <Button x:Name="FlyoutTarget3" Content="Show tall CommandBarFlyout" Margin="10" Click="OnFlyoutTarget3Click" />
-                <Button x:Name="FlyoutTarget4" Content="Show max-width CommandBarFlyout" Margin="10" Click="OnFlyoutTarget4Click" />
-                <Button x:Name="FlyoutTarget5" Content="Show CommandBarFlyout with sub-menu" Margin="10" Click="OnFlyoutTarget5Click" />
-                <StackPanel Orientation="Horizontal">
-                    <Button x:Name="FlyoutTarget6" Content="Show CommandBarFlyout with no primary commands" Margin="10" Click="OnFlyoutTarget6Click" />
-                    <Button x:Name="EditCommandCount6" Content="Add / Remove Primary Command" Click="OnEditCommandCount6Click" />
-                </StackPanel>
-                <Button x:Name="FlyoutTarget7" Content="Show CommandBarFlyout with non-focusable primary commands" Margin="10" Click="OnFlyoutTarget7Click" />
-                <Button x:Name="FlyoutTarget8" Content="Show CommandBarFlyout with no secondary commands" Margin="10" Click="OnFlyoutTarget8Click" />
-                <Button x:Name="FlyoutTarget9" Content="Show CommandBarFlyout with AlwaysExpanded" Margin="10" Click="OnFlyoutTarget9Click" />
-                <contract13Present:Button x:Name="FlyoutTarget10" Content="Show Windows.UI.Xaml.Controls.CommandBarFlyout" Margin="10" Click="OnFlyoutTarget10Click" />
-                <CheckBox x:Name="IsRTLCheckBox" Content="Is Page in RightToLeft FlowDirection?" AutomationProperties.AutomationId="IsRTLCheckBox" Margin="10,10,10,2" Checked="IsRTLCheckBox_Checked" Unchecked="IsRTLCheckBox_Unchecked" />
-                <StackPanel Orientation="Horizontal" Margin="10,0,10,2">
-                    <CheckBox x:Name="AddPrimaryCommandDynamicallyCheckBox" Content="Add Primary Commands Dynamically?" AutomationProperties.AutomationId="AddPrimaryCommandDynamicallyCheckBox" />
-                    <CheckBox x:Name="PrimaryCommandDynamicallyAddedCheckBox" Content="Primary Commands Added?" AutomationProperties.AutomationId="PrimaryCommandDynamicallyAddedCheckBox" Margin="5,0,0,0" />
-                </StackPanel>
-                <CheckBox x:Name="ClearPrimaryCommandsCheckBox" Content="Clear Primary Commands Asynchronously?" AutomationProperties.AutomationId="ClearPrimaryCommandsCheckBox" Margin="10,0,10,2" />
-                <StackPanel Orientation="Horizontal" Margin="10,0,10,2">
-                    <CheckBox x:Name="UseSecondaryCommandDynamicLabelCheckBox" Content="Use Secondary Command with Dynamic Label?" AutomationProperties.AutomationId="UseSecondaryCommandDynamicLabelCheckBox" />
-                    <CheckBox x:Name="SecondaryCommandDynamicLabelChangedCheckBox" Content="Label Changed?" AutomationProperties.AutomationId="SecondaryCommandDynamicLabelChangedCheckBox" Margin="5,0,0,0" />
-                    <TextBlock Text="Timer Interval (ms):" Margin="5,0,0,0" VerticalAlignment="Center"/>
-                    <TextBox x:Name="DynamicLabelTimerIntervalTextBox" Text="1500" Margin="5,0,0,0" AutomationProperties.AutomationId="DynamicLabelTimerIntervalTextBox"/>
-                    <TextBlock Text="Change Count:" Margin="5,0,0,0" VerticalAlignment="Center"/>
-                    <TextBox x:Name="DynamicLabelChangeCountTextBox" Text="4" Margin="5,0,0,0" AutomationProperties.AutomationId="DynamicLabelChangeCountTextBox"/>
-                </StackPanel>
-                <StackPanel Orientation="Horizontal" Margin="10,0,10,2">
-                    <CheckBox x:Name="UseSecondaryCommandDynamicVisibilityCheckBox" Content="Use Secondary Command with Dynamic Visibility?" AutomationProperties.AutomationId="UseSecondaryCommandDynamicVisibilityCheckBox" />
-                    <CheckBox x:Name="SecondaryCommandDynamicVisibilityChangedCheckBox" Content="Visibility Changed?" AutomationProperties.AutomationId="SecondaryCommandDynamicVisibilityChangedCheckBox" Margin="5,0,0,0" />
-                    <TextBlock Text="Timer Interval (ms):" Margin="5,0,0,0" VerticalAlignment="Center"/>
-                    <TextBox x:Name="DynamicVisibilityTimerIntervalTextBox" Text="1500" Margin="5,0,0,0" AutomationProperties.AutomationId="DynamicVisibilityTimerIntervalTextBox"/>
-                    <TextBlock Text="Change Count:" Margin="5,0,0,0" VerticalAlignment="Center"/>
-                    <TextBox x:Name="DynamicVisibilityChangeCountTextBox" Text="4" Margin="5,0,0,0" AutomationProperties.AutomationId="DynamicVisibilityChangeCountTextBox"/>
-                </StackPanel>
-                <StackPanel Orientation="Horizontal" Margin="10,0,10,2">
-                    <CheckBox x:Name="UseOverflowContentRootDynamicWidthCheckBox" Content="Use OverflowContentRoot with Dynamic Width?" AutomationProperties.AutomationId="UseOverflowContentRootDynamicWidthCheckBox" />
-                    <CheckBox x:Name="OverflowContentRootDynamicWidthChangedCheckBox" Content="Width Changed?" AutomationProperties.AutomationId="OverflowContentRootDynamicWidthChangedCheckBox" Margin="5,0,0,0" />
-                    <TextBlock Text="Timer Interval (ms):" Margin="5,0,0,0" VerticalAlignment="Center"/>
-                    <TextBox x:Name="DynamicWidthTimerIntervalTextBox" Text="1500" Margin="5,0,0,0" AutomationProperties.AutomationId="DynamicWidthTimerIntervalTextBox"/>
-                    <TextBlock Text="Change Count:" Margin="5,0,0,0" VerticalAlignment="Center"/>
-                    <TextBox x:Name="DynamicWidthChangeCountTextBox" Text="4" Margin="5,0,0,0" AutomationProperties.AutomationId="DynamicWidthChangeCountTextBox"/>
-                </StackPanel>
-                <CheckBox x:Name="ClearSecondaryCommandsCheckBox" Content="Clear Secondary Commands Asynchronously?" AutomationProperties.AutomationId="ClearSecondaryCommandsCheckBox" Margin="10,0,10,2" />
-                <CheckBox x:Name="UseAnimatedCommandBarFlyoutCommandBarStyleCheckBox" Content="Use DefaultCommandBarFlyoutCommandBarStyle with animations?" AutomationProperties.AutomationId="UseAnimatedCommandBarFlyoutCommandBarStyleCheckBox" Margin="10,0,10,2" />
-                <CheckBox x:Name="HideFlyoutOnFlyoutClosedCheckBox" Content="Hide flyout in FlyoutClosed handler?" AutomationProperties.AutomationId="HideFlyoutOnFlyoutClosedCheckBox" Margin="10,0,10,2" />
-            </StackPanel>
-        </ScrollViewer>
-        <StackPanel Grid.Row="1">
-            <TextBox IsReadOnly="True" AcceptsReturn="True" x:Name="StatusReportingTextBox" AutomationProperties.AutomationId="StatusReportingTextBox" Margin="10" />
-            <CheckBox x:Name="IsFlyoutOpenCheckBox" AutomationProperties.AutomationId="IsFlyoutOpenCheckBox" Content="Is flyout open" />
-        </StackPanel>
-    </Grid>
+				<muxc:CommandBarFlyout.SecondaryCommands>
+					<AppBarButton x:Name="UndoButton7" AutomationProperties.AutomationId="UndoButton7" Label="Undo" Icon="Undo" Click="OnElementClicked" />
+					<AppBarButton x:Name="RedoButton7" AutomationProperties.AutomationId="RedoButton7" Label="Redo" Icon="Redo" Click="OnElementClicked" />
+					<AppBarButton x:Name="SelectAllButton7" AutomationProperties.AutomationId="SelectAllButton7" Label="Select all" Click="OnElementClicked" />
+				</muxc:CommandBarFlyout.SecondaryCommands>
+			</muxc:CommandBarFlyout>
+			<muxc:CommandBarFlyout Placement="Right" x:Name="Flyout8" AutomationProperties.AutomationId="Flyout8" Opened="OnFlyoutOpened" Closed="OnFlyoutClosed" AlwaysExpanded="true">
+				<AppBarButton x:Name="CutButton8" AutomationProperties.AutomationId="CutButton8" Label="Cut" Icon="Cut" Click="OnElementClicked" />
+				<AppBarButton x:Name="CopyButton8" AutomationProperties.AutomationId="CopyButton8" Label="Copy" Icon="Copy" Click="OnElementClicked" />
+				<AppBarButton x:Name="PasteButton8" AutomationProperties.AutomationId="PasteButton8" Label="Paste" Icon="Paste" Click="OnElementClicked" />
+				<AppBarButton x:Name="BoldButton8" AutomationProperties.AutomationId="BoldButton8" Label="Bold" Icon="Bold" Click="OnElementClicked" />
+				<AppBarButton x:Name="ItalicButton8" AutomationProperties.AutomationId="ItalicButton8" Label="Italic" Icon="Italic" Click="OnElementClicked" />
+				<AppBarButton x:Name="UnderlineButton8" AutomationProperties.AutomationId="UnderlineButton8" Label="Underline" Icon="Underline" Click="OnElementClicked" />
+			</muxc:CommandBarFlyout>
+			<muxc:CommandBarFlyout Placement="Right" x:Name="Flyout9" AutomationProperties.AutomationId="Flyout9" Opened="OnFlyoutOpened" Closed="OnFlyoutClosed" AlwaysExpanded="true">
+				<AppBarButton x:Name="CutButton9" AutomationProperties.AutomationId="CutButton9" Label="Cut" Icon="Cut" Click="OnElementClicked" />
+				<AppBarButton x:Name="CopyButton9" AutomationProperties.AutomationId="CopyButton9" Label="Copy" Icon="Copy" Click="OnElementClicked" />
+				<AppBarButton x:Name="PasteButton9" AutomationProperties.AutomationId="PasteButton9" Label="Paste" Icon="Paste" Click="OnElementClicked" />
+				<AppBarButton x:Name="BoldButton9" AutomationProperties.AutomationId="BoldButton9" Label="Bold" Icon="Bold" Click="OnElementClicked" />
+				<AppBarButton x:Name="ItalicButton9" AutomationProperties.AutomationId="ItalicButton9" Label="Italic" Icon="Italic" Click="OnElementClicked" />
+				<AppBarButton x:Name="UnderlineButton9" AutomationProperties.AutomationId="UnderlineButton9" Label="Underline" Icon="Underline" Click="OnElementClicked" />
+				<muxc:CommandBarFlyout.SecondaryCommands>
+					<AppBarButton x:Name="UndoButton9" AutomationProperties.AutomationId="UndoButton9" Label="Undo" Icon="Undo" Click="OnElementClicked" />
+					<AppBarButton x:Name="RedoButton9" AutomationProperties.AutomationId="RedoButton9" Label="Redo" Icon="Redo" Click="OnElementClicked" />
+					<AppBarButton x:Name="SelectAllButton9" AutomationProperties.AutomationId="SelectAllButton9" Label="Select all" Click="OnElementClicked" />
+					<AppBarToggleButton x:Name="FavoriteToggleButton9" AutomationProperties.AutomationId="FavoriteToggleButton9" Label="Favorite" Icon="Favorite" Checked="OnElementChecked" Unchecked="OnElementUnchecked" />
+				</muxc:CommandBarFlyout.SecondaryCommands>
+			</muxc:CommandBarFlyout>
+			<CommandBarFlyout Placement="Right" x:Name="Flyout10" AutomationProperties.AutomationId="Flyout10" Opened="OnFlyoutOpened" Closed="OnFlyoutClosed">
+				<AppBarButton x:Name="CutButton10" AutomationProperties.AutomationId="CutButton10" Label="Cut" Icon="Cut" Click="OnElementClicked" />
+				<AppBarButton x:Name="CopyButton10" AutomationProperties.AutomationId="CopyButton10" Label="Copy" Icon="Copy" Click="OnElementClicked" />
+				<AppBarButton x:Name="PasteButton10" AutomationProperties.AutomationId="PasteButton10" Label="Paste" Icon="Paste" Click="OnElementClicked" />
+				<AppBarButton x:Name="BoldButton10" AutomationProperties.AutomationId="BoldButton10" Label="Bold" Icon="Bold" Click="OnElementClicked" />
+				<AppBarButton x:Name="ItalicButton10" AutomationProperties.AutomationId="ItalicButton10" Label="Italic" Icon="Italic" Click="OnElementClicked" />
+				<AppBarButton x:Name="UnderlineButton10" AutomationProperties.AutomationId="UnderlineButton10" Label="Underline" Icon="Underline" Click="OnElementClicked" />
+				<CommandBarFlyout.SecondaryCommands>
+					<AppBarButton x:Name="UndoButton10" AutomationProperties.AutomationId="UndoButton10" Label="Undo" Icon="Undo" Click="OnElementClicked" />
+					<AppBarButton x:Name="RedoButton10" AutomationProperties.AutomationId="RedoButton10" Label="Redo" Icon="Redo" Click="OnElementClicked" />
+					<AppBarButton x:Name="SelectAllButton10" AutomationProperties.AutomationId="SelectAllButton10" Label="Select all" Click="OnElementClicked" />
+					<AppBarToggleButton x:Name="FavoriteToggleButton10" AutomationProperties.AutomationId="FavoriteToggleButton10" Label="Favorite" Icon="Favorite" Checked="OnElementChecked" Unchecked="OnElementUnchecked" />
+				</CommandBarFlyout.SecondaryCommands>
+			</CommandBarFlyout>
+			<muxc:CommandBarFlyout Placement="Right" x:Name="Flyout11" AutomationProperties.AutomationId="Flyout11" Opened="OnFlyoutOpened" Closed="OnFlyoutClosed">
+				<muxc:CommandBarFlyout.SecondaryCommands>
+					<AppBarButton x:Name="UndoButton11" AutomationProperties.AutomationId="UndoButton11" Label="Undo" Icon="Undo" Click="OnElementClicked" />
+					<AppBarSeparator IsTabStop="False" />
+					<AppBarButton x:Name="RedoButton11" AutomationProperties.AutomationId="RedoButton11" Label="Redo" Icon="Redo" Click="OnElementClicked" />
+					<AppBarButton x:Name="SelectAllButton11" AutomationProperties.AutomationId="SelectAllButton11" Label="Select all" Click="OnElementClicked" />
+					<AppBarToggleButton x:Name="FavoriteToggleButton11" AutomationProperties.AutomationId="FavoriteToggleButton11" Label="Favorite" Icon="Favorite" Checked="OnElementChecked" Unchecked="OnElementUnchecked" />
+					<AppBarButton x:Name="LongLabelButton11" AutomationProperties.AutomationId="LongLabelButton11" Label="AppBarButton with long label" Visibility="Collapsed" Click="OnElementClicked" />
+					<AppBarSeparator IsTabStop="False" />
+					<AppBarButton Label="Text" />
+					<AppBarButton Label="Text" />
+					<AppBarSeparator IsTabStop="False" />
+					<AppBarButton Label="Text" />
+					<AppBarButton Label="Text" />
+				</muxc:CommandBarFlyout.SecondaryCommands>
+			</muxc:CommandBarFlyout>
+			<muxc:CommandBarFlyout Placement="Right" x:Name="Flyout12" AutomationProperties.AutomationId="Flyout12" Opened="OnFlyoutOpened" Closed="OnFlyoutClosed">
+				<AppBarButton x:Name="CutButton12" AutomationProperties.AutomationId="CutButton12" Label="Cut" Icon="Cut" Click="OnElementClicked"/>
+				<AppBarSeparator />
+				<AppBarButton x:Name="CopyButton12" AutomationProperties.AutomationId="CopyButton12" Label="Copy" Icon="Copy" Click="OnElementClicked" />
+				<AppBarButton x:Name="PasteButton12" AutomationProperties.AutomationId="PasteButton12" Label="Paste" Icon="Paste" Click="OnElementClicked" />
+				<AppBarButton x:Name="BoldButton12" AutomationProperties.AutomationId="BoldButton12" Label="Bold" Icon="Bold" Click="OnElementClicked" />
+				<AppBarButton x:Name="ItalicButton12" AutomationProperties.AutomationId="ItalicButton12" Label="Italic" Icon="Italic" Click="OnElementClicked" />
+				<AppBarToggleButton x:Name="UnderlineButton12" AutomationProperties.AutomationId="UnderlineButton12" Label="Underline" Icon="Underline" Click="OnElementClicked" />
+				<muxc:CommandBarFlyout.SecondaryCommands>
+					<AppBarButton x:Name="UndoButton12" AutomationProperties.AutomationId="UndoButton12" Label="Undo" Icon="Undo" Click="OnElementClicked" />
+					<AppBarSeparator IsTabStop="False" />
+					<AppBarButton x:Name="RedoButton12" AutomationProperties.AutomationId="RedoButton12" Label="Redo" Icon="Redo" Click="OnElementClicked" />
+					<AppBarButton x:Name="SelectAllButton12" AutomationProperties.AutomationId="SelectAllButton12" Label="Select all" Click="OnElementClicked" />
+					<AppBarToggleButton x:Name="FavoriteToggleButton12" AutomationProperties.AutomationId="FavoriteToggleButton12" Label="Favorite" Icon="Favorite" Checked="OnElementChecked" Unchecked="OnElementUnchecked" />
+				</muxc:CommandBarFlyout.SecondaryCommands>
+			</muxc:CommandBarFlyout>
+			<muxc:CommandBarFlyout Placement="Right" x:Name="Flyout13" AutomationProperties.AutomationId="Flyout13" Opened="OnFlyoutOpened" Closed="OnFlyoutClosed">
+				<AppBarButton x:Name="CutButton13" AutomationProperties.AutomationId="CutButton13" Label="Cut" Icon="Cut" Click="OnElementClicked" />
+				<AppBarButton x:Name="CopyButton13" AutomationProperties.AutomationId="CopyButton13" Label="Copy" Icon="Copy" Click="OnElementClicked" />
+				<AppBarButton x:Name="PasteButton13" AutomationProperties.AutomationId="PasteButton13" Label="Paste" Icon="Paste" Click="OnElementClicked" />
+				<AppBarButton x:Name="LongButton13" AutomationProperties.AutomationId="LongButton13"  Label="Item with a really really really long label that will stretch this AppBarButton a lot" Icon="Favorite" Click="OnElementClicked" />
+				<muxc:CommandBarFlyout.SecondaryCommands>
+					<AppBarButton x:Name="UndoButton13" AutomationProperties.AutomationId="UndoButton13" Label="Undo" Icon="Undo" Click="OnElementClicked" />
+					<AppBarButton x:Name="RedoButton13" AutomationProperties.AutomationId="RedoButton13" Label="Redo" Icon="Redo" Click="OnElementClicked" />
+					<AppBarButton x:Name="SelectAllButton13" AutomationProperties.AutomationId="SelectAllButton13" Label="Select all" Click="OnElementClicked" />
+					<AppBarButton Label="Item with a really really really long label that will not fit in the space provided" />
+				</muxc:CommandBarFlyout.SecondaryCommands>
+			</muxc:CommandBarFlyout>
+			<muxc:CommandBarFlyout Placement="Right" x:Name="Flyout14" AutomationProperties.AutomationId="Flyout14" Opened="OnFlyoutOpened" Closed="OnFlyoutClosed">
+				<AppBarButton x:Name="CutButton14" AutomationProperties.AutomationId="CutButton14" Label="Cut" Icon="Cut" Click="OnElementClicked" />
+				<AppBarButton x:Name="CopyButton14" AutomationProperties.AutomationId="CopyButton14" Label="Copy" Icon="Copy" Click="OnElementClicked" />
+				<AppBarButton x:Name="PasteButton14" AutomationProperties.AutomationId="PasteButton14" Icon="Paste" Click="OnElementClicked" />
+				<muxc:CommandBarFlyout.SecondaryCommands>
+					<AppBarButton x:Name="UndoButton14" AutomationProperties.AutomationId="UndoButton14" Label="Undo" Icon="Undo" Click="OnElementClicked" />
+					<AppBarButton x:Name="RedoButton14" AutomationProperties.AutomationId="RedoButton14" Label="Redo" Icon="Redo" Click="OnElementClicked" />
+					<AppBarButton x:Name="SelectAllButton14" AutomationProperties.AutomationId="SelectAllButton14" Label="Select all" Click="OnElementClicked" />
+				</muxc:CommandBarFlyout.SecondaryCommands>
+			</muxc:CommandBarFlyout>
+			<muxc:CommandBarFlyout Placement="Right" x:Name="Flyout15" AutomationProperties.AutomationId="Flyout15" Opened="OnFlyoutOpened" Closed="OnFlyoutClosed">
+				<AppBarButton x:Name="CutButton15" AutomationProperties.AutomationId="CutButton15" Icon="Cut" Click="OnElementClicked" />
+				<AppBarButton x:Name="CopyButton15" AutomationProperties.AutomationId="CopyButton15" Icon="Copy" Click="OnElementClicked" />
+				<AppBarButton x:Name="PasteButton15" AutomationProperties.AutomationId="PasteButton15" Icon="Paste" Click="OnElementClicked" />
+				<muxc:CommandBarFlyout.SecondaryCommands>
+					<AppBarButton x:Name="UndoButton15" AutomationProperties.AutomationId="UndoButton15" Label="Undo" Icon="Undo" Click="OnElementClicked" />
+					<AppBarButton x:Name="RedoButton15" AutomationProperties.AutomationId="RedoButton15" Label="Redo" Icon="Redo" Click="OnElementClicked" />
+					<AppBarButton x:Name="SelectAllButton15" AutomationProperties.AutomationId="SelectAllButton15" Label="Select all" Click="OnElementClicked" />
+				</muxc:CommandBarFlyout.SecondaryCommands>
+			</muxc:CommandBarFlyout>
+		</Grid.Resources>
+		<ScrollViewer>
+			<StackPanel>
+				<Button x:Name="FlyoutTarget1" Content="Show CommandBarFlyout" Margin="10" Click="OnFlyoutTarget1Click" />
+				<Button x:Name="FlyoutTarget2" Content="Show expanding CommandBarFlyout" Margin="10" Click="OnFlyoutTarget2Click" />
+				<Button x:Name="FlyoutTarget3" Content="Show tall CommandBarFlyout" Margin="10" Click="OnFlyoutTarget3Click" />
+				<Button x:Name="FlyoutTarget4" Content="Show max-width CommandBarFlyout" Margin="10" Click="OnFlyoutTarget4Click" />
+				<Button x:Name="FlyoutTarget5" Content="Show CommandBarFlyout with sub-menu" Margin="10" Click="OnFlyoutTarget5Click" />
+				<StackPanel Orientation="Horizontal">
+					<Button x:Name="FlyoutTarget6" Content="Show CommandBarFlyout with no primary commands" Margin="10" Click="OnFlyoutTarget6Click" />
+					<Button x:Name="EditCommandCount6" Content="Add / Remove Primary Command" Click="OnEditCommandCount6Click" />
+				</StackPanel>
+				<Button x:Name="FlyoutTarget7" Content="Show CommandBarFlyout with non-focusable primary commands" Margin="10" Click="OnFlyoutTarget7Click" />
+				<Button x:Name="FlyoutTarget8" Content="Show CommandBarFlyout with no secondary commands" Margin="10" Click="OnFlyoutTarget8Click" />
+				<Button x:Name="FlyoutTarget9" Content="Show CommandBarFlyout with AlwaysExpanded" Margin="10" Click="OnFlyoutTarget9Click" />
+				<Button x:Name="FlyoutTarget10" Content="Show Windows.UI.Xaml.Controls.CommandBarFlyout" Margin="10" Click="OnFlyoutTarget10Click" />
+				<Button x:Name="FlyoutTarget11" Content="Show CommandBarFlyout with potential layout cycle at 125% scale" Margin="10" Click="OnFlyoutTarget11Click" />
+				<Button x:Name="FlyoutTarget12" Content="Show CommandBarFlyout after a five-second delay" Margin="10" Click="OnFlyoutTarget12Click" />
+				<Button x:Name="FlyoutTarget13" Content="Show CommandBarFlyout with a very long primary command label" Margin="10" Click="OnFlyoutTarget13Click" />
+				<Button x:Name="FlyoutTarget14" Content="Show CommandBarFlyout with some primary commands with no label" Margin="10" Click="OnFlyoutTarget14Click" />
+				<Button x:Name="FlyoutTarget15" Content="Show CommandBarFlyout with all primary commands with no label" Margin="10" Click="OnFlyoutTarget15Click" />
+				<CheckBox x:Name="IsRTLCheckBox" Content="Is Page in RightToLeft FlowDirection?" AutomationProperties.AutomationId="IsRTLCheckBox" Margin="10,10,10,2" Checked="IsRTLCheckBox_Checked" Unchecked="IsRTLCheckBox_Unchecked" />
+				<StackPanel Orientation="Horizontal" Margin="10,0,10,2">
+					<CheckBox x:Name="AddPrimaryCommandDynamicallyCheckBox" Content="Add Primary Commands Dynamically?" AutomationProperties.AutomationId="AddPrimaryCommandDynamicallyCheckBox" />
+					<CheckBox x:Name="PrimaryCommandDynamicallyAddedCheckBox" Content="Primary Commands Added?" AutomationProperties.AutomationId="PrimaryCommandDynamicallyAddedCheckBox" Margin="5,0,0,0" />
+				</StackPanel>
+				<CheckBox x:Name="ClearPrimaryCommandsCheckBox" Content="Clear Primary Commands Asynchronously?" AutomationProperties.AutomationId="ClearPrimaryCommandsCheckBox" Margin="10,0,10,2" />
+				<StackPanel Orientation="Horizontal" Margin="10,0,10,2">
+					<CheckBox x:Name="UseSecondaryCommandDynamicLabelCheckBox" Content="Use Secondary Command with Dynamic Label?" AutomationProperties.AutomationId="UseSecondaryCommandDynamicLabelCheckBox" />
+					<CheckBox x:Name="SecondaryCommandDynamicLabelChangedCheckBox" Content="Label Changed?" AutomationProperties.AutomationId="SecondaryCommandDynamicLabelChangedCheckBox" Margin="5,0,0,0" />
+					<TextBlock Text="Timer Interval (ms):" Margin="5,0,0,0" VerticalAlignment="Center"/>
+					<TextBox x:Name="DynamicLabelTimerIntervalTextBox" Text="1500" Margin="5,0,0,0" AutomationProperties.AutomationId="DynamicLabelTimerIntervalTextBox"/>
+					<TextBlock Text="Change Count:" Margin="5,0,0,0" VerticalAlignment="Center"/>
+					<TextBox x:Name="DynamicLabelChangeCountTextBox" Text="4" Margin="5,0,0,0" AutomationProperties.AutomationId="DynamicLabelChangeCountTextBox"/>
+				</StackPanel>
+				<StackPanel Orientation="Horizontal" Margin="10,0,10,2">
+					<CheckBox x:Name="UseSecondaryCommandDynamicVisibilityCheckBox" Content="Use Secondary Command with Dynamic Visibility?" AutomationProperties.AutomationId="UseSecondaryCommandDynamicVisibilityCheckBox" />
+					<CheckBox x:Name="SecondaryCommandDynamicVisibilityChangedCheckBox" Content="Visibility Changed?" AutomationProperties.AutomationId="SecondaryCommandDynamicVisibilityChangedCheckBox" Margin="5,0,0,0" />
+					<TextBlock Text="Timer Interval (ms):" Margin="5,0,0,0" VerticalAlignment="Center"/>
+					<TextBox x:Name="DynamicVisibilityTimerIntervalTextBox" Text="1500" Margin="5,0,0,0" AutomationProperties.AutomationId="DynamicVisibilityTimerIntervalTextBox"/>
+					<TextBlock Text="Change Count:" Margin="5,0,0,0" VerticalAlignment="Center"/>
+					<TextBox x:Name="DynamicVisibilityChangeCountTextBox" Text="4" Margin="5,0,0,0" AutomationProperties.AutomationId="DynamicVisibilityChangeCountTextBox"/>
+				</StackPanel>
+				<StackPanel Orientation="Horizontal" Margin="10,0,10,2">
+					<CheckBox x:Name="UseOverflowContentRootDynamicWidthCheckBox" Content="Use OverflowContentRoot with Dynamic Width?" AutomationProperties.AutomationId="UseOverflowContentRootDynamicWidthCheckBox" />
+					<CheckBox x:Name="OverflowContentRootDynamicWidthChangedCheckBox" Content="Width Changed?" AutomationProperties.AutomationId="OverflowContentRootDynamicWidthChangedCheckBox" Margin="5,0,0,0" />
+					<TextBlock Text="Timer Interval (ms):" Margin="5,0,0,0" VerticalAlignment="Center"/>
+					<TextBox x:Name="DynamicWidthTimerIntervalTextBox" Text="1500" Margin="5,0,0,0" AutomationProperties.AutomationId="DynamicWidthTimerIntervalTextBox"/>
+					<TextBlock Text="Change Count:" Margin="5,0,0,0" VerticalAlignment="Center"/>
+					<TextBox x:Name="DynamicWidthChangeCountTextBox" Text="4" Margin="5,0,0,0" AutomationProperties.AutomationId="DynamicWidthChangeCountTextBox"/>
+				</StackPanel>
+				<CheckBox x:Name="ClearSecondaryCommandsCheckBox" Content="Clear Secondary Commands Asynchronously?" AutomationProperties.AutomationId="ClearSecondaryCommandsCheckBox" Margin="10,0,10,2" />
+				<CheckBox x:Name="UseAnimatedCommandBarFlyoutCommandBarStyleCheckBox" Content="Use DefaultCommandBarFlyoutCommandBarStyle with animations?" AutomationProperties.AutomationId="UseAnimatedCommandBarFlyoutCommandBarStyleCheckBox" Margin="10,0,10,2" />
+				<CheckBox x:Name="HideFlyoutOnFlyoutClosedCheckBox" Content="Hide flyout in FlyoutClosed handler?" AutomationProperties.AutomationId="HideFlyoutOnFlyoutClosedCheckBox" Margin="10,0,10,2" />
+			</StackPanel>
+		</ScrollViewer>
+		<StackPanel Grid.Row="1">
+			<TextBox IsReadOnly="True" AcceptsReturn="True" x:Name="StatusReportingTextBox" AutomationProperties.AutomationId="StatusReportingTextBox" Margin="10" />
+			<CheckBox x:Name="IsFlyoutOpenCheckBox" AutomationProperties.AutomationId="IsFlyoutOpenCheckBox" Content="Is flyout open" />
+		</StackPanel>
+	</Grid>
 </local:TestPage>
diff --git a/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/CommandBarFlyoutPage.xaml.cs b/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/CommandBarFlyoutPage.xaml.cs
index 78162f33dd30..2634535333b2 100644
--- a/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/CommandBarFlyoutPage.xaml.cs
+++ b/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/CommandBarFlyoutPage.xaml.cs
@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
+// MUX Reference controls\dev\CommandBarFlyout\TestUI\CommandBarFlyoutPage.xaml.cs, tag winui3/release/1.5.2, commit b91b3ce6f25c587a9e18c4e122f348f51331f18b
 
 using Common;
 using System;
@@ -62,54 +63,70 @@ public CommandBarFlyoutPage()
 		clearSecondaryCommandsTimer.Interval = new TimeSpan(0, 0, 3 /*sec*/);
 		clearPrimaryCommandsTimer.Tick += ClearPrimaryCommandsTimer_Tick;
 
-		if (ApiInformation.IsTypePresent("Windows.UI.Xaml.Input.KeyboardAccelerator"))
-		{
-			UndoButton1.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Z, Modifiers = VirtualKeyModifiers.Control });
-			UndoButton2.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Z, Modifiers = VirtualKeyModifiers.Control });
-			UndoButton3.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Z, Modifiers = VirtualKeyModifiers.Control });
-			UndoButton4.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Z, Modifiers = VirtualKeyModifiers.Control });
-			UndoButton5.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Z, Modifiers = VirtualKeyModifiers.Control });
-			UndoButton6.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Z, Modifiers = VirtualKeyModifiers.Control });
-			UndoButton7.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Z, Modifiers = VirtualKeyModifiers.Control });
-
-			RedoButton1.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Y, Modifiers = VirtualKeyModifiers.Control });
-			RedoButton2.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Y, Modifiers = VirtualKeyModifiers.Control });
-			RedoButton3.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Y, Modifiers = VirtualKeyModifiers.Control });
-			RedoButton4.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Y, Modifiers = VirtualKeyModifiers.Control });
-			RedoButton5.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Y, Modifiers = VirtualKeyModifiers.Control });
-			RedoButton6.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Y, Modifiers = VirtualKeyModifiers.Control });
-			RedoButton7.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Y, Modifiers = VirtualKeyModifiers.Control });
-
-			SelectAllButton1.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.A, Modifiers = VirtualKeyModifiers.Control });
-			SelectAllButton2.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.A, Modifiers = VirtualKeyModifiers.Control });
-			SelectAllButton3.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.A, Modifiers = VirtualKeyModifiers.Control });
-			SelectAllButton4.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.A, Modifiers = VirtualKeyModifiers.Control });
-			SelectAllButton5.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.A, Modifiers = VirtualKeyModifiers.Control });
-			SelectAllButton6.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.A, Modifiers = VirtualKeyModifiers.Control });
-			SelectAllButton7.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.A, Modifiers = VirtualKeyModifiers.Control });
-		}
-
-		if (ApiInformation.IsPropertyPresent("Windows.UI.Xaml.UIElement", "ContextFlyout"))
-		{
-			FlyoutTarget1.ContextFlyout = Flyout1;
-			FlyoutTarget2.ContextFlyout = Flyout2;
-			FlyoutTarget3.ContextFlyout = Flyout3;
-			FlyoutTarget4.ContextFlyout = Flyout4;
-			FlyoutTarget5.ContextFlyout = Flyout5;
-			FlyoutTarget6.ContextFlyout = Flyout6;
-			FlyoutTarget7.ContextFlyout = Flyout7;
-		}
-
-		if (ApiInformation.IsEnumNamedValuePresent("Windows.UI.Xaml.Controls.Primitives.FlyoutPlacementMode", "TopEdgeAlignedLeft"))
-		{
-			Flyout1.Placement = FlyoutPlacementMode.TopEdgeAlignedLeft;
-			Flyout2.Placement = FlyoutPlacementMode.TopEdgeAlignedLeft;
-			Flyout3.Placement = FlyoutPlacementMode.TopEdgeAlignedLeft;
-			Flyout4.Placement = FlyoutPlacementMode.TopEdgeAlignedLeft;
-			Flyout5.Placement = FlyoutPlacementMode.TopEdgeAlignedLeft;
-			Flyout6.Placement = FlyoutPlacementMode.TopEdgeAlignedLeft;
-			Flyout7.Placement = FlyoutPlacementMode.TopEdgeAlignedLeft;
-		}
+		UndoButton1.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Z, Modifiers = VirtualKeyModifiers.Control });
+		UndoButton2.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Z, Modifiers = VirtualKeyModifiers.Control });
+		UndoButton3.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Z, Modifiers = VirtualKeyModifiers.Control });
+		UndoButton4.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Z, Modifiers = VirtualKeyModifiers.Control });
+		UndoButton5.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Z, Modifiers = VirtualKeyModifiers.Control });
+		UndoButton6.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Z, Modifiers = VirtualKeyModifiers.Control });
+		UndoButton7.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Z, Modifiers = VirtualKeyModifiers.Control });
+		UndoButton11.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Z, Modifiers = VirtualKeyModifiers.Control });
+		UndoButton12.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Z, Modifiers = VirtualKeyModifiers.Control });
+		UndoButton13.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Z, Modifiers = VirtualKeyModifiers.Control });
+		UndoButton14.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Z, Modifiers = VirtualKeyModifiers.Control });
+		UndoButton15.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Z, Modifiers = VirtualKeyModifiers.Control });
+
+		RedoButton1.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Y, Modifiers = VirtualKeyModifiers.Control });
+		RedoButton2.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Y, Modifiers = VirtualKeyModifiers.Control });
+		RedoButton3.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Y, Modifiers = VirtualKeyModifiers.Control });
+		RedoButton4.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Y, Modifiers = VirtualKeyModifiers.Control });
+		RedoButton5.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Y, Modifiers = VirtualKeyModifiers.Control });
+		RedoButton6.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Y, Modifiers = VirtualKeyModifiers.Control });
+		RedoButton7.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Y, Modifiers = VirtualKeyModifiers.Control });
+		RedoButton11.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Y, Modifiers = VirtualKeyModifiers.Control });
+		RedoButton12.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Y, Modifiers = VirtualKeyModifiers.Control });
+		RedoButton13.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Y, Modifiers = VirtualKeyModifiers.Control });
+		RedoButton14.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Y, Modifiers = VirtualKeyModifiers.Control });
+		RedoButton15.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.Y, Modifiers = VirtualKeyModifiers.Control });
+
+		SelectAllButton1.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.A, Modifiers = VirtualKeyModifiers.Control });
+		SelectAllButton2.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.A, Modifiers = VirtualKeyModifiers.Control });
+		SelectAllButton3.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.A, Modifiers = VirtualKeyModifiers.Control });
+		SelectAllButton4.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.A, Modifiers = VirtualKeyModifiers.Control });
+		SelectAllButton5.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.A, Modifiers = VirtualKeyModifiers.Control });
+		SelectAllButton6.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.A, Modifiers = VirtualKeyModifiers.Control });
+		SelectAllButton7.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.A, Modifiers = VirtualKeyModifiers.Control });
+		SelectAllButton11.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.A, Modifiers = VirtualKeyModifiers.Control });
+		SelectAllButton12.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.A, Modifiers = VirtualKeyModifiers.Control });
+		SelectAllButton13.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.A, Modifiers = VirtualKeyModifiers.Control });
+		SelectAllButton14.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.A, Modifiers = VirtualKeyModifiers.Control });
+		SelectAllButton15.KeyboardAccelerators.Add(new KeyboardAccelerator() { Key = VirtualKey.A, Modifiers = VirtualKeyModifiers.Control });
+
+		FlyoutTarget1.ContextFlyout = Flyout1;
+		FlyoutTarget2.ContextFlyout = Flyout2;
+		FlyoutTarget3.ContextFlyout = Flyout3;
+		FlyoutTarget4.ContextFlyout = Flyout4;
+		FlyoutTarget5.ContextFlyout = Flyout5;
+		FlyoutTarget6.ContextFlyout = Flyout6;
+		FlyoutTarget7.ContextFlyout = Flyout7;
+		FlyoutTarget11.ContextFlyout = Flyout11;
+		FlyoutTarget12.ContextFlyout = Flyout12;
+		FlyoutTarget13.ContextFlyout = Flyout13;
+		FlyoutTarget14.ContextFlyout = Flyout14;
+		FlyoutTarget15.ContextFlyout = Flyout15;
+
+		Flyout1.Placement = FlyoutPlacementMode.TopEdgeAlignedLeft;
+		Flyout2.Placement = FlyoutPlacementMode.TopEdgeAlignedLeft;
+		Flyout3.Placement = FlyoutPlacementMode.TopEdgeAlignedLeft;
+		Flyout4.Placement = FlyoutPlacementMode.TopEdgeAlignedLeft;
+		Flyout5.Placement = FlyoutPlacementMode.TopEdgeAlignedLeft;
+		Flyout6.Placement = FlyoutPlacementMode.TopEdgeAlignedLeft;
+		Flyout7.Placement = FlyoutPlacementMode.TopEdgeAlignedLeft;
+		Flyout11.Placement = FlyoutPlacementMode.TopEdgeAlignedLeft;
+		Flyout12.Placement = FlyoutPlacementMode.TopEdgeAlignedLeft;
+		Flyout13.Placement = FlyoutPlacementMode.TopEdgeAlignedLeft;
+		Flyout14.Placement = FlyoutPlacementMode.TopEdgeAlignedLeft;
+		Flyout15.Placement = FlyoutPlacementMode.TopEdgeAlignedLeft;
 	}
 
 	public void OnElementClicked(object sender, object args)
@@ -259,9 +276,39 @@ private void OnFlyoutTarget9Click(object sender, RoutedEventArgs e)
 
 	private void OnFlyoutTarget10Click(object sender, RoutedEventArgs e)
 	{
-#if false // This uses WUX CommandBarFlyout - ignored
 		ShowFlyoutAt(Flyout10, FlyoutTarget10);
-#endif
+	}
+
+	private void OnFlyoutTarget11Click(object sender, RoutedEventArgs e)
+	{
+		ShowFlyoutAt(Flyout11, FlyoutTarget11, FlyoutShowMode.Standard);
+	}
+
+	private void OnFlyoutTarget12Click(object sender, RoutedEventArgs e)
+	{
+		DispatcherTimer showFlyoutTimer = new();
+		showFlyoutTimer.Interval = TimeSpan.FromSeconds(5);
+		showFlyoutTimer.Tick += (object sender, object args) =>
+		{
+			ShowFlyoutAt(Flyout12, FlyoutTarget12, FlyoutShowMode.Standard);
+			showFlyoutTimer.Stop();
+		};
+		showFlyoutTimer.Start();
+	}
+
+	private void OnFlyoutTarget13Click(object sender, RoutedEventArgs e)
+	{
+		ShowFlyoutAt(Flyout13, FlyoutTarget13);
+	}
+
+	private void OnFlyoutTarget14Click(object sender, RoutedEventArgs e)
+	{
+		ShowFlyoutAt(Flyout14, FlyoutTarget14);
+	}
+
+	private void OnFlyoutTarget15Click(object sender, RoutedEventArgs e)
+	{
+		ShowFlyoutAt(Flyout15, FlyoutTarget15);
 	}
 
 	private void ShowFlyoutAt(FlyoutBase flyout, FrameworkElement targetElement, FlyoutShowMode showMode = FlyoutShowMode.Transient)
@@ -309,15 +356,7 @@ private void ShowFlyoutAt(FlyoutBase flyout, FrameworkElement targetElement, Fly
 			}
 		}
 
-		if (PlatformConfiguration.IsOsVersionGreaterThanOrEqual(OSVersion.Redstone5))
-		{
-			flyout.ShowAt(targetElement, new FlyoutShowOptions { Placement = FlyoutPlacementMode.TopEdgeAlignedLeft, ShowMode = showMode });
-		}
-		else
-		{
-			flyout.Placement = FlyoutPlacementMode.Top;
-			flyout.ShowAt(targetElement);
-		}
+		flyout.ShowAt(targetElement, new FlyoutShowOptions { Placement = FlyoutPlacementMode.TopEdgeAlignedLeft, ShowMode = showMode });
 	}
 
 	private void SetClearSecondaryCommandsFlyout(CommandBarFlyout commandBarFlyout)
diff --git a/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/ExtraCommandBarFlyoutPage.xaml b/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/ExtraCommandBarFlyoutPage.xaml
index a92879a0ea67..cbfd794983d0 100644
--- a/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/ExtraCommandBarFlyoutPage.xaml
+++ b/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/ExtraCommandBarFlyoutPage.xaml
@@ -1,4 +1,5 @@
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<!-- MUX Reference controls\dev\CommandBarFlyout\TestUI\ExtraCommandBarFlyoutPage.xaml, commit b91b3ce6f25c587a9e18c4e122f348f51331f18b -->
 <local:TestPage
     x:Class="MUXControlsTestApp.ExtraCommandBarFlyoutPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -11,60 +12,60 @@
     mc:Ignorable="d"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 
-    <Page.Resources>
-        <muxc:TextCommandBarFlyout x:Name="TextCommandBarContextFlyout" />
-        <muxc:TextCommandBarFlyout x:Name="TextCommandBarSelectionFlyout" />
-    </Page.Resources>
+	<Page.Resources>
+		<muxc:TextCommandBarFlyout x:Name="TextCommandBarContextFlyout" />
+		<muxc:TextCommandBarFlyout x:Name="TextCommandBarSelectionFlyout" />
+	</Page.Resources>
 
-    <StackPanel Margin="12">
-        <TextBlock Text="Demo controls" Style="{ThemeResource StandardGroupHeader}"/>
-        <StackPanel Orientation="Horizontal">
-            <TextBox x:Name="TextBox1" AutomationProperties.AutomationId="TextBox" ContextFlyout="{x:Bind TextCommandBarContextFlyout}"
+	<StackPanel Margin="12">
+		<TextBlock Text="Demo controls" Style="{ThemeResource StandardGroupHeader}"/>
+		<StackPanel Orientation="Horizontal">
+			<TextBox x:Name="TextBox1" AutomationProperties.AutomationId="TextBox" ContextFlyout="{x:Bind TextCommandBarContextFlyout}"
                      MinWidth="200" />
-            <RichTextBlock x:Name="RichTextBlock1" AutomationProperties.AutomationId="RichTextBlock" Margin="10" OverflowContentTarget="{x:Bind RichTextBlockOverflow1}" ContextFlyout="{x:Bind TextCommandBarContextFlyout}" Width="100" Height="50" HorizontalAlignment="Center">
-                <RichTextBlock.Blocks>
-                    <Paragraph>
-                        <Run>This is a very, very long string that cannot possibly fit within the RichTextBlock's bounds, so it overflows.</Run>
-                    </Paragraph>
-                </RichTextBlock.Blocks>
-            </RichTextBlock>
-            <RichTextBlockOverflow x:Name="RichTextBlockOverflow1" AutomationProperties.AutomationId="RichTextBlockOverflow" Margin="10" HorizontalAlignment="Center" />
-            <Button Content="Click for a CommandBarFlyout with many items">
-                <Button.Flyout>
-                    <muxc:CommandBarFlyout>
-                        <AppBarButton Label="Item 1" Icon="Favorite" />
-                        <AppBarButton Label="Item 2" Icon="Favorite" />
-                        <AppBarButton Label="Item 3" Icon="Favorite" />
-                        <AppBarButton Label="Item 4" Icon="Favorite" />
-                        <AppBarButton Label="Item 5" Icon="Favorite" />
-                        <AppBarButton Label="Item 6" Icon="Favorite" />
-                        <AppBarButton Label="Item 7" Icon="Favorite" />
-                        <AppBarButton Label="Item 8" Icon="Favorite" />
-                        <AppBarButton Label="Item 9" Icon="Favorite" />
-                        <AppBarButton Label="Item 10" Icon="Favorite" />
-                        <AppBarButton Label="Item 11" Icon="Favorite" />
-                        <AppBarButton Label="Item 12" Icon="Favorite" />
-                        <AppBarButton Label="Item 13" Icon="Favorite" />
-                        <AppBarButton Label="Item 14" Icon="Favorite" />
-                        <AppBarButton Label="Item 15" Icon="Favorite" />
-                        <AppBarButton Label="Item 16" Icon="Favorite" />
-                        <AppBarButton Label="Item 17" Icon="Favorite" />
-                        <AppBarButton Label="Item 18" Icon="Favorite" />
-                        <AppBarButton Label="Item 19" Icon="Favorite" />
-                        <AppBarButton Label="Item 20" Icon="Favorite" />
-                    </muxc:CommandBarFlyout>
-                </Button.Flyout>
-            </Button>
-        </StackPanel>
-        <TextBlock Text="Actions" Style="{ThemeResource StandardGroupHeader}" Margin="0,24,0,8"/>
-        <Button AutomationProperties.AutomationId="ClearClipboardContentsButton" Content="Clear clipboard" Click="OnClearClipboardContentsClicked" />
-        <TextBox x:Name="tb" Loaded="tbloaded" Unloaded="tbunloaded" AutomationProperties.Name="TextBoxWithAdditionalItems"/>
+			<RichTextBlock x:Name="RichTextBlock1" AutomationProperties.AutomationId="RichTextBlock" Margin="10" OverflowContentTarget="{x:Bind RichTextBlockOverflow1}" ContextFlyout="{x:Bind TextCommandBarContextFlyout}" Width="100" Height="50" HorizontalAlignment="Center">
+				<RichTextBlock.Blocks>
+					<Paragraph>
+						<Run>This is a very, very long string that cannot possibly fit within the RichTextBlock's bounds, so it overflows.</Run>
+					</Paragraph>
+				</RichTextBlock.Blocks>
+			</RichTextBlock>
+			<RichTextBlockOverflow x:Name="RichTextBlockOverflow1" AutomationProperties.AutomationId="RichTextBlockOverflow" Margin="10" HorizontalAlignment="Center" />
+			<Button Content="Click for a CommandBarFlyout with many items">
+				<Button.Flyout>
+					<muxc:CommandBarFlyout>
+						<AppBarButton Label="Item 1" Icon="Favorite" />
+						<AppBarButton Label="Item 2" Icon="Favorite" />
+						<AppBarButton Label="Item 3" Icon="Favorite" />
+						<AppBarButton Label="Item 4" Icon="Favorite" />
+						<AppBarButton Label="Item 5" Icon="Favorite" />
+						<AppBarButton Label="Item 6" Icon="Favorite" />
+						<AppBarButton Label="Item 7" Icon="Favorite" />
+						<AppBarButton Label="Item 8" Icon="Favorite" />
+						<AppBarButton Label="Item 9" Icon="Favorite" />
+						<AppBarButton Label="Item 10" Icon="Favorite" />
+						<AppBarButton Label="Item 11" Icon="Favorite" />
+						<AppBarButton Label="Item 12" Icon="Favorite" />
+						<AppBarButton Label="Item 13" Icon="Favorite" />
+						<AppBarButton Label="Item 14" Icon="Favorite" />
+						<AppBarButton Label="Item 15" Icon="Favorite" />
+						<AppBarButton Label="Item 16" Icon="Favorite" />
+						<AppBarButton Label="Item 17" Icon="Favorite" />
+						<AppBarButton Label="Item 18" Icon="Favorite" />
+						<AppBarButton Label="Item 19" Icon="Favorite" />
+						<AppBarButton Label="Item 20" Icon="Favorite" />
+					</muxc:CommandBarFlyout>
+				</Button.Flyout>
+			</Button>
+		</StackPanel>
+		<TextBlock Text="Actions" Style="{ThemeResource StandardGroupHeader}" Margin="0,24,0,8"/>
+		<Button AutomationProperties.AutomationId="ClearClipboardContentsButton" Content="Clear clipboard" Click="OnClearClipboardContentsClicked" />
+		<TextBox x:Name="tb" Loaded="tbloaded" Unloaded="tbunloaded" AutomationProperties.Name="TextBoxWithAdditionalItems"/>
 
-        <TextBlock Text="Status" Style="{ThemeResource StandardGroupHeader}" Margin="0,24,0,8"/>
-        <StackPanel Orientation="Horizontal">
-            <Button AutomationProperties.AutomationId="CountPopupsButton" Content="Count popups" Click="OnCountPopupsClicked" Margin="0,0,8,0"/>
-            <TextBox x:Name="PopupCountTextBox" AutomationProperties.AutomationId="PopupCountTextBox" IsReadOnly="True" />
-            <TextBox x:Name="CustomButtonsOpenCount" AutomationProperties.AutomationId="CustomButtonsOpenCount" IsReadOnly="True" />
-        </StackPanel>
-    </StackPanel>
+		<TextBlock Text="Status" Style="{ThemeResource StandardGroupHeader}" Margin="0,24,0,8"/>
+		<StackPanel Orientation="Horizontal">
+			<Button AutomationProperties.AutomationId="CountPopupsButton" Content="Count popups" Click="OnCountPopupsClicked" Margin="0,0,8,0"/>
+			<TextBox x:Name="PopupCountTextBox" AutomationProperties.AutomationId="PopupCountTextBox" IsReadOnly="True" />
+			<TextBox x:Name="CustomButtonsOpenCount" AutomationProperties.AutomationId="CustomButtonsOpenCount" IsReadOnly="True" />
+		</StackPanel>
+	</StackPanel>
 </local:TestPage>
diff --git a/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/ExtraCommandBarFlyoutPage.xaml.cs b/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/ExtraCommandBarFlyoutPage.xaml.cs
index ac66c5f0c49c..2fe978af91c9 100644
--- a/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/ExtraCommandBarFlyoutPage.xaml.cs
+++ b/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/ExtraCommandBarFlyoutPage.xaml.cs
@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
+// MUX Reference controls\dev\CommandBarFlyout\TestUI\ExtraCommandBarFlyoutPage.xaml.cs, tag winui3/release/1.5.2, commit b91b3ce6f25c587a9e18c4e122f348f51331f18b
 
 using System;
 using System.Collections.Generic;
@@ -30,46 +31,12 @@ public ExtraCommandBarFlyoutPage()
 	{
 		this.InitializeComponent();
 
-		if (ApiInformation.IsEnumNamedValuePresent("Windows.UI.Xaml.Controls.Primitives.FlyoutPlacementMode", "BottomEdgeAlignedLeft"))
-		{
-			TextCommandBarContextFlyout.Placement = FlyoutPlacementMode.BottomEdgeAlignedLeft;
-		}
-		else
-		{
-			TextCommandBarContextFlyout.Placement = FlyoutPlacementMode.Top;
-		}
-
-		if (ApiInformation.IsEnumNamedValuePresent("Windows.UI.Xaml.Controls.Primitives.FlyoutPlacementMode", "TopEdgeAlignedLeft"))
-		{
-			TextCommandBarSelectionFlyout.Placement = FlyoutPlacementMode.TopEdgeAlignedLeft;
-		}
-		else
-		{
-			TextCommandBarSelectionFlyout.Placement = FlyoutPlacementMode.Top;
-		}
-
-		if (ApiInformation.IsPropertyPresent("Windows.UI.Xaml.UIElement", "ContextFlyout"))
-		{
-			TextBox1.ContextFlyout = TextCommandBarContextFlyout;
-			RichTextBlock1.ContextFlyout = TextCommandBarContextFlyout;
-		}
-
-		try
-		{
-			if (ApiInformation.IsPropertyPresent("Windows.UI.Xaml.Controls.TextBox", "SelectionFlyout"))
-			{
-				TextBox1.SelectionFlyout = TextCommandBarSelectionFlyout;
-			}
-		}
-		catch (InvalidCastException)
-		{
-			// RS5 interfaces can change before release, so we need to make sure we don't crash if they do.
-		}
-
-		if (ApiInformation.IsPropertyPresent("Windows.UI.Xaml.Controls.RichTextBlock", "SelectionFlyout"))
-		{
-			RichTextBlock1.SelectionFlyout = TextCommandBarSelectionFlyout;
-		}
+		TextCommandBarContextFlyout.Placement = FlyoutPlacementMode.BottomEdgeAlignedLeft;
+		TextCommandBarSelectionFlyout.Placement = FlyoutPlacementMode.TopEdgeAlignedLeft;
+		TextBox1.ContextFlyout = TextCommandBarContextFlyout;
+		RichTextBlock1.ContextFlyout = TextCommandBarContextFlyout;
+		TextBox1.SelectionFlyout = TextCommandBarSelectionFlyout;
+		RichTextBlock1.SelectionFlyout = TextCommandBarSelectionFlyout;
 	}
 
 	private void OnClearClipboardContentsClicked(object sender, object args)
@@ -79,7 +46,7 @@ private void OnClearClipboardContentsClicked(object sender, object args)
 
 	private void OnCountPopupsClicked(object sender, object args)
 	{
-		PopupCountTextBox.Text = VisualTreeHelper.GetOpenPopups(Window.Current).Count.ToString();
+		PopupCountTextBox.Text = VisualTreeHelper.GetOpenPopupsForXamlRoot(XamlRoot).Count.ToString();
 		CustomButtonsOpenCount.Text = customButtonsFlyoutOpenCount.ToString();
 	}
 
diff --git a/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/TextCommandBarFlyoutPage.xaml b/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/TextCommandBarFlyoutPage.xaml
index 4f66feb50fc3..e0e982e88ecb 100644
--- a/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/TextCommandBarFlyoutPage.xaml
+++ b/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/TextCommandBarFlyoutPage.xaml
@@ -1,4 +1,5 @@
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<!-- MUX Reference controls\dev\CommandBarFlyout\TestUI\TextCommandBarFlyoutPage.xaml, tag winui3/release/1.5.2, commit b91b3ce6f25c587a9e18c4e122f348f51331f18b -->
 <local:TestPage
     x:Class="MUXControlsTestApp.TextCommandBarFlyoutPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -9,76 +10,76 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <Grid.RowDefinitions>
-            <RowDefinition />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-        <ScrollViewer>
-            <StackPanel>
-                <StackPanel.Resources>
-                    <muxc:TextCommandBarFlyout x:Name="TextControlContextFlyout" />
-                    <muxc:TextCommandBarFlyout x:Name="TextControlSelectionFlyout" />
-                </StackPanel.Resources>
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <TextBox x:Name="TextBox1" AutomationProperties.AutomationId="TextBox" Text="Lorem ipsum ergo sum" Margin="10" />
-                    <TextBlock x:Name="TextBlock1" AutomationProperties.AutomationId="TextBlock" Text="Lorem ipsum ergo sum" Margin="10" IsTextSelectionEnabled="True" Grid.Row="1" />
-                    <!--<RichEditBox x:Name="RichEditBox1" AutomationProperties.AutomationId="RichEditBox" Margin="10" Grid.Row="2" />-->
-                    <RichTextBlock x:Name="RichTextBlock1" AutomationProperties.AutomationId="RichTextBlock" Margin="10" IsTextSelectionEnabled="True" Grid.Row="3">
-                        <Paragraph>
-                            <Bold>
-                                <Italic>
-                                    <Underline>Lorem ipsum ergo sum</Underline>
-                                </Italic>
-                            </Bold>
-                        </Paragraph>
-                    </RichTextBlock>
-                    <PasswordBox x:Name="PasswordBox1" AutomationProperties.AutomationId="PasswordBox" Password="Lorem ipsum ergo sum" Margin="10" Grid.Row="4" />
-                    <Button x:Name="TextBoxSelectAllButton" AutomationProperties.AutomationId="TextBoxSelectAllButton" Content="Select all" Click="OnTextBoxSelectAllClicked" Grid.Column="1" />
-                    <Button x:Name="TextBlockSelectAllButton" AutomationProperties.AutomationId="TextBlockSelectAllButton" Content="Select all" Click="OnTextBlockSelectAllClicked" Grid.Row="1" Grid.Column="1" />
-                    <Button x:Name="RichEditBoxSelectAllButton" AutomationProperties.AutomationId="RichEditBoxSelectAllButton" Content="Select all" Click="OnRichEditBoxSelectAllClicked" Grid.Row="2" Grid.Column="1" />
-                    <Button x:Name="RichTextBlockSelectAllButton" AutomationProperties.AutomationId="RichTextBlockSelectAllButton" Content="Select all" Click="OnRichTextBlockSelectAllClicked" Grid.Row="3" Grid.Column="1" />
-                    <Button x:Name="TextBoxClearSelectionButton" AutomationProperties.AutomationId="TextBoxClearSelectionButton" Content="Clear selection" Click="OnTextBoxClearSelectionClicked" Grid.Column="2" />
-                    <Button x:Name="TextBlockClearSelectionButton" AutomationProperties.AutomationId="TextBlockClearSelectionButton" Content="Clear selection" Click="OnTextBlockClearSelectionClicked" Grid.Row="1" Grid.Column="2" />
-                    <Button x:Name="RichEditBoxClearSelectionButton" AutomationProperties.AutomationId="RichEditBoxClearSelectionButton" Content="Clear selection" Click="OnRichEditBoxClearSelectionClicked" Grid.Row="2" Grid.Column="2" />
-                    <Button x:Name="RichTextBlockClearSelectionButton" AutomationProperties.AutomationId="RichTextBlockClearSelectionButton" Content="Clear selection" Click="OnRichTextBlockClearSelectionClicked" Grid.Row="3" Grid.Column="2" />
-                    <Button x:Name="TextBoxFillWithTextButton" AutomationProperties.AutomationId="TextBoxFillWithTextButton" Content="Fill with text" Click="OnTextBoxFillWithTextClicked" Grid.Column="3" />
-                    <Button x:Name="RichEditBoxFillWithTextButton" AutomationProperties.AutomationId="RichEditBoxFillWithTextButton" Content="Fill with text" Click="OnRichEditBoxFillWithTextClicked" Grid.Row="2" Grid.Column="3" />
-                </Grid>
-                <TextBlock Text="Show TextCommandBarFlyout in transient mode on..." HorizontalAlignment="Center" />
-                <VariableSizedWrapGrid Orientation="Horizontal">
-                    <Button x:Name="ShowTextControlFlyoutOnTextBoxButton" AutomationProperties.AutomationId="ShowTextControlFlyoutOnTextBoxButton" Content="TextBox" Width="150" Margin="5" Click="OnShowTextControlFlyoutOnTextBoxClicked" />
-                    <Button x:Name="ShowTextControlFlyoutOnTextBlockButton" AutomationProperties.AutomationId="ShowTextControlFlyoutOnTextBlockButton" Content="TextBlock" Width="150" Margin="5" Click="OnShowTextControlFlyoutOnTextBlockClicked" />
-                    <Button x:Name="ShowTextControlFlyoutOnRichEditBoxButton" AutomationProperties.AutomationId="ShowTextControlFlyoutOnRichEditBoxButton" Content="RichEditBox" Width="150" Margin="5" Click="OnShowTextControlFlyoutOnRichEditBoxClicked" />
-                    <Button x:Name="ShowTextControlFlyoutOnRichTextBlockButton" AutomationProperties.AutomationId="ShowTextControlFlyoutOnRichTextBlockButton" Content="RichTextBlock" Width="150" Margin="5" Click="OnShowTextControlFlyoutOnRichTextBlockClicked" />
-                    <Button x:Name="ShowTextControlFlyoutOnPasswordBoxButton" AutomationProperties.AutomationId="ShowTextControlFlyoutOnPasswordBoxButton" Content="PasswordBox" Width="150" Margin="5" Click="OnShowTextControlFlyoutOnPasswordBoxClicked" />
-                </VariableSizedWrapGrid>
-                <TextBlock Text="Show TextControlCommandBarFlyout in standard mode on..." HorizontalAlignment="Center" />
-                <VariableSizedWrapGrid Orientation="Horizontal">
-                    <Button x:Name="ShowStandardTextControlFlyoutOnTextBoxButton" AutomationProperties.AutomationId="ShowStandardTextControlFlyoutOnTextBoxButton" Content="TextBox" Width="150" Margin="5" Click="OnShowStandardTextControlFlyoutOnTextBoxClicked" />
-                    <Button x:Name="ShowStandardTextControlFlyoutOnTextBlockButton" AutomationProperties.AutomationId="ShowStandardTextControlFlyoutOnTextBlockButton" Content="TextBlock" Width="150" Margin="5" Click="OnShowStandardTextControlFlyoutOnTextBlockClicked" />
-                    <Button x:Name="ShowStandardTextControlFlyoutOnRichEditBoxButton" AutomationProperties.AutomationId="ShowStandardTextControlFlyoutOnRichEditBoxButton" Content="RichEditBox" Width="150" Margin="5" Click="OnShowStandardTextControlFlyoutOnRichEditBoxClicked" />
-                    <Button x:Name="ShowStandardTextControlFlyoutOnRichTextBlockButton" AutomationProperties.AutomationId="ShowStandardTextControlFlyoutOnRichTextBlockButton" Content="RichTextBlock" Width="150" Margin="5" Click="OnShowStandardTextControlFlyoutOnRichTextBlockClicked" />
-                    <Button x:Name="ShowStandardTextControlFlyoutOnPasswordBoxButton" AutomationProperties.AutomationId="ShowStandardTextControlFlyoutOnPasswordBoxButton" Content="PasswordBox" Width="150" Margin="5" Click="OnShowStandardTextControlFlyoutOnPasswordBoxClicked" />
-                </VariableSizedWrapGrid>
-                <Button x:Name="ClearClipboardContentsButton" AutomationProperties.AutomationId="ClearClipboardContentsButton" Content="Clear clipboard contents" Click="OnClearClipboardContentsClicked" />
-                <Button x:Name="SetClipboardContentsButton" AutomationProperties.AutomationId="SetClipboardContentsButton" Content="Set clipboard contents" Click="OnSetClipboardContentsClicked" />
-                <Button x:Name="GetRichEditBoxRtfContentButton" AutomationProperties.AutomationId="GetRichEditBoxRtfContentButton" Content="Get RichEditBox RTF content" Click="OnGetRichEditBoxRtfContentClicked" />
-            </StackPanel>
-        </ScrollViewer>
-        <TextBox Grid.Row="1" IsReadOnly="True" AcceptsReturn="True" x:Name="StatusReportingTextBox" AutomationProperties.AutomationId="StatusReportingTextBox" Margin="10" />
-    </Grid>
+	<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+		<Grid.RowDefinitions>
+			<RowDefinition />
+			<RowDefinition Height="Auto" />
+		</Grid.RowDefinitions>
+		<ScrollViewer>
+			<StackPanel>
+				<StackPanel.Resources>
+					<muxc:TextCommandBarFlyout x:Name="TextControlContextFlyout" />
+					<muxc:TextCommandBarFlyout x:Name="TextControlSelectionFlyout" />
+				</StackPanel.Resources>
+				<Grid>
+					<Grid.RowDefinitions>
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+					</Grid.RowDefinitions>
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition />
+						<ColumnDefinition Width="Auto" />
+						<ColumnDefinition Width="Auto" />
+						<ColumnDefinition Width="Auto" />
+					</Grid.ColumnDefinitions>
+					<TextBox x:Name="TextBox1" AutomationProperties.AutomationId="TextBox" Text="Lorem ipsum ergo sum" Margin="10" />
+					<TextBlock x:Name="TextBlock1" AutomationProperties.AutomationId="TextBlock" Text="Lorem ipsum ergo sum" Margin="10" IsTextSelectionEnabled="True" Grid.Row="1" />
+					<RichEditBox x:Name="RichEditBox1" AutomationProperties.AutomationId="RichEditBox" Margin="10" Grid.Row="2" />
+					<RichTextBlock x:Name="RichTextBlock1" AutomationProperties.AutomationId="RichTextBlock" Margin="10" IsTextSelectionEnabled="True" Grid.Row="3">
+						<Paragraph>
+							<Bold>
+								<Italic>
+									<Underline>Lorem ipsum ergo sum</Underline>
+								</Italic>
+							</Bold>
+						</Paragraph>
+					</RichTextBlock>
+					<PasswordBox x:Name="PasswordBox1" AutomationProperties.AutomationId="PasswordBox" Password="Lorem ipsum ergo sum" Margin="10" Grid.Row="4" />
+					<Button x:Name="TextBoxSelectAllButton" AutomationProperties.AutomationId="TextBoxSelectAllButton" Content="Select all" Click="OnTextBoxSelectAllClicked" Grid.Column="1" />
+					<Button x:Name="TextBlockSelectAllButton" AutomationProperties.AutomationId="TextBlockSelectAllButton" Content="Select all" Click="OnTextBlockSelectAllClicked" Grid.Row="1" Grid.Column="1" />
+					<Button x:Name="RichEditBoxSelectAllButton" AutomationProperties.AutomationId="RichEditBoxSelectAllButton" Content="Select all" Click="OnRichEditBoxSelectAllClicked" Grid.Row="2" Grid.Column="1" />
+					<Button x:Name="RichTextBlockSelectAllButton" AutomationProperties.AutomationId="RichTextBlockSelectAllButton" Content="Select all" Click="OnRichTextBlockSelectAllClicked" Grid.Row="3" Grid.Column="1" />
+					<Button x:Name="TextBoxClearSelectionButton" AutomationProperties.AutomationId="TextBoxClearSelectionButton" Content="Clear selection" Click="OnTextBoxClearSelectionClicked" Grid.Column="2" />
+					<Button x:Name="TextBlockClearSelectionButton" AutomationProperties.AutomationId="TextBlockClearSelectionButton" Content="Clear selection" Click="OnTextBlockClearSelectionClicked" Grid.Row="1" Grid.Column="2" />
+					<Button x:Name="RichEditBoxClearSelectionButton" AutomationProperties.AutomationId="RichEditBoxClearSelectionButton" Content="Clear selection" Click="OnRichEditBoxClearSelectionClicked" Grid.Row="2" Grid.Column="2" />
+					<Button x:Name="RichTextBlockClearSelectionButton" AutomationProperties.AutomationId="RichTextBlockClearSelectionButton" Content="Clear selection" Click="OnRichTextBlockClearSelectionClicked" Grid.Row="3" Grid.Column="2" />
+					<Button x:Name="TextBoxFillWithTextButton" AutomationProperties.AutomationId="TextBoxFillWithTextButton" Content="Fill with text" Click="OnTextBoxFillWithTextClicked" Grid.Column="3" />
+					<Button x:Name="RichEditBoxFillWithTextButton" AutomationProperties.AutomationId="RichEditBoxFillWithTextButton" Content="Fill with text" Click="OnRichEditBoxFillWithTextClicked" Grid.Row="2" Grid.Column="3" />
+				</Grid>
+				<TextBlock Text="Show TextCommandBarFlyout in transient mode on..." HorizontalAlignment="Center" />
+				<VariableSizedWrapGrid Orientation="Horizontal">
+					<Button x:Name="ShowTextControlFlyoutOnTextBoxButton" AutomationProperties.AutomationId="ShowTextControlFlyoutOnTextBoxButton" Content="TextBox" Width="150" Margin="5" Click="OnShowTextControlFlyoutOnTextBoxClicked" />
+					<Button x:Name="ShowTextControlFlyoutOnTextBlockButton" AutomationProperties.AutomationId="ShowTextControlFlyoutOnTextBlockButton" Content="TextBlock" Width="150" Margin="5" Click="OnShowTextControlFlyoutOnTextBlockClicked" />
+					<Button x:Name="ShowTextControlFlyoutOnRichEditBoxButton" AutomationProperties.AutomationId="ShowTextControlFlyoutOnRichEditBoxButton" Content="RichEditBox" Width="150" Margin="5" Click="OnShowTextControlFlyoutOnRichEditBoxClicked" />
+					<Button x:Name="ShowTextControlFlyoutOnRichTextBlockButton" AutomationProperties.AutomationId="ShowTextControlFlyoutOnRichTextBlockButton" Content="RichTextBlock" Width="150" Margin="5" Click="OnShowTextControlFlyoutOnRichTextBlockClicked" />
+					<Button x:Name="ShowTextControlFlyoutOnPasswordBoxButton" AutomationProperties.AutomationId="ShowTextControlFlyoutOnPasswordBoxButton" Content="PasswordBox" Width="150" Margin="5" Click="OnShowTextControlFlyoutOnPasswordBoxClicked" />
+				</VariableSizedWrapGrid>
+				<TextBlock Text="Show TextControlCommandBarFlyout in standard mode on..." HorizontalAlignment="Center" />
+				<VariableSizedWrapGrid Orientation="Horizontal">
+					<Button x:Name="ShowStandardTextControlFlyoutOnTextBoxButton" AutomationProperties.AutomationId="ShowStandardTextControlFlyoutOnTextBoxButton" Content="TextBox" Width="150" Margin="5" Click="OnShowStandardTextControlFlyoutOnTextBoxClicked" />
+					<Button x:Name="ShowStandardTextControlFlyoutOnTextBlockButton" AutomationProperties.AutomationId="ShowStandardTextControlFlyoutOnTextBlockButton" Content="TextBlock" Width="150" Margin="5" Click="OnShowStandardTextControlFlyoutOnTextBlockClicked" />
+					<Button x:Name="ShowStandardTextControlFlyoutOnRichEditBoxButton" AutomationProperties.AutomationId="ShowStandardTextControlFlyoutOnRichEditBoxButton" Content="RichEditBox" Width="150" Margin="5" Click="OnShowStandardTextControlFlyoutOnRichEditBoxClicked" />
+					<Button x:Name="ShowStandardTextControlFlyoutOnRichTextBlockButton" AutomationProperties.AutomationId="ShowStandardTextControlFlyoutOnRichTextBlockButton" Content="RichTextBlock" Width="150" Margin="5" Click="OnShowStandardTextControlFlyoutOnRichTextBlockClicked" />
+					<Button x:Name="ShowStandardTextControlFlyoutOnPasswordBoxButton" AutomationProperties.AutomationId="ShowStandardTextControlFlyoutOnPasswordBoxButton" Content="PasswordBox" Width="150" Margin="5" Click="OnShowStandardTextControlFlyoutOnPasswordBoxClicked" />
+				</VariableSizedWrapGrid>
+				<Button x:Name="ClearClipboardContentsButton" AutomationProperties.AutomationId="ClearClipboardContentsButton" Content="Clear clipboard contents" Click="OnClearClipboardContentsClicked" />
+				<Button x:Name="SetClipboardContentsButton" AutomationProperties.AutomationId="SetClipboardContentsButton" Content="Set clipboard contents" Click="OnSetClipboardContentsClicked" />
+				<Button x:Name="GetRichEditBoxRtfContentButton" AutomationProperties.AutomationId="GetRichEditBoxRtfContentButton" Content="Get RichEditBox RTF content" Click="OnGetRichEditBoxRtfContentClicked" />
+			</StackPanel>
+		</ScrollViewer>
+		<TextBox Grid.Row="1" IsReadOnly="True" AcceptsReturn="True" x:Name="StatusReportingTextBox" AutomationProperties.AutomationId="StatusReportingTextBox" Margin="10" />
+	</Grid>
 </local:TestPage>
diff --git a/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/TextCommandBarFlyoutPage.xaml.cs b/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/TextCommandBarFlyoutPage.xaml.cs
index 96540c438cb1..ef2db4a73ea1 100644
--- a/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/TextCommandBarFlyoutPage.xaml.cs
+++ b/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/TextCommandBarFlyoutPage.xaml.cs
@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
+// MUX Reference controls\dev\CommandBarFlyout\TestUI\TextCommandBarFlyoutPage.xaml.cs, tag winui3/release/1.5.2, commit b91b3ce6f25c587a9e18c4e122f348f51331f18b
 
 using Common;
 using System;
@@ -27,73 +28,21 @@ public TextCommandBarFlyoutPage()
 	{
 		this.InitializeComponent();
 
-#if !HAS_UNO
-		RichEditBox1.Document.SetText(Windows.UI.Text.TextSetOptions.None, "Lorem ipsum ergo sum");
-#endif
+		RichEditBox1.Document.SetText(TextSetOptions.None, "Lorem ipsum ergo sum");
 		Clipboard.ContentChanged += OnClipboardContentChanged;
 
-		if (ApiInformation.IsEnumNamedValuePresent("Windows.UI.Xaml.Controls.Primitives.FlyoutPlacementMode", "BottomEdgeAlignedLeft"))
-		{
-			TextControlContextFlyout.Placement = FlyoutPlacementMode.BottomEdgeAlignedLeft;
-		}
-		else
-		{
-			TextControlContextFlyout.Placement = FlyoutPlacementMode.Top;
-		}
-
-		if (ApiInformation.IsEnumNamedValuePresent("Windows.UI.Xaml.Controls.Primitives.FlyoutPlacementMode", "TopEdgeAlignedLeft"))
-		{
-			TextControlSelectionFlyout.Placement = FlyoutPlacementMode.TopEdgeAlignedLeft;
-		}
-		else
-		{
-			TextControlSelectionFlyout.Placement = FlyoutPlacementMode.Top;
-		}
-
-		if (ApiInformation.IsPropertyPresent("Windows.UI.Xaml.UIElement", "ContextFlyout"))
-		{
-			TextBox1.ContextFlyout = TextControlContextFlyout;
-			TextBlock1.ContextFlyout = TextControlContextFlyout;
-#if !HAS_UNO
-			RichEditBox1.ContextFlyout = TextControlContextFlyout;
-#endif
-			RichTextBlock1.ContextFlyout = TextControlContextFlyout;
-			PasswordBox1.ContextFlyout = TextControlContextFlyout;
-		}
-
-		try
-		{
-			if (ApiInformation.IsPropertyPresent("Windows.UI.Xaml.Controls.TextBox", "SelectionFlyout"))
-			{
-				TextBox1.SelectionFlyout = TextControlSelectionFlyout;
-			}
-
-			if (ApiInformation.IsPropertyPresent("Windows.UI.Xaml.Controls.TextBlock", "SelectionFlyout"))
-			{
-				TextBlock1.SelectionFlyout = TextControlSelectionFlyout;
-			}
-
-			if (ApiInformation.IsPropertyPresent("Windows.UI.Xaml.Controls.RichEditBox", "SelectionFlyout"))
-			{
-#if !HAS_UNO
-				RichEditBox1.SelectionFlyout = TextControlSelectionFlyout;
-#endif
-			}
-
-			if (ApiInformation.IsPropertyPresent("Windows.UI.Xaml.Controls.RichTextBlock", "SelectionFlyout"))
-			{
-				RichTextBlock1.SelectionFlyout = TextControlSelectionFlyout;
-			}
-
-			if (ApiInformation.IsPropertyPresent("Windows.UI.Xaml.Controls.PasswordBox", "SelectionFlyout"))
-			{
-				PasswordBox1.SelectionFlyout = TextControlSelectionFlyout;
-			}
-		}
-		catch (InvalidCastException)
-		{
-			// RS5 interfaces can change before release, so we need to make sure we don't crash if they do.
-		}
+		TextControlContextFlyout.Placement = FlyoutPlacementMode.BottomEdgeAlignedLeft;
+		TextControlSelectionFlyout.Placement = FlyoutPlacementMode.TopEdgeAlignedLeft;
+		TextBox1.ContextFlyout = TextControlContextFlyout;
+		TextBlock1.ContextFlyout = TextControlContextFlyout;
+		RichEditBox1.ContextFlyout = TextControlContextFlyout;
+		RichTextBlock1.ContextFlyout = TextControlContextFlyout;
+		PasswordBox1.ContextFlyout = TextControlContextFlyout;
+		TextBox1.SelectionFlyout = TextControlSelectionFlyout;
+		TextBlock1.SelectionFlyout = TextControlSelectionFlyout;
+		RichEditBox1.SelectionFlyout = TextControlSelectionFlyout;
+		RichTextBlock1.SelectionFlyout = TextControlSelectionFlyout;
+		PasswordBox1.SelectionFlyout = TextControlSelectionFlyout;
 	}
 
 	private async void OnClipboardContentChanged(object sender, object e)
@@ -141,9 +90,7 @@ private void OnTextBlockSelectAllClicked(object sender, object args)
 
 	private void OnRichEditBoxSelectAllClicked(object sender, object args)
 	{
-#if !HAS_UNO
-		RichEditBox1.Document.Selection.Expand(Windows.UI.Text.TextRangeUnit.Story);
-#endif
+		RichEditBox1.Document.Selection.Expand(TextRangeUnit.Story);
 	}
 
 	private void OnRichTextBlockSelectAllClicked(object sender, object args)
@@ -163,9 +110,7 @@ private void OnTextBlockClearSelectionClicked(object sender, object args)
 
 	private void OnRichEditBoxClearSelectionClicked(object sender, object args)
 	{
-#if !HAS_UNO
 		RichEditBox1.Document.Selection.Collapse(true);
-#endif
 	}
 
 	private void OnTextBoxFillWithTextClicked(object sender, object args)
@@ -175,9 +120,7 @@ private void OnTextBoxFillWithTextClicked(object sender, object args)
 
 	private void OnRichEditBoxFillWithTextClicked(object sender, object args)
 	{
-#if !HAS_UNO
-            RichEditBox1.Document.SetText(TextSetOptions.None, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
-#endif
+		RichEditBox1.Document.SetText(TextSetOptions.None, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
 	}
 
 	private void OnRichTextBlockClearSelectionClicked(object sender, object args)
@@ -197,9 +140,7 @@ private void OnShowTextControlFlyoutOnTextBlockClicked(object sender, object arg
 
 	private void OnShowTextControlFlyoutOnRichEditBoxClicked(object sender, object args)
 	{
-#if !HAS_UNO
 		ShowTextControlContextFlyoutTransient(RichEditBox1);
-#endif
 	}
 
 	private void OnShowTextControlFlyoutOnRichTextBlockClicked(object sender, object args)
@@ -224,9 +165,7 @@ private void OnShowStandardTextControlFlyoutOnTextBlockClicked(object sender, ob
 
 	private void OnShowStandardTextControlFlyoutOnRichEditBoxClicked(object sender, object args)
 	{
-#if !HAS_UNO
 		ShowTextControlContextFlyoutStandard(RichEditBox1);
-#endif
 	}
 
 	private void OnShowStandardTextControlFlyoutOnRichTextBlockClicked(object sender, object args)
@@ -241,26 +180,12 @@ private void OnShowStandardTextControlFlyoutOnPasswordBoxClicked(object sender,
 
 	private void ShowTextControlContextFlyoutTransient(FrameworkElement targetElement)
 	{
-		if (PlatformConfiguration.IsOsVersionGreaterThanOrEqual(OSVersion.Redstone5))
-		{
-			TextControlContextFlyout.ShowAt(targetElement, new FlyoutShowOptions { ShowMode = FlyoutShowMode.Transient });
-		}
-		else
-		{
-			TextControlContextFlyout.ShowAt(targetElement);
-		}
+		TextControlContextFlyout.ShowAt(targetElement, new FlyoutShowOptions { ShowMode = FlyoutShowMode.Transient });
 	}
 
 	private void ShowTextControlContextFlyoutStandard(FrameworkElement targetElement)
 	{
-		if (PlatformConfiguration.IsOsVersionGreaterThanOrEqual(OSVersion.Redstone5))
-		{
-			TextControlSelectionFlyout.ShowAt(targetElement, new FlyoutShowOptions { ShowMode = FlyoutShowMode.Standard });
-		}
-		else
-		{
-			TextControlSelectionFlyout.ShowAt(targetElement);
-		}
+		TextControlSelectionFlyout.ShowAt(targetElement, new FlyoutShowOptions { ShowMode = FlyoutShowMode.Standard });
 	}
 
 	private void OnClearClipboardContentsClicked(object sender, object args)
@@ -280,10 +205,8 @@ private void OnSetClipboardContentsClicked(object sender, object args)
 
 	private void OnGetRichEditBoxRtfContentClicked(object sender, object args)
 	{
-#if !HAS_UNO
 		string rtfContent;
-            RichEditBox1.Document.GetText(TextGetOptions.FormatRtf, out rtfContent);
+		RichEditBox1.Document.GetText(TextGetOptions.FormatRtf, out rtfContent);
 		StatusReportingTextBox.Text = rtfContent;
-#endif
 	}
 }
diff --git a/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/ScrollViewTests/ScrollViewPage.xaml.cs b/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/ScrollViewTests/ScrollViewPage.xaml.cs
index 23fdf5669ffa..b12c1a860dfc 100644
--- a/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/ScrollViewTests/ScrollViewPage.xaml.cs
+++ b/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/ScrollViewTests/ScrollViewPage.xaml.cs
@@ -15,19 +15,6 @@
 
 namespace MUXControlsTestApp;
 
-public static class FrameExtensions
-{
-	public static void NavigateWithoutAnimation(this Frame frame, Type sourcePageType)
-	{
-		frame.Navigate(sourcePageType, new SuppressNavigationTransitionInfo());
-	}
-
-	public static void NavigateWithoutAnimation(this Frame frame, Type sourcePageType, object parameter)
-	{
-		frame.Navigate(sourcePageType, parameter, new SuppressNavigationTransitionInfo());
-	}
-}
-
 [Sample("Scrolling")]
 public sealed partial class ScrollViewPage : TestPage
 {