diff --git a/dev/CommandBarFlyout/TestUI/CommandBarFlyoutPage.xaml b/dev/CommandBarFlyout/TestUI/CommandBarFlyoutPage.xaml
index 854321d855..e2caa5c362 100644
--- a/dev/CommandBarFlyout/TestUI/CommandBarFlyoutPage.xaml
+++ b/dev/CommandBarFlyout/TestUI/CommandBarFlyoutPage.xaml
@@ -14,12 +14,17 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
diff --git a/dev/CommonStyles/TestUI/CommandBarPage.xaml b/dev/CommonStyles/TestUI/CommandBarPage.xaml
index a481c09329..346a04421e 100644
--- a/dev/CommonStyles/TestUI/CommandBarPage.xaml
+++ b/dev/CommonStyles/TestUI/CommandBarPage.xaml
@@ -2,56 +2,74 @@
x:Class="MUXControlsTestApp.CommandBarPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- xmlns:local="using:CommonStyles_TestUI"
+ xmlns:contract5NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,5)"
+ xmlns:contract6NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,6)"
+ xmlns:contract6Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,6)"
+ xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
+ xmlns:controls="using:Microsoft.UI.Xaml.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:local="using:CommonStyles_TestUI"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:controls="using:Microsoft.UI.Xaml.Controls"
- xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
- xmlns:contract6Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,6)"
- xmlns:contract6NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,6)"
- xmlns:contract5NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,5)"
mc:Ignorable="d">
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
@@ -65,8 +83,8 @@
-
-
+
+
@@ -93,8 +111,8 @@
-
-
+
+
@@ -106,68 +124,74 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
+
-
+
Visible
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
+
@@ -180,15 +204,18 @@
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
diff --git a/dev/CommonStyles/TestUI/MenuFlyoutPage.xaml b/dev/CommonStyles/TestUI/MenuFlyoutPage.xaml
index 668de86686..bcaf5ba073 100755
--- a/dev/CommonStyles/TestUI/MenuFlyoutPage.xaml
+++ b/dev/CommonStyles/TestUI/MenuFlyoutPage.xaml
@@ -13,12 +13,17 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+