diff --git a/src/.vsconfig_buildtools b/src/.vsconfig_buildtools
index da5ccf978f..1b09e7cd2e 100644
--- a/src/.vsconfig_buildtools
+++ b/src/.vsconfig_buildtools
@@ -25,6 +25,7 @@
     "Microsoft.VisualStudio.ComponentGroup.UWP.VC.BuildTools",
     "Microsoft.VisualStudio.Workload.MSBuildTools",
     "Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools",
+    "Microsoft.VisualStudio.Workload.Universal",
     "Microsoft.VisualStudio.Workload.UniversalBuildTools",
     "Microsoft.VisualStudio.Workload.VCTools",
     "Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre",
diff --git a/src/Packages.props b/src/Packages.props
index 62ca7e87a1..657871cf52 100644
--- a/src/Packages.props
+++ b/src/Packages.props
@@ -37,5 +37,7 @@
     <PackageReference Update="System.Private.Uri" Version="4.3.2"/>
     <PackageReference Update="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)"/>
     <PackageReference Update="Microsoft.WindowsAppSDK" Version="$(WindowsAppSdkPackageVersion)" />
+    <PackageReference Update="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Update="MSTest.TestFramework" Version="3.1.1" />
   </ItemGroup>
 </Project>
diff --git a/src/UpdateMockWinAppSDKPackage.csproj b/src/UpdateMockWinAppSDKPackage.csproj
index b4cfb638fc..57766e5b74 100644
--- a/src/UpdateMockWinAppSDKPackage.csproj
+++ b/src/UpdateMockWinAppSDKPackage.csproj
@@ -34,6 +34,7 @@
     <CallTarget Targets="Clean" />
     <CallTarget Targets="Build" />
   </Target>
+  <Target Name="Publish" />
   <Target Name="Clean" Condition="'$(BuildingInsideVisualStudio)' == 'true'" />
   <Target Name="Build" Condition="'$(BuildingInsideVisualStudio)' == 'true'" DependsOnTargets="CheckIfUpdateIsRequired" />
   <Target Name="CheckIfUpdateIsRequired">
diff --git a/src/controls/CleanupMSBuildProcesses.csproj b/src/controls/CleanupMSBuildProcesses.csproj
index 54855f930b..87f8f5a332 100644
--- a/src/controls/CleanupMSBuildProcesses.csproj
+++ b/src/controls/CleanupMSBuildProcesses.csproj
@@ -32,7 +32,7 @@
   </ItemGroup>
   <Import Project="$([MSBuild]::GetPathOfFileAbove(environment.props))" />
   <Import Project="..\eng\versions.props" />
-  <Import Project="$(NuGetPackageRoot)\MUXCustomBuildTasks.$(MuxCustomBuildTasksPackageVersion)\build\MUXCustomBuildTasks.targets" Condition="Exists('$(NuGetPackageRoot)\MUXCustomBuildTasks\$(MuxCustomBuildTasksPackageVersion)\build\MUXCustomBuildTasks.targets')" />
+  <Import Project="$(NuGetPackageRoot)\MUXCustomBuildTasks.$(MuxCustomBuildTasksPackageVersion)\build\MUXCustomBuildTasks.targets" Condition="Exists('$(NuGetPackageRoot)\MUXCustomBuildTasks.$(MuxCustomBuildTasksPackageVersion)\build\MUXCustomBuildTasks.targets')" />
   <Target Name="KillLeftOverMSBuildProcesses">
     <ItemGroup>
       <LeftOverMSBuildProcesses Include="$(TEMP)\*.msbproc" />
diff --git a/src/controls/HybridCRT.props b/src/controls/HybridCRT.props
index f2d81da329..02ec1a275c 100644
--- a/src/controls/HybridCRT.props
+++ b/src/controls/HybridCRT.props
@@ -6,21 +6,7 @@
     <UseCrtSDKReferenceStaticWarning>false</UseCrtSDKReferenceStaticWarning>
   </PropertyGroup>
 
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
-    <ClCompile>
-      <!-- We use MultiThreadedDebug, rather than MultiThreadedDebugDLL, to avoid DLL dependencies on VCRUNTIME140d.dll and MSVCP140d.dll. -->
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
-           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
-           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
-           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrtd.lib</IgnoreSpecificDefaultLibraries>
-      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrtd.lib</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
+  <ItemDefinitionGroup>
     <ClCompile>
       <!-- We use MultiThreaded, rather than MultiThreadedDLL, to avoid DLL dependencies on VCRUNTIME140.dll and MSVCP140.dll. -->
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
diff --git a/src/controls/MUXControls.sln b/src/controls/MUXControls.sln
index 0c08a0cfc8..9586c2fe12 100644
--- a/src/controls/MUXControls.sln
+++ b/src/controls/MUXControls.sln
@@ -653,6 +653,7 @@ EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "MapControl_TestUI", "dev\MapControl\TestUI\MapControl_TestUI.shproj", "{8C2F2FA6-5639-4C01-84D0-06E037824689}"
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "MapControl_InteractionTests", "dev\MapControl\InteractionTests\MapControl_InteractionTests.shproj", "{189F0B87-4CA1-4F77-8195-FC6DC714157A}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DesktopAcrylicBackdrop", "DesktopAcrylicBackdrop", "{0BEED10A-70BC-4103-8BC8-84D83A14EF75}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MicaBackdrop", "MicaBackdrop", "{AAEE68EF-8CB5-40D2-8BC8-9A00FB0A1B6A}"
@@ -693,737 +694,465 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SelectorBar_TestUI", "dev\S
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SelectorBar_APITests", "dev\SelectorBar\APITests\SelectorBar_APITests.shproj", "{F778ACAE-150F-4D7D-83C1-5BF2E1ACB399}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TabViewTearOutApp", "test\TabViewTearOutApp\TabViewTearOutApp.vcxproj", "{86317243-45A8-4770-A4B2-768F721E5F9B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug_test|Any CPU = Debug_test|Any CPU
 		Debug_test|ARM64 = Debug_test|ARM64
-		Debug_test|Win32 = Debug_test|Win32
 		Debug_test|x64 = Debug_test|x64
 		Debug_test|x86 = Debug_test|x86
-		Debug|Any CPU = Debug|Any CPU
 		Debug|ARM64 = Debug|ARM64
-		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
 		Release|ARM64 = Release|ARM64
-		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Debug_test|Any CPU.ActiveCfg = Debug|x64
-		{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Debug_test|Any CPU.Build.0 = Debug|x64
 		{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Debug_test|ARM64.ActiveCfg = Debug|ARM64
 		{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Debug_test|ARM64.Build.0 = Debug|ARM64
-		{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Debug_test|Win32.ActiveCfg = Debug|Win32
-		{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Debug_test|Win32.Build.0 = Debug|Win32
 		{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Debug_test|x64.ActiveCfg = Debug|x64
 		{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Debug_test|x64.Build.0 = Debug|x64
 		{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Debug_test|x86.ActiveCfg = Debug|Win32
 		{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Debug_test|x86.Build.0 = Debug|Win32
-		{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Debug|Any CPU.Build.0 = Debug|x64
 		{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Debug|ARM64.Build.0 = Debug|ARM64
-		{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Debug|Win32.Build.0 = Debug|Win32
 		{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Debug|x64.ActiveCfg = Debug|x64
 		{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Debug|x64.Build.0 = Debug|x64
 		{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Debug|x86.ActiveCfg = Debug|Win32
 		{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Debug|x86.Build.0 = Debug|Win32
-		{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Release|Any CPU.ActiveCfg = Release|x64
-		{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Release|Any CPU.Build.0 = Release|x64
 		{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Release|ARM64.ActiveCfg = Release|ARM64
 		{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Release|ARM64.Build.0 = Release|ARM64
-		{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Release|Win32.ActiveCfg = Release|Win32
-		{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Release|Win32.Build.0 = Release|Win32
 		{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Release|x64.ActiveCfg = Release|x64
 		{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Release|x64.Build.0 = Release|x64
 		{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Release|x86.ActiveCfg = Release|Win32
 		{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Release|x86.Build.0 = Release|Win32
-		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug_test|Any CPU.ActiveCfg = Debug|x64
-		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug_test|Any CPU.Build.0 = Debug|x64
-		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug_test|Any CPU.Deploy.0 = Debug|x64
 		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug_test|ARM64.ActiveCfg = Debug|ARM64
 		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug_test|ARM64.Build.0 = Debug|ARM64
 		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug_test|ARM64.Deploy.0 = Debug|ARM64
-		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug_test|Win32.ActiveCfg = Debug|Win32
-		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug_test|Win32.Build.0 = Debug|Win32
-		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug_test|Win32.Deploy.0 = Debug|Win32
 		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug_test|x64.ActiveCfg = Debug|x64
 		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug_test|x64.Build.0 = Debug|x64
 		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug_test|x64.Deploy.0 = Debug|x64
 		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug_test|x86.ActiveCfg = Debug|Win32
 		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug_test|x86.Build.0 = Debug|Win32
 		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug_test|x86.Deploy.0 = Debug|Win32
-		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug|Any CPU.Build.0 = Debug|x64
-		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug|Any CPU.Deploy.0 = Debug|x64
 		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug|ARM64.Build.0 = Debug|ARM64
 		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug|Win32.Build.0 = Debug|Win32
-		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug|Win32.Deploy.0 = Debug|Win32
 		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug|x64.ActiveCfg = Debug|x64
 		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug|x64.Build.0 = Debug|x64
 		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug|x64.Deploy.0 = Debug|x64
 		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug|x86.ActiveCfg = Debug|Win32
 		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug|x86.Build.0 = Debug|Win32
 		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug|x86.Deploy.0 = Debug|Win32
-		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Release|Any CPU.ActiveCfg = Release|x64
-		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Release|Any CPU.Build.0 = Release|x64
-		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Release|Any CPU.Deploy.0 = Release|x64
 		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Release|ARM64.ActiveCfg = Release|ARM64
 		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Release|ARM64.Build.0 = Release|ARM64
 		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Release|ARM64.Deploy.0 = Release|ARM64
-		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Release|Win32.ActiveCfg = Release|Win32
-		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Release|Win32.Build.0 = Release|Win32
-		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Release|Win32.Deploy.0 = Release|Win32
 		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Release|x64.ActiveCfg = Release|x64
 		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Release|x64.Build.0 = Release|x64
 		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Release|x64.Deploy.0 = Release|x64
 		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Release|x86.ActiveCfg = Release|Win32
 		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Release|x86.Build.0 = Release|Win32
 		{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Release|x86.Deploy.0 = Release|Win32
-		{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Debug_test|Any CPU.ActiveCfg = Debug_test|Any CPU
-		{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Debug_test|Any CPU.Build.0 = Debug_test|Any CPU
 		{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Debug_test|ARM64.ActiveCfg = Debug_test|ARM64
 		{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Debug_test|ARM64.Build.0 = Debug_test|ARM64
-		{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Debug_test|Win32.ActiveCfg = Debug_test|Win32
-		{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Debug_test|Win32.Build.0 = Debug_test|Win32
 		{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Debug_test|x64.ActiveCfg = Debug_test|x64
 		{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Debug_test|x64.Build.0 = Debug_test|x64
 		{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Debug_test|x86.ActiveCfg = Debug_test|Win32
 		{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Debug_test|x86.Build.0 = Debug_test|Win32
-		{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Debug|ARM64.Build.0 = Debug|ARM64
-		{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Debug|Win32.Build.0 = Debug|Win32
 		{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Debug|x64.ActiveCfg = Debug|x64
 		{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Debug|x64.Build.0 = Debug|x64
 		{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Debug|x86.ActiveCfg = Debug|Win32
 		{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Debug|x86.Build.0 = Debug|Win32
-		{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Release|ARM64.ActiveCfg = Release|ARM64
 		{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Release|ARM64.Build.0 = Release|ARM64
-		{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Release|Win32.ActiveCfg = Release|Win32
-		{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Release|Win32.Build.0 = Release|Win32
 		{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Release|x64.ActiveCfg = Release|x64
 		{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Release|x64.Build.0 = Release|x64
 		{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Release|x86.ActiveCfg = Release|Win32
 		{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Release|x86.Build.0 = Release|Win32
-		{DE10DFE2-5EA3-452A-B055-FC60E330AFBB}.Debug_test|Any CPU.ActiveCfg = Debug|x64
-		{DE10DFE2-5EA3-452A-B055-FC60E330AFBB}.Debug_test|Any CPU.Build.0 = Debug|x64
 		{DE10DFE2-5EA3-452A-B055-FC60E330AFBB}.Debug_test|ARM64.ActiveCfg = Debug|ARM64
 		{DE10DFE2-5EA3-452A-B055-FC60E330AFBB}.Debug_test|ARM64.Build.0 = Debug|ARM64
-		{DE10DFE2-5EA3-452A-B055-FC60E330AFBB}.Debug_test|Win32.ActiveCfg = Debug|Win32
-		{DE10DFE2-5EA3-452A-B055-FC60E330AFBB}.Debug_test|Win32.Build.0 = Debug|Win32
 		{DE10DFE2-5EA3-452A-B055-FC60E330AFBB}.Debug_test|x64.ActiveCfg = Debug|x64
 		{DE10DFE2-5EA3-452A-B055-FC60E330AFBB}.Debug_test|x64.Build.0 = Debug|x64
 		{DE10DFE2-5EA3-452A-B055-FC60E330AFBB}.Debug_test|x86.ActiveCfg = Debug|Win32
 		{DE10DFE2-5EA3-452A-B055-FC60E330AFBB}.Debug_test|x86.Build.0 = Debug|Win32
-		{DE10DFE2-5EA3-452A-B055-FC60E330AFBB}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{DE10DFE2-5EA3-452A-B055-FC60E330AFBB}.Debug|Any CPU.Build.0 = Debug|x64
 		{DE10DFE2-5EA3-452A-B055-FC60E330AFBB}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{DE10DFE2-5EA3-452A-B055-FC60E330AFBB}.Debug|ARM64.Build.0 = Debug|ARM64
-		{DE10DFE2-5EA3-452A-B055-FC60E330AFBB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DE10DFE2-5EA3-452A-B055-FC60E330AFBB}.Debug|Win32.Build.0 = Debug|Win32
 		{DE10DFE2-5EA3-452A-B055-FC60E330AFBB}.Debug|x64.ActiveCfg = Debug|x64
 		{DE10DFE2-5EA3-452A-B055-FC60E330AFBB}.Debug|x64.Build.0 = Debug|x64
 		{DE10DFE2-5EA3-452A-B055-FC60E330AFBB}.Debug|x86.ActiveCfg = Debug|Win32
 		{DE10DFE2-5EA3-452A-B055-FC60E330AFBB}.Debug|x86.Build.0 = Debug|Win32
-		{DE10DFE2-5EA3-452A-B055-FC60E330AFBB}.Release|Any CPU.ActiveCfg = Release|x64
-		{DE10DFE2-5EA3-452A-B055-FC60E330AFBB}.Release|Any CPU.Build.0 = Release|x64
 		{DE10DFE2-5EA3-452A-B055-FC60E330AFBB}.Release|ARM64.ActiveCfg = Release|ARM64
 		{DE10DFE2-5EA3-452A-B055-FC60E330AFBB}.Release|ARM64.Build.0 = Release|ARM64
-		{DE10DFE2-5EA3-452A-B055-FC60E330AFBB}.Release|Win32.ActiveCfg = Release|Win32
-		{DE10DFE2-5EA3-452A-B055-FC60E330AFBB}.Release|Win32.Build.0 = Release|Win32
 		{DE10DFE2-5EA3-452A-B055-FC60E330AFBB}.Release|x64.ActiveCfg = Release|x64
 		{DE10DFE2-5EA3-452A-B055-FC60E330AFBB}.Release|x64.Build.0 = Release|x64
 		{DE10DFE2-5EA3-452A-B055-FC60E330AFBB}.Release|x86.ActiveCfg = Release|Win32
 		{DE10DFE2-5EA3-452A-B055-FC60E330AFBB}.Release|x86.Build.0 = Release|Win32
-		{A1EB01C3-AC8B-45A8-97C8-C459B77ED690}.Debug_test|Any CPU.ActiveCfg = Debug|x64
-		{A1EB01C3-AC8B-45A8-97C8-C459B77ED690}.Debug_test|Any CPU.Build.0 = Debug|x64
 		{A1EB01C3-AC8B-45A8-97C8-C459B77ED690}.Debug_test|ARM64.ActiveCfg = Debug|ARM64
 		{A1EB01C3-AC8B-45A8-97C8-C459B77ED690}.Debug_test|ARM64.Build.0 = Debug|ARM64
-		{A1EB01C3-AC8B-45A8-97C8-C459B77ED690}.Debug_test|Win32.ActiveCfg = Debug|Win32
-		{A1EB01C3-AC8B-45A8-97C8-C459B77ED690}.Debug_test|Win32.Build.0 = Debug|Win32
 		{A1EB01C3-AC8B-45A8-97C8-C459B77ED690}.Debug_test|x64.ActiveCfg = Debug|x64
 		{A1EB01C3-AC8B-45A8-97C8-C459B77ED690}.Debug_test|x64.Build.0 = Debug|x64
 		{A1EB01C3-AC8B-45A8-97C8-C459B77ED690}.Debug_test|x86.ActiveCfg = Debug|Win32
 		{A1EB01C3-AC8B-45A8-97C8-C459B77ED690}.Debug_test|x86.Build.0 = Debug|Win32
-		{A1EB01C3-AC8B-45A8-97C8-C459B77ED690}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{A1EB01C3-AC8B-45A8-97C8-C459B77ED690}.Debug|Any CPU.Build.0 = Debug|x64
 		{A1EB01C3-AC8B-45A8-97C8-C459B77ED690}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{A1EB01C3-AC8B-45A8-97C8-C459B77ED690}.Debug|ARM64.Build.0 = Debug|ARM64
-		{A1EB01C3-AC8B-45A8-97C8-C459B77ED690}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A1EB01C3-AC8B-45A8-97C8-C459B77ED690}.Debug|Win32.Build.0 = Debug|Win32
 		{A1EB01C3-AC8B-45A8-97C8-C459B77ED690}.Debug|x64.ActiveCfg = Debug|x64
 		{A1EB01C3-AC8B-45A8-97C8-C459B77ED690}.Debug|x64.Build.0 = Debug|x64
 		{A1EB01C3-AC8B-45A8-97C8-C459B77ED690}.Debug|x86.ActiveCfg = Debug|Win32
 		{A1EB01C3-AC8B-45A8-97C8-C459B77ED690}.Debug|x86.Build.0 = Debug|Win32
-		{A1EB01C3-AC8B-45A8-97C8-C459B77ED690}.Release|Any CPU.ActiveCfg = Release|x64
-		{A1EB01C3-AC8B-45A8-97C8-C459B77ED690}.Release|Any CPU.Build.0 = Release|x64
 		{A1EB01C3-AC8B-45A8-97C8-C459B77ED690}.Release|ARM64.ActiveCfg = Release|ARM64
 		{A1EB01C3-AC8B-45A8-97C8-C459B77ED690}.Release|ARM64.Build.0 = Release|ARM64
-		{A1EB01C3-AC8B-45A8-97C8-C459B77ED690}.Release|Win32.ActiveCfg = Release|Win32
-		{A1EB01C3-AC8B-45A8-97C8-C459B77ED690}.Release|Win32.Build.0 = Release|Win32
 		{A1EB01C3-AC8B-45A8-97C8-C459B77ED690}.Release|x64.ActiveCfg = Release|x64
 		{A1EB01C3-AC8B-45A8-97C8-C459B77ED690}.Release|x64.Build.0 = Release|x64
 		{A1EB01C3-AC8B-45A8-97C8-C459B77ED690}.Release|x86.ActiveCfg = Release|Win32
 		{A1EB01C3-AC8B-45A8-97C8-C459B77ED690}.Release|x86.Build.0 = Release|Win32
-		{F24B3ECB-BD87-4626-B17C-D8CC3E253F32}.Debug_test|Any CPU.ActiveCfg = Debug|x64
-		{F24B3ECB-BD87-4626-B17C-D8CC3E253F32}.Debug_test|Any CPU.Build.0 = Debug|x64
 		{F24B3ECB-BD87-4626-B17C-D8CC3E253F32}.Debug_test|ARM64.ActiveCfg = Debug|ARM64
 		{F24B3ECB-BD87-4626-B17C-D8CC3E253F32}.Debug_test|ARM64.Build.0 = Debug|ARM64
-		{F24B3ECB-BD87-4626-B17C-D8CC3E253F32}.Debug_test|Win32.ActiveCfg = Debug|Win32
-		{F24B3ECB-BD87-4626-B17C-D8CC3E253F32}.Debug_test|Win32.Build.0 = Debug|Win32
 		{F24B3ECB-BD87-4626-B17C-D8CC3E253F32}.Debug_test|x64.ActiveCfg = Debug|x64
 		{F24B3ECB-BD87-4626-B17C-D8CC3E253F32}.Debug_test|x64.Build.0 = Debug|x64
 		{F24B3ECB-BD87-4626-B17C-D8CC3E253F32}.Debug_test|x86.ActiveCfg = Debug|Win32
 		{F24B3ECB-BD87-4626-B17C-D8CC3E253F32}.Debug_test|x86.Build.0 = Debug|Win32
-		{F24B3ECB-BD87-4626-B17C-D8CC3E253F32}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{F24B3ECB-BD87-4626-B17C-D8CC3E253F32}.Debug|Any CPU.Build.0 = Debug|x64
 		{F24B3ECB-BD87-4626-B17C-D8CC3E253F32}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{F24B3ECB-BD87-4626-B17C-D8CC3E253F32}.Debug|ARM64.Build.0 = Debug|ARM64
-		{F24B3ECB-BD87-4626-B17C-D8CC3E253F32}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F24B3ECB-BD87-4626-B17C-D8CC3E253F32}.Debug|Win32.Build.0 = Debug|Win32
 		{F24B3ECB-BD87-4626-B17C-D8CC3E253F32}.Debug|x64.ActiveCfg = Debug|x64
 		{F24B3ECB-BD87-4626-B17C-D8CC3E253F32}.Debug|x64.Build.0 = Debug|x64
 		{F24B3ECB-BD87-4626-B17C-D8CC3E253F32}.Debug|x86.ActiveCfg = Debug|Win32
 		{F24B3ECB-BD87-4626-B17C-D8CC3E253F32}.Debug|x86.Build.0 = Debug|Win32
-		{F24B3ECB-BD87-4626-B17C-D8CC3E253F32}.Release|Any CPU.ActiveCfg = Release|x64
-		{F24B3ECB-BD87-4626-B17C-D8CC3E253F32}.Release|Any CPU.Build.0 = Release|x64
 		{F24B3ECB-BD87-4626-B17C-D8CC3E253F32}.Release|ARM64.ActiveCfg = Release|ARM64
 		{F24B3ECB-BD87-4626-B17C-D8CC3E253F32}.Release|ARM64.Build.0 = Release|ARM64
-		{F24B3ECB-BD87-4626-B17C-D8CC3E253F32}.Release|Win32.ActiveCfg = Release|Win32
-		{F24B3ECB-BD87-4626-B17C-D8CC3E253F32}.Release|Win32.Build.0 = Release|Win32
 		{F24B3ECB-BD87-4626-B17C-D8CC3E253F32}.Release|x64.ActiveCfg = Release|x64
 		{F24B3ECB-BD87-4626-B17C-D8CC3E253F32}.Release|x64.Build.0 = Release|x64
 		{F24B3ECB-BD87-4626-B17C-D8CC3E253F32}.Release|x86.ActiveCfg = Release|Win32
 		{F24B3ECB-BD87-4626-B17C-D8CC3E253F32}.Release|x86.Build.0 = Release|Win32
-		{F021A52A-6162-4E8D-B109-847EE5362DF9}.Debug_test|Any CPU.ActiveCfg = Debug|x64
-		{F021A52A-6162-4E8D-B109-847EE5362DF9}.Debug_test|Any CPU.Build.0 = Debug|x64
 		{F021A52A-6162-4E8D-B109-847EE5362DF9}.Debug_test|ARM64.ActiveCfg = Debug|ARM64
 		{F021A52A-6162-4E8D-B109-847EE5362DF9}.Debug_test|ARM64.Build.0 = Debug|ARM64
-		{F021A52A-6162-4E8D-B109-847EE5362DF9}.Debug_test|Win32.ActiveCfg = Debug|Win32
-		{F021A52A-6162-4E8D-B109-847EE5362DF9}.Debug_test|Win32.Build.0 = Debug|Win32
 		{F021A52A-6162-4E8D-B109-847EE5362DF9}.Debug_test|x64.ActiveCfg = Debug|x64
 		{F021A52A-6162-4E8D-B109-847EE5362DF9}.Debug_test|x64.Build.0 = Debug|x64
 		{F021A52A-6162-4E8D-B109-847EE5362DF9}.Debug_test|x86.ActiveCfg = Debug|Win32
 		{F021A52A-6162-4E8D-B109-847EE5362DF9}.Debug_test|x86.Build.0 = Debug|Win32
-		{F021A52A-6162-4E8D-B109-847EE5362DF9}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{F021A52A-6162-4E8D-B109-847EE5362DF9}.Debug|Any CPU.Build.0 = Debug|x64
 		{F021A52A-6162-4E8D-B109-847EE5362DF9}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{F021A52A-6162-4E8D-B109-847EE5362DF9}.Debug|ARM64.Build.0 = Debug|ARM64
-		{F021A52A-6162-4E8D-B109-847EE5362DF9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F021A52A-6162-4E8D-B109-847EE5362DF9}.Debug|Win32.Build.0 = Debug|Win32
 		{F021A52A-6162-4E8D-B109-847EE5362DF9}.Debug|x64.ActiveCfg = Debug|x64
 		{F021A52A-6162-4E8D-B109-847EE5362DF9}.Debug|x64.Build.0 = Debug|x64
 		{F021A52A-6162-4E8D-B109-847EE5362DF9}.Debug|x86.ActiveCfg = Debug|Win32
 		{F021A52A-6162-4E8D-B109-847EE5362DF9}.Debug|x86.Build.0 = Debug|Win32
-		{F021A52A-6162-4E8D-B109-847EE5362DF9}.Release|Any CPU.ActiveCfg = Release|x64
-		{F021A52A-6162-4E8D-B109-847EE5362DF9}.Release|Any CPU.Build.0 = Release|x64
 		{F021A52A-6162-4E8D-B109-847EE5362DF9}.Release|ARM64.ActiveCfg = Release|ARM64
 		{F021A52A-6162-4E8D-B109-847EE5362DF9}.Release|ARM64.Build.0 = Release|ARM64
-		{F021A52A-6162-4E8D-B109-847EE5362DF9}.Release|Win32.ActiveCfg = Release|Win32
-		{F021A52A-6162-4E8D-B109-847EE5362DF9}.Release|Win32.Build.0 = Release|Win32
 		{F021A52A-6162-4E8D-B109-847EE5362DF9}.Release|x64.ActiveCfg = Release|x64
 		{F021A52A-6162-4E8D-B109-847EE5362DF9}.Release|x64.Build.0 = Release|x64
 		{F021A52A-6162-4E8D-B109-847EE5362DF9}.Release|x86.ActiveCfg = Release|Win32
 		{F021A52A-6162-4E8D-B109-847EE5362DF9}.Release|x86.Build.0 = Release|Win32
-		{5876E568-B204-4219-8C08-9E8124EDAB9C}.Debug_test|Any CPU.ActiveCfg = Debug|x64
-		{5876E568-B204-4219-8C08-9E8124EDAB9C}.Debug_test|Any CPU.Build.0 = Debug|x64
 		{5876E568-B204-4219-8C08-9E8124EDAB9C}.Debug_test|ARM64.ActiveCfg = Debug|ARM64
 		{5876E568-B204-4219-8C08-9E8124EDAB9C}.Debug_test|ARM64.Build.0 = Debug|ARM64
-		{5876E568-B204-4219-8C08-9E8124EDAB9C}.Debug_test|Win32.ActiveCfg = Debug|Win32
-		{5876E568-B204-4219-8C08-9E8124EDAB9C}.Debug_test|Win32.Build.0 = Debug|Win32
 		{5876E568-B204-4219-8C08-9E8124EDAB9C}.Debug_test|x64.ActiveCfg = Debug|x64
 		{5876E568-B204-4219-8C08-9E8124EDAB9C}.Debug_test|x64.Build.0 = Debug|x64
 		{5876E568-B204-4219-8C08-9E8124EDAB9C}.Debug_test|x86.ActiveCfg = Debug|Win32
 		{5876E568-B204-4219-8C08-9E8124EDAB9C}.Debug_test|x86.Build.0 = Debug|Win32
-		{5876E568-B204-4219-8C08-9E8124EDAB9C}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{5876E568-B204-4219-8C08-9E8124EDAB9C}.Debug|Any CPU.Build.0 = Debug|x64
 		{5876E568-B204-4219-8C08-9E8124EDAB9C}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{5876E568-B204-4219-8C08-9E8124EDAB9C}.Debug|ARM64.Build.0 = Debug|ARM64
-		{5876E568-B204-4219-8C08-9E8124EDAB9C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5876E568-B204-4219-8C08-9E8124EDAB9C}.Debug|Win32.Build.0 = Debug|Win32
 		{5876E568-B204-4219-8C08-9E8124EDAB9C}.Debug|x64.ActiveCfg = Debug|x64
 		{5876E568-B204-4219-8C08-9E8124EDAB9C}.Debug|x64.Build.0 = Debug|x64
 		{5876E568-B204-4219-8C08-9E8124EDAB9C}.Debug|x86.ActiveCfg = Debug|Win32
 		{5876E568-B204-4219-8C08-9E8124EDAB9C}.Debug|x86.Build.0 = Debug|Win32
-		{5876E568-B204-4219-8C08-9E8124EDAB9C}.Release|Any CPU.ActiveCfg = Release|x64
-		{5876E568-B204-4219-8C08-9E8124EDAB9C}.Release|Any CPU.Build.0 = Release|x64
 		{5876E568-B204-4219-8C08-9E8124EDAB9C}.Release|ARM64.ActiveCfg = Release|ARM64
 		{5876E568-B204-4219-8C08-9E8124EDAB9C}.Release|ARM64.Build.0 = Release|ARM64
-		{5876E568-B204-4219-8C08-9E8124EDAB9C}.Release|Win32.ActiveCfg = Release|Win32
-		{5876E568-B204-4219-8C08-9E8124EDAB9C}.Release|Win32.Build.0 = Release|Win32
 		{5876E568-B204-4219-8C08-9E8124EDAB9C}.Release|x64.ActiveCfg = Release|x64
 		{5876E568-B204-4219-8C08-9E8124EDAB9C}.Release|x64.Build.0 = Release|x64
 		{5876E568-B204-4219-8C08-9E8124EDAB9C}.Release|x86.ActiveCfg = Release|Win32
 		{5876E568-B204-4219-8C08-9E8124EDAB9C}.Release|x86.Build.0 = Release|Win32
-		{84D22D7D-5FD0-4CCF-B8D2-C34506C6BA66}.Debug_test|Any CPU.ActiveCfg = Debug|x64
-		{84D22D7D-5FD0-4CCF-B8D2-C34506C6BA66}.Debug_test|Any CPU.Build.0 = Debug|x64
 		{84D22D7D-5FD0-4CCF-B8D2-C34506C6BA66}.Debug_test|ARM64.ActiveCfg = Debug|ARM64
 		{84D22D7D-5FD0-4CCF-B8D2-C34506C6BA66}.Debug_test|ARM64.Build.0 = Debug|ARM64
-		{84D22D7D-5FD0-4CCF-B8D2-C34506C6BA66}.Debug_test|Win32.ActiveCfg = Debug|Win32
-		{84D22D7D-5FD0-4CCF-B8D2-C34506C6BA66}.Debug_test|Win32.Build.0 = Debug|Win32
 		{84D22D7D-5FD0-4CCF-B8D2-C34506C6BA66}.Debug_test|x64.ActiveCfg = Debug|x64
 		{84D22D7D-5FD0-4CCF-B8D2-C34506C6BA66}.Debug_test|x64.Build.0 = Debug|x64
 		{84D22D7D-5FD0-4CCF-B8D2-C34506C6BA66}.Debug_test|x86.ActiveCfg = Debug|Win32
 		{84D22D7D-5FD0-4CCF-B8D2-C34506C6BA66}.Debug_test|x86.Build.0 = Debug|Win32
-		{84D22D7D-5FD0-4CCF-B8D2-C34506C6BA66}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{84D22D7D-5FD0-4CCF-B8D2-C34506C6BA66}.Debug|Any CPU.Build.0 = Debug|x64
 		{84D22D7D-5FD0-4CCF-B8D2-C34506C6BA66}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{84D22D7D-5FD0-4CCF-B8D2-C34506C6BA66}.Debug|ARM64.Build.0 = Debug|ARM64
-		{84D22D7D-5FD0-4CCF-B8D2-C34506C6BA66}.Debug|Win32.ActiveCfg = Debug|Win32
-		{84D22D7D-5FD0-4CCF-B8D2-C34506C6BA66}.Debug|Win32.Build.0 = Debug|Win32
 		{84D22D7D-5FD0-4CCF-B8D2-C34506C6BA66}.Debug|x64.ActiveCfg = Debug|x64
 		{84D22D7D-5FD0-4CCF-B8D2-C34506C6BA66}.Debug|x64.Build.0 = Debug|x64
 		{84D22D7D-5FD0-4CCF-B8D2-C34506C6BA66}.Debug|x86.ActiveCfg = Debug|Win32
 		{84D22D7D-5FD0-4CCF-B8D2-C34506C6BA66}.Debug|x86.Build.0 = Debug|Win32
-		{84D22D7D-5FD0-4CCF-B8D2-C34506C6BA66}.Release|Any CPU.ActiveCfg = Release|x64
-		{84D22D7D-5FD0-4CCF-B8D2-C34506C6BA66}.Release|Any CPU.Build.0 = Release|x64
 		{84D22D7D-5FD0-4CCF-B8D2-C34506C6BA66}.Release|ARM64.ActiveCfg = Release|ARM64
 		{84D22D7D-5FD0-4CCF-B8D2-C34506C6BA66}.Release|ARM64.Build.0 = Release|ARM64
-		{84D22D7D-5FD0-4CCF-B8D2-C34506C6BA66}.Release|Win32.ActiveCfg = Release|Win32
-		{84D22D7D-5FD0-4CCF-B8D2-C34506C6BA66}.Release|Win32.Build.0 = Release|Win32
 		{84D22D7D-5FD0-4CCF-B8D2-C34506C6BA66}.Release|x64.ActiveCfg = Release|x64
 		{84D22D7D-5FD0-4CCF-B8D2-C34506C6BA66}.Release|x64.Build.0 = Release|x64
 		{84D22D7D-5FD0-4CCF-B8D2-C34506C6BA66}.Release|x86.ActiveCfg = Release|Win32
 		{84D22D7D-5FD0-4CCF-B8D2-C34506C6BA66}.Release|x86.Build.0 = Release|Win32
-		{52B2ED64-1CFC-401B-8C5B-6D1E1DEADF98}.Debug_test|Any CPU.ActiveCfg = Debug|x64
-		{52B2ED64-1CFC-401B-8C5B-6D1E1DEADF98}.Debug_test|Any CPU.Build.0 = Debug|x64
 		{52B2ED64-1CFC-401B-8C5B-6D1E1DEADF98}.Debug_test|ARM64.ActiveCfg = Debug|ARM64
 		{52B2ED64-1CFC-401B-8C5B-6D1E1DEADF98}.Debug_test|ARM64.Build.0 = Debug|ARM64
-		{52B2ED64-1CFC-401B-8C5B-6D1E1DEADF98}.Debug_test|Win32.ActiveCfg = Debug|Win32
-		{52B2ED64-1CFC-401B-8C5B-6D1E1DEADF98}.Debug_test|Win32.Build.0 = Debug|Win32
 		{52B2ED64-1CFC-401B-8C5B-6D1E1DEADF98}.Debug_test|x64.ActiveCfg = Debug|x64
 		{52B2ED64-1CFC-401B-8C5B-6D1E1DEADF98}.Debug_test|x64.Build.0 = Debug|x64
 		{52B2ED64-1CFC-401B-8C5B-6D1E1DEADF98}.Debug_test|x86.ActiveCfg = Debug|Win32
 		{52B2ED64-1CFC-401B-8C5B-6D1E1DEADF98}.Debug_test|x86.Build.0 = Debug|Win32
-		{52B2ED64-1CFC-401B-8C5B-6D1E1DEADF98}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{52B2ED64-1CFC-401B-8C5B-6D1E1DEADF98}.Debug|Any CPU.Build.0 = Debug|x64
 		{52B2ED64-1CFC-401B-8C5B-6D1E1DEADF98}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{52B2ED64-1CFC-401B-8C5B-6D1E1DEADF98}.Debug|ARM64.Build.0 = Debug|ARM64
-		{52B2ED64-1CFC-401B-8C5B-6D1E1DEADF98}.Debug|Win32.ActiveCfg = Debug|Win32
-		{52B2ED64-1CFC-401B-8C5B-6D1E1DEADF98}.Debug|Win32.Build.0 = Debug|Win32
 		{52B2ED64-1CFC-401B-8C5B-6D1E1DEADF98}.Debug|x64.ActiveCfg = Debug|x64
 		{52B2ED64-1CFC-401B-8C5B-6D1E1DEADF98}.Debug|x64.Build.0 = Debug|x64
 		{52B2ED64-1CFC-401B-8C5B-6D1E1DEADF98}.Debug|x86.ActiveCfg = Debug|Win32
 		{52B2ED64-1CFC-401B-8C5B-6D1E1DEADF98}.Debug|x86.Build.0 = Debug|Win32
-		{52B2ED64-1CFC-401B-8C5B-6D1E1DEADF98}.Release|Any CPU.ActiveCfg = Release|x64
-		{52B2ED64-1CFC-401B-8C5B-6D1E1DEADF98}.Release|Any CPU.Build.0 = Release|x64
 		{52B2ED64-1CFC-401B-8C5B-6D1E1DEADF98}.Release|ARM64.ActiveCfg = Release|ARM64
 		{52B2ED64-1CFC-401B-8C5B-6D1E1DEADF98}.Release|ARM64.Build.0 = Release|ARM64
-		{52B2ED64-1CFC-401B-8C5B-6D1E1DEADF98}.Release|Win32.ActiveCfg = Release|Win32
-		{52B2ED64-1CFC-401B-8C5B-6D1E1DEADF98}.Release|Win32.Build.0 = Release|Win32
 		{52B2ED64-1CFC-401B-8C5B-6D1E1DEADF98}.Release|x64.ActiveCfg = Release|x64
 		{52B2ED64-1CFC-401B-8C5B-6D1E1DEADF98}.Release|x64.Build.0 = Release|x64
 		{52B2ED64-1CFC-401B-8C5B-6D1E1DEADF98}.Release|x86.ActiveCfg = Release|Win32
 		{52B2ED64-1CFC-401B-8C5B-6D1E1DEADF98}.Release|x86.Build.0 = Release|Win32
-		{D638A8EF-3A48-45F2-913C-88B29FED03CB}.Debug_test|Any CPU.ActiveCfg = Debug|x64
-		{D638A8EF-3A48-45F2-913C-88B29FED03CB}.Debug_test|Any CPU.Build.0 = Debug|x64
 		{D638A8EF-3A48-45F2-913C-88B29FED03CB}.Debug_test|ARM64.ActiveCfg = Debug|ARM64
 		{D638A8EF-3A48-45F2-913C-88B29FED03CB}.Debug_test|ARM64.Build.0 = Debug|ARM64
-		{D638A8EF-3A48-45F2-913C-88B29FED03CB}.Debug_test|Win32.ActiveCfg = Debug|Win32
-		{D638A8EF-3A48-45F2-913C-88B29FED03CB}.Debug_test|Win32.Build.0 = Debug|Win32
 		{D638A8EF-3A48-45F2-913C-88B29FED03CB}.Debug_test|x64.ActiveCfg = Debug|x64
 		{D638A8EF-3A48-45F2-913C-88B29FED03CB}.Debug_test|x64.Build.0 = Debug|x64
 		{D638A8EF-3A48-45F2-913C-88B29FED03CB}.Debug_test|x86.ActiveCfg = Debug|Win32
 		{D638A8EF-3A48-45F2-913C-88B29FED03CB}.Debug_test|x86.Build.0 = Debug|Win32
-		{D638A8EF-3A48-45F2-913C-88B29FED03CB}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{D638A8EF-3A48-45F2-913C-88B29FED03CB}.Debug|Any CPU.Build.0 = Debug|x64
 		{D638A8EF-3A48-45F2-913C-88B29FED03CB}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{D638A8EF-3A48-45F2-913C-88B29FED03CB}.Debug|ARM64.Build.0 = Debug|ARM64
-		{D638A8EF-3A48-45F2-913C-88B29FED03CB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D638A8EF-3A48-45F2-913C-88B29FED03CB}.Debug|Win32.Build.0 = Debug|Win32
 		{D638A8EF-3A48-45F2-913C-88B29FED03CB}.Debug|x64.ActiveCfg = Debug|x64
 		{D638A8EF-3A48-45F2-913C-88B29FED03CB}.Debug|x64.Build.0 = Debug|x64
 		{D638A8EF-3A48-45F2-913C-88B29FED03CB}.Debug|x86.ActiveCfg = Debug|Win32
 		{D638A8EF-3A48-45F2-913C-88B29FED03CB}.Debug|x86.Build.0 = Debug|Win32
-		{D638A8EF-3A48-45F2-913C-88B29FED03CB}.Release|Any CPU.ActiveCfg = Release|x64
-		{D638A8EF-3A48-45F2-913C-88B29FED03CB}.Release|Any CPU.Build.0 = Release|x64
 		{D638A8EF-3A48-45F2-913C-88B29FED03CB}.Release|ARM64.ActiveCfg = Release|ARM64
 		{D638A8EF-3A48-45F2-913C-88B29FED03CB}.Release|ARM64.Build.0 = Release|ARM64
-		{D638A8EF-3A48-45F2-913C-88B29FED03CB}.Release|Win32.ActiveCfg = Release|Win32
-		{D638A8EF-3A48-45F2-913C-88B29FED03CB}.Release|Win32.Build.0 = Release|Win32
 		{D638A8EF-3A48-45F2-913C-88B29FED03CB}.Release|x64.ActiveCfg = Release|x64
 		{D638A8EF-3A48-45F2-913C-88B29FED03CB}.Release|x64.Build.0 = Release|x64
 		{D638A8EF-3A48-45F2-913C-88B29FED03CB}.Release|x86.ActiveCfg = Release|Win32
 		{D638A8EF-3A48-45F2-913C-88B29FED03CB}.Release|x86.Build.0 = Release|Win32
-		{1CEEC8E3-419A-4304-841C-08A334B9E4FF}.Debug_test|Any CPU.ActiveCfg = Debug_test|Any CPU
-		{1CEEC8E3-419A-4304-841C-08A334B9E4FF}.Debug_test|Any CPU.Build.0 = Debug_test|Any CPU
 		{1CEEC8E3-419A-4304-841C-08A334B9E4FF}.Debug_test|ARM64.ActiveCfg = Debug_test|ARM64
 		{1CEEC8E3-419A-4304-841C-08A334B9E4FF}.Debug_test|ARM64.Build.0 = Debug_test|ARM64
-		{1CEEC8E3-419A-4304-841C-08A334B9E4FF}.Debug_test|Win32.ActiveCfg = Debug_test|Win32
-		{1CEEC8E3-419A-4304-841C-08A334B9E4FF}.Debug_test|Win32.Build.0 = Debug_test|Win32
 		{1CEEC8E3-419A-4304-841C-08A334B9E4FF}.Debug_test|x64.ActiveCfg = Debug_test|x64
 		{1CEEC8E3-419A-4304-841C-08A334B9E4FF}.Debug_test|x64.Build.0 = Debug_test|x64
 		{1CEEC8E3-419A-4304-841C-08A334B9E4FF}.Debug_test|x86.ActiveCfg = Debug_test|x86
 		{1CEEC8E3-419A-4304-841C-08A334B9E4FF}.Debug_test|x86.Build.0 = Debug_test|x86
-		{1CEEC8E3-419A-4304-841C-08A334B9E4FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1CEEC8E3-419A-4304-841C-08A334B9E4FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1CEEC8E3-419A-4304-841C-08A334B9E4FF}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{1CEEC8E3-419A-4304-841C-08A334B9E4FF}.Debug|ARM64.Build.0 = Debug|ARM64
-		{1CEEC8E3-419A-4304-841C-08A334B9E4FF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1CEEC8E3-419A-4304-841C-08A334B9E4FF}.Debug|Win32.Build.0 = Debug|Win32
 		{1CEEC8E3-419A-4304-841C-08A334B9E4FF}.Debug|x64.ActiveCfg = Debug|x64
 		{1CEEC8E3-419A-4304-841C-08A334B9E4FF}.Debug|x64.Build.0 = Debug|x64
 		{1CEEC8E3-419A-4304-841C-08A334B9E4FF}.Debug|x86.ActiveCfg = Debug|x86
 		{1CEEC8E3-419A-4304-841C-08A334B9E4FF}.Debug|x86.Build.0 = Debug|x86
-		{1CEEC8E3-419A-4304-841C-08A334B9E4FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1CEEC8E3-419A-4304-841C-08A334B9E4FF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1CEEC8E3-419A-4304-841C-08A334B9E4FF}.Release|ARM64.ActiveCfg = Release|ARM64
 		{1CEEC8E3-419A-4304-841C-08A334B9E4FF}.Release|ARM64.Build.0 = Release|ARM64
-		{1CEEC8E3-419A-4304-841C-08A334B9E4FF}.Release|Win32.ActiveCfg = Release|Win32
-		{1CEEC8E3-419A-4304-841C-08A334B9E4FF}.Release|Win32.Build.0 = Release|Win32
 		{1CEEC8E3-419A-4304-841C-08A334B9E4FF}.Release|x64.ActiveCfg = Release|x64
 		{1CEEC8E3-419A-4304-841C-08A334B9E4FF}.Release|x64.Build.0 = Release|x64
 		{1CEEC8E3-419A-4304-841C-08A334B9E4FF}.Release|x86.ActiveCfg = Release|x86
 		{1CEEC8E3-419A-4304-841C-08A334B9E4FF}.Release|x86.Build.0 = Release|x86
-		{4A1CB0BC-5A0F-488D-AD8F-FA3642D18DB8}.Debug_test|Any CPU.ActiveCfg = Debug|x64
-		{4A1CB0BC-5A0F-488D-AD8F-FA3642D18DB8}.Debug_test|Any CPU.Build.0 = Debug|x64
 		{4A1CB0BC-5A0F-488D-AD8F-FA3642D18DB8}.Debug_test|ARM64.ActiveCfg = Debug|ARM64
 		{4A1CB0BC-5A0F-488D-AD8F-FA3642D18DB8}.Debug_test|ARM64.Build.0 = Debug|ARM64
-		{4A1CB0BC-5A0F-488D-AD8F-FA3642D18DB8}.Debug_test|Win32.ActiveCfg = Debug|Win32
-		{4A1CB0BC-5A0F-488D-AD8F-FA3642D18DB8}.Debug_test|Win32.Build.0 = Debug|Win32
 		{4A1CB0BC-5A0F-488D-AD8F-FA3642D18DB8}.Debug_test|x64.ActiveCfg = Debug|x64
 		{4A1CB0BC-5A0F-488D-AD8F-FA3642D18DB8}.Debug_test|x64.Build.0 = Debug|x64
 		{4A1CB0BC-5A0F-488D-AD8F-FA3642D18DB8}.Debug_test|x86.ActiveCfg = Debug|Win32
 		{4A1CB0BC-5A0F-488D-AD8F-FA3642D18DB8}.Debug_test|x86.Build.0 = Debug|Win32
-		{4A1CB0BC-5A0F-488D-AD8F-FA3642D18DB8}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{4A1CB0BC-5A0F-488D-AD8F-FA3642D18DB8}.Debug|Any CPU.Build.0 = Debug|x64
 		{4A1CB0BC-5A0F-488D-AD8F-FA3642D18DB8}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{4A1CB0BC-5A0F-488D-AD8F-FA3642D18DB8}.Debug|ARM64.Build.0 = Debug|ARM64
-		{4A1CB0BC-5A0F-488D-AD8F-FA3642D18DB8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4A1CB0BC-5A0F-488D-AD8F-FA3642D18DB8}.Debug|Win32.Build.0 = Debug|Win32
 		{4A1CB0BC-5A0F-488D-AD8F-FA3642D18DB8}.Debug|x64.ActiveCfg = Debug|x64
 		{4A1CB0BC-5A0F-488D-AD8F-FA3642D18DB8}.Debug|x64.Build.0 = Debug|x64
 		{4A1CB0BC-5A0F-488D-AD8F-FA3642D18DB8}.Debug|x86.ActiveCfg = Debug|Win32
 		{4A1CB0BC-5A0F-488D-AD8F-FA3642D18DB8}.Debug|x86.Build.0 = Debug|Win32
-		{4A1CB0BC-5A0F-488D-AD8F-FA3642D18DB8}.Release|Any CPU.ActiveCfg = Release|x64
-		{4A1CB0BC-5A0F-488D-AD8F-FA3642D18DB8}.Release|Any CPU.Build.0 = Release|x64
 		{4A1CB0BC-5A0F-488D-AD8F-FA3642D18DB8}.Release|ARM64.ActiveCfg = Release|ARM64
 		{4A1CB0BC-5A0F-488D-AD8F-FA3642D18DB8}.Release|ARM64.Build.0 = Release|ARM64
-		{4A1CB0BC-5A0F-488D-AD8F-FA3642D18DB8}.Release|Win32.ActiveCfg = Release|Win32
-		{4A1CB0BC-5A0F-488D-AD8F-FA3642D18DB8}.Release|Win32.Build.0 = Release|Win32
 		{4A1CB0BC-5A0F-488D-AD8F-FA3642D18DB8}.Release|x64.ActiveCfg = Release|x64
 		{4A1CB0BC-5A0F-488D-AD8F-FA3642D18DB8}.Release|x64.Build.0 = Release|x64
 		{4A1CB0BC-5A0F-488D-AD8F-FA3642D18DB8}.Release|x86.ActiveCfg = Release|Win32
 		{4A1CB0BC-5A0F-488D-AD8F-FA3642D18DB8}.Release|x86.Build.0 = Release|Win32
-		{25CF9F3C-2B8C-438B-92AD-0FE7CC47C30E}.Debug_test|Any CPU.ActiveCfg = Debug|x64
-		{25CF9F3C-2B8C-438B-92AD-0FE7CC47C30E}.Debug_test|Any CPU.Build.0 = Debug|x64
 		{25CF9F3C-2B8C-438B-92AD-0FE7CC47C30E}.Debug_test|ARM64.ActiveCfg = Debug|ARM64
 		{25CF9F3C-2B8C-438B-92AD-0FE7CC47C30E}.Debug_test|ARM64.Build.0 = Debug|ARM64
-		{25CF9F3C-2B8C-438B-92AD-0FE7CC47C30E}.Debug_test|Win32.ActiveCfg = Debug|Win32
-		{25CF9F3C-2B8C-438B-92AD-0FE7CC47C30E}.Debug_test|Win32.Build.0 = Debug|Win32
 		{25CF9F3C-2B8C-438B-92AD-0FE7CC47C30E}.Debug_test|x64.ActiveCfg = Debug|x64
 		{25CF9F3C-2B8C-438B-92AD-0FE7CC47C30E}.Debug_test|x64.Build.0 = Debug|x64
 		{25CF9F3C-2B8C-438B-92AD-0FE7CC47C30E}.Debug_test|x86.ActiveCfg = Debug|Win32
 		{25CF9F3C-2B8C-438B-92AD-0FE7CC47C30E}.Debug_test|x86.Build.0 = Debug|Win32
-		{25CF9F3C-2B8C-438B-92AD-0FE7CC47C30E}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{25CF9F3C-2B8C-438B-92AD-0FE7CC47C30E}.Debug|Any CPU.Build.0 = Debug|x64
 		{25CF9F3C-2B8C-438B-92AD-0FE7CC47C30E}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{25CF9F3C-2B8C-438B-92AD-0FE7CC47C30E}.Debug|ARM64.Build.0 = Debug|ARM64
-		{25CF9F3C-2B8C-438B-92AD-0FE7CC47C30E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{25CF9F3C-2B8C-438B-92AD-0FE7CC47C30E}.Debug|Win32.Build.0 = Debug|Win32
 		{25CF9F3C-2B8C-438B-92AD-0FE7CC47C30E}.Debug|x64.ActiveCfg = Debug|x64
 		{25CF9F3C-2B8C-438B-92AD-0FE7CC47C30E}.Debug|x64.Build.0 = Debug|x64
 		{25CF9F3C-2B8C-438B-92AD-0FE7CC47C30E}.Debug|x86.ActiveCfg = Debug|Win32
 		{25CF9F3C-2B8C-438B-92AD-0FE7CC47C30E}.Debug|x86.Build.0 = Debug|Win32
-		{25CF9F3C-2B8C-438B-92AD-0FE7CC47C30E}.Release|Any CPU.ActiveCfg = Release|x64
-		{25CF9F3C-2B8C-438B-92AD-0FE7CC47C30E}.Release|Any CPU.Build.0 = Release|x64
 		{25CF9F3C-2B8C-438B-92AD-0FE7CC47C30E}.Release|ARM64.ActiveCfg = Release|ARM64
 		{25CF9F3C-2B8C-438B-92AD-0FE7CC47C30E}.Release|ARM64.Build.0 = Release|ARM64
-		{25CF9F3C-2B8C-438B-92AD-0FE7CC47C30E}.Release|Win32.ActiveCfg = Release|Win32
-		{25CF9F3C-2B8C-438B-92AD-0FE7CC47C30E}.Release|Win32.Build.0 = Release|Win32
 		{25CF9F3C-2B8C-438B-92AD-0FE7CC47C30E}.Release|x64.ActiveCfg = Release|x64
 		{25CF9F3C-2B8C-438B-92AD-0FE7CC47C30E}.Release|x64.Build.0 = Release|x64
 		{25CF9F3C-2B8C-438B-92AD-0FE7CC47C30E}.Release|x86.ActiveCfg = Release|Win32
 		{25CF9F3C-2B8C-438B-92AD-0FE7CC47C30E}.Release|x86.Build.0 = Release|Win32
-		{1D6EDD7D-D380-444D-B233-3C718ABB382D}.Debug_test|Any CPU.ActiveCfg = Debug|x64
-		{1D6EDD7D-D380-444D-B233-3C718ABB382D}.Debug_test|Any CPU.Build.0 = Debug|x64
 		{1D6EDD7D-D380-444D-B233-3C718ABB382D}.Debug_test|ARM64.ActiveCfg = Debug|ARM64
 		{1D6EDD7D-D380-444D-B233-3C718ABB382D}.Debug_test|ARM64.Build.0 = Debug|ARM64
-		{1D6EDD7D-D380-444D-B233-3C718ABB382D}.Debug_test|Win32.ActiveCfg = Debug|x86
-		{1D6EDD7D-D380-444D-B233-3C718ABB382D}.Debug_test|Win32.Build.0 = Debug|x86
 		{1D6EDD7D-D380-444D-B233-3C718ABB382D}.Debug_test|x64.ActiveCfg = Debug|x64
 		{1D6EDD7D-D380-444D-B233-3C718ABB382D}.Debug_test|x64.Build.0 = Debug|x64
 		{1D6EDD7D-D380-444D-B233-3C718ABB382D}.Debug_test|x86.ActiveCfg = Debug|x86
 		{1D6EDD7D-D380-444D-B233-3C718ABB382D}.Debug_test|x86.Build.0 = Debug|x86
-		{1D6EDD7D-D380-444D-B233-3C718ABB382D}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{1D6EDD7D-D380-444D-B233-3C718ABB382D}.Debug|Any CPU.Build.0 = Debug|x64
 		{1D6EDD7D-D380-444D-B233-3C718ABB382D}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{1D6EDD7D-D380-444D-B233-3C718ABB382D}.Debug|ARM64.Build.0 = Debug|ARM64
-		{1D6EDD7D-D380-444D-B233-3C718ABB382D}.Debug|Win32.ActiveCfg = Debug|x86
-		{1D6EDD7D-D380-444D-B233-3C718ABB382D}.Debug|Win32.Build.0 = Debug|x86
 		{1D6EDD7D-D380-444D-B233-3C718ABB382D}.Debug|x64.ActiveCfg = Debug|x64
 		{1D6EDD7D-D380-444D-B233-3C718ABB382D}.Debug|x64.Build.0 = Debug|x64
 		{1D6EDD7D-D380-444D-B233-3C718ABB382D}.Debug|x86.ActiveCfg = Debug|x86
 		{1D6EDD7D-D380-444D-B233-3C718ABB382D}.Debug|x86.Build.0 = Debug|x86
-		{1D6EDD7D-D380-444D-B233-3C718ABB382D}.Release|Any CPU.ActiveCfg = Release|x64
-		{1D6EDD7D-D380-444D-B233-3C718ABB382D}.Release|Any CPU.Build.0 = Release|x64
 		{1D6EDD7D-D380-444D-B233-3C718ABB382D}.Release|ARM64.ActiveCfg = Release|ARM64
 		{1D6EDD7D-D380-444D-B233-3C718ABB382D}.Release|ARM64.Build.0 = Release|ARM64
-		{1D6EDD7D-D380-444D-B233-3C718ABB382D}.Release|Win32.ActiveCfg = Release|x86
-		{1D6EDD7D-D380-444D-B233-3C718ABB382D}.Release|Win32.Build.0 = Release|x86
 		{1D6EDD7D-D380-444D-B233-3C718ABB382D}.Release|x64.ActiveCfg = Release|x64
 		{1D6EDD7D-D380-444D-B233-3C718ABB382D}.Release|x64.Build.0 = Release|x64
 		{1D6EDD7D-D380-444D-B233-3C718ABB382D}.Release|x86.ActiveCfg = Release|x86
 		{1D6EDD7D-D380-444D-B233-3C718ABB382D}.Release|x86.Build.0 = Release|x86
-		{4D8C5D1B-F982-44A1-B744-DD0E51651BF2}.Debug_test|Any CPU.ActiveCfg = Debug|x64
-		{4D8C5D1B-F982-44A1-B744-DD0E51651BF2}.Debug_test|Any CPU.Build.0 = Debug|x64
 		{4D8C5D1B-F982-44A1-B744-DD0E51651BF2}.Debug_test|ARM64.ActiveCfg = Debug|ARM64
 		{4D8C5D1B-F982-44A1-B744-DD0E51651BF2}.Debug_test|ARM64.Build.0 = Debug|ARM64
-		{4D8C5D1B-F982-44A1-B744-DD0E51651BF2}.Debug_test|Win32.ActiveCfg = Debug|x86
-		{4D8C5D1B-F982-44A1-B744-DD0E51651BF2}.Debug_test|Win32.Build.0 = Debug|x86
 		{4D8C5D1B-F982-44A1-B744-DD0E51651BF2}.Debug_test|x64.ActiveCfg = Debug|x64
 		{4D8C5D1B-F982-44A1-B744-DD0E51651BF2}.Debug_test|x64.Build.0 = Debug|x64
 		{4D8C5D1B-F982-44A1-B744-DD0E51651BF2}.Debug_test|x86.ActiveCfg = Debug|x86
 		{4D8C5D1B-F982-44A1-B744-DD0E51651BF2}.Debug_test|x86.Build.0 = Debug|x86
-		{4D8C5D1B-F982-44A1-B744-DD0E51651BF2}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{4D8C5D1B-F982-44A1-B744-DD0E51651BF2}.Debug|Any CPU.Build.0 = Debug|x64
 		{4D8C5D1B-F982-44A1-B744-DD0E51651BF2}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{4D8C5D1B-F982-44A1-B744-DD0E51651BF2}.Debug|ARM64.Build.0 = Debug|ARM64
-		{4D8C5D1B-F982-44A1-B744-DD0E51651BF2}.Debug|Win32.ActiveCfg = Debug|x86
-		{4D8C5D1B-F982-44A1-B744-DD0E51651BF2}.Debug|Win32.Build.0 = Debug|x86
 		{4D8C5D1B-F982-44A1-B744-DD0E51651BF2}.Debug|x64.ActiveCfg = Debug|x64
 		{4D8C5D1B-F982-44A1-B744-DD0E51651BF2}.Debug|x64.Build.0 = Debug|x64
 		{4D8C5D1B-F982-44A1-B744-DD0E51651BF2}.Debug|x86.ActiveCfg = Debug|x86
 		{4D8C5D1B-F982-44A1-B744-DD0E51651BF2}.Debug|x86.Build.0 = Debug|x86
-		{4D8C5D1B-F982-44A1-B744-DD0E51651BF2}.Release|Any CPU.ActiveCfg = Release|x64
-		{4D8C5D1B-F982-44A1-B744-DD0E51651BF2}.Release|Any CPU.Build.0 = Release|x64
 		{4D8C5D1B-F982-44A1-B744-DD0E51651BF2}.Release|ARM64.ActiveCfg = Release|ARM64
 		{4D8C5D1B-F982-44A1-B744-DD0E51651BF2}.Release|ARM64.Build.0 = Release|ARM64
-		{4D8C5D1B-F982-44A1-B744-DD0E51651BF2}.Release|Win32.ActiveCfg = Release|x86
-		{4D8C5D1B-F982-44A1-B744-DD0E51651BF2}.Release|Win32.Build.0 = Release|x86
 		{4D8C5D1B-F982-44A1-B744-DD0E51651BF2}.Release|x64.ActiveCfg = Release|x64
 		{4D8C5D1B-F982-44A1-B744-DD0E51651BF2}.Release|x64.Build.0 = Release|x64
 		{4D8C5D1B-F982-44A1-B744-DD0E51651BF2}.Release|x86.ActiveCfg = Release|x86
 		{4D8C5D1B-F982-44A1-B744-DD0E51651BF2}.Release|x86.Build.0 = Release|x86
-		{4E6F8103-9E20-40DD-8FE0-1E73964BB800}.Debug_test|Any CPU.ActiveCfg = Debug|x64
-		{4E6F8103-9E20-40DD-8FE0-1E73964BB800}.Debug_test|Any CPU.Build.0 = Debug|x64
 		{4E6F8103-9E20-40DD-8FE0-1E73964BB800}.Debug_test|ARM64.ActiveCfg = Debug|ARM64
 		{4E6F8103-9E20-40DD-8FE0-1E73964BB800}.Debug_test|ARM64.Build.0 = Debug|ARM64
-		{4E6F8103-9E20-40DD-8FE0-1E73964BB800}.Debug_test|Win32.ActiveCfg = Debug|x86
-		{4E6F8103-9E20-40DD-8FE0-1E73964BB800}.Debug_test|Win32.Build.0 = Debug|x86
 		{4E6F8103-9E20-40DD-8FE0-1E73964BB800}.Debug_test|x64.ActiveCfg = Debug|x64
 		{4E6F8103-9E20-40DD-8FE0-1E73964BB800}.Debug_test|x64.Build.0 = Debug|x64
 		{4E6F8103-9E20-40DD-8FE0-1E73964BB800}.Debug_test|x86.ActiveCfg = Debug|x86
 		{4E6F8103-9E20-40DD-8FE0-1E73964BB800}.Debug_test|x86.Build.0 = Debug|x86
-		{4E6F8103-9E20-40DD-8FE0-1E73964BB800}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{4E6F8103-9E20-40DD-8FE0-1E73964BB800}.Debug|Any CPU.Build.0 = Debug|x64
 		{4E6F8103-9E20-40DD-8FE0-1E73964BB800}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{4E6F8103-9E20-40DD-8FE0-1E73964BB800}.Debug|ARM64.Build.0 = Debug|ARM64
-		{4E6F8103-9E20-40DD-8FE0-1E73964BB800}.Debug|Win32.ActiveCfg = Debug|x86
-		{4E6F8103-9E20-40DD-8FE0-1E73964BB800}.Debug|Win32.Build.0 = Debug|x86
 		{4E6F8103-9E20-40DD-8FE0-1E73964BB800}.Debug|x64.ActiveCfg = Debug|x64
 		{4E6F8103-9E20-40DD-8FE0-1E73964BB800}.Debug|x64.Build.0 = Debug|x64
 		{4E6F8103-9E20-40DD-8FE0-1E73964BB800}.Debug|x86.ActiveCfg = Debug|x86
 		{4E6F8103-9E20-40DD-8FE0-1E73964BB800}.Debug|x86.Build.0 = Debug|x86
-		{4E6F8103-9E20-40DD-8FE0-1E73964BB800}.Release|Any CPU.ActiveCfg = Release|x64
-		{4E6F8103-9E20-40DD-8FE0-1E73964BB800}.Release|Any CPU.Build.0 = Release|x64
 		{4E6F8103-9E20-40DD-8FE0-1E73964BB800}.Release|ARM64.ActiveCfg = Release|ARM64
 		{4E6F8103-9E20-40DD-8FE0-1E73964BB800}.Release|ARM64.Build.0 = Release|ARM64
-		{4E6F8103-9E20-40DD-8FE0-1E73964BB800}.Release|Win32.ActiveCfg = Release|x86
-		{4E6F8103-9E20-40DD-8FE0-1E73964BB800}.Release|Win32.Build.0 = Release|x86
 		{4E6F8103-9E20-40DD-8FE0-1E73964BB800}.Release|x64.ActiveCfg = Release|x64
 		{4E6F8103-9E20-40DD-8FE0-1E73964BB800}.Release|x64.Build.0 = Release|x64
 		{4E6F8103-9E20-40DD-8FE0-1E73964BB800}.Release|x86.ActiveCfg = Release|x86
 		{4E6F8103-9E20-40DD-8FE0-1E73964BB800}.Release|x86.Build.0 = Release|x86
-		{52DDC946-7073-4130-8454-80E84AD3CF5A}.Debug_test|Any CPU.ActiveCfg = Debug|x64
-		{52DDC946-7073-4130-8454-80E84AD3CF5A}.Debug_test|Any CPU.Build.0 = Debug|x64
 		{52DDC946-7073-4130-8454-80E84AD3CF5A}.Debug_test|ARM64.ActiveCfg = Debug|ARM64
 		{52DDC946-7073-4130-8454-80E84AD3CF5A}.Debug_test|ARM64.Build.0 = Debug|ARM64
-		{52DDC946-7073-4130-8454-80E84AD3CF5A}.Debug_test|Win32.ActiveCfg = Debug|x86
-		{52DDC946-7073-4130-8454-80E84AD3CF5A}.Debug_test|Win32.Build.0 = Debug|x86
 		{52DDC946-7073-4130-8454-80E84AD3CF5A}.Debug_test|x64.ActiveCfg = Debug|x64
 		{52DDC946-7073-4130-8454-80E84AD3CF5A}.Debug_test|x64.Build.0 = Debug|x64
 		{52DDC946-7073-4130-8454-80E84AD3CF5A}.Debug_test|x86.ActiveCfg = Debug|x86
 		{52DDC946-7073-4130-8454-80E84AD3CF5A}.Debug_test|x86.Build.0 = Debug|x86
-		{52DDC946-7073-4130-8454-80E84AD3CF5A}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{52DDC946-7073-4130-8454-80E84AD3CF5A}.Debug|Any CPU.Build.0 = Debug|x64
 		{52DDC946-7073-4130-8454-80E84AD3CF5A}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{52DDC946-7073-4130-8454-80E84AD3CF5A}.Debug|ARM64.Build.0 = Debug|ARM64
-		{52DDC946-7073-4130-8454-80E84AD3CF5A}.Debug|Win32.ActiveCfg = Debug|x86
-		{52DDC946-7073-4130-8454-80E84AD3CF5A}.Debug|Win32.Build.0 = Debug|x86
 		{52DDC946-7073-4130-8454-80E84AD3CF5A}.Debug|x64.ActiveCfg = Debug|x64
 		{52DDC946-7073-4130-8454-80E84AD3CF5A}.Debug|x64.Build.0 = Debug|x64
 		{52DDC946-7073-4130-8454-80E84AD3CF5A}.Debug|x86.ActiveCfg = Debug|x86
 		{52DDC946-7073-4130-8454-80E84AD3CF5A}.Debug|x86.Build.0 = Debug|x86
-		{52DDC946-7073-4130-8454-80E84AD3CF5A}.Release|Any CPU.ActiveCfg = Release|x64
-		{52DDC946-7073-4130-8454-80E84AD3CF5A}.Release|Any CPU.Build.0 = Release|x64
 		{52DDC946-7073-4130-8454-80E84AD3CF5A}.Release|ARM64.ActiveCfg = Release|ARM64
 		{52DDC946-7073-4130-8454-80E84AD3CF5A}.Release|ARM64.Build.0 = Release|ARM64
-		{52DDC946-7073-4130-8454-80E84AD3CF5A}.Release|Win32.ActiveCfg = Release|x86
-		{52DDC946-7073-4130-8454-80E84AD3CF5A}.Release|Win32.Build.0 = Release|x86
 		{52DDC946-7073-4130-8454-80E84AD3CF5A}.Release|x64.ActiveCfg = Release|x64
 		{52DDC946-7073-4130-8454-80E84AD3CF5A}.Release|x64.Build.0 = Release|x64
 		{52DDC946-7073-4130-8454-80E84AD3CF5A}.Release|x86.ActiveCfg = Release|x86
 		{52DDC946-7073-4130-8454-80E84AD3CF5A}.Release|x86.Build.0 = Release|x86
-		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|Any CPU.ActiveCfg = Debug_test|Any CPU
-		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|Any CPU.Build.0 = Debug_test|Any CPU
 		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|ARM64.ActiveCfg = Debug_test|ARM64
-		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|Win32.ActiveCfg = Debug_test|Win32
-		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|Win32.Build.0 = Debug_test|Win32
-		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|Win32.Deploy.0 = Debug_test|Win32
 		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|x64.ActiveCfg = Debug_test|x64
 		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|x64.Build.0 = Debug_test|x64
 		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|x64.Deploy.0 = Debug_test|x64
 		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|x86.ActiveCfg = Debug_test|x86
 		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|x86.Build.0 = Debug_test|x86
 		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug_test|x86.Deploy.0 = Debug_test|x86
-		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|Win32.Build.0 = Debug|Win32
-		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|Win32.Deploy.0 = Debug|Win32
 		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|x64.ActiveCfg = Debug|x64
 		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|x64.Build.0 = Debug|x64
 		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|x64.Deploy.0 = Debug|x64
 		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|x86.ActiveCfg = Debug|x86
 		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|x86.Build.0 = Debug|x86
 		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Debug|x86.Deploy.0 = Debug|x86
-		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|ARM64.ActiveCfg = Release|ARM64
-		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|Win32.ActiveCfg = Release|Win32
-		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|Win32.Build.0 = Release|Win32
-		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|Win32.Deploy.0 = Release|Win32
 		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|x64.ActiveCfg = Release|x64
 		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|x64.Build.0 = Release|x64
 		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|x64.Deploy.0 = Release|x64
 		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|x86.ActiveCfg = Release|x86
 		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|x86.Build.0 = Release|x86
 		{FCC396F5-26DD-4CA3-981E-C7BC9FEA4546}.Release|x86.Deploy.0 = Release|x86
-		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96}.Debug_test|Any CPU.ActiveCfg = Debug|Any CPU
-		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96}.Debug_test|Any CPU.Build.0 = Debug|Any CPU
 		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96}.Debug_test|ARM64.ActiveCfg = Debug|Any CPU
 		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96}.Debug_test|ARM64.Build.0 = Debug|Any CPU
-		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96}.Debug_test|Win32.ActiveCfg = Debug|Any CPU
-		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96}.Debug_test|Win32.Build.0 = Debug|Any CPU
 		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96}.Debug_test|x64.ActiveCfg = Debug|Any CPU
 		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96}.Debug_test|x64.Build.0 = Debug|Any CPU
 		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96}.Debug_test|x86.ActiveCfg = Debug|Any CPU
 		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96}.Debug_test|x86.Build.0 = Debug|Any CPU
-		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96}.Debug|ARM64.ActiveCfg = Debug|Any CPU
 		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96}.Debug|Win32.Build.0 = Debug|Any CPU
 		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96}.Debug|x64.Build.0 = Debug|Any CPU
 		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96}.Debug|x86.Build.0 = Debug|Any CPU
-		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96}.Release|Any CPU.Build.0 = Release|Any CPU
 		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96}.Release|ARM64.ActiveCfg = Release|Any CPU
 		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96}.Release|ARM64.Build.0 = Release|Any CPU
-		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96}.Release|Win32.ActiveCfg = Release|Any CPU
-		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96}.Release|Win32.Build.0 = Release|Any CPU
 		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96}.Release|x64.ActiveCfg = Release|Any CPU
 		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96}.Release|x64.Build.0 = Release|Any CPU
 		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96}.Release|x86.ActiveCfg = Release|Any CPU
 		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96}.Release|x86.Build.0 = Release|Any CPU
-		{2F1F8DCD-98F2-4C02-97BA-15105E933057}.Debug_test|Any CPU.ActiveCfg = Debug|Any CPU
-		{2F1F8DCD-98F2-4C02-97BA-15105E933057}.Debug_test|Any CPU.Build.0 = Debug|Any CPU
 		{2F1F8DCD-98F2-4C02-97BA-15105E933057}.Debug_test|ARM64.ActiveCfg = Debug|ARM64
 		{2F1F8DCD-98F2-4C02-97BA-15105E933057}.Debug_test|ARM64.Build.0 = Debug|ARM64
-		{2F1F8DCD-98F2-4C02-97BA-15105E933057}.Debug_test|Win32.ActiveCfg = Debug|Win32
-		{2F1F8DCD-98F2-4C02-97BA-15105E933057}.Debug_test|Win32.Build.0 = Debug|Win32
 		{2F1F8DCD-98F2-4C02-97BA-15105E933057}.Debug_test|x64.ActiveCfg = Debug|x64
 		{2F1F8DCD-98F2-4C02-97BA-15105E933057}.Debug_test|x64.Build.0 = Debug|x64
 		{2F1F8DCD-98F2-4C02-97BA-15105E933057}.Debug_test|x86.ActiveCfg = Debug|Win32
 		{2F1F8DCD-98F2-4C02-97BA-15105E933057}.Debug_test|x86.Build.0 = Debug|Win32
-		{2F1F8DCD-98F2-4C02-97BA-15105E933057}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2F1F8DCD-98F2-4C02-97BA-15105E933057}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2F1F8DCD-98F2-4C02-97BA-15105E933057}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{2F1F8DCD-98F2-4C02-97BA-15105E933057}.Debug|ARM64.Build.0 = Debug|ARM64
-		{2F1F8DCD-98F2-4C02-97BA-15105E933057}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2F1F8DCD-98F2-4C02-97BA-15105E933057}.Debug|Win32.Build.0 = Debug|Win32
 		{2F1F8DCD-98F2-4C02-97BA-15105E933057}.Debug|x64.ActiveCfg = Debug|x64
 		{2F1F8DCD-98F2-4C02-97BA-15105E933057}.Debug|x64.Build.0 = Debug|x64
 		{2F1F8DCD-98F2-4C02-97BA-15105E933057}.Debug|x86.ActiveCfg = Debug|Win32
 		{2F1F8DCD-98F2-4C02-97BA-15105E933057}.Debug|x86.Build.0 = Debug|Win32
-		{2F1F8DCD-98F2-4C02-97BA-15105E933057}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2F1F8DCD-98F2-4C02-97BA-15105E933057}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2F1F8DCD-98F2-4C02-97BA-15105E933057}.Release|ARM64.ActiveCfg = Release|ARM64
 		{2F1F8DCD-98F2-4C02-97BA-15105E933057}.Release|ARM64.Build.0 = Release|ARM64
-		{2F1F8DCD-98F2-4C02-97BA-15105E933057}.Release|Win32.ActiveCfg = Release|Win32
-		{2F1F8DCD-98F2-4C02-97BA-15105E933057}.Release|Win32.Build.0 = Release|Win32
 		{2F1F8DCD-98F2-4C02-97BA-15105E933057}.Release|x64.ActiveCfg = Release|x64
 		{2F1F8DCD-98F2-4C02-97BA-15105E933057}.Release|x64.Build.0 = Release|x64
 		{2F1F8DCD-98F2-4C02-97BA-15105E933057}.Release|x86.ActiveCfg = Release|Win32
 		{2F1F8DCD-98F2-4C02-97BA-15105E933057}.Release|x86.Build.0 = Release|Win32
-		{70429938-E9C3-415D-9CA2-61FB08ED001F}.Debug_test|Any CPU.ActiveCfg = Debug|Any CPU
-		{70429938-E9C3-415D-9CA2-61FB08ED001F}.Debug_test|Any CPU.Build.0 = Debug|Any CPU
 		{70429938-E9C3-415D-9CA2-61FB08ED001F}.Debug_test|ARM64.ActiveCfg = Debug|ARM64
 		{70429938-E9C3-415D-9CA2-61FB08ED001F}.Debug_test|ARM64.Build.0 = Debug|ARM64
-		{70429938-E9C3-415D-9CA2-61FB08ED001F}.Debug_test|Win32.ActiveCfg = Debug|Win32
-		{70429938-E9C3-415D-9CA2-61FB08ED001F}.Debug_test|Win32.Build.0 = Debug|Win32
 		{70429938-E9C3-415D-9CA2-61FB08ED001F}.Debug_test|x64.ActiveCfg = Debug|x64
 		{70429938-E9C3-415D-9CA2-61FB08ED001F}.Debug_test|x64.Build.0 = Debug|x64
 		{70429938-E9C3-415D-9CA2-61FB08ED001F}.Debug_test|x86.ActiveCfg = Debug|x86
 		{70429938-E9C3-415D-9CA2-61FB08ED001F}.Debug_test|x86.Build.0 = Debug|x86
-		{70429938-E9C3-415D-9CA2-61FB08ED001F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{70429938-E9C3-415D-9CA2-61FB08ED001F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{70429938-E9C3-415D-9CA2-61FB08ED001F}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{70429938-E9C3-415D-9CA2-61FB08ED001F}.Debug|ARM64.Build.0 = Debug|ARM64
-		{70429938-E9C3-415D-9CA2-61FB08ED001F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{70429938-E9C3-415D-9CA2-61FB08ED001F}.Debug|Win32.Build.0 = Debug|Win32
 		{70429938-E9C3-415D-9CA2-61FB08ED001F}.Debug|x64.ActiveCfg = Debug|x64
 		{70429938-E9C3-415D-9CA2-61FB08ED001F}.Debug|x64.Build.0 = Debug|x64
 		{70429938-E9C3-415D-9CA2-61FB08ED001F}.Debug|x86.ActiveCfg = Debug|x86
 		{70429938-E9C3-415D-9CA2-61FB08ED001F}.Debug|x86.Build.0 = Debug|x86
-		{70429938-E9C3-415D-9CA2-61FB08ED001F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{70429938-E9C3-415D-9CA2-61FB08ED001F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{70429938-E9C3-415D-9CA2-61FB08ED001F}.Release|ARM64.ActiveCfg = Release|ARM64
 		{70429938-E9C3-415D-9CA2-61FB08ED001F}.Release|ARM64.Build.0 = Release|ARM64
-		{70429938-E9C3-415D-9CA2-61FB08ED001F}.Release|Win32.ActiveCfg = Release|x86
-		{70429938-E9C3-415D-9CA2-61FB08ED001F}.Release|Win32.Build.0 = Release|x86
 		{70429938-E9C3-415D-9CA2-61FB08ED001F}.Release|x64.ActiveCfg = Release|x64
 		{70429938-E9C3-415D-9CA2-61FB08ED001F}.Release|x64.Build.0 = Release|x64
 		{70429938-E9C3-415D-9CA2-61FB08ED001F}.Release|x86.ActiveCfg = Release|x86
 		{70429938-E9C3-415D-9CA2-61FB08ED001F}.Release|x86.Build.0 = Release|x86
-		{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D}.Debug_test|Any CPU.ActiveCfg = Debug|Any CPU
-		{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D}.Debug_test|Any CPU.Build.0 = Debug|Any CPU
 		{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D}.Debug_test|ARM64.ActiveCfg = Debug|Any CPU
 		{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D}.Debug_test|ARM64.Build.0 = Debug|Any CPU
-		{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D}.Debug_test|Win32.ActiveCfg = Debug|Any CPU
-		{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D}.Debug_test|Win32.Build.0 = Debug|Any CPU
 		{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D}.Debug_test|x64.ActiveCfg = Debug|Any CPU
 		{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D}.Debug_test|x64.Build.0 = Debug|Any CPU
 		{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D}.Debug_test|x86.ActiveCfg = Debug|Any CPU
 		{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D}.Debug_test|x86.Build.0 = Debug|Any CPU
-		{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D}.Debug|ARM64.ActiveCfg = Debug|Any CPU
 		{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D}.Debug|Win32.Build.0 = Debug|Any CPU
 		{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D}.Debug|x64.Build.0 = Debug|Any CPU
 		{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D}.Debug|x86.Build.0 = Debug|Any CPU
-		{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D}.Release|ARM64.ActiveCfg = Release|Any CPU
 		{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D}.Release|ARM64.Build.0 = Release|Any CPU
-		{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D}.Release|Win32.ActiveCfg = Release|Any CPU
-		{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D}.Release|Win32.Build.0 = Release|Any CPU
 		{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D}.Release|x64.ActiveCfg = Release|Any CPU
 		{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D}.Release|x64.Build.0 = Release|Any CPU
 		{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D}.Release|x86.ActiveCfg = Release|Any CPU
 		{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D}.Release|x86.Build.0 = Release|Any CPU
+		{86317243-45A8-4770-A4B2-768F721E5F9B}.Debug_test|ARM64.ActiveCfg = Debug|ARM64
+		{86317243-45A8-4770-A4B2-768F721E5F9B}.Debug_test|ARM64.Build.0 = Debug|ARM64
+		{86317243-45A8-4770-A4B2-768F721E5F9B}.Debug_test|x64.ActiveCfg = Debug|x64
+		{86317243-45A8-4770-A4B2-768F721E5F9B}.Debug_test|x64.Build.0 = Debug|x64
+		{86317243-45A8-4770-A4B2-768F721E5F9B}.Debug_test|x86.ActiveCfg = Debug|Win32
+		{86317243-45A8-4770-A4B2-768F721E5F9B}.Debug_test|x86.Build.0 = Debug|Win32
+		{86317243-45A8-4770-A4B2-768F721E5F9B}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{86317243-45A8-4770-A4B2-768F721E5F9B}.Debug|ARM64.Build.0 = Debug|ARM64
+		{86317243-45A8-4770-A4B2-768F721E5F9B}.Debug|x64.ActiveCfg = Debug|x64
+		{86317243-45A8-4770-A4B2-768F721E5F9B}.Debug|x64.Build.0 = Debug|x64
+		{86317243-45A8-4770-A4B2-768F721E5F9B}.Debug|x86.ActiveCfg = Debug|Win32
+		{86317243-45A8-4770-A4B2-768F721E5F9B}.Debug|x86.Build.0 = Debug|Win32
+		{86317243-45A8-4770-A4B2-768F721E5F9B}.Release|ARM64.ActiveCfg = Release|ARM64
+		{86317243-45A8-4770-A4B2-768F721E5F9B}.Release|ARM64.Build.0 = Release|ARM64
+		{86317243-45A8-4770-A4B2-768F721E5F9B}.Release|x64.ActiveCfg = Release|x64
+		{86317243-45A8-4770-A4B2-768F721E5F9B}.Release|x64.Build.0 = Release|x64
+		{86317243-45A8-4770-A4B2-768F721E5F9B}.Release|x86.ActiveCfg = Release|Win32
+		{86317243-45A8-4770-A4B2-768F721E5F9B}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1720,6 +1449,7 @@ Global
 		{4BE74739-227A-4367-8DBA-AEC2769562C8} = {BC59C0F9-07AC-44B2-BDF1-6533A1371BB2}
 		{1C950F53-542E-4CC4-9281-D9E36072A743} = {BC59C0F9-07AC-44B2-BDF1-6533A1371BB2}
 		{F778ACAE-150F-4D7D-83C1-5BF2E1ACB399} = {BC59C0F9-07AC-44B2-BDF1-6533A1371BB2}
+		{86317243-45A8-4770-A4B2-768F721E5F9B} = {D3327F36-E161-4FED-A0F4-56F2B735827E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D93836AB-52D3-4DE2-AE25-23F26F55ECED}
@@ -1812,7 +1542,6 @@ Global
 		dev\ItemContainer\InteractionTests\ItemContainer_InteractionTests.projitems*{4d8c5d1b-f982-44a1-b744-dd0e51651bf2}*SharedItemsImports = 5
 		dev\ItemsView\InteractionTests\ItemsView_InteractionTests.projitems*{4d8c5d1b-f982-44a1-b744-dd0e51651bf2}*SharedItemsImports = 5
 		dev\MapControl\InteractionTests\MapControl_InteractionTests.projitems*{4d8c5d1b-f982-44a1-b744-dd0e51651bf2}*SharedItemsImports = 5
-		dev\SelectorBar\InteractionTests\SelectorBar_InteractionTests.projitems*{4d8c5d1b-f982-44a1-b744-dd0e51651bf2}*SharedItemsImports = 5
 		dev\Materials\Acrylic\InteractionTests\AcrylicBrush_InteractionTests.projitems*{4d8c5d1b-f982-44a1-b744-dd0e51651bf2}*SharedItemsImports = 5
 		dev\Materials\Reveal\InteractionTests\Reveal_InteractionTests\Reveal_InteractionTests.projitems*{4d8c5d1b-f982-44a1-b744-dd0e51651bf2}*SharedItemsImports = 5
 		dev\MenuBar\MenuBar_InteractionTests\MenuBar_InteractionTests.projitems*{4d8c5d1b-f982-44a1-b744-dd0e51651bf2}*SharedItemsImports = 5
@@ -1833,10 +1562,12 @@ Global
 		dev\Repeater\InteractionTests\Repeater_InteractionTests.projitems*{4d8c5d1b-f982-44a1-b744-dd0e51651bf2}*SharedItemsImports = 5
 		dev\ScrollPresenter\InteractionTests\ScrollPresenter_InteractionTests.projitems*{4d8c5d1b-f982-44a1-b744-dd0e51651bf2}*SharedItemsImports = 5
 		dev\ScrollView\InteractionTests\ScrollView_InteractionTests.projitems*{4d8c5d1b-f982-44a1-b744-dd0e51651bf2}*SharedItemsImports = 5
+		dev\SelectorBar\InteractionTests\SelectorBar_InteractionTests.projitems*{4d8c5d1b-f982-44a1-b744-dd0e51651bf2}*SharedItemsImports = 5
 		dev\SplitButton\InteractionTests\SplitButton_InteractionTests.projitems*{4d8c5d1b-f982-44a1-b744-dd0e51651bf2}*SharedItemsImports = 5
 		dev\SwipeControl\SwipeControl_InteractionTests\SwipeControl_InteractionTests.projitems*{4d8c5d1b-f982-44a1-b744-dd0e51651bf2}*SharedItemsImports = 5
 		dev\TabView\InteractionTests\TabView_InteractionTests.projitems*{4d8c5d1b-f982-44a1-b744-dd0e51651bf2}*SharedItemsImports = 5
 		dev\TeachingTip\InteractionTests\TeachingTip_InteractionTests.projitems*{4d8c5d1b-f982-44a1-b744-dd0e51651bf2}*SharedItemsImports = 5
+		dev\TitleBar\InteractionTests\TitleBar_InteractionTests.projitems*{4d8c5d1b-f982-44a1-b744-dd0e51651bf2}*SharedItemsImports = 5
 		dev\TreeView\InteractionTests\TreeView_InteractionTests.projitems*{4d8c5d1b-f982-44a1-b744-dd0e51651bf2}*SharedItemsImports = 5
 		dev\TwoPaneView\InteractionTests\TwoPaneView_InteractionTests.projitems*{4d8c5d1b-f982-44a1-b744-dd0e51651bf2}*SharedItemsImports = 5
 		dev\WebView2\InteractionTests\WebView2_InteractionTests.projitems*{4d8c5d1b-f982-44a1-b744-dd0e51651bf2}*SharedItemsImports = 5
@@ -1874,8 +1605,6 @@ Global
 		dev\LayoutPanel\APITests\LayoutPanel_APITests.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
 		dev\MapControl\APITests\MapControl_APITests.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
 		dev\MapControl\TestUI\MapControl_TestUI.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
-		dev\SelectorBar\APITests\SelectorBar_APITests.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
-		dev\SelectorBar\TestUI\SelectorBar_TestUI.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
 		dev\Materials\Acrylic\APITests\AcrylicBrush_ApiTests.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
 		dev\Materials\Acrylic\TestUI\AcrylicBrush_TestUI.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
 		dev\Materials\Reveal\APITests\Reveal_APITests.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
@@ -1916,6 +1645,8 @@ Global
 		dev\ScrollPresenter\TestUI\ScrollPresenter_TestUI.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
 		dev\ScrollView\APITests\ScrollView_APITests.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
 		dev\ScrollView\TestUI\ScrollView_TestUI.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
+		dev\SelectorBar\APITests\SelectorBar_APITests.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
+		dev\SelectorBar\TestUI\SelectorBar_TestUI.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
 		dev\SplitButton\APITests\SplitButton_APITests.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
 		dev\SplitButton\TestUI\SplitButton_TestUI.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
 		dev\SplitView\TestUI\SplitView_TestUI.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
@@ -1925,6 +1656,7 @@ Global
 		dev\TabView\TestUI\TabView_TestUI.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
 		dev\TeachingTip\APITests\TeachingTip_APITests.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
 		dev\TeachingTip\TestUI\TeachingTip_TestUI.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
+		dev\TitleBar\TestUI\TitleBar_TestUI.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
 		dev\TreeView\APITests\TreeView_APITests.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
 		dev\TreeView\TestUI\TreeView_TestUI.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
 		dev\TwoPaneView\APITests\TwoPaneView_APITests.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
diff --git a/src/controls/MUXExperimental.sln b/src/controls/MUXExperimental.sln
deleted file mode 100644
index dc284579aa..0000000000
--- a/src/controls/MUXExperimental.sln
+++ /dev/null
@@ -1,269 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29209.152
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dev", "dev", "{67599AD5-51EC-44CB-85CE-B60CD8CBA270}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "dev\Common\Common.vcxitems", "{80AD7F51-8997-47B9-BB41-078B81CFF9B0}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{D3327F36-E161-4FED-A0F4-56F2B735827E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Collections", "dev\Collections\Collections.vcxitems", "{395A71A1-4327-477B-85D4-AF0851732CCB}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{5654F115-F01A-495B-91C7-09408ABF14F0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ResourceHelper", "dev\ResourceHelper\ResourceHelper.vcxitems", "{45D41ACC-2C3C-43D2-BC10-02AA73FFC7C7}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "CommonManaged", "dev\CommonManaged\CommonManaged.shproj", "{85A134E5-C83F-44A4-80DF-59F6EBF6C60D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Experimental.UI.Xaml", "dev\dll\Microsoft.Experimental.UI.Xaml.vcxproj", "{4647FA1B-124E-4447-AF56-4016AB6FAF4A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SampleControl", "SampleControl", "{718B6519-D0E4-4236-AB21-517AF3B3EE27}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleControl", "dev\SampleControl\SampleControl.vcxitems", "{A329FB8A-3093-4050-83D3-4D9F5847F3B8}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SampleControl_TestUI", "dev\SampleControl\TestUI\SampleControl_TestUI.shproj", "{05361409-7FBB-4296-996F-2E591857D84A}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SampleControl_InteractionTests", "dev\SampleControl\InteractionTests\SampleControl_InteractionTests.shproj", "{30120040-3EB8-404D-9344-5E99E34B6090}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MUXExperimentalTestApp", "test\MUXExperimentalTest\MUXExperimentalTestApp\MUXExperimentalTestApp.csproj", "{CCA3696F-5CAC-421D-8528-4D9122B4D240}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AppTestAutomationHelpers", "test\testinfra\AppTestAutomationHelpers\AppTestAutomationHelpers.vcxproj", "{128E6F7A-578C-48DC-BD3F-750EC662C268}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MUXExperimentalControls.Test", "MUXExperimentalControls.Test", "{C41F6221-0716-4A7B-AE58-7A9D0DDAA53F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MSTest", "MSTest", "{1D0CC29F-61C8-4330-9CB6-AA9D7F9ACE38}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MUXExperimental.Test", "test\MUXExperimentalTest\MUXExperimental.Test\MSTest\MUXExperimental.Test.csproj", "{D06B12F6-8633-4C9C-8F0D-114AA7184459}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "MUXExperimental.Test.Shared", "test\MUXExperimentalTest\MUXExperimental.Test\MUXExperimental.Test.Shared.shproj", "{815C5F42-3DEB-4DCB-B143-1C088FCE97F9}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TAEF", "TAEF", "{8CD5C170-B2DE-4E68-B6CC-C52DFEFA6D85}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MUXExperimental.Test.TAEF", "test\MUXExperimentalTest\MUXExperimental.Test\TAEF\MUXExperimental.Test.TAEF.csproj", "{14018522-0223-4334-87D2-C343074DDD48}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MUXTestInfra.TAEF", "test\testinfra\MUXTestInfra\TAEF\MUXTestInfra.TAEF.csproj", "{74F6AA79-E026-4FDC-8294-49102674977A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestInfra", "TestInfra", "{CCF338CD-58F3-4C91-8674-14DA5ADFD8EE}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TAEF", "TAEF", "{AD9D5064-9E3C-43FB-9B3A-DD1E44301021}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MSTest", "MSTest", "{85C7AE5E-F4C5-4FEE-82A9-881FA2251649}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MUXTestInfra.MSTest", "test\testinfra\MUXTestInfra\MSTest\MUXTestInfra.MSTest.csproj", "{E9BC58A3-A066-4120-9E8B-611DC8DE4600}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonStyles", "dev\CommonStyles\CommonStyles.vcxitems", "{3A07FA59-C5C1-4B46-8B31-043F9CA91226}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TitleBar", "TitleBar", "{EF60F757-9BD4-4D53-A3C7-6860C67CE4B4}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TitleBar", "dev\TitleBar\TitleBar.vcxitems", "{B122B4A6-BA38-4738-984B-3DAB2177D5E2}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "TitleBar_TestUI", "dev\TitleBar\TestUI\TitleBar_TestUI.shproj", "{0C05E2F0-F21F-4E60-A5BD-B4F5EB655C1D}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "TitleBar_InteractionTests", "dev\TitleBar\InteractionTests\TitleBar_InteractionTests.shproj", "{AEC0BAEE-7A86-4539-9E07-A5363F7B9A8C}"
-EndProject
-Global
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		dev\SampleControl\TestUI\SampleControl_TestUI.projitems*{05361409-7fbb-4296-996f-2e591857d84a}*SharedItemsImports = 13
-		dev\TitleBar\TestUI\TitleBar_TestUI.projitems*{0c05e2f0-f21f-4e60-a5bd-b4f5eb655c1d}*SharedItemsImports = 13
-		dev\SampleControl\InteractionTests\SampleControl_InteractionTests.projitems*{30120040-3eb8-404d-9344-5e99e34b6090}*SharedItemsImports = 13
-		dev\Collections\Collections.vcxitems*{395a71a1-4327-477b-85d4-af0851732ccb}*SharedItemsImports = 9
-		dev\CommonStyles\CommonStyles.vcxitems*{3a07fa59-c5c1-4b46-8b31-043f9ca91226}*SharedItemsImports = 9
-		dev\ResourceHelper\ResourceHelper.vcxitems*{45d41acc-2c3c-43d2-bc10-02aa73ffc7c7}*SharedItemsImports = 9
-		dev\Collections\Collections.vcxitems*{4647fa1b-124e-4447-af56-4016ab6faf4a}*SharedItemsImports = 4
-		dev\CommonStyles\CommonStyles.vcxitems*{4647fa1b-124e-4447-af56-4016ab6faf4a}*SharedItemsImports = 4
-		dev\ResourceHelper\ResourceHelper.vcxitems*{4647fa1b-124e-4447-af56-4016ab6faf4a}*SharedItemsImports = 4
-		dev\SampleControl\SampleControl.vcxitems*{4647fa1b-124e-4447-af56-4016ab6faf4a}*SharedItemsImports = 4
-		dev\TitleBar\TitleBar.vcxitems*{4647fa1b-124e-4447-af56-4016ab6faf4a}*SharedItemsImports = 4
-		dev\Common\Common.vcxitems*{80ad7f51-8997-47b9-bb41-078b81cff9b0}*SharedItemsImports = 9
-		dev\SampleControl\InteractionTests\SampleControl_InteractionTests.projitems*{815c5f42-3deb-4dcb-b143-1c088fce97f9}*SharedItemsImports = 13
-		dev\TitleBar\InteractionTests\TitleBar_InteractionTests.projitems*{815c5f42-3deb-4dcb-b143-1c088fce97f9}*SharedItemsImports = 13
-		test\MUXExperimentalTest\MUXExperimental.Test\MUXExperimental.Test.Shared.projitems*{815c5f42-3deb-4dcb-b143-1c088fce97f9}*SharedItemsImports = 13
-		dev\CommonManaged\CommonManaged.projitems*{85a134e5-c83f-44a4-80df-59f6ebf6c60d}*SharedItemsImports = 13
-		dev\SampleControl\SampleControl.vcxitems*{a329fb8a-3093-4050-83d3-4d9f5847f3b8}*SharedItemsImports = 9
-		dev\TitleBar\InteractionTests\TitleBar_InteractionTests.projitems*{aec0baee-7a86-4539-9e07-a5363f7b9a8c}*SharedItemsImports = 13
-		dev\TitleBar\TitleBar.vcxitems*{b122b4a6-ba38-4738-984b-3dab2177d5e2}*SharedItemsImports = 9
-		dev\SampleControl\TestUI\SampleControl_TestUI.projitems*{cca3696f-5cac-421d-8528-4d9122b4d240}*SharedItemsImports = 4
-		dev\TitleBar\TestUI\TitleBar_TestUI.projitems*{cca3696f-5cac-421d-8528-4d9122b4d240}*SharedItemsImports = 4
-		test\TestAppUtils\TestAppUtils.projitems*{cca3696f-5cac-421d-8528-4d9122b4d240}*SharedItemsImports = 4
-	EndGlobalSection
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug_test|ARM64 = Debug_test|ARM64
-		Debug_test|x64 = Debug_test|x64
-		Debug_test|x86 = Debug_test|x86
-		Debug|ARM64 = Debug|ARM64
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|ARM64 = Release|ARM64
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4647FA1B-124E-4447-AF56-4016AB6FAF4A}.Debug_test|ARM64.ActiveCfg = Debug|ARM64
-		{4647FA1B-124E-4447-AF56-4016AB6FAF4A}.Debug_test|ARM64.Build.0 = Debug|ARM64
-		{4647FA1B-124E-4447-AF56-4016AB6FAF4A}.Debug_test|x64.ActiveCfg = Debug|x64
-		{4647FA1B-124E-4447-AF56-4016AB6FAF4A}.Debug_test|x64.Build.0 = Debug|x64
-		{4647FA1B-124E-4447-AF56-4016AB6FAF4A}.Debug_test|x86.ActiveCfg = Debug|Win32
-		{4647FA1B-124E-4447-AF56-4016AB6FAF4A}.Debug_test|x86.Build.0 = Debug|Win32
-		{4647FA1B-124E-4447-AF56-4016AB6FAF4A}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{4647FA1B-124E-4447-AF56-4016AB6FAF4A}.Debug|ARM64.Build.0 = Debug|ARM64
-		{4647FA1B-124E-4447-AF56-4016AB6FAF4A}.Debug|x64.ActiveCfg = Debug|x64
-		{4647FA1B-124E-4447-AF56-4016AB6FAF4A}.Debug|x64.Build.0 = Debug|x64
-		{4647FA1B-124E-4447-AF56-4016AB6FAF4A}.Debug|x86.ActiveCfg = Debug|Win32
-		{4647FA1B-124E-4447-AF56-4016AB6FAF4A}.Debug|x86.Build.0 = Debug|Win32
-		{4647FA1B-124E-4447-AF56-4016AB6FAF4A}.Release|ARM64.ActiveCfg = Release|ARM64
-		{4647FA1B-124E-4447-AF56-4016AB6FAF4A}.Release|ARM64.Build.0 = Release|ARM64
-		{4647FA1B-124E-4447-AF56-4016AB6FAF4A}.Release|x64.ActiveCfg = Release|x64
-		{4647FA1B-124E-4447-AF56-4016AB6FAF4A}.Release|x64.Build.0 = Release|x64
-		{4647FA1B-124E-4447-AF56-4016AB6FAF4A}.Release|x86.ActiveCfg = Release|Win32
-		{4647FA1B-124E-4447-AF56-4016AB6FAF4A}.Release|x86.Build.0 = Release|Win32
-		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug_test|ARM64.ActiveCfg = Debug_test|x86
-		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug_test|x64.ActiveCfg = Debug_test|x64
-		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug_test|x64.Build.0 = Debug_test|x64
-		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug_test|x64.Deploy.0 = Debug_test|x64
-		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug_test|x86.ActiveCfg = Debug|x86
-		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug_test|x86.Build.0 = Debug|x86
-		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug_test|x86.Deploy.0 = Debug|x86
-		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug|ARM64.ActiveCfg = Debug|x86
-		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug|x64.ActiveCfg = Debug|x64
-		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug|x64.Build.0 = Debug|x64
-		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug|x64.Deploy.0 = Debug|x64
-		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug|x86.ActiveCfg = Debug|x86
-		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug|x86.Build.0 = Debug|x86
-		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug|x86.Deploy.0 = Debug|x86
-		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Release|ARM64.ActiveCfg = Release|x86
-		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Release|x64.ActiveCfg = Release|x64
-		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Release|x64.Build.0 = Release|x64
-		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Release|x64.Deploy.0 = Release|x64
-		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Release|x86.ActiveCfg = Release|x86
-		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Release|x86.Build.0 = Release|x86
-		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Release|x86.Deploy.0 = Release|x86
-		{128E6F7A-578C-48DC-BD3F-750EC662C268}.Debug_test|ARM64.ActiveCfg = Debug|ARM64
-		{128E6F7A-578C-48DC-BD3F-750EC662C268}.Debug_test|ARM64.Build.0 = Debug|ARM64
-		{128E6F7A-578C-48DC-BD3F-750EC662C268}.Debug_test|x64.ActiveCfg = Debug|x64
-		{128E6F7A-578C-48DC-BD3F-750EC662C268}.Debug_test|x64.Build.0 = Debug|x64
-		{128E6F7A-578C-48DC-BD3F-750EC662C268}.Debug_test|x86.ActiveCfg = Debug|Win32
-		{128E6F7A-578C-48DC-BD3F-750EC662C268}.Debug_test|x86.Build.0 = Debug|Win32
-		{128E6F7A-578C-48DC-BD3F-750EC662C268}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{128E6F7A-578C-48DC-BD3F-750EC662C268}.Debug|ARM64.Build.0 = Debug|ARM64
-		{128E6F7A-578C-48DC-BD3F-750EC662C268}.Debug|x64.ActiveCfg = Debug|x64
-		{128E6F7A-578C-48DC-BD3F-750EC662C268}.Debug|x64.Build.0 = Debug|x64
-		{128E6F7A-578C-48DC-BD3F-750EC662C268}.Debug|x86.ActiveCfg = Debug|Win32
-		{128E6F7A-578C-48DC-BD3F-750EC662C268}.Debug|x86.Build.0 = Debug|Win32
-		{128E6F7A-578C-48DC-BD3F-750EC662C268}.Release|ARM64.ActiveCfg = Release|ARM64
-		{128E6F7A-578C-48DC-BD3F-750EC662C268}.Release|ARM64.Build.0 = Release|ARM64
-		{128E6F7A-578C-48DC-BD3F-750EC662C268}.Release|x64.ActiveCfg = Release|x64
-		{128E6F7A-578C-48DC-BD3F-750EC662C268}.Release|x64.Build.0 = Release|x64
-		{128E6F7A-578C-48DC-BD3F-750EC662C268}.Release|x86.ActiveCfg = Release|Win32
-		{128E6F7A-578C-48DC-BD3F-750EC662C268}.Release|x86.Build.0 = Release|Win32
-		{D06B12F6-8633-4C9C-8F0D-114AA7184459}.Debug_test|ARM64.ActiveCfg = Debug|Any CPU
-		{D06B12F6-8633-4C9C-8F0D-114AA7184459}.Debug_test|ARM64.Build.0 = Debug|Any CPU
-		{D06B12F6-8633-4C9C-8F0D-114AA7184459}.Debug_test|x64.ActiveCfg = Debug|Any CPU
-		{D06B12F6-8633-4C9C-8F0D-114AA7184459}.Debug_test|x64.Build.0 = Debug|Any CPU
-		{D06B12F6-8633-4C9C-8F0D-114AA7184459}.Debug_test|x86.ActiveCfg = Debug|Any CPU
-		{D06B12F6-8633-4C9C-8F0D-114AA7184459}.Debug_test|x86.Build.0 = Debug|Any CPU
-		{D06B12F6-8633-4C9C-8F0D-114AA7184459}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{D06B12F6-8633-4C9C-8F0D-114AA7184459}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{D06B12F6-8633-4C9C-8F0D-114AA7184459}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D06B12F6-8633-4C9C-8F0D-114AA7184459}.Debug|x64.Build.0 = Debug|Any CPU
-		{D06B12F6-8633-4C9C-8F0D-114AA7184459}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D06B12F6-8633-4C9C-8F0D-114AA7184459}.Debug|x86.Build.0 = Debug|Any CPU
-		{D06B12F6-8633-4C9C-8F0D-114AA7184459}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{D06B12F6-8633-4C9C-8F0D-114AA7184459}.Release|ARM64.Build.0 = Release|Any CPU
-		{D06B12F6-8633-4C9C-8F0D-114AA7184459}.Release|x64.ActiveCfg = Release|Any CPU
-		{D06B12F6-8633-4C9C-8F0D-114AA7184459}.Release|x64.Build.0 = Release|Any CPU
-		{D06B12F6-8633-4C9C-8F0D-114AA7184459}.Release|x86.ActiveCfg = Release|Any CPU
-		{D06B12F6-8633-4C9C-8F0D-114AA7184459}.Release|x86.Build.0 = Release|Any CPU
-		{14018522-0223-4334-87D2-C343074DDD48}.Debug_test|ARM64.ActiveCfg = Debug|Any CPU
-		{14018522-0223-4334-87D2-C343074DDD48}.Debug_test|ARM64.Build.0 = Debug|Any CPU
-		{14018522-0223-4334-87D2-C343074DDD48}.Debug_test|x64.ActiveCfg = Debug|Any CPU
-		{14018522-0223-4334-87D2-C343074DDD48}.Debug_test|x64.Build.0 = Debug|Any CPU
-		{14018522-0223-4334-87D2-C343074DDD48}.Debug_test|x86.ActiveCfg = Debug|Any CPU
-		{14018522-0223-4334-87D2-C343074DDD48}.Debug_test|x86.Build.0 = Debug|Any CPU
-		{14018522-0223-4334-87D2-C343074DDD48}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{14018522-0223-4334-87D2-C343074DDD48}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{14018522-0223-4334-87D2-C343074DDD48}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{14018522-0223-4334-87D2-C343074DDD48}.Debug|x64.Build.0 = Debug|Any CPU
-		{14018522-0223-4334-87D2-C343074DDD48}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{14018522-0223-4334-87D2-C343074DDD48}.Debug|x86.Build.0 = Debug|Any CPU
-		{14018522-0223-4334-87D2-C343074DDD48}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{14018522-0223-4334-87D2-C343074DDD48}.Release|ARM64.Build.0 = Release|Any CPU
-		{14018522-0223-4334-87D2-C343074DDD48}.Release|x64.ActiveCfg = Release|Any CPU
-		{14018522-0223-4334-87D2-C343074DDD48}.Release|x64.Build.0 = Release|Any CPU
-		{14018522-0223-4334-87D2-C343074DDD48}.Release|x86.ActiveCfg = Release|Any CPU
-		{14018522-0223-4334-87D2-C343074DDD48}.Release|x86.Build.0 = Release|Any CPU
-		{74F6AA79-E026-4FDC-8294-49102674977A}.Debug_test|ARM64.ActiveCfg = Debug|Any CPU
-		{74F6AA79-E026-4FDC-8294-49102674977A}.Debug_test|ARM64.Build.0 = Debug|Any CPU
-		{74F6AA79-E026-4FDC-8294-49102674977A}.Debug_test|x64.ActiveCfg = Debug|Any CPU
-		{74F6AA79-E026-4FDC-8294-49102674977A}.Debug_test|x64.Build.0 = Debug|Any CPU
-		{74F6AA79-E026-4FDC-8294-49102674977A}.Debug_test|x86.ActiveCfg = Debug|Any CPU
-		{74F6AA79-E026-4FDC-8294-49102674977A}.Debug_test|x86.Build.0 = Debug|Any CPU
-		{74F6AA79-E026-4FDC-8294-49102674977A}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{74F6AA79-E026-4FDC-8294-49102674977A}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{74F6AA79-E026-4FDC-8294-49102674977A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{74F6AA79-E026-4FDC-8294-49102674977A}.Debug|x64.Build.0 = Debug|Any CPU
-		{74F6AA79-E026-4FDC-8294-49102674977A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{74F6AA79-E026-4FDC-8294-49102674977A}.Debug|x86.Build.0 = Debug|Any CPU
-		{74F6AA79-E026-4FDC-8294-49102674977A}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{74F6AA79-E026-4FDC-8294-49102674977A}.Release|ARM64.Build.0 = Release|Any CPU
-		{74F6AA79-E026-4FDC-8294-49102674977A}.Release|x64.ActiveCfg = Release|Any CPU
-		{74F6AA79-E026-4FDC-8294-49102674977A}.Release|x64.Build.0 = Release|Any CPU
-		{74F6AA79-E026-4FDC-8294-49102674977A}.Release|x86.ActiveCfg = Release|Any CPU
-		{74F6AA79-E026-4FDC-8294-49102674977A}.Release|x86.Build.0 = Release|Any CPU
-		{E9BC58A3-A066-4120-9E8B-611DC8DE4600}.Debug_test|ARM64.ActiveCfg = Debug|Any CPU
-		{E9BC58A3-A066-4120-9E8B-611DC8DE4600}.Debug_test|ARM64.Build.0 = Debug|Any CPU
-		{E9BC58A3-A066-4120-9E8B-611DC8DE4600}.Debug_test|x64.ActiveCfg = Debug|Any CPU
-		{E9BC58A3-A066-4120-9E8B-611DC8DE4600}.Debug_test|x64.Build.0 = Debug|Any CPU
-		{E9BC58A3-A066-4120-9E8B-611DC8DE4600}.Debug_test|x86.ActiveCfg = Debug|Any CPU
-		{E9BC58A3-A066-4120-9E8B-611DC8DE4600}.Debug_test|x86.Build.0 = Debug|Any CPU
-		{E9BC58A3-A066-4120-9E8B-611DC8DE4600}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{E9BC58A3-A066-4120-9E8B-611DC8DE4600}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{E9BC58A3-A066-4120-9E8B-611DC8DE4600}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E9BC58A3-A066-4120-9E8B-611DC8DE4600}.Debug|x64.Build.0 = Debug|Any CPU
-		{E9BC58A3-A066-4120-9E8B-611DC8DE4600}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E9BC58A3-A066-4120-9E8B-611DC8DE4600}.Debug|x86.Build.0 = Debug|Any CPU
-		{E9BC58A3-A066-4120-9E8B-611DC8DE4600}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{E9BC58A3-A066-4120-9E8B-611DC8DE4600}.Release|ARM64.Build.0 = Release|Any CPU
-		{E9BC58A3-A066-4120-9E8B-611DC8DE4600}.Release|x64.ActiveCfg = Release|Any CPU
-		{E9BC58A3-A066-4120-9E8B-611DC8DE4600}.Release|x64.Build.0 = Release|Any CPU
-		{E9BC58A3-A066-4120-9E8B-611DC8DE4600}.Release|x86.ActiveCfg = Release|Any CPU
-		{E9BC58A3-A066-4120-9E8B-611DC8DE4600}.Release|x86.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{80AD7F51-8997-47B9-BB41-078B81CFF9B0} = {5654F115-F01A-495B-91C7-09408ABF14F0}
-		{395A71A1-4327-477B-85D4-AF0851732CCB} = {5654F115-F01A-495B-91C7-09408ABF14F0}
-		{5654F115-F01A-495B-91C7-09408ABF14F0} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270}
-		{45D41ACC-2C3C-43D2-BC10-02AA73FFC7C7} = {5654F115-F01A-495B-91C7-09408ABF14F0}
-		{85A134E5-C83F-44A4-80DF-59F6EBF6C60D} = {5654F115-F01A-495B-91C7-09408ABF14F0}
-		{4647FA1B-124E-4447-AF56-4016AB6FAF4A} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270}
-		{718B6519-D0E4-4236-AB21-517AF3B3EE27} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270}
-		{A329FB8A-3093-4050-83D3-4D9F5847F3B8} = {718B6519-D0E4-4236-AB21-517AF3B3EE27}
-		{05361409-7FBB-4296-996F-2E591857D84A} = {718B6519-D0E4-4236-AB21-517AF3B3EE27}
-		{30120040-3EB8-404D-9344-5E99E34B6090} = {718B6519-D0E4-4236-AB21-517AF3B3EE27}
-		{CCA3696F-5CAC-421D-8528-4D9122B4D240} = {D3327F36-E161-4FED-A0F4-56F2B735827E}
-		{128E6F7A-578C-48DC-BD3F-750EC662C268} = {CCF338CD-58F3-4C91-8674-14DA5ADFD8EE}
-		{C41F6221-0716-4A7B-AE58-7A9D0DDAA53F} = {D3327F36-E161-4FED-A0F4-56F2B735827E}
-		{1D0CC29F-61C8-4330-9CB6-AA9D7F9ACE38} = {C41F6221-0716-4A7B-AE58-7A9D0DDAA53F}
-		{D06B12F6-8633-4C9C-8F0D-114AA7184459} = {1D0CC29F-61C8-4330-9CB6-AA9D7F9ACE38}
-		{815C5F42-3DEB-4DCB-B143-1C088FCE97F9} = {C41F6221-0716-4A7B-AE58-7A9D0DDAA53F}
-		{8CD5C170-B2DE-4E68-B6CC-C52DFEFA6D85} = {C41F6221-0716-4A7B-AE58-7A9D0DDAA53F}
-		{14018522-0223-4334-87D2-C343074DDD48} = {8CD5C170-B2DE-4E68-B6CC-C52DFEFA6D85}
-		{74F6AA79-E026-4FDC-8294-49102674977A} = {AD9D5064-9E3C-43FB-9B3A-DD1E44301021}
-		{CCF338CD-58F3-4C91-8674-14DA5ADFD8EE} = {D3327F36-E161-4FED-A0F4-56F2B735827E}
-		{AD9D5064-9E3C-43FB-9B3A-DD1E44301021} = {CCF338CD-58F3-4C91-8674-14DA5ADFD8EE}
-		{85C7AE5E-F4C5-4FEE-82A9-881FA2251649} = {CCF338CD-58F3-4C91-8674-14DA5ADFD8EE}
-		{E9BC58A3-A066-4120-9E8B-611DC8DE4600} = {85C7AE5E-F4C5-4FEE-82A9-881FA2251649}
-		{3A07FA59-C5C1-4B46-8B31-043F9CA91226} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270}
-		{EF60F757-9BD4-4D53-A3C7-6860C67CE4B4} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270}
-		{B122B4A6-BA38-4738-984B-3DAB2177D5E2} = {EF60F757-9BD4-4D53-A3C7-6860C67CE4B4}
-		{0C05E2F0-F21F-4E60-A5BD-B4F5EB655C1D} = {EF60F757-9BD4-4D53-A3C7-6860C67CE4B4}
-		{AEC0BAEE-7A86-4539-9E07-A5363F7B9A8C} = {EF60F757-9BD4-4D53-A3C7-6860C67CE4B4}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {D93836AB-52D3-4DE2-AE25-23F26F55ECED}
-	EndGlobalSection
-EndGlobal
diff --git a/src/controls/ProjectImports.targets b/src/controls/ProjectImports.targets
index 03211020f2..f60b5b02b2 100644
--- a/src/controls/ProjectImports.targets
+++ b/src/controls/ProjectImports.targets
@@ -64,5 +64,6 @@
     <Import Project="$(MSBuildThisFileDirectory)dev\AnnotatedScrollBar\AnnotatedScrollBar.vcxitems" Label="Shared" Condition="$(FeatureAnnotatedScrollBarEnabled) == 'true' Or $(FeatureAnnotatedScrollBarEnabled) == 'productOnly'" />
     <Import Project="$(MSBuildThisFileDirectory)dev\MapControl\MapControl.vcxitems" Label="Shared" Condition="$(FeatureMapControlEnabled) == 'true' Or $(FeatureMapControlEnabled) == 'productOnly'" />
     <Import Project="$(MSBuildThisFileDirectory)dev\SelectorBar\SelectorBar.vcxitems" Label="Shared" Condition="$(FeatureSelectorBarEnabled) == 'true' Or $(FeatureSelectorBarEnabled) == 'productOnly'" />
+    <Import Project="$(MSBuildThisFileDirectory)dev\TitleBar\TitleBar.vcxitems" Label="Shared" Condition="$(FeatureTitleBarEnabled) == 'true' Or $(FeatureTitleBarEnabled) == 'productOnly'" />
   </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/src/controls/dev/AnimatedVisualPlayer/AnimatedVisualPlayer.cpp b/src/controls/dev/AnimatedVisualPlayer/AnimatedVisualPlayer.cpp
index c632834805..6b643b4a3c 100644
--- a/src/controls/dev/AnimatedVisualPlayer/AnimatedVisualPlayer.cpp
+++ b/src/controls/dev/AnimatedVisualPlayer/AnimatedVisualPlayer.cpp
@@ -428,9 +428,17 @@ void AnimatedVisualPlayer::OnLoaded(winrt::IInspectable const& /*sender*/, winrt
 
 void AnimatedVisualPlayer::OnUnloaded(winrt::IInspectable const& /*sender*/, winrt::RoutedEventArgs const& /*args*/)
 {
-    m_isUnloaded = true;
-    // Remove any content. If we get reloaded the content will get reloaded.
-    UnloadContent();
+   // There is an anomaly in the Loading/Loaded/Unloaded events that can cause an Unloaded event to
+   // fire when the element is in the tree. When this happens, we end up unlaoding our content 
+   // and not displaying it. Unfortunately, we can't fix this until at least version 2.0 so for
+   // for now we will work around it (as we have suggested to customers to do), by checking to see 
+   // if we are actually unloaded before removing our content.
+   if (!IsLoaded())
+    {
+        m_isUnloaded = true;
+        // Remove any content. If we get reloaded the content will get reloaded.
+        UnloadContent();
+    }
 }
 
 void AnimatedVisualPlayer::OnHiding()
diff --git a/src/controls/dev/AnimatedVisualPlayer/AnimatedVisualPlayer.h b/src/controls/dev/AnimatedVisualPlayer/AnimatedVisualPlayer.h
index 103f666ef2..8dd75b0098 100644
--- a/src/controls/dev/AnimatedVisualPlayer/AnimatedVisualPlayer.h
+++ b/src/controls/dev/AnimatedVisualPlayer/AnimatedVisualPlayer.h
@@ -130,7 +130,7 @@ struct AnimatedVisualPlayer :
     //
     tracker_ref<winrt::IAnimatedVisual> m_animatedVisual{ this };
     // The native size of the current animated visual. Only valid if m_animatedVisual is not nullptr.
-    winrt::float2 m_animatedVisualSize;
+    winrt::float2 m_animatedVisualSize{};
     winrt::Visual m_animatedVisualRoot{ nullptr };
     int m_playAsyncVersion{ 0 };
     double m_currentPlayFromProgress{ 0 };
diff --git a/src/controls/dev/AnnotatedScrollBar/InteractionTests/AnnotatedScrollBarInteractionTests.cs b/src/controls/dev/AnnotatedScrollBar/InteractionTests/AnnotatedScrollBarInteractionTests.cs
index f316b1b349..08c7e37433 100644
--- a/src/controls/dev/AnnotatedScrollBar/InteractionTests/AnnotatedScrollBarInteractionTests.cs
+++ b/src/controls/dev/AnnotatedScrollBar/InteractionTests/AnnotatedScrollBarInteractionTests.cs
@@ -327,11 +327,11 @@ public void CollidingLabelsAreRemoved()
                 Verify.IsNotNull(label19);
 
                 Log.Comment("Some intermediate items not removed by collision logic should be visible.");
-                var label4 = ElementCache.TryGetObjectByName("Num 4", false);
-                Verify.IsNotNull(label4);
+                var label3 = ElementCache.TryGetObjectByName("Num 3", false);
+                Verify.IsNotNull(label3);
 
-                var label16 = ElementCache.TryGetObjectByName("Num 16", false);
-                Verify.IsNotNull(label16);
+                var label15 = ElementCache.TryGetObjectByName("Num 15", false);
+                Verify.IsNotNull(label15);
 
                 Log.Comment("Some intermediate items removed by collision logic should not be visible.");
                 var label1 = ElementCache.TryGetObjectByName("Num 1", false);
diff --git a/src/controls/dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml b/src/controls/dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml
index 87e1572913..e7c38b22aa 100644
--- a/src/controls/dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml
+++ b/src/controls/dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml
@@ -236,7 +236,7 @@
             </Grid.RowDefinitions>
             <Border x:Name="BorderElement" Grid.Row="1" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="4" Grid.RowSpan="1" CornerRadius="{TemplateBinding CornerRadius}" />
             <ContentPresenter x:Name="HeaderContentPresenter" x:DeferLoadStrategy="Lazy" Visibility="Collapsed" Grid.Row="0" Foreground="{ThemeResource TextControlHeaderForeground}" Margin="{ThemeResource AutoSuggestBoxTopHeaderMargin}" Grid.ColumnSpan="4" Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}" FontWeight="Normal" TextWrapping="Wrap" />
-            <ScrollViewer x:Name="ContentElement" Grid.Row="1" HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}" IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}" IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" IsTabStop="False" AutomationProperties.AccessibilityView="Raw" ZoomMode="Disabled" />
+            <ScrollViewer x:Name="ContentElement" Foreground="{TemplateBinding Foreground}" Grid.Row="1" HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}" IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}" IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" IsTabStop="False" AutomationProperties.AccessibilityView="Raw" ZoomMode="Disabled" />
             <ContentControl x:Name="PlaceholderTextContentPresenter" Grid.Row="1" Foreground="{ThemeResource TextControlPlaceholderForeground}" Margin="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" IsTabStop="False" Grid.ColumnSpan="2" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Content="{TemplateBinding PlaceholderText}" IsHitTestVisible="False" />
             <Button x:Name="DeleteButton" Grid.Row="1" CornerRadius="{TemplateBinding CornerRadius}" Style="{StaticResource DeleteButtonStyle}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{ThemeResource HelperButtonThemePadding}" IsTabStop="False" Grid.Column="1" Visibility="Collapsed" FontSize="{TemplateBinding FontSize}" Width="32" AutomationProperties.AccessibilityView="Raw" VerticalAlignment="Stretch" />
             <Button x:Name="QueryButton" Grid.Row="1" Grid.Column="2" CornerRadius="{TemplateBinding CornerRadius}" Style="{StaticResource QueryButtonStyle}" BorderThickness="{TemplateBinding BorderThickness}" Margin="2,0,0,0" Padding="{ThemeResource HelperButtonThemePadding}" IsTabStop="False" FontSize="{TemplateBinding FontSize}" Width="32" Height="28" VerticalAlignment="Stretch" AutomationProperties.AccessibilityView="Raw" />
diff --git a/src/controls/dev/Breadcrumb/BreadcrumbBar.xaml b/src/controls/dev/Breadcrumb/BreadcrumbBar.xaml
index 7f419a5e58..d7d0b16aae 100644
--- a/src/controls/dev/Breadcrumb/BreadcrumbBar.xaml
+++ b/src/controls/dev/Breadcrumb/BreadcrumbBar.xaml
@@ -160,11 +160,12 @@
               Background="{TemplateBinding Background}"
               BorderBrush="{TemplateBinding BorderBrush}"
               BorderThickness="{TemplateBinding BorderThickness}"
+              CornerRadius="{TemplateBinding CornerRadius}"      
+              Foreground="{TemplateBinding Foreground}"
               Control.IsTemplateFocusTarget="True"
               IsTabStop="False"
               FocusVisualMargin="-3"
-              Padding="1,3"
-              CornerRadius="{TemplateBinding CornerRadius}">
+              Padding="1,3">
               <Button.Style>
                 <Style TargetType="Button">
                   <Setter Property="Foreground" Value="{ThemeResource BreadcrumbBarNormalForegroundBrush}" />
@@ -180,14 +181,10 @@
                   <Setter Property="Template">
                     <Setter.Value>
                       <ControlTemplate TargetType="Button">
-                        <Grid Background="Transparent">
+                        <Grid Background="{TemplateBinding Background}">
                           <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
-                              <VisualState x:Name="Normal">
-                                <VisualState.Setters>
-                                  <Setter Target="PART_ContentPresenter.Foreground" Value="{ThemeResource BreadcrumbBarNormalForegroundBrush}" />
-                                </VisualState.Setters>
-                              </VisualState>
+                              <VisualState x:Name="Normal" />
                               <!-- Current refers to the last item -->
                               <VisualState x:Name="CurrentNormal">
                                 <VisualState.Setters>
@@ -250,6 +247,7 @@
                             Content="{TemplateBinding Content}"
                             ContentTransitions="{TemplateBinding ContentTransitions}"
                             ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Foreground="{TemplateBinding Foreground}"
                             Padding="{TemplateBinding Padding}"
                             HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
@@ -287,6 +285,7 @@
             <ContentPresenter x:Name="PART_LastItemContentPresenter"
               AutomationProperties.AccessibilityView="Raw"
               Visibility="Collapsed"
+              Background="{TemplateBinding Background}"
               Content="{TemplateBinding Content}"
               ContentTransitions="{TemplateBinding ContentTransitions}"
               ContentTemplate="{TemplateBinding ContentTemplate}"
diff --git a/src/controls/dev/Breadcrumb/InteractionTests/BreadcrumbBarTests.cs b/src/controls/dev/Breadcrumb/InteractionTests/BreadcrumbBarTests.cs
index cb1d70df63..509a270c90 100644
--- a/src/controls/dev/Breadcrumb/InteractionTests/BreadcrumbBarTests.cs
+++ b/src/controls/dev/Breadcrumb/InteractionTests/BreadcrumbBarTests.cs
@@ -103,6 +103,7 @@ public static void ClassInitialize(TestContext testContext)
             TestEnvironment.Initialize(testContext);
         }
 
+        [TestCleanup]
         public void TestCleanup()
         {
             TestCleanupHelper.Cleanup();
@@ -166,9 +167,9 @@ public void AddItemsAndCompressBreadcrumbTest()
             using (var setup = new TestSetupHelper("BreadcrumbBar Tests"))
             {
                 var breadcrumb = SetUpTest();
-                
+
                 VerifyBreadcrumbBarItemsContain(breadcrumb.Children, new string[] { "Root", "Node A", "Node A_2", "Node A_2_3", "Node A_2_3_1" }, true);
-                
+
                 Verify.AreEqual(1, breadcrumb.Children.Count, "The breadcrumb should contain 1 item");
             }
         }
@@ -248,7 +249,7 @@ public void InvokeDropDownItemTest()
         [TestProperty("TestSuite", "A")]
         public void KeyboardNavigationLeftToRightTest()
         {
-            using (var setup = new TestSetupHelper("BreadcrumbBar Tests"))
+            using (var setup = new TestSetupHelper("BreadcrumbBar Tests", new TestSetupHelper.TestSetupHelperOptions { AutomaticCleanup = false }))
             {
                 var breadcrumb = SetUpTest();
                 var breadcrumbItems = breadcrumb.Children;
@@ -287,6 +288,8 @@ public void KeyboardNavigationLeftToRightTest()
                 // Bug to solve here
                 KeyboardHelper.PressKey(Key.Left);
                 Verify.IsTrue(breadcrumbItems[0].HasKeyboardFocus, "'Root' BreadcrumbBarItem should keep the focus");
+
+                setup.AllowCleanup();
             }
         }
 
@@ -294,7 +297,7 @@ public void KeyboardNavigationLeftToRightTest()
         [TestProperty("TestSuite", "A")]
         public void KeyboardNavigationRightToLeftTest()
         {
-            using (var setup = new TestSetupHelper("BreadcrumbBar Tests"))
+            using (var setup = new TestSetupHelper("BreadcrumbBar Tests", new TestSetupHelper.TestSetupHelperOptions { AutomaticCleanup = false }))
             {
                 var breadcrumb = SetUpTest();
                 var breadcrumbItems = breadcrumb.Children;
@@ -333,6 +336,8 @@ public void KeyboardNavigationRightToLeftTest()
                 // Bug to solve here
                 KeyboardHelper.PressKey(Key.Right);
                 Verify.IsTrue(breadcrumbItems[0].HasKeyboardFocus, "'Root' BreadcrumbBarItem should keep the focus");
+
+                setup.AllowCleanup();
             }
         }
 
@@ -453,7 +458,7 @@ public void KeyboardNavigationItemInvokationTest()
                 Verify.IsTrue(breadcrumbItems[2].HasKeyboardFocus, "'Node A_2' BreadcrumbBarItem should have focus");
 
                 KeyboardHelper.PressKey(Key.Enter);
-                
+
                 VerifyLastClickedItemIndexIs(2);
                 VerifyLastClickedItemIs("Node A_2");
 
@@ -470,7 +475,7 @@ public void KeyboardNavigationItemInvokationTest()
         [TestProperty("TestSuite", "A")]
         public void KeyboardNavigationDropDownItemInvokationTest()
         {
-            using(var setup = new TestSetupHelper("BreadcrumbBar Tests"))
+            using(var setup = new TestSetupHelper("BreadcrumbBar Tests", new TestSetupHelper.TestSetupHelperOptions { AutomaticCleanup = false }))
             {
                 var breadcrumb = SetUpCrumbledTest();
                 var breadcrumbItems = breadcrumb.Children;
@@ -503,6 +508,8 @@ public void KeyboardNavigationDropDownItemInvokationTest()
                 Verify.AreEqual(2, breadcrumb.Children.Count, "The breadcrumb should contain 2 items.");
 
                 VerifyBreadcrumbBarItemsContain(breadcrumb.Children, new string[] { "Root", "Node A" });
+
+                setup.AllowCleanup();
             }
         }
 
@@ -688,7 +695,7 @@ private void SetFocusToFirstBreadcrumbBarItem(UIObject breadcrumb, bool isEllips
 
             int indexToFocus = 0;
 
-            // The RS3 and RS2 behaviours seem a little odd on how many tabs need to be pressed 
+            // The RS3 and RS2 behaviours seem a little odd on how many tabs need to be pressed
             bool gotFocus = TryGetFocusForRs2(breadcrumb, indexToFocus, isEllipsisVisible);
             if (!gotFocus)
             {
@@ -763,14 +770,14 @@ private UIObject RetrieveRTLCheckBox(bool mustClickCheckBox = false)
 
         private void VerifyBreadcrumbBarItemsContain(UICollection<UIObject> breadcrumbItems, string[] expectedItemValues, bool firstItemIsCurrentItem = false, bool isEllipsisVisible = false)
         {
-            // WARNING: this method clicks on each breadcrumb so once the verification has finished, 
+            // WARNING: this method clicks on each breadcrumb so once the verification has finished,
             // only the ellipsis item and 'Root' should exist
 
-            // As recycled breadcrumbs are not deleted, then we compare that the breadcrumb count is always bigger 
+            // As recycled breadcrumbs are not deleted, then we compare that the breadcrumb count is always bigger
             // than the expected values count
             var ellipsisPresentCount = isEllipsisVisible ? 1 : 0;
 
-            Verify.IsTrue(breadcrumbItems.Count - ellipsisPresentCount >= expectedItemValues.Length, 
+            Verify.IsTrue(breadcrumbItems.Count - ellipsisPresentCount >= expectedItemValues.Length,
                 "The expected values count should at least be one less than the BreadcrumbBarItems count");
 
             bool mustVerifyItemAsLastItem = firstItemIsCurrentItem;
@@ -813,7 +820,7 @@ private Button VerifyDropDownItemContainsText(string expectedText)
         private Button GetDropDownItemByName(string dropDownItemName)
         {
             var ellipsisFlyout = FindElement.ByName("EllipsisFlyout");
-            
+
             foreach (var child in ellipsisFlyout.Children)
             {
                 if (child.Name == dropDownItemName)
diff --git a/src/controls/dev/ColorPicker/ColorHelpers.cpp b/src/controls/dev/ColorPicker/ColorHelpers.cpp
index 0797fc409e..41b8508d77 100644
--- a/src/controls/dev/ColorPicker/ColorHelpers.cpp
+++ b/src/controls/dev/ColorPicker/ColorHelpers.cpp
@@ -366,7 +366,7 @@ void CreateCheckeredBackgroundAsync(
         return;
     }
 
-    bgraCheckeredPixelData->reserve(static_cast<size_t>(width * height * 4));
+    bgraCheckeredPixelData->reserve(static_cast<size_t>(width) * height * 4);
 
     winrt::WorkItemHandler workItemHandler(
         [width, height, checkerColor, bgraCheckeredPixelData]
@@ -566,7 +566,7 @@ winrt::LoadedImageSurface CreateSurfaceFromPixelData(
 
     for (int y = pixelHeight - 1; y >= 0; y--)
     {
-        memcpy(bmpData.data() + (headerSize + (pixelHeight - 1 - y) * stride), (*bgraPixelData).data() + (y * stride), stride);
+        memcpy(bmpData.data() + (headerSize + (static_cast<size_t>(pixelHeight) - 1 - y) * stride), (*bgraPixelData).data() + (static_cast<size_t>(y) * stride), stride);
     }
 
     winrt::InMemoryRandomAccessStream stream = SharedHelpers::CreateStreamFromBytes(winrt::array_view<const byte>(bmpData));
diff --git a/src/controls/dev/ColorPicker/ColorSpectrum.cpp b/src/controls/dev/ColorPicker/ColorSpectrum.cpp
index e1f42a1c8f..79e667cdd6 100644
--- a/src/controls/dev/ColorPicker/ColorSpectrum.cpp
+++ b/src/controls/dev/ColorPicker/ColorSpectrum.cpp
@@ -431,10 +431,18 @@ void ColorSpectrum::OnComponentsChanged(winrt::DependencyPropertyChangedEventArg
 
 void ColorSpectrum::OnUnloaded(winrt::IInspectable const& sender, winrt::RoutedEventArgs const& args)
 {
-    // If we're in the middle of creating an image bitmap while being unloaded,
-    // we'll want to synchronously cancel it so we don't have any asynchronous actions
-    // lingering beyond our lifetime.
-    CancelAsyncAction(m_createImageBitmapAction);
+    // There is an anomaly in the Loading/Loaded/Unloaded events that can cause an Unloaded event to
+    // fire when the element is in the tree. When this happens, we end up cancelling the spectrum
+    // image generation and don't display it.  Unfortunately, we can't fix this until at least version
+    // 2.0, so for now we will work around it (as we have suggested to customers to do), by checking
+    // to see if we are actually unloaded before cancelling.
+    if (!IsLoaded())
+    {
+        // If we're in the middle of creating an image bitmap while being unloaded,
+        // we'll want to synchronously cancel it so we don't have any asynchronous actions
+        // lingering beyond our lifetime.
+        CancelAsyncAction(m_createImageBitmapAction);
+    }
 }
 
 winrt::Rect ColorSpectrum::GetBoundingRectangle()
@@ -556,7 +564,7 @@ void ColorSpectrum::UpdateColorFromPoint(const winrt::PointerPoint& point)
 
     // The gradient image contains two dimensions of HSL information, but not the third.
     // We should keep the third where it already was.
-    Hsv hsvAtPoint = m_hsvValues[y * width + x];
+    Hsv hsvAtPoint = m_hsvValues[static_cast<std::vector<Hsv>::size_type>(y) * width + x];
 
     const auto components = Components();
     const auto hsvColor = HsvColor();
@@ -618,8 +626,8 @@ void ColorSpectrum::UpdateEllipse()
         double yPercent = 0;
 
         const double hPercent = (hsv::GetHue(hsvColor) - m_minHueFromLastBitmapCreation) / (m_maxHueFromLastBitmapCreation - m_minHueFromLastBitmapCreation);
-        double sPercent = (hsv::GetSaturation(hsvColor) * 100.0 - m_minSaturationFromLastBitmapCreation) / (m_maxSaturationFromLastBitmapCreation - m_minSaturationFromLastBitmapCreation);
-        double vPercent = (hsv::GetValue(hsvColor) * 100.0 - m_minValueFromLastBitmapCreation) / (m_maxValueFromLastBitmapCreation - m_minValueFromLastBitmapCreation);
+        double sPercent = (hsv::GetSaturation(hsvColor) * 100.0 - m_minSaturationFromLastBitmapCreation) / (static_cast<double>(m_maxSaturationFromLastBitmapCreation) - m_minSaturationFromLastBitmapCreation);
+        double vPercent = (hsv::GetValue(hsvColor) * 100.0 - m_minValueFromLastBitmapCreation) / (static_cast<double>(m_maxValueFromLastBitmapCreation) - m_minValueFromLastBitmapCreation);
 
         // In the case where saturation was an axis in the spectrum with hue, or value is an axis, full stop,
         // we inverted the direction of that axis in order to put more hue on the outside of the ring,
@@ -681,20 +689,20 @@ void ColorSpectrum::UpdateEllipse()
             0;
         double sThetaValue =
             m_maxSaturationFromLastBitmapCreation != m_minSaturationFromLastBitmapCreation ?
-            360 * (hsv::GetSaturation(hsvColor) * 100.0 - m_minSaturationFromLastBitmapCreation) / (m_maxSaturationFromLastBitmapCreation - m_minSaturationFromLastBitmapCreation) :
+            360 * (hsv::GetSaturation(hsvColor) * 100.0 - m_minSaturationFromLastBitmapCreation) / (static_cast<double>(m_maxSaturationFromLastBitmapCreation) - m_minSaturationFromLastBitmapCreation) :
             0;
         double vThetaValue =
             m_maxValueFromLastBitmapCreation != m_minValueFromLastBitmapCreation ?
-            360 * (hsv::GetValue(hsvColor) * 100.0 - m_minValueFromLastBitmapCreation) / (m_maxValueFromLastBitmapCreation - m_minValueFromLastBitmapCreation) :
+            360 * (hsv::GetValue(hsvColor) * 100.0 - m_minValueFromLastBitmapCreation) / (static_cast<double>(m_maxValueFromLastBitmapCreation) - m_minValueFromLastBitmapCreation) :
             0;
         const double hRValue = m_maxHueFromLastBitmapCreation != m_minHueFromLastBitmapCreation ?
             (hsv::GetHue(hsvColor) - m_minHueFromLastBitmapCreation) / (m_maxHueFromLastBitmapCreation - m_minHueFromLastBitmapCreation) - 1 :
             0;
         double sRValue = m_maxSaturationFromLastBitmapCreation != m_minSaturationFromLastBitmapCreation ?
-            (hsv::GetSaturation(hsvColor) * 100.0 - m_minSaturationFromLastBitmapCreation) / (m_maxSaturationFromLastBitmapCreation - m_minSaturationFromLastBitmapCreation) - 1 :
+            (hsv::GetSaturation(hsvColor) * 100.0 - m_minSaturationFromLastBitmapCreation) / (static_cast<double>(m_maxSaturationFromLastBitmapCreation) - m_minSaturationFromLastBitmapCreation) - 1 :
             0;
         double vRValue = m_maxValueFromLastBitmapCreation != m_minValueFromLastBitmapCreation ?
-            (hsv::GetValue(hsvColor) * 100.0 - m_minValueFromLastBitmapCreation) / (m_maxValueFromLastBitmapCreation - m_minValueFromLastBitmapCreation) - 1 :
+            (hsv::GetValue(hsvColor) * 100.0 - m_minValueFromLastBitmapCreation) / (static_cast<double>(m_maxValueFromLastBitmapCreation) - m_minValueFromLastBitmapCreation) - 1 :
             0;
 
         // In the case where saturation was an axis in the spectrum with hue, or value is an axis, full stop,
diff --git a/src/controls/dev/ComboBox/ComboBox_themeresources.xaml b/src/controls/dev/ComboBox/ComboBox_themeresources.xaml
index 8392646144..4578f4c9b2 100644
--- a/src/controls/dev/ComboBox/ComboBox_themeresources.xaml
+++ b/src/controls/dev/ComboBox/ComboBox_themeresources.xaml
@@ -574,7 +574,7 @@
                 <CompositeTransform x:Name="PillTransform" ScaleY="1" />
               </Rectangle.RenderTransform>
             </Rectangle>
-            <ContentPresenter x:Name="ContentPresenter" Grid.Row="1" Grid.Column="0" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+            <ContentPresenter x:Name="ContentPresenter" Grid.Row="1" Grid.Column="0" Foreground="{TemplateBinding Foreground}" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
               <TextBlock x:Name="PlaceholderTextBlock" Text="{TemplateBinding PlaceholderText}" Foreground="{Binding PlaceholderForeground, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={ThemeResource ComboBoxPlaceHolderForeground}}" />
             </ContentPresenter>
             <TextBox x:Name="EditableText" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Style="{TemplateBinding TextBoxStyle}" Margin="0,0,0,0" Padding="{ThemeResource ComboBoxEditableTextPadding}" BorderBrush="Transparent" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" PlaceholderText="{TemplateBinding PlaceholderText}" Foreground="{Binding PlaceholderForeground, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={ThemeResource ComboBoxPlaceHolderForeground}}" Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Text, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Visibility="Collapsed" Header="{TemplateBinding Header}" AutomationProperties.Name="{TemplateBinding AutomationProperties.Name}" x:Load="False" CornerRadius="{TemplateBinding CornerRadius}" />
@@ -811,4 +811,4 @@
       </Setter.Value>
     </Setter>
   </Style>
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/src/controls/dev/CommandBarFlyout/APITests/CommandBarFlyoutTests.cs b/src/controls/dev/CommandBarFlyout/APITests/CommandBarFlyoutTests.cs
index 2184b55977..201c6dae05 100644
--- a/src/controls/dev/CommandBarFlyout/APITests/CommandBarFlyoutTests.cs
+++ b/src/controls/dev/CommandBarFlyout/APITests/CommandBarFlyoutTests.cs
@@ -269,7 +269,7 @@ public void VerifyPrimaryCommandsCanOverflowToSecondaryItemsControl()
                 Log.Comment("We expect there to be 17 items located inside the secondary ItemsControl (16 + autogenerated separator); {0} were found.", secondaryItemsControl.Items.Count);
                 Verify.AreEqual(17, secondaryItemsControl.Items.Count);
             });
-            
+
             CloseFlyout(flyout);
         }
 
@@ -321,7 +321,7 @@ public void VerifyPrimaryCommandLabelsAffectLayout()
                 originalWidth = commandBar.ActualWidth;
                 originalHeight = commandBar.ActualHeight;
             });
-            
+
             CloseFlyout(flyout);
 
             RunOnUIThread.Execute(() =>
@@ -367,6 +367,31 @@ public void VerifyPrimaryCommandLabelsAffectLayout()
             CloseFlyout(flyout);
         }
 
+        [TestMethod]
+        [TestProperty("Description", "Verifies that CommandBarFlyoutCommandBar can set its SystemBackdrop without being parented to the tree.")]
+        public void VerifyDisconnectedFlyoutCommandBar()
+        {
+            CommandBarFlyoutCommandBar cbfcb = null;
+            DesktopAcrylicBackdrop dba = null;
+
+            RunOnUIThread.Execute(() =>
+            {
+                cbfcb = new CommandBarFlyoutCommandBar();
+                dba = new DesktopAcrylicBackdrop();
+
+                // cbfcb isn't in the tree yet. Setting this shouldn't crash. The parser will do this (set properties before inserting into tree).
+                cbfcb.SystemBackdrop = dba;
+
+                // dbfcb shouldn't crash when it's destroyed.
+                cbfcb = null;
+                GC.Collect();
+                GC.WaitForPendingFinalizers();
+                GC.Collect();
+            });
+
+            IdleSynchronizer.Wait();
+        }
+
         private void SetupCommandBarFlyoutTest(out CommandBarFlyout flyout, out Button flyoutTarget)
         {
             CommandBarFlyout commandBarFlyout = null;
diff --git a/src/controls/dev/CommandBarFlyout/CommandBarFlyout.h b/src/controls/dev/CommandBarFlyout/CommandBarFlyout.h
index f7677113fe..de75af9640 100644
--- a/src/controls/dev/CommandBarFlyout/CommandBarFlyout.h
+++ b/src/controls/dev/CommandBarFlyout/CommandBarFlyout.h
@@ -43,7 +43,7 @@ class CommandBarFlyout :
     void UnhookAllCommandBarElementDependencyPropertyChanges();
     void OnCommandBarElementDependencyPropertyChanged(winrt::DependencyObject const& dependencyObject, winrt::DependencyProperty const& dependencyProperty);
 
-    bool m_alwaysExpanded;
+    bool m_alwaysExpanded{ false };
 
     winrt::IObservableVector<winrt::ICommandBarElement> m_primaryCommands{ nullptr };
     winrt::IObservableVector<winrt::ICommandBarElement> m_secondaryCommands{ nullptr };
diff --git a/src/controls/dev/CommandBarFlyout/CommandBarFlyoutCommandBar.cpp b/src/controls/dev/CommandBarFlyout/CommandBarFlyoutCommandBar.cpp
index 95605c1f58..c539325b72 100644
--- a/src/controls/dev/CommandBarFlyout/CommandBarFlyoutCommandBar.cpp
+++ b/src/controls/dev/CommandBarFlyout/CommandBarFlyoutCommandBar.cpp
@@ -69,6 +69,10 @@ CommandBarFlyoutCommandBar::CommandBarFlyoutCommandBar()
                     }
                 }
             }
+
+            TryConnectSystemBackdrop();
+            // If we have a SystemBackdrop, it should be connected by now.
+            MUX_ASSERT(m_registeredWithSystemBackdrop || !m_systemBackdrop);
         }
     });
 
@@ -150,10 +154,13 @@ CommandBarFlyoutCommandBar::CommandBarFlyoutCommandBar()
 CommandBarFlyoutCommandBar::~CommandBarFlyoutCommandBar()
 {
     // The SystemBackdrop DP has already been cleared out. Use our cached field.
-    if (auto systemBackdrop = m_systemBackdrop.get())
+    if (m_registeredWithSystemBackdrop)
     {
-        systemBackdrop.OnTargetDisconnected(m_backdropLink);
-        systemBackdrop.OnTargetDisconnected(m_overflowPopupBackdropLink);
+        if (auto systemBackdrop = m_systemBackdrop.get())
+        {
+            systemBackdrop.OnTargetDisconnected(m_backdropLink);
+            systemBackdrop.OnTargetDisconnected(m_overflowPopupBackdropLink);
+        }
     }
 }
 
@@ -211,7 +218,7 @@ void CommandBarFlyoutCommandBar::OnApplyTemplate()
         // Hard-code a large size for the placement visual. The size and position of this lifted visual controls the
         // size and position of the system visual with the backdrop. This visual is parented in a windowed popup, so it
         // should use the popup's coordinate space, but we're seeing it use the main island's coordinate space instead.
-        // We don't easily have the popup hwnd's offset from outside MUX.dll, so just size the placement visual to a
+        // We don't easily have the popup island's offset from outside MUX.dll, so just size the placement visual to a
         // large number to cover everything. We'll apply a clip to this placement visual later to size it to the
         // CommandBarFlyoutCommandBar's contents.
         placementVisual.Size({10000, 10000});
@@ -607,7 +614,7 @@ void CommandBarFlyoutCommandBar::UpdateVisualState(
                 const auto overflowPopupSize = m_secondaryItemsRoot.get().DesiredSize();
 
                 shouldExpandUp =
-                    controlBounds.Y + controlBounds.Height + overflowPopupSize.Height > availableHeight &&
+                    static_cast<double>(controlBounds.Y) + controlBounds.Height + overflowPopupSize.Height > availableHeight &&
                     controlBounds.Y - overflowPopupSize.Height >= 0;
             }
         }
@@ -1503,6 +1510,7 @@ void CommandBarFlyoutCommandBar::OnPropertyChanged(const winrt::DependencyProper
             {
                 oldSystemBackdrop.OnTargetDisconnected(m_backdropLink);
                 oldSystemBackdrop.OnTargetDisconnected(m_overflowPopupBackdropLink);
+                m_registeredWithSystemBackdrop = false;
             }
 
             m_systemBackdrop = newSystemBackdrop;
@@ -1517,8 +1525,7 @@ void CommandBarFlyoutCommandBar::OnPropertyChanged(const winrt::DependencyProper
                     m_overflowPopupBackdropLink = winrt::ContentExternalBackdropLink::Create(compositor);
                 }
 
-                newSystemBackdrop.OnTargetConnected(m_backdropLink, XamlRoot());
-                newSystemBackdrop.OnTargetConnected(m_overflowPopupBackdropLink, XamlRoot());
+                TryConnectSystemBackdrop();
             }
             else
             {
@@ -1528,3 +1535,24 @@ void CommandBarFlyoutCommandBar::OnPropertyChanged(const winrt::DependencyProper
         }
     }
 }
+
+void CommandBarFlyoutCommandBar::TryConnectSystemBackdrop()
+{
+    if (!m_registeredWithSystemBackdrop)
+    {
+        if (auto systemBackdrop = m_systemBackdrop.get())
+        {
+            MUX_ASSERT(m_backdropLink);
+            MUX_ASSERT(m_overflowPopupBackdropLink);
+
+            auto xamlRoot = XamlRoot();
+
+            if (xamlRoot)
+            {
+                systemBackdrop.OnTargetConnected(m_backdropLink, XamlRoot());
+                systemBackdrop.OnTargetConnected(m_overflowPopupBackdropLink, XamlRoot());
+                m_registeredWithSystemBackdrop = true;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/controls/dev/CommandBarFlyout/CommandBarFlyoutCommandBar.h b/src/controls/dev/CommandBarFlyout/CommandBarFlyoutCommandBar.h
index 278ed88d35..044599b832 100644
--- a/src/controls/dev/CommandBarFlyout/CommandBarFlyoutCommandBar.h
+++ b/src/controls/dev/CommandBarFlyout/CommandBarFlyoutCommandBar.h
@@ -67,6 +67,8 @@ class CommandBarFlyoutCommandBar :
 
     void SetPresenterName(winrt::FlyoutPresenter const& presenter);
 
+    void TryConnectSystemBackdrop();
+
     template<class TCommand>
     bool HasVisibleLabel(TCommand const& command)
     {
@@ -150,6 +152,12 @@ class CommandBarFlyoutCommandBar :
     // but the app can release and delete this CommandBarFlyoutCommandBar without ever closing it.
     weak_ref<winrt::SystemBackdrop> m_systemBackdrop{ nullptr };
 
+    // Bookkeeping for registering and unregistering with the SystemBackdrop. In order to register, we need to have a
+    // XamlRoot available so we can listen for events like theme changed or high contrast changed. It's possible we get
+    // a SystemBackdrop object set without being in the tree, in which case there's no XamlRoot so we can't register
+    // yet. We'll wait for the Loaded event to register.
+    bool m_registeredWithSystemBackdrop{ false };
+
     // Localized string caches. Looking these up from MRTCore is expensive, so we don't want to put the lookups in a
     // loop. Instead, look them up once, cache them, use the cached values, then clear the cache. The values in these
     // caches are only valid after CacheLocalizedStringResources and before ClearLocalizedStringResourceCache.
diff --git a/src/controls/dev/CommonStyles/CalendarDatePicker_themeresources.xaml b/src/controls/dev/CommonStyles/CalendarDatePicker_themeresources.xaml
index 3827bc9ed1..cf55ccdca1 100644
--- a/src/controls/dev/CommonStyles/CalendarDatePicker_themeresources.xaml
+++ b/src/controls/dev/CommonStyles/CalendarDatePicker_themeresources.xaml
@@ -80,7 +80,7 @@
   <Thickness x:Key="CalendarDatePickerTopHeaderMargin">0,0,0,8</Thickness>
   <Style TargetType="CalendarDatePicker" BasedOn="{StaticResource DefaultCalendarDatePicker}" />
   <Style x:Key="DefaultCalendarDatePicker" TargetType="CalendarDatePicker">
-    <Setter Property="Foreground" Value="{ThemeResource CalendarDatePickerForeground}" />
+    <Setter Property="Foreground" Value="{ThemeResource CalendarDatePickerTextForeground}" />
     <Setter Property="Background" Value="{ThemeResource CalendarDatePickerBackground}" />
     <Setter Property="BorderBrush" Value="{ThemeResource CalendarDatePickerBorderBrush}" />
     <Setter Property="BorderThickness" Value="{ThemeResource CalendarDatePickerBorderThemeThickness}" />
@@ -212,7 +212,7 @@
             </Grid.ColumnDefinitions>
             <ContentPresenter x:Name="HeaderContentPresenter" x:DeferLoadStrategy="Lazy" Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2" Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}" Margin="{StaticResource CalendarDatePickerTopHeaderMargin}" TextWrapping="Wrap" VerticalAlignment="Top" Visibility="Collapsed" />
             <Border x:Name="Background" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" CornerRadius="{TemplateBinding CornerRadius}" Control.IsTemplateFocusTarget="True" MinHeight="32" />
-            <TextBlock x:Name="DateText" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left" Foreground="{ThemeResource CalendarDatePickerTextForeground}" Text="{TemplateBinding PlaceholderText}" Padding="12, 0, 0, 2" VerticalAlignment="Center" />
+            <TextBlock x:Name="DateText" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left" Foreground="{TemplateBinding Foreground}" Text="{TemplateBinding PlaceholderText}" Padding="12, 0, 0, 2" VerticalAlignment="Center" />
             <FontIcon x:Name="CalendarGlyph" Grid.Row="1" Grid.Column="2" Glyph="&#xE787;" FontFamily="{ThemeResource SymbolThemeFontFamily}" Foreground="{ThemeResource CalendarDatePickerCalendarGlyphForeground}" FontSize="12" HorizontalAlignment="Center" VerticalAlignment="Center" />
             <ContentPresenter x:Name="DescriptionPresenter" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" Content="{TemplateBinding Description}" x:Load="False" Foreground="{ThemeResource SystemControlDescriptionTextForegroundBrush}" AutomationProperties.AccessibilityView="Raw" />
           </Grid>
@@ -220,4 +220,4 @@
       </Setter.Value>
     </Setter>
   </Style>
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/src/controls/dev/CommonStyles/CalendarView_themeresources.xaml b/src/controls/dev/CommonStyles/CalendarView_themeresources.xaml
index 5716439211..237f442197 100644
--- a/src/controls/dev/CommonStyles/CalendarView_themeresources.xaml
+++ b/src/controls/dev/CommonStyles/CalendarView_themeresources.xaml
@@ -335,7 +335,6 @@
                 <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
                 <Setter Property="FontSize" Value="{ThemeResource CalendarViewHeaderNavigationButtonFontSize}" />
                 <Setter Property="FontWeight" Value="{ThemeResource CalendarViewHeaderNavigationFontWeight}" />
-                <Setter Property="Foreground" Value="{ThemeResource CalendarViewHeaderNavigationButtonForeground}" />
                 <Setter Property="Background" Value="{ThemeResource CalendarViewNavigationButtonBackground}" />
                 <Setter Property="Margin" Value="{ThemeResource CalendarViewHeaderNavigationButtonMargin}" />
                 <Setter Property="Padding" Value="{ThemeResource CalendarViewHeaderNavigationButtonPadding}" />
@@ -381,7 +380,6 @@
                 <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
                 <Setter Property="FontSize" Value="{ThemeResource CalendarViewNavigationButtonFontSize}" />
                 <Setter Property="Background" Value="{ThemeResource CalendarViewNavigationButtonBackground}" />
-                <Setter Property="Foreground" Value="{ThemeResource CalendarViewNavigationButtonForeground}" />
                 <Setter Property="Padding" Value="{ThemeResource CalendarViewNavigationButtonPadding}" />
                 <Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
                 <Setter Property="CornerRadius" Value="{StaticResource ControlCornerRadius}" />
@@ -680,9 +678,9 @@
                   <ColumnDefinition Width="Auto" />
                   <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
-                <Button x:Name="HeaderButton" Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.HeaderText}" IsEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.HasMoreViews}" Style="{StaticResource HeaderNavigationButtonStyle}" HorizontalContentAlignment="Left" />
-                <Button x:Name="PreviousButton" Grid.Column="1" Content="&#xEDDB;" IsEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.HasMoreContentBefore}" Style="{StaticResource NavigationButtonStyle}" Margin="{ThemeResource CalendarViewNavigationPreviousButtonMargin}" HorizontalContentAlignment="Center" />
-                <Button x:Name="NextButton" Grid.Column="2" Content="&#xEDDC;" IsEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.HasMoreContentAfter}" Style="{StaticResource NavigationButtonStyle}" Margin="{ThemeResource CalendarViewNavigationNextButtonMargin}" HorizontalContentAlignment="Center" />
+                <Button x:Name="HeaderButton" Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.HeaderText}" IsEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.HasMoreViews}" Style="{StaticResource HeaderNavigationButtonStyle}" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="Left" />
+                <Button x:Name="PreviousButton" Grid.Column="1" Content="&#xEDDB;" IsEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.HasMoreContentBefore}" Style="{StaticResource NavigationButtonStyle}" Foreground="{TemplateBinding Foreground}" Margin="{ThemeResource CalendarViewNavigationPreviousButtonMargin}" HorizontalContentAlignment="Center" />
+                <Button x:Name="NextButton" Grid.Column="2" Content="&#xEDDC;" IsEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.HasMoreContentAfter}" Style="{StaticResource NavigationButtonStyle}" Foreground="{TemplateBinding Foreground}" Margin="{ThemeResource CalendarViewNavigationNextButtonMargin}" HorizontalContentAlignment="Center" />
               </Grid>
               <Border Grid.Row="1" Height="1" Background="{TemplateBinding BorderBrush}" />
               <Grid x:Name="Views" Grid.Row="2">
diff --git a/src/controls/dev/CommonStyles/CheckBox_themeresources.xaml b/src/controls/dev/CommonStyles/CheckBox_themeresources.xaml
index 8254681e7c..71e21d32b7 100644
--- a/src/controls/dev/CommonStyles/CheckBox_themeresources.xaml
+++ b/src/controls/dev/CommonStyles/CheckBox_themeresources.xaml
@@ -298,31 +298,7 @@
           <Grid x:Name="RootGrid" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}">
             <VisualStateManager.VisualStateGroups>
               <VisualStateGroup x:Name="CombinedStates">
-                <VisualState x:Name="UncheckedNormal">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource CheckBoxForegroundUnchecked}" />
-                    </ObjectAnimationUsingKeyFrames>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Background">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource CheckBoxBackgroundUnchecked}" />
-                    </ObjectAnimationUsingKeyFrames>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="BorderBrush">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource CheckBoxBorderBrushUnchecked}" />
-                    </ObjectAnimationUsingKeyFrames>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NormalRectangle" Storyboard.TargetProperty="Stroke">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource CheckBoxCheckBackgroundStrokeUnchecked}" />
-                    </ObjectAnimationUsingKeyFrames>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NormalRectangle" Storyboard.TargetProperty="Fill">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource CheckBoxCheckBackgroundFillUnchecked}" />
-                    </ObjectAnimationUsingKeyFrames>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="CheckGlyph" Storyboard.TargetProperty="Foreground">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource CheckBoxCheckGlyphForegroundUnchecked}" />
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                  <VisualState.Setters>
-                    <Setter Target="CheckGlyph.(controls:AnimatedIcon.State)" Value="NormalOff" />
-                  </VisualState.Setters>
-                </VisualState>
+                <VisualState x:Name="UncheckedNormal" />
                 <VisualState x:Name="UncheckedPointerOver">
                   <Storyboard>
                     <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
@@ -625,17 +601,17 @@
             </Grid.ColumnDefinitions>
             <Grid Grid.Column="0" VerticalAlignment="Center" Height="{StaticResource CheckBoxSize}" Width="{StaticResource CheckBoxSize}">
               <Rectangle x:Name="NormalRectangle" Fill="{ThemeResource CheckBoxCheckBackgroundFillUnchecked}" Stroke="{ThemeResource CheckBoxCheckBackgroundStrokeUnchecked}" StrokeThickness="{StaticResource CheckBoxBorderThickness}" UseLayoutRounding="False" Height="{StaticResource CheckBoxSize}" Width="{StaticResource CheckBoxSize}" RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
-              <controls:AnimatedIcon x:Name="CheckGlyph" Foreground="{ThemeResource CheckBoxCheckGlyphForegroundUnchecked}" Margin="0,1,0,-1">
+              <controls:AnimatedIcon x:Name="CheckGlyph" Foreground="{ThemeResource CheckBoxCheckGlyphForegroundUnchecked}" controls:AnimatedIcon.State="NormalOff" Margin="0,1,0,-1">
                 <animatedvisuals:AnimatedAcceptVisualSource />
                 <controls:AnimatedIcon.FallbackIconSource>
                   <controls:FontIconSource x:Name="DownLevelCheckGlyph" FontFamily="{ThemeResource SymbolThemeFontFamily}" Glyph="{StaticResource CheckBoxCheckedGlyph}" FontSize="{StaticResource CheckBoxGlyphSize}" />
                 </controls:AnimatedIcon.FallbackIconSource>
               </controls:AnimatedIcon>
             </Grid>
-            <ContentPresenter x:Name="ContentPresenter" Grid.Column="1" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTransitions="{TemplateBinding ContentTransitions}" Content="{TemplateBinding Content}" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" AutomationProperties.AccessibilityView="Raw" TextWrapping="Wrap" />
+            <ContentPresenter x:Name="ContentPresenter" Grid.Column="1" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTransitions="{TemplateBinding ContentTransitions}" Content="{TemplateBinding Content}" Foreground="{TemplateBinding Foreground}" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" AutomationProperties.AccessibilityView="Raw" TextWrapping="Wrap" />
           </Grid>
         </ControlTemplate>
       </Setter.Value>
     </Setter>
   </Style>
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/src/controls/dev/CommonStyles/CommandBar_themeresources.xaml b/src/controls/dev/CommonStyles/CommandBar_themeresources.xaml
index 14de7a5d84..f524c6d543 100644
--- a/src/controls/dev/CommonStyles/CommandBar_themeresources.xaml
+++ b/src/controls/dev/CommonStyles/CommandBar_themeresources.xaml
@@ -1016,6 +1016,7 @@
               CornerRadius="{TemplateBinding CornerRadius}"
               ContentTransitions="{TemplateBinding ContentTransitions}"
               ContentTemplate="{TemplateBinding ContentTemplate}"
+              Foreground="{TemplateBinding Foreground}"
               Margin="{StaticResource AppBarEllipsisButtonInnerBorderMargin}"
               Padding="0"
               HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
diff --git a/src/controls/dev/CommonStyles/InteractionTests/CommonStylesTests.cs b/src/controls/dev/CommonStyles/InteractionTests/CommonStylesTests.cs
index 69031eb196..8eea8eece8 100644
--- a/src/controls/dev/CommonStyles/InteractionTests/CommonStylesTests.cs
+++ b/src/controls/dev/CommonStyles/InteractionTests/CommonStylesTests.cs
@@ -194,7 +194,7 @@ public void MenuFlyoutItemSizeTest()
 
                 var width = Convert.ToDouble(testMenuFlyoutItemWidthTextBlock.GetText());
 
-                Verify.AreEqual("32", testMenuFlyoutItemHeightTextBlock.GetText(), "Comparing height of MenuFlyoutItem after Flyout was opened with mouse");
+                Verify.AreEqual("30", testMenuFlyoutItemHeightTextBlock.GetText(), "Comparing height of MenuFlyoutItem after Flyout was opened with mouse");
                 Verify.IsGreaterThan(width, 0.0, "Comparing height of MenuFlyoutItem after Flyout was opened with mouse");
                 Verify.IsLessThan(width, 200.0, "Comparing height of MenuFlyoutItem after Flyout was opened with mouse");
 
@@ -206,7 +206,7 @@ public void MenuFlyoutItemSizeTest()
                 Wait.ForIdle();
 
                 width = Convert.ToDouble(testMenuFlyoutItemWidthTextBlock.GetText());
-                Verify.AreEqual("40", testMenuFlyoutItemHeightTextBlock.GetText(), "Comparing height of MenuFlyoutItem after Flyout was opened with touch");
+                Verify.AreEqual("38", testMenuFlyoutItemHeightTextBlock.GetText(), "Comparing height of MenuFlyoutItem after Flyout was opened with touch");
                 Verify.IsGreaterThan(width, 200.0, "Comparing width of MenuFlyoutItem after Flyout was opened with touch");
             }
         }
diff --git a/src/controls/dev/CommonStyles/PasswordBox_themeresources.xaml b/src/controls/dev/CommonStyles/PasswordBox_themeresources.xaml
index 600e70d524..979d2b18dc 100644
--- a/src/controls/dev/CommonStyles/PasswordBox_themeresources.xaml
+++ b/src/controls/dev/CommonStyles/PasswordBox_themeresources.xaml
@@ -188,7 +188,7 @@
             </Grid.ColumnDefinitions>
             <ContentPresenter x:Name="HeaderContentPresenter" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}" FontWeight="Normal" Foreground="{ThemeResource TextControlHeaderForeground}" Margin="{ThemeResource PasswordBoxTopHeaderMargin}" TextWrapping="Wrap" VerticalAlignment="Top" Visibility="Collapsed" x:DeferLoadStrategy="Lazy" />
             <Border x:Name="BorderElement" Grid.Row="1" Grid.Column="0" Grid.RowSpan="1" Grid.ColumnSpan="2" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" MinWidth="{ThemeResource TextControlThemeMinWidth}" MinHeight="{ThemeResource TextControlThemeMinHeight}" />
-            <ScrollViewer x:Name="ContentElement" Grid.Row="1" Grid.Column="0" HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}" IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}" Margin="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" IsTabStop="False" ZoomMode="Disabled" AutomationProperties.AccessibilityView="Raw" />
+            <ScrollViewer x:Name="ContentElement" Grid.Row="1" Grid.Column="0" Foreground="{TemplateBinding Foreground}" HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}" IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}" Margin="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" IsTabStop="False" ZoomMode="Disabled" AutomationProperties.AccessibilityView="Raw" />
             <TextBlock x:Name="PlaceholderTextContentPresenter" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Foreground="{ThemeResource TextControlPlaceholderForeground}" Margin="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" Text="{TemplateBinding PlaceholderText}" IsHitTestVisible="False" />
             <ToggleButton x:Name="RevealButton" Grid.Row="1" Grid.Column="1" Style="{StaticResource RevealButtonStyle}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" Padding="{ThemeResource HelperButtonThemePadding}" IsTabStop="False" Visibility="Collapsed" FontSize="{TemplateBinding FontSize}" VerticalAlignment="Stretch" Width="30" />
             <ContentPresenter x:Name="DescriptionPresenter" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Content="{TemplateBinding Description}" Foreground="{ThemeResource SystemControlDescriptionTextForegroundBrush}" AutomationProperties.AccessibilityView="Raw" x:Load="False" />
@@ -197,4 +197,4 @@
       </Setter.Value>
     </Setter>
   </Style>
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/src/controls/dev/CommonStyles/TestUI/CommonStyles_TestUI.projitems b/src/controls/dev/CommonStyles/TestUI/CommonStyles_TestUI.projitems
index 6521478fb6..ca945d15e3 100644
--- a/src/controls/dev/CommonStyles/TestUI/CommonStyles_TestUI.projitems
+++ b/src/controls/dev/CommonStyles/TestUI/CommonStyles_TestUI.projitems
@@ -60,6 +60,11 @@
       <Generator>MSBuild:Compile</Generator>
       <IncludeInWindowsAppx>false</IncludeInWindowsAppx>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)VisualPropertiesPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+      <IncludeInWindowsAppx>false</IncludeInWindowsAppx>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)CalendarDatePickerPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -100,6 +105,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)ListViewAnchoringPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)GroupedItemsControlPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -162,6 +171,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)WindowPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)NewWindowRootPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)AppBarPage.xaml.cs">
@@ -194,6 +211,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)VisualStatesPage.xaml.cs">
       <DependentUpon>VisualStatesPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)VisualPropertiesPage.xaml.cs">
+      <DependentUpon>VisualPropertiesPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)CalendarDatePickerPage.xaml.cs">
       <DependentUpon>CalendarDatePickerPage.xaml</DependentUpon>
     </Compile>
@@ -227,6 +247,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)ListViewBasePage.xaml.cs">
       <DependentUpon>ListViewBasePage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)ListViewAnchoringPage.xaml.cs">
+      <DependentUpon>ListViewAnchoringPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)GroupedItemsControlPage.xaml.cs">
       <DependentUpon>GroupedItemsControlPage.xaml</DependentUpon>
     </Compile>
@@ -269,6 +292,12 @@
     <Compile Include="$(MSBuildThisFileDirectory)MediaTransportControlsPage.xaml.cs">
       <DependentUpon>MediaTransportControlsPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)WindowPage.xaml.cs">
+      <DependentUpon>WindowPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)NewWindowRootPage.xaml.cs">
+      <DependentUpon>NewWindowRootPage.xaml</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Page Include="$(MSBuildThisFileDirectory)CompactPage.xaml">
diff --git a/src/controls/dev/CommonStyles/TestUI/CompactPage.xaml.cs b/src/controls/dev/CommonStyles/TestUI/CompactPage.xaml.cs
index 1a5fa23cba..f408427a06 100644
--- a/src/controls/dev/CommonStyles/TestUI/CompactPage.xaml.cs
+++ b/src/controls/dev/CommonStyles/TestUI/CompactPage.xaml.cs
@@ -84,8 +84,8 @@ private void RunTest_Click(object sender, RoutedEventArgs e)
             VerifyChildHeight(simpleVerify, RichEditBox, "BorderElement", 24, "RichEditBox");
             VerifyChildHeight(simpleVerify, ComboBox, "Background", 24, "TextBox");
 
-            VerifyChildHeight(simpleVerify, TimePicker, "FlyoutButton", 24, "TimePicker");
-            VerifyChildHeight(simpleVerify, DatePicker, "FlyoutButton", 24, "DatePicker");
+            VerifyChildHeight(simpleVerify, TimePicker, "FlyoutButton", 22, "TimePicker");
+            VerifyChildHeight(simpleVerify, DatePicker, "FlyoutButton", 22, "DatePicker");
 
             CompactTestResult.Text = simpleVerify.ToString();
         }
diff --git a/src/controls/dev/CommonStyles/TestUI/GroupedListViewBasePage.xaml b/src/controls/dev/CommonStyles/TestUI/GroupedListViewBasePage.xaml
index a7eb90e26a..98d6a8d601 100644
--- a/src/controls/dev/CommonStyles/TestUI/GroupedListViewBasePage.xaml
+++ b/src/controls/dev/CommonStyles/TestUI/GroupedListViewBasePage.xaml
@@ -34,7 +34,7 @@
 
     <Grid x:Name="rootGrid" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Margin="4"
         RowDefinitions="Auto, *, Auto"
-        ColumnDefinitions="Auto, Auto, *, *">
+        ColumnDefinitions="Auto, Auto, Auto, *, *">
         <StackPanel Orientation="Horizontal" Grid.ColumnSpan="4">
             <TextBlock x:Name="tblGroupedListViewBasePageTitle" FontWeight="Bold" Margin="0,0,2,0" VerticalAlignment="Center"/>
             <CheckBox x:Name="chkProperties" 
@@ -44,6 +44,13 @@
                 IsChecked="True" 
                 IsThreeState="False"
                 Margin="2,0,0,0"/>
+            <CheckBox x:Name="chkMethods" 
+                Content="Methods" 
+                Checked="ChkMethods_Checked" 
+                Unchecked="ChkMethods_Unchecked" 
+                IsChecked="True" 
+                IsThreeState="False"
+                Margin="2,0,0,0"/>
             <CheckBox x:Name="chkDataSource" 
                 Content="DataSource" 
                 Checked="ChkDataSource_Checked" 
@@ -195,11 +202,11 @@
                 <Button x:Name="btnGetScrollViewerExtentHeight" Content="G" Margin="1" Grid.Row="18" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetScrollViewerExtentHeight_Click"/>
 
                 <TextBlock Text="HorizontalOffset:" Grid.Row="19" VerticalAlignment="Center"/>
-                <TextBox x:Name="txtScrollViewerHorizontalOffset" IsReadOnly="True" Grid.Row="19" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
+                <TextBox x:Name="txtScrollViewerHorizontalOffset" MaxWidth="157" IsReadOnly="True" Grid.Row="19" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
                 <Button x:Name="btnGetScrollViewerHorizontalOffset" Content="G" Margin="1" Grid.Row="19" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetScrollViewerHorizontalOffset_Click"/>
 
                 <TextBlock Text="VerticalOffset:" Grid.Row="20" VerticalAlignment="Center"/>
-                <TextBox x:Name="txtScrollViewerVerticalOffset" IsReadOnly="True" Grid.Row="20" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
+                <TextBox x:Name="txtScrollViewerVerticalOffset" MaxWidth="157" IsReadOnly="True" Grid.Row="20" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
                 <Button x:Name="btnGetScrollViewerVerticalOffset" Content="G" Margin="1" Grid.Row="20" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetScrollViewerVerticalOffset_Click"/>
 
                 <TextBlock Text="ItemsPanel Properties" Foreground="Red" Margin="0,4,0,0" Grid.Row="21" Grid.ColumnSpan="4"/>
@@ -268,26 +275,65 @@
                 <Button x:Name="btnGetItemsWrapGridItemHeight" Content="G" Margin="1" Grid.Row="30" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetItemsWrapGridItemHeight_Click"/>
                 <Button x:Name="btnSetItemsWrapGridItemHeight" Content="S" Margin="1" Grid.Row="30" Grid.Column="3" VerticalAlignment="Center" Click="BtnSetItemsWrapGridItemHeight_Click"/>
 
-                <TextBlock x:Name="tblItemsWrapGridCacheLength" Text="CacheLength:" Grid.Row="31" VerticalAlignment="Center"/>
-                <TextBox x:Name="txtItemsWrapGridCacheLength" Grid.Row="31" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
-                <Button x:Name="btnGetItemsWrapGridCacheLength" Content="G" Margin="1" Grid.Row="31" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetItemsWrapGridCacheLength_Click"/>
-                <Button x:Name="btnSetItemsWrapGridCacheLength" Content="S" Margin="1" Grid.Row="31" Grid.Column="3" VerticalAlignment="Center" Click="BtnSetItemsWrapGridCacheLength_Click"/>
+                <TextBlock x:Name="tblItemsPanelCacheLength" Text="CacheLength:" Grid.Row="31" VerticalAlignment="Center"/>
+                <TextBox x:Name="txtItemsPanelCacheLength" Grid.Row="31" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
+                <Button x:Name="btnGetItemsPanelCacheLength" Content="G" Margin="1" Grid.Row="31" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetItemsPanelCacheLength_Click"/>
+                <Button x:Name="btnSetItemsPanelCacheLength" Content="S" Margin="1" Grid.Row="31" Grid.Column="3" VerticalAlignment="Center" Click="BtnSetItemsPanelCacheLength_Click"/>
             </Grid>
         </ScrollViewer>
 
-        <ScrollViewer x:Name="svDataSource" Grid.Row="1" Grid.Column="1" Visibility="Collapsed">
+        <ScrollViewer x:Name="svMethods" Grid.Row="1" Grid.Column="1">
             <Grid Margin="4,0,4,0" Padding="6"
                 BorderBrush="{ThemeResource SystemChromeGrayColor}" BorderThickness="1"
-                RowDefinitions="Auto, Auto, Auto"
-                ColumnDefinitions="Auto">
-                <TextBlock Text="Data Source" Foreground="Red"/>
+                RowDefinitions="Auto, Auto, Auto, Auto"
+                ColumnDefinitions="Auto, Auto">
+                <TextBlock Text="Methods" Foreground="Red"/>
+
+                <TextBlock Text="Item index:" Grid.Row="1" VerticalAlignment="Center"/>
+                <TextBox x:Name="txtMethodsItemIndex" Text="0" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
+
+                <TextBlock Text="ScrollIntoViewAlignment:" Grid.Row="2" VerticalAlignment="Center"/>
+                <ComboBox x:Name="cmbScrollIntoViewAlignment" Grid.Row="2" Grid.Column="1"
+                    HorizontalAlignment="Stretch" VerticalAlignment="Center" SelectedIndex="0" MinWidth="125">
+                    <ComboBoxItem>Default</ComboBoxItem>
+                    <ComboBoxItem>Leading</ComboBoxItem>
+                </ComboBox>
+            
+                <Button x:Name="btnScrollIntoView" Content="ScrollIntoView" Margin="1" Grid.Row="3" Grid.ColumnSpan="2" VerticalAlignment="Center" Click="BtnScrollIntoView_Click"/>
+            </Grid>
+        </ScrollViewer>
+
+        <ScrollViewer x:Name="svDataSource" Grid.Row="1" Grid.Column="2" Visibility="Collapsed">
+            <Grid Background="{ThemeResource SystemListLowColor}" Margin="4,0,4,0" Padding="6"                
+                BorderBrush="{ThemeResource SystemChromeGrayColor}" BorderThickness="1"
+                RowDefinitions="Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto"
+                ColumnDefinitions="Auto, Auto, Auto, Auto">
+                <TextBlock Text="Data Source" Foreground="Red" Grid.ColumnSpan="4"/>
+
+                <Button x:Name="btnResetItemsSource" Content="Reset ItemsSource" Margin="1" Grid.Row="1" Grid.ColumnSpan="4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Click="BtnResetItemsSource_Click"/>
+                <Button x:Name="btnSetItemsSource" Content="Set ItemsSource" Margin="1" Grid.Row="2" Grid.ColumnSpan="4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Click="BtnSetItemsSource_Click"/>
+
+                <TextBlock Text="ICollectionView" Foreground="Red" Margin="0,4,0,0" Grid.Row="3" Grid.ColumnSpan="4"/>
+
+                <TextBlock Text="CurrentItem:" Grid.Row="4" VerticalAlignment="Center"/>
+                <TextBox x:Name="txtCollectionViewCurrentItem" IsReadOnly="True" TextWrapping="Wrap" MaxWidth="160" MaxHeight="320" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
+                <Button x:Name="btnGetCollectionViewCurrentItem" Content="G" Margin="1" Grid.Row="4" Grid.Column="3" VerticalAlignment="Center" Click="BtnGetCollectionViewCurrentItem_Click"/>
+
+                <TextBlock Text="CurrentPosition:" Grid.Row="5" VerticalAlignment="Center"/>
+                <TextBox x:Name="txtCollectionViewCurrentPosition" IsReadOnly="True" Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
+                <Button x:Name="btnGetCollectionViewCurrentPosition" Content="G" Margin="1" Grid.Row="5" Grid.Column="3" VerticalAlignment="Center" Click="BtnGetCollectionViewCurrentPosition_Click"/>
+
+                <TextBlock Text="MovePosition:" Grid.Row="6" VerticalAlignment="Center"/>
+                <TextBox x:Name="txtCollectionViewMovePosition" Text="0" Grid.Row="6" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
+                <Button x:Name="btnCollectionViewMoveCurrentToPosition" Content="MoveCurrentToPosition" Margin="1" Grid.Row="6" Grid.Column="2" Grid.ColumnSpan="2" VerticalAlignment="Center" Click="BtnCollectionViewMoveCurrentToPosition_Click"/>
+
+                <TextBlock Text="FocusManager" Foreground="Red" Margin="0,4,0,0" Grid.Row="7" Grid.ColumnSpan="4"/>
 
-                <Button x:Name="btnResetItemsSource" Content="Reset ItemsSource" Margin="1" Grid.Row="1" VerticalAlignment="Center" Click="BtnResetItemsSource_Click"/>
-                <Button x:Name="btnSetItemsSource" Content="Set ItemsSource" Margin="1" Grid.Row="2" VerticalAlignment="Center" Click="BtnSetItemsSource_Click"/>
+                <Button x:Name="btnFocusManagerCollectionViewCurrentItemProgrammaticFocus" Content="CurrentItem Programmatic Focus" Margin="1" Grid.Row="8" Grid.ColumnSpan="4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Click="BtnFocusManagerCollectionViewCurrentItemProgrammaticFocus_Click"/>
             </Grid>
         </ScrollViewer>
 
-        <Grid x:Name="grdLogs" Grid.Row="1" Grid.Column="2" Margin="2"
+        <Grid x:Name="grdLogs" Grid.Row="1" Grid.Column="3" Margin="2"
             RowDefinitions="Auto, Auto, *"
             ColumnDefinitions="*">
             <TextBlock Text="Logs" Foreground="Red"/>
@@ -296,7 +342,7 @@
             <ListBox x:Name="lstLogs" Margin="1" Grid.Row="2"/>
         </Grid>
 
-        <GridView x:Name="gridView" Grid.Row="1" Grid.Column="3" Background="Gray"
+        <GridView x:Name="gridView" Grid.Row="1" Grid.Column="4" Background="Gray"
             Visibility="Collapsed"
             ScrollViewer.ZoomMode="Enabled"
             ItemClick="ListViewBase_ItemClick">
@@ -327,7 +373,7 @@
             </GridView.ItemTemplate>
         </GridView>
 
-        <ListView x:Name="listView" Grid.Row="1" Grid.Column="3" Background="Gray"
+        <ListView x:Name="listView" Grid.Row="1" Grid.Column="4" Background="Gray"
             Visibility="Collapsed"
             ScrollViewer.ZoomMode="Enabled"
             ItemClick="ListViewBase_ItemClick">
@@ -358,7 +404,7 @@
             </ListView.ItemTemplate>
         </ListView>
 
-        <StackPanel Orientation="Horizontal" Grid.Row="2" Grid.ColumnSpan="4">
+        <StackPanel Orientation="Horizontal" Grid.Row="2" Grid.ColumnSpan="5">
             <TextBlock Text="Exception Report" VerticalAlignment="Center" Margin="2"/>
             <Button x:Name="btnClearExceptionReport" Content="Clear Exception Report" Click="BtnClearExceptionReport_Click" Margin="2"/>
             <TextBox x:Name="txtExceptionReport" IsReadOnly="True" Margin="2"/>
diff --git a/src/controls/dev/CommonStyles/TestUI/GroupedListViewBasePage.xaml.cs b/src/controls/dev/CommonStyles/TestUI/GroupedListViewBasePage.xaml.cs
index 70cf662289..c9e97b8d26 100644
--- a/src/controls/dev/CommonStyles/TestUI/GroupedListViewBasePage.xaml.cs
+++ b/src/controls/dev/CommonStyles/TestUI/GroupedListViewBasePage.xaml.cs
@@ -129,11 +129,11 @@ private void UpdateItemsPanelType()
                 {
                     switch (cmbListViewBaseItemsPanelType.SelectedIndex)
                     {
-                        case 0: // Use the wrapGridItemsPanelTemplate resource
+                        case 0: // Use the itemsWrapGridItemsPanelTemplate resource
                             _listViewBase.ItemsPanel = Resources["itemsWrapGridItemsPanelTemplate"] as ItemsPanelTemplate;
                             UpdateItemsWrapGridUIVisibility(Visibility.Visible);
                             break;
-                        case 1: // Use the stackPanelItemsPanelTemplate resource
+                        case 1: // Use the itemsStackPanelItemsPanelTemplate resource
                             _listViewBase.ItemsPanel = Resources["itemsStackPanelItemsPanelTemplate"] as ItemsPanelTemplate;
                             UpdateItemsWrapGridUIVisibility(Visibility.Collapsed);
                             break;
@@ -161,7 +161,7 @@ private void UpdateItemsPanelProperties()
             UpdateItemsPanelMargin();
             UpdateItemsPanelGroupPadding();
             UpdateItemsPanelAreStickyGroupHeadersEnabled();
-            UpdateItemsWrapGridCacheLength();
+            UpdateItemsPanelCacheLength();
             UpdateItemsWrapGridItemWidth();
             UpdateItemsWrapGridItemHeight();
 
@@ -379,17 +379,26 @@ private void UpdateItemsPanelAreStickyGroupHeadersEnabled()
             }
         }
 
-        private void UpdateItemsWrapGridCacheLength()
+        private void UpdateItemsPanelCacheLength()
         {
             try
             {
-                if (_listViewBase != null && txtItemsWrapGridCacheLength != null)
+                if (_listViewBase != null && txtItemsPanelCacheLength != null)
                 {
                     ItemsWrapGrid itemsWrapGrid = _listViewBase.ItemsPanelRoot as ItemsWrapGrid;
 
                     if (itemsWrapGrid != null)
                     {
-                        txtItemsWrapGridCacheLength.Text = itemsWrapGrid.CacheLength.ToString();
+                        txtItemsPanelCacheLength.Text = itemsWrapGrid.CacheLength.ToString();
+                    }
+                    else
+                    {
+                        ItemsStackPanel itemsStackPanel = _listViewBase.ItemsPanelRoot as ItemsStackPanel;
+
+                        if (itemsStackPanel != null)
+                        {
+                            txtItemsPanelCacheLength.Text = itemsStackPanel.CacheLength.ToString();
+                        }
                     }
                 }
             }
@@ -1002,22 +1011,31 @@ private void BtnSetItemsPanelGroupPadding_Click(object sender, RoutedEventArgs e
             }
         }
 
-        private void BtnGetItemsWrapGridCacheLength_Click(object sender, RoutedEventArgs e)
+        private void BtnGetItemsPanelCacheLength_Click(object sender, RoutedEventArgs e)
         {
-            UpdateItemsWrapGridCacheLength();
+            UpdateItemsPanelCacheLength();
         }
 
-        private void BtnSetItemsWrapGridCacheLength_Click(object sender, RoutedEventArgs e)
+        private void BtnSetItemsPanelCacheLength_Click(object sender, RoutedEventArgs e)
         {
             try
             {
-                if (_listViewBase != null && txtItemsWrapGridCacheLength != null)
+                if (_listViewBase != null && txtItemsPanelCacheLength != null)
                 {
                     ItemsWrapGrid itemsWrapGrid = _listViewBase.ItemsPanelRoot as ItemsWrapGrid;
 
                     if (itemsWrapGrid != null)
                     {
-                        itemsWrapGrid.CacheLength = double.Parse(txtItemsWrapGridCacheLength.Text);
+                        itemsWrapGrid.CacheLength = double.Parse(txtItemsPanelCacheLength.Text);
+                    }
+                    else
+                    {
+                        ItemsStackPanel itemsStackPanel = _listViewBase.ItemsPanelRoot as ItemsStackPanel;
+
+                        if (itemsStackPanel != null)
+                        {
+                            itemsStackPanel.CacheLength = double.Parse(txtItemsPanelCacheLength.Text);
+                        }
                     }
                 }
             }
@@ -1080,6 +1098,25 @@ private void BtnSetItemsWrapGridItemHeight_Click(object sender, RoutedEventArgs
             }
         }
 
+        private void BtnScrollIntoView_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (_listViewBase != null && _listViewBase.ItemsSource != null &&
+                    _groupedListViewBaseViewModel != null && 
+                    txtMethodsItemIndex != null && cmbScrollIntoViewAlignment != null)
+                {
+                    object item = GetDataSourceItemFromIndex(int.Parse(txtMethodsItemIndex.Text));
+                    _listViewBase.ScrollIntoView(item, (ScrollIntoViewAlignment)cmbScrollIntoViewAlignment.SelectedIndex); ;
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+                AppendEventMessage(ex.ToString());
+            }
+        }
+
         private void BtnResetItemsSource_Click(object sender, RoutedEventArgs e)
         {
             if (_listViewBase != null && _listViewBase.ItemsSource != null)
@@ -1096,6 +1133,62 @@ private void BtnSetItemsSource_Click(object sender, RoutedEventArgs e)
             }
         }
 
+        private void BtnGetCollectionViewCurrentItem_Click(object sender, RoutedEventArgs e)
+        {
+            if (txtCollectionViewCurrentItem != null && _cvs != null && _cvs.View != null)
+            {
+                string currentItemAsStr = _cvs.View.CurrentItem == null ? "null" : _cvs.View.CurrentItem.ToString();
+                txtCollectionViewCurrentItem.Text = currentItemAsStr.Length > 60 ? currentItemAsStr.Substring(0, 59) : currentItemAsStr;
+            }
+        }
+
+        private void BtnGetCollectionViewCurrentPosition_Click(object sender, RoutedEventArgs e)
+        {
+            if (txtCollectionViewCurrentPosition != null && _cvs != null && _cvs.View != null)
+            {
+                txtCollectionViewCurrentPosition.Text = _cvs.View.CurrentPosition.ToString();
+            }
+        }
+
+        private void BtnCollectionViewMoveCurrentToPosition_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (txtCollectionViewMovePosition != null && _cvs != null && _cvs.View != null)
+                {
+                    bool result = _cvs.View.MoveCurrentToPosition(int.Parse(txtCollectionViewMovePosition.Text));
+                    AppendEventMessage("ICollectionView.MoveCurrentToPosition result: " + result);
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+                AppendEventMessage(ex.ToString());
+            }
+        }
+
+        private async void BtnFocusManagerCollectionViewCurrentItemProgrammaticFocus_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (_listViewBase != null && _cvs != null && _cvs.View != null && _cvs.View.CurrentItem != null)
+                {
+                    DependencyObject container = _listViewBase.ContainerFromItem(_cvs.View.CurrentItem);
+
+                    if (container != null)
+                    {
+                        FocusMovementResult result = await FocusManager.TryFocusAsync(container, FocusState.Programmatic);
+                        AppendEventMessage("FocusManager.TryFocusAsync FocusMovementResult.Succeeded: " + result.Succeeded);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+                AppendEventMessage(ex.ToString());
+            }
+        }
+
         private void BtnGetScrollViewerHorizontalScrollMode_Click(object sender, RoutedEventArgs e)
         {
             UpdateScrollViewerHorizontalScrollMode();
@@ -1249,6 +1342,18 @@ private void ChkProperties_Unchecked(object sender, RoutedEventArgs e)
                 svProperties.Visibility = Visibility.Collapsed;
         }
 
+        private void ChkMethods_Checked(object sender, RoutedEventArgs e)
+        {
+            if (svMethods != null)
+                svMethods.Visibility = Visibility.Visible;
+        }
+
+        private void ChkMethods_Unchecked(object sender, RoutedEventArgs e)
+        {
+            if (svMethods != null)
+                svMethods.Visibility = Visibility.Collapsed;
+        }
+
         private void ChkDataSource_Checked(object sender, RoutedEventArgs e)
         {
             if (svDataSource != null)
@@ -1299,6 +1404,55 @@ private Thickness GetThicknessFromString(string thickness)
                     Convert.ToDouble(lengths[0]), Convert.ToDouble(lengths[1]), Convert.ToDouble(lengths[2]), Convert.ToDouble(lengths[3]));
         }
 
+        private object GetDataSourceItemFromIndex(int itemIndex)
+        {
+            // itemIndex:0 means the first group GroupedListViewBaseGroupItem
+            // itemIndex:1 means the first item GroupedListViewBaseItem in the first group GroupedListViewBaseGroupItem
+            if (itemIndex < 0 || _groupedListViewBaseViewModel.Items.Count == 0) return null;
+
+            int groupCount = _groupedListViewBaseViewModel.Items.Count;
+            int groupIndex = 0;
+            object item = null;
+
+            while (itemIndex >= 0 && groupIndex < groupCount)
+            {
+                GroupedListViewBaseGroupItem groupedListViewBaseGroupItem = _groupedListViewBaseViewModel.Items[groupIndex];
+                item = groupedListViewBaseGroupItem;
+
+                if (itemIndex == 0)
+                {
+                    return item;
+                }
+                else
+                {
+                    itemIndex--;
+
+                    int groupItemCount = groupedListViewBaseGroupItem.Items.Count;
+                    int groupItemIndex = 0;
+
+                    while (itemIndex >= 0 && groupItemIndex < groupItemCount)
+                    {
+                        GroupedListViewBaseItem groupedListViewBaseItem = groupedListViewBaseGroupItem.Items[groupItemIndex];
+                        item = groupedListViewBaseItem;
+
+                        if (itemIndex == 0)
+                        {
+                            return item;
+                        }
+                        else
+                        {
+                            itemIndex--;
+                            groupItemIndex++;
+                        }
+                    }
+
+                    groupIndex++;
+                }
+            }
+
+            return null;
+        }
+
         private static T FindElementOfTypeInSubtree<T>(DependencyObject element) where T : DependencyObject
         {
             if (element == null)
diff --git a/src/controls/dev/CommonStyles/TestUI/ListViewAnchoringPage.xaml b/src/controls/dev/CommonStyles/TestUI/ListViewAnchoringPage.xaml
new file mode 100644
index 0000000000..4fb2e52c7a
--- /dev/null
+++ b/src/controls/dev/CommonStyles/TestUI/ListViewAnchoringPage.xaml
@@ -0,0 +1,272 @@
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<local:TestPage
+    x:Class="MUXControlsTestApp.ListViewAnchoringPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:MUXControlsTestApp"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+
+    <local:TestPage.Resources>
+        <ItemsPanelTemplate x:Key="stackPanelItemsPanelTemplate">
+            <StackPanel
+                x:Name="stackPanel"
+                Orientation="Vertical"/>
+        </ItemsPanelTemplate>
+        <ItemsPanelTemplate x:Key="itemsWrapGridItemsPanelTemplate">
+            <ItemsWrapGrid
+                x:Name="itemsWrapGrid"
+                ItemHeight="150"
+                ItemWidth="350"
+                MaximumRowsOrColumns="2"
+                Orientation="Horizontal"/>
+        </ItemsPanelTemplate>
+    </local:TestPage.Resources>
+    
+    <Grid x:Name="rootGrid" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+        RowDefinitions="*, Auto, Auto, Auto, Auto, Auto, Auto"
+        ColumnDefinitions="*, Auto, Auto">
+        <Grid
+            Margin="4"
+            Grid.RowSpan="6"
+            Background="LightGray">
+            <ListView x:Name="listView"
+                Background="Gray">
+                <ListView.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <ItemsStackPanel
+                            VerticalAlignment="Top"
+                            ItemsUpdatingScrollMode="KeepItemsInView"/>
+                    </ItemsPanelTemplate>
+                </ListView.ItemsPanel>
+                <ListView.GroupStyle>
+                    <GroupStyle>
+                        <GroupStyle.HeaderTemplate>
+                            <DataTemplate>
+                                <TextBlock Height="48" FontSize="18" FontWeight="Bold" Text="{Binding Name}"/>
+                            </DataTemplate>
+                        </GroupStyle.HeaderTemplate>
+                    </GroupStyle>
+                </ListView.GroupStyle>
+                <ListView.ItemTemplate>
+                    <DataTemplate>
+                        <Border
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Top"
+                            Background="White"
+                            BorderThickness="1"
+                            BorderBrush="Black"
+                            CornerRadius="4"
+                            Height="100">
+                            <TextBlock
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Stretch"
+                                Text="{Binding Id}"
+                                FontSize="40"
+                                MaxLines="0"
+                                TextTrimming="CharacterEllipsis"
+                                TextWrapping="Wrap"/>
+                        </Border>
+                    </DataTemplate>
+                </ListView.ItemTemplate>
+                <ListView.ItemContainerTransitions>
+                    <TransitionCollection/>
+                </ListView.ItemContainerTransitions>
+            </ListView>
+        </Grid>
+        
+        <Grid
+            Margin="4"
+            Grid.Column="1"
+            VerticalAlignment="Top"
+            RowDefinitions="Auto, Auto"
+            ColumnDefinitions="Auto, Auto, Auto, Auto">
+
+            <TextBlock Text="ItemsStackPanel Properties" Foreground="Red" Grid.ColumnSpan="4"/>
+            
+            <TextBlock Text="ItemsUpdatingScrollMode:" Grid.Row="1" VerticalAlignment="Center"/>
+            <ComboBox x:Name="cmbItemsStackPanelItemsUpdatingScrollMode" Width="175" Grid.Row="1" Grid.Column="1" Margin="1" VerticalAlignment="Center" SelectedIndex="0">
+                <ComboBoxItem>KeepItemsInView</ComboBoxItem>
+                <ComboBoxItem>KeepScrollOffset</ComboBoxItem>
+                <ComboBoxItem>KeepLastItemInView</ComboBoxItem>
+            </ComboBox>
+            <Button x:Name="btnGetItemsStackPanelItemsUpdatingScrollMode" Content="G" Margin="1" Grid.Row="1" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetItemsStackPanelItemsUpdatingScrollMode_Click"/>
+            <Button x:Name="btnSetItemsStackPanelItemsUpdatingScrollMode" Content="S" Margin="1" Grid.Row="1" Grid.Column="3" VerticalAlignment="Center" Click="BtnSetItemsStackPanelItemsUpdatingScrollMode_Click"/>
+        </Grid>
+
+        <Grid
+            Margin="4"
+            Grid.Column="1"
+            Grid.Row="1"
+            VerticalAlignment="Top"
+            RowDefinitions="Auto, Auto, Auto, Auto, Auto"
+            ColumnDefinitions="Auto, Auto, Auto, Auto">
+
+            <TextBlock Text="ModernCollectionBasePanel Properties" Foreground="Red" Grid.ColumnSpan="4"/>
+
+            <TextBlock Text="GroupPadding:" Grid.Row="1" VerticalAlignment="Center"/>
+            <TextBox x:Name="txtModernCollectionBasePanelGroupPadding" Text="0,0,0,0" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
+            <Button x:Name="btnGetModernCollectionBasePanelGroupPadding" Content="G" Margin="1" Grid.Row="1" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetModernCollectionBasePanelGroupPadding_Click"/>
+            <Button x:Name="btnSetModernCollectionBasePanelGroupPadding" Content="S" Margin="1" Grid.Row="1" Grid.Column="3" VerticalAlignment="Center" Click="BtnSetModernCollectionBasePanelGroupPadding_Click"/>
+
+            <TextBlock Text="VerticalAlignment:" Grid.Row="2" VerticalAlignment="Center"/>
+            <ComboBox x:Name="cmbModernCollectionBasePanelVerticalAlignment" Width="175" Grid.Row="2" Grid.Column="1" Margin="1" VerticalAlignment="Center" SelectedIndex="0">
+                <ComboBoxItem>Top</ComboBoxItem>
+                <ComboBoxItem>Center</ComboBoxItem>
+                <ComboBoxItem>Bottom</ComboBoxItem>
+                <ComboBoxItem>Stretch</ComboBoxItem>
+            </ComboBox>
+            <Button x:Name="btnGetModernCollectionBasePanelVerticalAlignment" Content="G" Margin="1" Grid.Row="2" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetModernCollectionBasePanelVerticalAlignment_Click"/>
+            <Button x:Name="btnSetModernCollectionBasePanelVerticalAlignment" Content="S" Margin="1" Grid.Row="2" Grid.Column="3" VerticalAlignment="Center" Click="BtnSetModernCollectionBasePanelVerticalAlignment_Click"/>
+
+            <TextBlock Text="GroupHeaderPlacement:" Grid.Row="3" VerticalAlignment="Center"/>
+            <ComboBox x:Name="cmbModernCollectionBasePanelGroupHeaderPlacement" Grid.Row="3" Grid.Column="1"
+                HorizontalAlignment="Stretch" VerticalAlignment="Center" SelectedIndex="0" MinWidth="125">
+                <ComboBoxItem>Top</ComboBoxItem>
+                <ComboBoxItem>Left</ComboBoxItem>
+            </ComboBox>
+            <Button x:Name="btnGetModernCollectionBasePanelGroupHeaderPlacement" Content="G" Margin="1" Grid.Row="3" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetModernCollectionBasePanelGroupHeaderPlacement_Click"/>
+            <Button x:Name="btnSetModernCollectionBasePanelGroupHeaderPlacement" Content="S" Margin="1" Grid.Row="3" Grid.Column="3" VerticalAlignment="Center" Click="BtnSetModernCollectionBasePanelGroupHeaderPlacement_Click"/>
+
+            <TextBlock Text="AreStickyGroupHeadersEnabled:" Grid.Row="4" VerticalAlignment="Center"/>
+            <CheckBox x:Name="chkModernCollectionBasePanelAreStickyGroupHeadersEnabled"
+                Checked="ChkModernCollectionBasePanelAreStickyGroupHeadersEnabled_IsCheckedChanged"
+                Unchecked="ChkModernCollectionBasePanelAreStickyGroupHeadersEnabled_IsCheckedChanged"
+                IsChecked="True"
+                IsThreeState="False"
+                Margin="2,0,0,0"
+                Grid.Row="4"
+                Grid.Column="1"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center"/>
+        </Grid>
+
+        <Grid
+            Margin="4"
+            Grid.Column="1"
+            Grid.Row="2"
+            VerticalAlignment="Top"
+            RowDefinitions="Auto, Auto"
+            ColumnDefinitions="Auto, Auto, Auto, Auto">
+
+            <TextBlock Text="StackPanel Properties" Foreground="Red" Grid.ColumnSpan="4"/>
+
+            <TextBlock Text="VerticalAlignment:" Grid.Row="1" VerticalAlignment="Center"/>
+            <ComboBox x:Name="cmbStackPanelVerticalAlignment" Width="175" Grid.Row="1" Grid.Column="1" Margin="1" VerticalAlignment="Center" SelectedIndex="2">
+                <ComboBoxItem>Top</ComboBoxItem>
+                <ComboBoxItem>Center</ComboBoxItem>
+                <ComboBoxItem>Bottom</ComboBoxItem>
+                <ComboBoxItem>Stretch</ComboBoxItem>
+            </ComboBox>
+            <Button x:Name="btnGetStackPanelVerticalAlignment" Content="G" Margin="1" Grid.Row="1" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetStackPanelVerticalAlignment_Click"/>
+            <Button x:Name="btnSetStackPanelVerticalAlignment" Content="S" Margin="1" Grid.Row="1" Grid.Column="3" VerticalAlignment="Center" Click="BtnSetStackPanelVerticalAlignment_Click"/>
+        </Grid>
+
+        <Grid
+            Margin="4"
+            Grid.Column="1"
+            Grid.Row="3"
+            VerticalAlignment="Top"
+            RowDefinitions="Auto, Auto, Auto, Auto, Auto"
+            ColumnDefinitions="Auto, Auto, Auto, Auto">
+
+            <TextBlock Text="ListView Properties" Foreground="Red" Grid.ColumnSpan="4"/>
+
+            <TextBlock Text="ItemsPanel:" Grid.Row="1" VerticalAlignment="Center"/>
+            <ComboBox x:Name="cmbListViewItemsPanelType" Width="155" Margin="1" Grid.Row="1" Grid.Column="1"
+                HorizontalAlignment="Left" VerticalAlignment="Center" SelectedIndex="0" SelectionChanged="CmbListViewItemsPanelType_SelectionChanged">
+                <ComboBoxItem>ItemsStackPanel</ComboBoxItem>
+                <ComboBoxItem>ItemsWrapGrid</ComboBoxItem>
+                <ComboBoxItem>StackPanel</ComboBoxItem>
+            </ComboBox>
+
+            <TextBlock Text="ItemsSource:" Grid.Row="2" VerticalAlignment="Center"/>
+            <Button x:Name="btnSetListViewFlatItemsSource" Content="Set Flat" Margin="1" Grid.Row="2" Grid.Column="2" VerticalAlignment="Center" Click="BtnSetListViewFlatItemsSource_Click"/>
+            <Button x:Name="btnSetListViewGroupedItemsSource" Content="Set Grouped" Margin="1" Grid.Row="2" Grid.Column="3" VerticalAlignment="Center" Click="BtnSetListViewGroupedItemsSource_Click"/>
+            <Button x:Name="btnClearListViewItemsSource" Content="Clear" Margin="1" Grid.Row="3" Grid.Column="2" VerticalAlignment="Center" Click="BtnClearListViewItemsSource_Click"/>
+            <Button x:Name="btnResetListViewItemsSource" Content="Reset" Margin="1" Grid.Row="3" Grid.Column="3" VerticalAlignment="Center" Click="BtnResetListViewItemsSource_Click"/>
+
+            <TextBlock Text="Size:" Grid.Row="4" VerticalAlignment="Center"/>
+            <TextBox x:Name="txtListViewWidth" Width="100" IsReadOnly="True" Grid.Row="4" Grid.Column="1" VerticalAlignment="Center"/>
+            <TextBox x:Name="txtListViewHeight" Width="100" IsReadOnly="True" Grid.Row="4" Grid.Column="2" VerticalAlignment="Center"/>
+            <Button x:Name="btnGetListViewSize" Content="Get" Margin="1" Grid.Row="4" Grid.Column="3" Grid.ColumnSpan="2" VerticalAlignment="Center" Click="BtnGetListViewSize_Click"/>
+        </Grid>
+
+        <Grid
+            Margin="4"
+            Grid.Column="1"
+            Grid.Row="4"
+            VerticalAlignment="Top"
+            RowDefinitions="Auto, Auto, Auto"
+            ColumnDefinitions="Auto, Auto, Auto, Auto">
+
+            <TextBlock Text="ScrollViewer Properties" Foreground="Red" Grid.ColumnSpan="4"/>
+
+            <TextBlock Text="VerticalAnchorRatio:" Grid.Row="1" VerticalAlignment="Center"/>
+            <TextBox x:Name="txtScrollViewerVerticalAnchorRatio" Text="0" Width="100" Margin="1" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"/>
+            <Button x:Name="btnGetScrollViewerVerticalAnchorRatio" Content="Get" Margin="1" Grid.Row="1" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetScrollViewerVerticalAnchorRatio_Click"/>
+            <Button x:Name="btnSetScrollViewerVerticalAnchorRatio" Content="Set" Margin="1" Grid.Row="1" Grid.Column="3" VerticalAlignment="Center" Click="BtnSetScrollViewerVerticalAnchorRatio_Click"/>
+
+            <TextBlock Text="VerticalOffset:" Grid.Row="2" VerticalAlignment="Center"/>
+            <TextBox x:Name="txtScrollViewerVerticalOffset" Text="0" Width="100" Margin="1" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center"/>
+            <Button x:Name="btnGetScrollViewerVerticalOffset" Content="Get" Margin="1" Grid.Row="2" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetScrollViewerVerticalOffset_Click"/>
+            <Button x:Name="btnSetScrollViewerVerticalOffset" Content="Set" Margin="1" Grid.Row="2" Grid.Column="3" VerticalAlignment="Center" Click="BtnSetScrollViewerVerticalOffset_Click"/>
+        </Grid>
+
+        <Grid
+            Margin="4"
+            Grid.Column="1"
+            Grid.Row="5"
+            VerticalAlignment="Top"
+            RowDefinitions="Auto, Auto, Auto, Auto"
+            ColumnDefinitions="Auto, Auto, Auto, Auto">
+
+            <TextBlock Text="ListViewItem Properties" Foreground="Red" Grid.ColumnSpan="4"/>
+
+            <TextBlock Text="Index:" Grid.Row="1" VerticalAlignment="Center"/>
+            <TextBox x:Name="txtListViewItemIndex" Text="0" Width="100" Margin="1" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"/>
+
+            <TextBlock Text="ActualHeight:" Grid.Row="2" VerticalAlignment="Center"/>
+            <TextBox x:Name="txtListViewItemActualHeight" Text="0" IsReadOnly="True" Width="100" Margin="1" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center"/>
+            <Button x:Name="btnGetListViewItemActualHeight" Content="Get" Margin="1" Grid.Row="2" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetListViewItemActualHeight_Click"/>
+
+            <TextBlock Text="Height:" Grid.Row="3" VerticalAlignment="Center"/>
+            <TextBox x:Name="txtListViewItemHeight" Text="NaN" Width="100" Margin="1" Grid.Row="3" Grid.Column="1" VerticalAlignment="Center"/>
+            <Button x:Name="btnGetListViewItemHeight" Content="Get" Margin="1" Grid.Row="3" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetListViewItemHeight_Click"/>
+            <Button x:Name="btnSetListViewItemHeight" Content="Set" Margin="1" Grid.Row="3" Grid.Column="3" VerticalAlignment="Center" Click="BtnSetListViewItemHeight_Click"/>
+        </Grid>
+
+        <Grid
+            Margin="4"
+            Grid.Column="2"
+            Grid.RowSpan="6"
+            RowDefinitions="Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto"
+            ColumnDefinitions="Auto, Auto, Auto, Auto, Auto">
+
+            <TextBlock Text="Page Operations" Foreground="Red" Grid.ColumnSpan="5"/>
+
+            <TextBlock Text="Size:" Grid.Row="1" VerticalAlignment="Center"/>
+            <TextBox x:Name="txtPageWidth" Width="100" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"/>
+            <TextBox x:Name="txtPageHeight" Width="100" Grid.Row="1" Grid.Column="2" VerticalAlignment="Center"/>
+            <Button x:Name="btnGetPageSize" Content="Get" Margin="1" Grid.Row="1" Grid.Column="3" VerticalAlignment="Center" Click="BtnGetPageSize_Click"/>
+            <Button x:Name="btnSetPageSize" Content="Set" Margin="1" Grid.Row="1" Grid.Column="4" VerticalAlignment="Center" Click="BtnSetPageSize_Click"/>
+
+            <TextBlock Text="Operation Count:" Grid.Row="2" VerticalAlignment="Center"/>
+            <TextBox x:Name="txtPageOperationCount" Text="10" Width="100" Margin="1" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center"/>
+
+            <Button x:Name="btnPageShrinkSize" Content="Shrink Page Width &amp; Height" Margin="1" Grid.Row="3" Grid.ColumnSpan="2" VerticalAlignment="Center" Click="BtnPageShrinkSize_Click"/>
+            <Button x:Name="btnSourceInsertItem" Content="Insert ItemsSource Item" Margin="1" Grid.Row="4" Grid.ColumnSpan="2" VerticalAlignment="Center" Click="BtnSourceInsertItem_Click"/>
+            <Button x:Name="btnSourceAppendItem" Content="Append ItemsSource Item" Margin="1" Grid.Row="5" Grid.ColumnSpan="2" VerticalAlignment="Center" Click="BtnSourceAppendItem_Click"/>
+            <Button x:Name="btnSourceRemoveFirstItem" Content="Remove First ItemsSource Item" Margin="1" Grid.Row="6" Grid.ColumnSpan="2" VerticalAlignment="Center" Click="BtnSourceRemoveFirstItem_Click"/>
+            <Button x:Name="btnSourceRemoveLastItem" Content="Remove Last ItemsSource Item" Margin="1" Grid.Row="7" Grid.ColumnSpan="2" VerticalAlignment="Center" Click="BtnSourceRemoveLastItem_Click"/>
+        </Grid>
+
+        <StackPanel Orientation="Horizontal" Grid.Row="6" Grid.ColumnSpan="3">
+            <TextBlock Text="Exception Report" VerticalAlignment="Center" Margin="2"/>
+            <Button x:Name="btnClearExceptionReport" Content="Clear Exception Report" Click="BtnClearExceptionReport_Click" Margin="2"/>
+            <TextBox x:Name="txtExceptionReport" IsReadOnly="True" Margin="2"/>
+        </StackPanel>
+    </Grid>
+</local:TestPage>
diff --git a/src/controls/dev/CommonStyles/TestUI/ListViewAnchoringPage.xaml.cs b/src/controls/dev/CommonStyles/TestUI/ListViewAnchoringPage.xaml.cs
new file mode 100644
index 0000000000..d0260708aa
--- /dev/null
+++ b/src/controls/dev/CommonStyles/TestUI/ListViewAnchoringPage.xaml.cs
@@ -0,0 +1,918 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Media;
+using System;
+using System.Collections.ObjectModel;
+
+namespace MUXControlsTestApp
+{
+    public sealed partial class ListViewAnchoringPage : TestPage
+    {
+        [Flags]
+        private enum QueuedOperationType
+        {
+            None = 0,
+            PageShrinkSize = 1,
+            SourceInsertItem = 2,
+            SourceAppendItem = 4,
+            SourceRemoveFirstItem = 8,
+            SourceRemoveLastItem = 16
+        }
+
+        private GroupedListViewBaseViewModel _groupedListViewBaseViewModel;
+        private CollectionViewSource _cvs;
+        private ItemsPanelTemplate _itemsStackPanelTemplate;
+        private DispatcherTimer _pageOperationTimer;
+        private int _pageOperationCount;
+        private QueuedOperationType _pageOperations = QueuedOperationType.None;
+
+        public ListViewAnchoringPage()
+        {
+            this.InitializeComponent();
+
+            _pageOperationTimer = new DispatcherTimer();
+            _pageOperationTimer.Interval = new TimeSpan(0, 0, 0, 0, 125 /*ms*/);
+            _pageOperationTimer.Tick += PageOperationTimer_Tick;
+
+            Loaded += ListViewAnchoringPage_Loaded;
+        }
+
+        private void ListViewAnchoringPage_Loaded(object sender, RoutedEventArgs e)
+        {
+            if (listView != null)
+            {
+                _itemsStackPanelTemplate = listView.ItemsPanel;
+            }
+        }
+
+        private void PageOperationTimer_Tick(object sender, object e)
+        {
+            try
+            {
+                _pageOperationCount++;
+
+                int maxOperationCount = 10;
+
+                if (txtPageOperationCount != null)
+                {
+                    maxOperationCount = int.Parse(txtPageOperationCount.Text);
+                }
+
+                if ((_pageOperations & QueuedOperationType.PageShrinkSize) == QueuedOperationType.PageShrinkSize)
+                {
+                    Width = ActualWidth - 10.0;
+                    Height = ActualHeight - 10.0;
+                }
+
+                if (listView != null)
+                {
+                    if ((_pageOperations & QueuedOperationType.SourceInsertItem) == QueuedOperationType.SourceInsertItem)
+                    {
+                        if (listView.ItemsSource == null)
+                        {
+                            listView.ItemsSource = new ObservableCollection<GroupedListViewBaseItem>()
+                            {
+                                new GroupedListViewBaseItem("ListView Item 0")
+                            };
+                        }
+                        else
+                        {
+                            ObservableCollection<GroupedListViewBaseItem> source = listView.ItemsSource as ObservableCollection<GroupedListViewBaseItem>;
+                            if (source != null)
+                            {
+                                source.Insert(0, new GroupedListViewBaseItem("ListView Item " + source.Count));
+                            }
+                            else
+                            {
+                                int count = _groupedListViewBaseViewModel.Items.Count;
+                                string groupName = ((char)(65 + count)).ToString();
+                                GroupedListViewBaseGroupItem group = new GroupedListViewBaseGroupItem("Group " + groupName);
+                                group.Items.Add(new GroupedListViewBaseItem("id" + groupName + "1"));
+                                _groupedListViewBaseViewModel.Items.Insert(0, group);
+                            }
+                        }
+                    }
+
+                    if ((_pageOperations & QueuedOperationType.SourceAppendItem) == QueuedOperationType.SourceAppendItem)
+                    {
+                        if (listView.ItemsSource == null)
+                        {
+                            listView.ItemsSource = new ObservableCollection<GroupedListViewBaseItem>()
+                            {
+                                new GroupedListViewBaseItem("ListView Item 0")
+                            };
+                        }
+                        else
+                        {
+                            ObservableCollection<GroupedListViewBaseItem> source = listView.ItemsSource as ObservableCollection<GroupedListViewBaseItem>;
+                            if (source != null)
+                            {
+                                source.Add(new GroupedListViewBaseItem("ListView Item " + source.Count));
+                            }
+                            else
+                            {
+                                int count = _groupedListViewBaseViewModel.Items.Count;
+                                string groupName = ((char)(65 + count)).ToString();
+                                GroupedListViewBaseGroupItem group = new GroupedListViewBaseGroupItem("Group " + groupName);
+                                group.Items.Add(new GroupedListViewBaseItem("id" + groupName + "1"));
+                                _groupedListViewBaseViewModel.Items.Add(group);
+                            }
+                        }
+                    }
+
+                    if (listView.ItemsSource != null &&
+                        (_pageOperations & QueuedOperationType.SourceRemoveFirstItem) == QueuedOperationType.SourceRemoveFirstItem)
+                    {
+                        ObservableCollection<GroupedListViewBaseItem> source = listView.ItemsSource as ObservableCollection<GroupedListViewBaseItem>;
+                        if (source != null)
+                        {
+                            if (source.Count > 0)
+                            {
+                                source.RemoveAt(0);
+                            }
+                        }
+                        else
+                        {
+                            int count = _groupedListViewBaseViewModel.Items.Count;
+                            if (count > 0)
+                            {
+                                GroupedListViewBaseGroupItem group = _groupedListViewBaseViewModel.Items[0];
+                                group.Items.RemoveAt(0);
+                                if (group.Items.Count == 0)
+                                {
+                                    _groupedListViewBaseViewModel.Items.RemoveAt(0);
+                                }
+                            }
+                        }
+                    }
+
+                    if (listView.ItemsSource != null &&
+                        (_pageOperations & QueuedOperationType.SourceRemoveLastItem) == QueuedOperationType.SourceRemoveLastItem)
+                    {
+                        ObservableCollection<GroupedListViewBaseItem> source = listView.ItemsSource as ObservableCollection<GroupedListViewBaseItem>;
+                        if (source != null)
+                        {
+                            if (source.Count > 0)
+                            {
+                                source.RemoveAt(source.Count - 1);
+                            }
+                        }
+                        else
+                        {
+                            int count = _groupedListViewBaseViewModel.Items.Count;
+                            if (count > 0)
+                            {
+                                GroupedListViewBaseGroupItem group = _groupedListViewBaseViewModel.Items[count - 1];
+                                group.Items.RemoveAt(group.Items.Count - 1);
+                                if (group.Items.Count == 0)
+                                {
+                                    _groupedListViewBaseViewModel.Items.RemoveAt(count - 1);
+                                }
+                            }
+                        }
+                    }
+
+                    if (_pageOperationCount == maxOperationCount)
+                    {
+                        _pageOperations = QueuedOperationType.None;
+
+                        if (_pageOperationTimer != null)
+                        {
+                            _pageOperationTimer.Stop();
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void CmbListViewItemsPanelType_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            try
+            {
+                if (listView != null && cmbListViewItemsPanelType != null)
+                {
+                    switch (cmbListViewItemsPanelType.SelectedIndex)
+                    {
+                        case 0:
+                            if (_itemsStackPanelTemplate != null && _itemsStackPanelTemplate != listView.ItemsPanel)
+                            {
+                                listView.ItemsPanel = _itemsStackPanelTemplate;
+                            }
+                            break;
+                        case 1: // Use the itemsWrapGridItemsPanelTemplate resource
+                            listView.ItemsPanel = Resources["itemsWrapGridItemsPanelTemplate"] as ItemsPanelTemplate;
+                            break;
+                        case 2: // Use the stackPanelItemsPanelTemplate resource
+                            listView.ItemsPanel = Resources["stackPanelItemsPanelTemplate"] as ItemsPanelTemplate;
+                            break;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void BtnGetItemsStackPanelItemsUpdatingScrollMode_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (listView != null)
+                {
+                    ItemsStackPanel itemsStackPanel = GetItemsStackPanel();
+
+                    if (itemsStackPanel != null)
+                    {
+                        cmbItemsStackPanelItemsUpdatingScrollMode.SelectedIndex = (int)itemsStackPanel.ItemsUpdatingScrollMode;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void BtnSetItemsStackPanelItemsUpdatingScrollMode_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (listView != null)
+                {
+                    ItemsStackPanel itemsStackPanel = GetItemsStackPanel();
+
+                    if (itemsStackPanel != null)
+                    {
+                        itemsStackPanel.ItemsUpdatingScrollMode = (ItemsUpdatingScrollMode)cmbItemsStackPanelItemsUpdatingScrollMode.SelectedIndex;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void BtnGetModernCollectionBasePanelGroupPadding_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (listView != null && txtModernCollectionBasePanelGroupPadding != null)
+                {
+                    ItemsStackPanel itemsStackPanel = GetItemsStackPanel();
+
+                    if (itemsStackPanel != null)
+                    {
+                        txtModernCollectionBasePanelGroupPadding.Text = itemsStackPanel.GroupPadding.ToString();
+                    }
+                    else
+                    { 
+                        ItemsWrapGrid itemsWrapGrid = GetItemsWrapGrid();
+
+                        if (itemsWrapGrid != null)
+                        {
+                            txtModernCollectionBasePanelGroupPadding.Text = itemsWrapGrid.GroupPadding.ToString();
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void BtnSetModernCollectionBasePanelGroupPadding_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (listView != null && txtModernCollectionBasePanelGroupPadding != null)
+                {
+                    ItemsStackPanel itemsStackPanel = GetItemsStackPanel();
+
+                    if (itemsStackPanel != null)
+                    {
+                        itemsStackPanel.GroupPadding = GetThicknessFromString(txtModernCollectionBasePanelGroupPadding.Text);
+                    }
+                    else
+                    { 
+                        ItemsWrapGrid itemsWrapGrid = GetItemsWrapGrid();
+
+                        if (itemsWrapGrid != null)
+                        {
+                            itemsWrapGrid.GroupPadding = GetThicknessFromString(txtModernCollectionBasePanelGroupPadding.Text);
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void BtnGetModernCollectionBasePanelVerticalAlignment_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (listView != null && cmbModernCollectionBasePanelVerticalAlignment != null)
+                {
+                    ItemsStackPanel itemsStackPanel = GetItemsStackPanel();
+
+                    if (itemsStackPanel != null)
+                    {
+                        cmbModernCollectionBasePanelVerticalAlignment.SelectedIndex = (int)itemsStackPanel.VerticalAlignment;
+                    }
+                    else
+                    {
+                        ItemsWrapGrid itemsWrapGrid = GetItemsWrapGrid();
+
+                        if (itemsWrapGrid != null)
+                        {
+                            cmbModernCollectionBasePanelVerticalAlignment.SelectedIndex = (int)itemsWrapGrid.VerticalAlignment;
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void BtnSetModernCollectionBasePanelVerticalAlignment_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (listView != null && cmbModernCollectionBasePanelVerticalAlignment != null)
+                {
+                    ItemsStackPanel itemsStackPanel = GetItemsStackPanel();
+
+                    if (itemsStackPanel != null)
+                    {
+                        itemsStackPanel.VerticalAlignment = (VerticalAlignment)cmbModernCollectionBasePanelVerticalAlignment.SelectedIndex;
+                    }
+                    else
+                    {
+                        ItemsWrapGrid itemsWrapGrid = GetItemsWrapGrid();
+
+                        if (itemsWrapGrid != null)
+                        {
+                            itemsWrapGrid.VerticalAlignment = (VerticalAlignment)cmbModernCollectionBasePanelVerticalAlignment.SelectedIndex;
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void BtnGetStackPanelVerticalAlignment_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (listView != null && cmbStackPanelVerticalAlignment != null)
+                {
+                    StackPanel stackPanel = GetStackPanel();
+
+                    if (stackPanel != null)
+                    {
+                        cmbStackPanelVerticalAlignment.SelectedIndex = (int)stackPanel.VerticalAlignment;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void BtnSetStackPanelVerticalAlignment_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (listView != null && cmbStackPanelVerticalAlignment != null)
+                {
+                    StackPanel stackPanel = GetStackPanel();
+
+                    if (stackPanel != null)
+                    {
+                        stackPanel.VerticalAlignment = (VerticalAlignment)cmbStackPanelVerticalAlignment.SelectedIndex;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void BtnGetModernCollectionBasePanelGroupHeaderPlacement_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (cmbModernCollectionBasePanelGroupHeaderPlacement != null)
+                {
+                    ItemsStackPanel itemsStackPanel = GetItemsStackPanel();
+
+                    if (itemsStackPanel != null)
+                    {
+                        cmbModernCollectionBasePanelGroupHeaderPlacement.SelectedIndex = (int)itemsStackPanel.GroupHeaderPlacement;
+                    }
+                    else
+                    {
+                        ItemsWrapGrid itemsWrapGrid = GetItemsWrapGrid();
+
+                        if (itemsWrapGrid != null)
+                        {
+                            cmbModernCollectionBasePanelGroupHeaderPlacement.SelectedIndex = (int)itemsWrapGrid.GroupHeaderPlacement;
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void BtnSetModernCollectionBasePanelGroupHeaderPlacement_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (cmbModernCollectionBasePanelGroupHeaderPlacement != null)
+                {
+                    ItemsStackPanel itemsStackPanel = GetItemsStackPanel();
+
+                    if (itemsStackPanel != null)
+                    {
+                        itemsStackPanel.GroupHeaderPlacement = (GroupHeaderPlacement)cmbModernCollectionBasePanelGroupHeaderPlacement.SelectedIndex;
+                    }
+                    else
+                    {
+                        ItemsWrapGrid itemsWrapGrid = GetItemsWrapGrid();
+
+                        if (itemsWrapGrid != null)
+                        {
+                            itemsWrapGrid.GroupHeaderPlacement = (GroupHeaderPlacement)cmbModernCollectionBasePanelGroupHeaderPlacement.SelectedIndex;
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void ChkModernCollectionBasePanelAreStickyGroupHeadersEnabled_IsCheckedChanged(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (chkModernCollectionBasePanelAreStickyGroupHeadersEnabled != null)
+                {
+                    ItemsStackPanel itemsStackPanel = GetItemsStackPanel();
+
+                    if (itemsStackPanel != null)
+                    {
+                        itemsStackPanel.AreStickyGroupHeadersEnabled = (bool)chkModernCollectionBasePanelAreStickyGroupHeadersEnabled.IsChecked;
+                    }
+                    else
+                    {
+                        ItemsWrapGrid itemsWrapGrid = GetItemsWrapGrid();
+
+                        if (itemsWrapGrid != null)
+                        {
+                            itemsWrapGrid.AreStickyGroupHeadersEnabled = (bool)chkModernCollectionBasePanelAreStickyGroupHeadersEnabled.IsChecked;
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void BtnSetListViewFlatItemsSource_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (listView != null)
+                {
+                    listView.ItemsSource = new ObservableCollection<GroupedListViewBaseItem>()
+                    {
+                        new GroupedListViewBaseItem("ListView Item 0"),
+                        new GroupedListViewBaseItem("ListView Item 1"),
+                        new GroupedListViewBaseItem("ListView Item 2"),
+                        new GroupedListViewBaseItem("ListView Item 3"),
+                        new GroupedListViewBaseItem("ListView Item 4"),
+                        new GroupedListViewBaseItem("ListView Item 5")
+                    };
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void BtnSetListViewGroupedItemsSource_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (listView != null)
+                {
+                    _groupedListViewBaseViewModel = new GroupedListViewBaseViewModel();
+                    _cvs = new CollectionViewSource();
+
+                    _cvs.Source = _groupedListViewBaseViewModel.Items;
+                    _cvs.IsSourceGrouped = true;
+                    _cvs.ItemsPath = new PropertyPath("Items");
+
+                    listView.ItemsSource = _cvs.View;
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void BtnClearListViewItemsSource_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (listView != null)
+                {
+                    ObservableCollection<GroupedListViewBaseItem> source = listView.ItemsSource as ObservableCollection<GroupedListViewBaseItem>;
+                    if (source != null)
+                    {
+                        source.Clear();
+                    }
+                    else if (_groupedListViewBaseViewModel != null)
+                    {
+                        _groupedListViewBaseViewModel.Items.Clear();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void BtnResetListViewItemsSource_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (listView != null)
+                {
+                    listView.ItemsSource = null;
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void BtnGetListViewSize_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (listView != null && txtListViewWidth != null && txtListViewHeight != null)
+                {
+                    txtListViewWidth.Text = "AW: " + listView.ActualWidth.ToString();
+                    txtListViewHeight.Text = "AH: " + listView.ActualHeight.ToString();
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void BtnGetScrollViewerVerticalAnchorRatio_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (listView != null && txtScrollViewerVerticalAnchorRatio != null)
+                {
+                    ScrollViewer scrollViewer = FindElementOfTypeInSubtree<ScrollViewer>(listView);
+
+                    if (scrollViewer != null)
+                    {
+                        txtScrollViewerVerticalAnchorRatio.Text = scrollViewer.VerticalAnchorRatio.ToString();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void BtnSetScrollViewerVerticalAnchorRatio_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (listView != null && txtScrollViewerVerticalAnchorRatio != null)
+                {
+                    ScrollViewer scrollViewer = FindElementOfTypeInSubtree<ScrollViewer>(listView);
+
+                    if (scrollViewer != null)
+                    {
+                        scrollViewer.VerticalAnchorRatio = double.Parse(txtScrollViewerVerticalAnchorRatio.Text);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void BtnGetScrollViewerVerticalOffset_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (listView != null && txtScrollViewerVerticalOffset != null)
+                {
+                    ScrollViewer scrollViewer = FindElementOfTypeInSubtree<ScrollViewer>(listView);
+
+                    if (scrollViewer != null)
+                    {
+                        txtScrollViewerVerticalOffset.Text = scrollViewer.VerticalOffset.ToString();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void BtnSetScrollViewerVerticalOffset_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (listView != null && txtScrollViewerVerticalOffset != null)
+                {
+                    ScrollViewer scrollViewer = FindElementOfTypeInSubtree<ScrollViewer>(listView);
+
+                    if (scrollViewer != null)
+                    {
+                        scrollViewer.ChangeView(null, double.Parse(txtScrollViewerVerticalOffset.Text), null, true);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void BtnGetListViewItemActualHeight_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (listView != null && txtListViewItemIndex != null && txtListViewItemActualHeight != null)
+                {
+                    int listViewItemIndex = int.Parse(txtListViewItemIndex.Text);
+                    ListViewItem listViewItem = listView.ContainerFromIndex(listViewItemIndex) as ListViewItem;
+                    txtListViewItemActualHeight.Text = listViewItem.ActualHeight.ToString();
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void BtnGetListViewItemHeight_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (listView != null && txtListViewItemIndex != null && txtListViewItemHeight != null)
+                {
+                    int listViewItemIndex = int.Parse(txtListViewItemIndex.Text);
+                    ListViewItem listViewItem = listView.ContainerFromIndex(listViewItemIndex) as ListViewItem;
+                    txtListViewItemHeight.Text = listViewItem.Height.ToString();
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void BtnSetListViewItemHeight_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (listView != null && txtListViewItemIndex != null && txtListViewItemHeight != null)
+                {
+                    int listViewItemIndex = int.Parse(txtListViewItemIndex.Text);
+                    ListViewItem listViewItem = listView.ContainerFromIndex(listViewItemIndex) as ListViewItem;
+                    listViewItem.Height = double.Parse(txtListViewItemHeight.Text);
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void BtnGetPageSize_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (txtPageWidth != null && txtPageHeight != null)
+                {
+                    txtPageWidth.Text = ActualWidth.ToString();
+                    txtPageHeight.Text = ActualHeight.ToString();
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void BtnSetPageSize_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (txtPageWidth != null && txtPageHeight != null)
+                {
+                    Width = double.Parse(txtPageWidth.Text);
+                    Height = double.Parse(txtPageHeight.Text);
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void BtnPageShrinkSize_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (_pageOperationTimer != null)
+                {
+                    _pageOperations |= QueuedOperationType.PageShrinkSize;
+                    _pageOperationCount = 0;
+                    _pageOperationTimer.Start();
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void BtnSourceInsertItem_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (_pageOperationTimer != null)
+                {
+                    _pageOperations |= QueuedOperationType.SourceInsertItem;
+                    _pageOperationCount = 0;
+                    _pageOperationTimer.Start();
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void BtnSourceAppendItem_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (_pageOperationTimer != null)
+                {
+                    _pageOperations |= QueuedOperationType.SourceAppendItem;
+                    _pageOperationCount = 0;
+                    _pageOperationTimer.Start();
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void BtnSourceRemoveFirstItem_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (_pageOperationTimer != null)
+                {
+                    _pageOperations |= QueuedOperationType.SourceRemoveFirstItem;
+                    _pageOperationCount = 0;
+                    _pageOperationTimer.Start();
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void BtnSourceRemoveLastItem_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (_pageOperationTimer != null)
+                {
+                    _pageOperations |= QueuedOperationType.SourceRemoveLastItem;
+                    _pageOperationCount = 0;
+                    _pageOperationTimer.Start();
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+            }
+        }
+
+        private void BtnClearExceptionReport_Click(object sender, RoutedEventArgs e)
+        {
+            txtExceptionReport.Text = string.Empty;
+        }
+
+        private ItemsStackPanel GetItemsStackPanel()
+        {
+            if (listView != null)
+            {
+                return listView.ItemsPanelRoot as ItemsStackPanel;
+            }
+            return null;
+        }
+
+        private Thickness GetThicknessFromString(string thickness)
+        {
+            string[] lengths = thickness.Split(',');
+            if (lengths.Length < 4)
+                return new Thickness(
+                    Convert.ToDouble(lengths[0]));
+            else
+                return new Thickness(
+                    Convert.ToDouble(lengths[0]), Convert.ToDouble(lengths[1]), Convert.ToDouble(lengths[2]), Convert.ToDouble(lengths[3]));
+        }
+
+        private ItemsWrapGrid GetItemsWrapGrid()
+        {
+            if (listView != null)
+            {
+                return listView.ItemsPanelRoot as ItemsWrapGrid;
+            }
+            return null;
+        }
+
+        private StackPanel GetStackPanel()
+        {
+            if (listView != null)
+            {
+                return listView.ItemsPanelRoot as StackPanel;
+            }
+            return null;
+        }
+
+        private static T FindElementOfTypeInSubtree<T>(DependencyObject element) where T : DependencyObject
+        {
+            if (element == null)
+                return null;
+
+            if (element is T)
+                return (T)element;
+
+            int childrenCount = VisualTreeHelper.GetChildrenCount(element);
+            for (int i = 0; i < childrenCount; i++)
+            {
+                var result = FindElementOfTypeInSubtree<T>(VisualTreeHelper.GetChild(element, i));
+                if (result != null)
+                    return result;
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/controls/dev/CommonStyles/TestUI/ListViewBasePage.xaml b/src/controls/dev/CommonStyles/TestUI/ListViewBasePage.xaml
index 4f20718d97..e82cd92405 100644
--- a/src/controls/dev/CommonStyles/TestUI/ListViewBasePage.xaml
+++ b/src/controls/dev/CommonStyles/TestUI/ListViewBasePage.xaml
@@ -54,7 +54,7 @@
         <ScrollViewer x:Name="svListViewBaseProperties" Grid.Row="1">
             <Grid Background="{ThemeResource SystemListLowColor}" Margin="4,0,4,0" Padding="6"
                 BorderBrush="{ThemeResource SystemChromeGrayColor}" BorderThickness="1"
-                RowDefinitions="Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto"
+                RowDefinitions="Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto"
                 ColumnDefinitions="Auto, Auto, Auto, Auto">
                 <TextBlock Text="ListViewBase Properties" Foreground="Red"/>
 
@@ -66,55 +66,80 @@
                     <ComboBoxItem>StackPanel</ComboBoxItem>
                 </ComboBox>
 
-                <TextBlock Text="SelectionMode:" Grid.Row="2" VerticalAlignment="Center"/>
-                <ComboBox x:Name="cmbListViewBaseSelectionMode" Grid.Row="2" Grid.Column="1" Margin="1"
+                <TextBlock Text="ReorderMode:" Grid.Row="2" VerticalAlignment="Center"/>
+                <ComboBox x:Name="cmbListViewBaseReorderMode" Grid.Row="2" Grid.Column="1" Margin="1"
+                    HorizontalAlignment="Stretch" VerticalAlignment="Center" SelectedIndex="0" MinWidth="125">
+                    <ComboBoxItem>Disabled</ComboBoxItem>
+                    <ComboBoxItem>Enabled</ComboBoxItem>
+                </ComboBox>
+                <Button x:Name="btnGetListViewBaseReorderMode" Content="G" Margin="1" Grid.Row="2" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetListViewBaseReorderMode_Click"/>
+                <Button x:Name="btnSetListViewBaseReorderMode" Content="S" Margin="1" Grid.Row="2" Grid.Column="3" VerticalAlignment="Center" Click="BtnSetListViewBaseReorderMode_Click"/>
+
+                <TextBlock Text="SelectionMode:" Grid.Row="3" VerticalAlignment="Center"/>
+                <ComboBox x:Name="cmbListViewBaseSelectionMode" Grid.Row="3" Grid.Column="1" Margin="1"
                     HorizontalAlignment="Stretch" VerticalAlignment="Center" SelectedIndex="1" MinWidth="125">
                     <ComboBoxItem>None</ComboBoxItem>
                     <ComboBoxItem>Single</ComboBoxItem>
                     <ComboBoxItem>Multiple</ComboBoxItem>
                     <ComboBoxItem>Extended</ComboBoxItem>
                 </ComboBox>
-                <Button x:Name="btnGetListViewBaseSelectionMode" Content="G" Margin="1" Grid.Row="2" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetListViewBaseSelectionMode_Click"/>
-                <Button x:Name="btnSetListViewBaseSelectionMode" Content="S" Margin="1" Grid.Row="2" Grid.Column="3" VerticalAlignment="Center" Click="BtnSetListViewBaseSelectionMode_Click"/>
+                <Button x:Name="btnGetListViewBaseSelectionMode" Content="G" Margin="1" Grid.Row="3" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetListViewBaseSelectionMode_Click"/>
+                <Button x:Name="btnSetListViewBaseSelectionMode" Content="S" Margin="1" Grid.Row="3" Grid.Column="3" VerticalAlignment="Center" Click="BtnSetListViewBaseSelectionMode_Click"/>
 
-                <TextBlock Text="TabNavigation:" Grid.Row="3" VerticalAlignment="Center"/>
-                <ComboBox x:Name="cmbListViewBaseTabNavigation" Grid.Row="3" Grid.Column="1" Margin="1"
+                <TextBlock Text="TabNavigation:" Grid.Row="4" VerticalAlignment="Center"/>
+                <ComboBox x:Name="cmbListViewBaseTabNavigation" Grid.Row="4" Grid.Column="1" Margin="1"
                     HorizontalAlignment="Stretch" VerticalAlignment="Center" SelectedIndex="2" MinWidth="125">
                     <ComboBoxItem>Local</ComboBoxItem>
                     <ComboBoxItem>Cycle</ComboBoxItem>
                     <ComboBoxItem>Once</ComboBoxItem>
                 </ComboBox>
-                <Button x:Name="btnGetListViewBaseTabNavigation" Content="G" Margin="1" Grid.Row="3" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetListViewBaseTabNavigation_Click"/>
-                <Button x:Name="btnSetListViewBaseTabNavigation" Content="S" Margin="1" Grid.Row="3" Grid.Column="3" VerticalAlignment="Center" Click="BtnSetListViewBaseTabNavigation_Click"/>
+                <Button x:Name="btnGetListViewBaseTabNavigation" Content="G" Margin="1" Grid.Row="4" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetListViewBaseTabNavigation_Click"/>
+                <Button x:Name="btnSetListViewBaseTabNavigation" Content="S" Margin="1" Grid.Row="4" Grid.Column="3" VerticalAlignment="Center" Click="BtnSetListViewBaseTabNavigation_Click"/>
 
-                <TextBlock Text="IsItemClickEnabled:" Grid.Row="4" VerticalAlignment="Center"/>
-                <CheckBox x:Name="chkListViewBaseIsItemClickEnabled" VerticalAlignment="Center" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="3" Margin="1"
+                <TextBlock Text="IsItemClickEnabled:" Grid.Row="5" VerticalAlignment="Center"/>
+                <CheckBox x:Name="chkListViewBaseIsItemClickEnabled" VerticalAlignment="Center" Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="3" Margin="1"
                     Checked="ChkListViewBaseIsItemClickEnabled_IsCheckedChanged" Unchecked="ChkListViewBaseIsItemClickEnabled_IsCheckedChanged"/>
 
-                <TextBlock Text="SingleSelectionFollowsFocus:" Grid.Row="5" VerticalAlignment="Center"/>
-                <CheckBox x:Name="chkListViewBaseSingleSelectionFollowsFocus" VerticalAlignment="Center" Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="3" Margin="1"
+                <TextBlock Text="SingleSelectionFollowsFocus:" Grid.Row="6" VerticalAlignment="Center"/>
+                <CheckBox x:Name="chkListViewBaseSingleSelectionFollowsFocus" VerticalAlignment="Center" Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="3" Margin="1"
                     Checked="ChkListViewBaseSingleSelectionFollowsFocus_IsCheckedChanged" Unchecked="ChkListViewBaseSingleSelectionFollowsFocus_IsCheckedChanged"/>
 
-                <TextBlock Text="Header:" Grid.Row="6" VerticalAlignment="Center"/>
-                <ComboBox x:Name="cmbListViewBaseHeader" Width="155" Margin="1" Grid.Row="6" Grid.Column="1"
+                <TextBlock Text="AllowDrop:" Grid.Row="7" VerticalAlignment="Center"/>
+                <CheckBox x:Name="chkListViewBaseAllowDrop" VerticalAlignment="Center" Grid.Row="7" Grid.Column="1" Grid.ColumnSpan="3" Margin="1"
+                    Checked="ChkListViewBaseAllowDrop_IsCheckedChanged" Unchecked="ChkListViewBaseAllowDrop_IsCheckedChanged"/>
+
+                <TextBlock Text="CanDragItems:" Grid.Row="8" VerticalAlignment="Center"/>
+                <CheckBox x:Name="chkListViewBaseCanDragItems" VerticalAlignment="Center" Grid.Row="8" Grid.Column="1" Grid.ColumnSpan="3" Margin="1"
+                    Checked="ChkListViewBaseCanDragItems_IsCheckedChanged" Unchecked="ChkListViewBaseCanDragItems_IsCheckedChanged"/>
+
+                <TextBlock Text="CanReorderItems:" Grid.Row="9" VerticalAlignment="Center"/>
+                <CheckBox x:Name="chkListViewBaseCanReorderItems" VerticalAlignment="Center" Grid.Row="9" Grid.Column="1" Grid.ColumnSpan="3" Margin="1"
+                    Checked="ChkListViewBaseCanReorderItems_IsCheckedChanged" Unchecked="ChkListViewBaseCanReorderItems_IsCheckedChanged"/>
+
+                <TextBlock Text="IsSwipeEnabled:" Grid.Row="10" VerticalAlignment="Center"/>
+                <CheckBox x:Name="chkListViewBaseIsSwipeEnabled" VerticalAlignment="Center" Grid.Row="10" Grid.Column="1" Grid.ColumnSpan="3" Margin="1" IsChecked="True"
+                    Checked="ChkListViewBaseIsSwipeEnabled_IsCheckedChanged" Unchecked="ChkListViewBaseIsSwipeEnabled_IsCheckedChanged"/>
+
+                <TextBlock Text="Header:" Grid.Row="11" VerticalAlignment="Center"/>
+                <ComboBox x:Name="cmbListViewBaseHeader" Width="155" Margin="1" Grid.Row="11" Grid.Column="1"
                     HorizontalAlignment="Left" VerticalAlignment="Center" SelectedIndex="0" SelectionChanged="CmbListViewBaseHeader_SelectionChanged">
                     <ComboBoxItem>None</ComboBoxItem>
                     <ComboBoxItem>Non-focusable</ComboBoxItem>
                     <ComboBoxItem>Focusable</ComboBoxItem>
                 </ComboBox>
 
-                <TextBlock Text="Footer:" Grid.Row="7" VerticalAlignment="Center"/>
-                <ComboBox x:Name="cmbListViewBaseFooter" Width="155" Margin="1" Grid.Row="7" Grid.Column="1"
+                <TextBlock Text="Footer:" Grid.Row="12" VerticalAlignment="Center"/>
+                <ComboBox x:Name="cmbListViewBaseFooter" Width="155" Margin="1" Grid.Row="12" Grid.Column="1"
                     HorizontalAlignment="Left" VerticalAlignment="Center" SelectedIndex="0" SelectionChanged="CmbListViewBaseFooter_SelectionChanged">
                     <ComboBoxItem>None</ComboBoxItem>
                     <ComboBoxItem>Non-focusable</ComboBoxItem>
                     <ComboBoxItem>Focusable</ComboBoxItem>
                 </ComboBox>
 
-                <TextBlock Text="ScrollViewer Properties" Foreground="Red" Margin="0,4,0,0" Grid.Row="8" Grid.ColumnSpan="2"/>
+                <TextBlock Text="ScrollViewer Properties" Foreground="Red" Margin="0,4,0,0" Grid.Row="13" Grid.ColumnSpan="2"/>
 
-                <TextBlock Text="HorizontalSnapPointsType:" Grid.Row="9" VerticalAlignment="Center"/>
-                <ComboBox x:Name="cmbScrollViewerHorizontalSnapPointsType" Width="155" Margin="1" Grid.Row="9" Grid.Column="1"
+                <TextBlock Text="HorizontalSnapPointsType:" Grid.Row="14" VerticalAlignment="Center"/>
+                <ComboBox x:Name="cmbScrollViewerHorizontalSnapPointsType" Width="155" Margin="1" Grid.Row="14" Grid.Column="1"
                     HorizontalAlignment="Left" VerticalAlignment="Center" SelectedIndex="0" SelectionChanged="CmbScrollViewerHorizontalSnapPointsType_SelectionChanged">
                     <ComboBoxItem>None</ComboBoxItem>
                     <ComboBoxItem>Optional</ComboBoxItem>
@@ -123,8 +148,8 @@
                     <ComboBoxItem>MandatorySingle</ComboBoxItem>
                 </ComboBox>
 
-                <TextBlock Text="VerticalSnapPointsType:" Grid.Row="10" VerticalAlignment="Center"/>
-                <ComboBox x:Name="cmbScrollViewerVerticalSnapPointsType" Width="155" Margin="1" Grid.Row="10" Grid.Column="1"
+                <TextBlock Text="VerticalSnapPointsType:" Grid.Row="15" VerticalAlignment="Center"/>
+                <ComboBox x:Name="cmbScrollViewerVerticalSnapPointsType" Width="155" Margin="1" Grid.Row="15" Grid.Column="1"
                     HorizontalAlignment="Left" VerticalAlignment="Center" SelectedIndex="0" SelectionChanged="CmbScrollViewerVerticalSnapPointsType_SelectionChanged">
                     <ComboBoxItem>None</ComboBoxItem>
                     <ComboBoxItem>Optional</ComboBoxItem>
@@ -133,63 +158,63 @@
                     <ComboBoxItem>MandatorySingle</ComboBoxItem>
                 </ComboBox>
 
-                <TextBlock Text="HorizontalSnapPointsAlignment:" Grid.Row="11" VerticalAlignment="Center"/>
-                <ComboBox x:Name="cmbScrollViewerHorizontalSnapPointsAlignment" Width="155" Margin="1" Grid.Row="11" Grid.Column="1"
+                <TextBlock Text="HorizontalSnapPointsAlignment:" Grid.Row="16" VerticalAlignment="Center"/>
+                <ComboBox x:Name="cmbScrollViewerHorizontalSnapPointsAlignment" Width="155" Margin="1" Grid.Row="16" Grid.Column="1"
                     HorizontalAlignment="Left" VerticalAlignment="Center" SelectedIndex="0" SelectionChanged="CmbScrollViewerHorizontalSnapPointsAlignment_SelectionChanged">
                     <ComboBoxItem>Near</ComboBoxItem>
                     <ComboBoxItem>Center</ComboBoxItem>
                     <ComboBoxItem>Far</ComboBoxItem>
                 </ComboBox>
 
-                <TextBlock Text="VerticalSnapPointsAlignment:" Grid.Row="12" VerticalAlignment="Center"/>
-                <ComboBox x:Name="cmbScrollViewerVerticalSnapPointsAlignment" Width="155" Margin="1" Grid.Row="12" Grid.Column="1"
+                <TextBlock Text="VerticalSnapPointsAlignment:" Grid.Row="17" VerticalAlignment="Center"/>
+                <ComboBox x:Name="cmbScrollViewerVerticalSnapPointsAlignment" Width="155" Margin="1" Grid.Row="17" Grid.Column="1"
                     HorizontalAlignment="Left" VerticalAlignment="Center" SelectedIndex="0" SelectionChanged="CmbScrollViewerVerticalSnapPointsAlignment_SelectionChanged">
                     <ComboBoxItem>Near</ComboBoxItem>
                     <ComboBoxItem>Center</ComboBoxItem>
                     <ComboBoxItem>Far</ComboBoxItem>
                 </ComboBox>
 
-                <TextBlock Text="ViewportWidth:" Grid.Row="13" VerticalAlignment="Center"/>
-                <TextBox x:Name="txtScrollViewerViewportWidth" IsReadOnly="True" Grid.Row="13" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
-                <Button x:Name="btnGetScrollViewerViewportWidth" Content="G" Margin="1" Grid.Row="13" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetScrollViewerViewportWidth_Click"/>
+                <TextBlock Text="ViewportWidth:" Grid.Row="18" VerticalAlignment="Center"/>
+                <TextBox x:Name="txtScrollViewerViewportWidth" IsReadOnly="True" Grid.Row="18" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
+                <Button x:Name="btnGetScrollViewerViewportWidth" Content="G" Margin="1" Grid.Row="18" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetScrollViewerViewportWidth_Click"/>
 
-                <TextBlock Text="ViewportHeight:" Grid.Row="14" VerticalAlignment="Center"/>
-                <TextBox x:Name="txtScrollViewerViewportHeight" IsReadOnly="True" Grid.Row="14" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
-                <Button x:Name="btnGetScrollViewerViewportHeight" Content="G" Margin="1" Grid.Row="14" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetScrollViewerViewportHeight_Click"/>
+                <TextBlock Text="ViewportHeight:" Grid.Row="19" VerticalAlignment="Center"/>
+                <TextBox x:Name="txtScrollViewerViewportHeight" IsReadOnly="True" Grid.Row="19" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
+                <Button x:Name="btnGetScrollViewerViewportHeight" Content="G" Margin="1" Grid.Row="19" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetScrollViewerViewportHeight_Click"/>
 
-                <TextBlock Text="ExtentWidth:" Grid.Row="15" VerticalAlignment="Center"/>
-                <TextBox x:Name="txtScrollViewerExtentWidth" IsReadOnly="True" Grid.Row="15" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
-                <Button x:Name="btnGetScrollViewerExtentWidth" Content="G" Margin="1" Grid.Row="15" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetScrollViewerExtentWidth_Click"/>
+                <TextBlock Text="ExtentWidth:" Grid.Row="20" VerticalAlignment="Center"/>
+                <TextBox x:Name="txtScrollViewerExtentWidth" IsReadOnly="True" Grid.Row="20" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
+                <Button x:Name="btnGetScrollViewerExtentWidth" Content="G" Margin="1" Grid.Row="20" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetScrollViewerExtentWidth_Click"/>
 
-                <TextBlock Text="ExtentHeight:" Grid.Row="16" VerticalAlignment="Center"/>
-                <TextBox x:Name="txtScrollViewerExtentHeight" IsReadOnly="True" Grid.Row="16" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
-                <Button x:Name="btnGetScrollViewerExtentHeight" Content="G" Margin="1" Grid.Row="16" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetScrollViewerExtentHeight_Click"/>
+                <TextBlock Text="ExtentHeight:" Grid.Row="21" VerticalAlignment="Center"/>
+                <TextBox x:Name="txtScrollViewerExtentHeight" IsReadOnly="True" Grid.Row="21" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
+                <Button x:Name="btnGetScrollViewerExtentHeight" Content="G" Margin="1" Grid.Row="21" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetScrollViewerExtentHeight_Click"/>
 
-                <TextBlock Text="HorizontalOffset:" Grid.Row="17" VerticalAlignment="Center"/>
-                <TextBox x:Name="txtScrollViewerHorizontalOffset" IsReadOnly="True" Grid.Row="17" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
-                <Button x:Name="btnGetScrollViewerHorizontalOffset" Content="G" Margin="1" Grid.Row="17" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetScrollViewerHorizontalOffset_Click"/>
+                <TextBlock Text="HorizontalOffset:" Grid.Row="22" VerticalAlignment="Center"/>
+                <TextBox x:Name="txtScrollViewerHorizontalOffset" IsReadOnly="True" Grid.Row="22" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
+                <Button x:Name="btnGetScrollViewerHorizontalOffset" Content="G" Margin="1" Grid.Row="22" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetScrollViewerHorizontalOffset_Click"/>
 
-                <TextBlock Text="VerticalOffset:" Grid.Row="18" VerticalAlignment="Center"/>
-                <TextBox x:Name="txtScrollViewerVerticalOffset" IsReadOnly="True" Grid.Row="18" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
-                <Button x:Name="btnGetScrollViewerVerticalOffset" Content="G" Margin="1" Grid.Row="18" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetScrollViewerVerticalOffset_Click"/>
+                <TextBlock Text="VerticalOffset:" Grid.Row="23" VerticalAlignment="Center"/>
+                <TextBox x:Name="txtScrollViewerVerticalOffset" IsReadOnly="True" Grid.Row="23" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
+                <Button x:Name="btnGetScrollViewerVerticalOffset" Content="G" Margin="1" Grid.Row="23" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetScrollViewerVerticalOffset_Click"/>
 
-                <TextBlock Text="ItemsPanel Properties" Foreground="Red" Margin="0,4,0,0" Grid.Row="19" Grid.ColumnSpan="2"/>
+                <TextBlock Text="ItemsPanel Properties" Foreground="Red" Margin="0,4,0,0" Grid.Row="24" Grid.ColumnSpan="2"/>
 
-                <TextBlock Text="Orientation:" Grid.Row="20" VerticalAlignment="Center"/>
-                <ComboBox x:Name="cmbItemsPanelOrientation" Grid.Row="20" Grid.Column="1" Margin="1"
+                <TextBlock Text="Orientation:" Grid.Row="25" VerticalAlignment="Center"/>
+                <ComboBox x:Name="cmbItemsPanelOrientation" Grid.Row="25" Grid.Column="1" Margin="1"
                     HorizontalAlignment="Stretch" VerticalAlignment="Center" MinWidth="125">
                     <ComboBoxItem>Vertical</ComboBoxItem>
                     <ComboBoxItem>Horizontal</ComboBoxItem>
                 </ComboBox>
-                <Button x:Name="btnGetItemsPanelOrientation" Content="G" Margin="1" Grid.Row="20" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetItemsPanelOrientation_Click"/>
-                <Button x:Name="btnSetItemsPanelOrientation" Content="S" Margin="1" Grid.Row="20" Grid.Column="3" VerticalAlignment="Center" Click="BtnSetItemsPanelOrientation_Click"/>
+                <Button x:Name="btnGetItemsPanelOrientation" Content="G" Margin="1" Grid.Row="25" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetItemsPanelOrientation_Click"/>
+                <Button x:Name="btnSetItemsPanelOrientation" Content="S" Margin="1" Grid.Row="25" Grid.Column="3" VerticalAlignment="Center" Click="BtnSetItemsPanelOrientation_Click"/>
 
-                <TextBlock Text="Margin:" Grid.Row="21" VerticalAlignment="Center"/>
-                <TextBox x:Name="txtItemsPanelMargin" Grid.Row="21" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
-                <Button x:Name="btnGetItemsPanelMargin" Content="G" Margin="1" Grid.Row="21" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetItemsPanelMargin_Click"/>
-                <Button x:Name="btnSetItemsPanelMargin" Content="S" Margin="1" Grid.Row="21" Grid.Column="3" VerticalAlignment="Center" Click="BtnSetItemsPanelMargin_Click"/>
+                <TextBlock Text="Margin:" Grid.Row="26" VerticalAlignment="Center"/>
+                <TextBox x:Name="txtItemsPanelMargin" Grid.Row="26" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
+                <Button x:Name="btnGetItemsPanelMargin" Content="G" Margin="1" Grid.Row="26" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetItemsPanelMargin_Click"/>
+                <Button x:Name="btnSetItemsPanelMargin" Content="S" Margin="1" Grid.Row="26" Grid.Column="3" VerticalAlignment="Center" Click="BtnSetItemsPanelMargin_Click"/>
 
-                <TextBlock x:Name="tblItemsWrapGridMaximumRowsOrColumns" Text="MaximumRowsOrColumns:" Grid.Row="22" VerticalAlignment="Center"
+                <TextBlock x:Name="tblItemsWrapGridMaximumRowsOrColumns" Text="MaximumRowsOrColumns:" Grid.Row="27" VerticalAlignment="Center"
                     Visibility="Collapsed"/>
                 <NumberBox x:Name="nbItemsWrapGridMaximumRowsOrColumns"
                     SpinButtonPlacementMode="Inline"
@@ -197,7 +222,7 @@
                     Maximum ="11"
                     Value="11"
                     Margin="2,1,1,1"
-                    Grid.Row="22"
+                    Grid.Row="27"
                     Grid.Column="1"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
diff --git a/src/controls/dev/CommonStyles/TestUI/ListViewBasePage.xaml.cs b/src/controls/dev/CommonStyles/TestUI/ListViewBasePage.xaml.cs
index a1c628e1a7..a2912f7f90 100644
--- a/src/controls/dev/CommonStyles/TestUI/ListViewBasePage.xaml.cs
+++ b/src/controls/dev/CommonStyles/TestUI/ListViewBasePage.xaml.cs
@@ -140,6 +140,14 @@ private void UpdateItemsPanelProperties()
             _ = this.DispatcherQueue.TryEnqueue(Microsoft.UI.Dispatching.DispatcherQueuePriority.Low, UpdateScrollViewerProperties);
         }
 
+        private void UpdateListViewBaseReorderMode()
+        {
+            if (_listViewBase != null && cmbListViewBaseReorderMode != null)
+            {
+                cmbListViewBaseReorderMode.SelectedIndex = (int)_listViewBase.ReorderMode;
+            }
+        }
+
         private void UpdateListViewBaseSelectionMode()
         {
             if (_listViewBase != null && cmbListViewBaseSelectionMode != null)
@@ -644,6 +652,19 @@ private void ListViewBase_ItemClick(object sender, ItemClickEventArgs e)
             }
         }
 
+        private void BtnGetListViewBaseReorderMode_Click(object sender, RoutedEventArgs e)
+        {
+            UpdateListViewBaseReorderMode();
+        }
+
+        private void BtnSetListViewBaseReorderMode_Click(object sender, RoutedEventArgs e)
+        {
+            if (_listViewBase != null && cmbListViewBaseReorderMode != null)
+            {
+                _listViewBase.ReorderMode = (ListViewReorderMode)cmbListViewBaseReorderMode.SelectedIndex;
+            }
+        }
+
         private void BtnGetListViewBaseSelectionMode_Click(object sender, RoutedEventArgs e)
         {
             UpdateListViewBaseSelectionMode();
@@ -1062,6 +1083,70 @@ private void BtnDataSourceReplaceItem_Click(object sender, RoutedEventArgs e)
             }
         }
 
+        private void ChkListViewBaseAllowDrop_IsCheckedChanged(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (_listViewBase != null)
+                {
+                    _listViewBase.AllowDrop = (bool)chkListViewBaseAllowDrop.IsChecked;
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+                AppendEventMessage(ex.ToString());
+            }
+        }
+
+        private void ChkListViewBaseCanDragItems_IsCheckedChanged(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (_listViewBase != null)
+                {
+                    _listViewBase.CanDragItems = (bool)chkListViewBaseCanDragItems.IsChecked;
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+                AppendEventMessage(ex.ToString());
+            }
+        }
+
+        private void ChkListViewBaseCanReorderItems_IsCheckedChanged(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (_listViewBase != null)
+                {
+                    _listViewBase.CanReorderItems = (bool)chkListViewBaseCanReorderItems.IsChecked;
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+                AppendEventMessage(ex.ToString());
+            }
+        }
+
+        private void ChkListViewBaseIsSwipeEnabled_IsCheckedChanged(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (_listViewBase != null)
+                {
+                    _listViewBase.IsSwipeEnabled = (bool)chkListViewBaseIsSwipeEnabled.IsChecked;
+                }
+            }
+            catch (Exception ex)
+            {
+                txtExceptionReport.Text = ex.ToString();
+                AppendEventMessage(ex.ToString());
+            }
+        }
+
         private void ChkListViewBaseIsItemClickEnabled_IsCheckedChanged(object sender, RoutedEventArgs e)
         {
             try
diff --git a/src/controls/dev/CommonStyles/TestUI/ListViewPage.xaml b/src/controls/dev/CommonStyles/TestUI/ListViewPage.xaml
index 4bf3df954b..216d65b932 100644
--- a/src/controls/dev/CommonStyles/TestUI/ListViewPage.xaml
+++ b/src/controls/dev/CommonStyles/TestUI/ListViewPage.xaml
@@ -12,5 +12,6 @@
         <Button x:Name="navigateToListView" AutomationProperties.Name="navigateToListView" Margin="2" HorizontalAlignment="Stretch">ListView</Button>
         <Button x:Name="navigateToGroupedListView" AutomationProperties.Name="navigateToGroupedListView" Margin="2" HorizontalAlignment="Stretch">Grouped ListView</Button>
         <Button x:Name="navigateToNestedListViews" AutomationProperties.Name="navigateToNestedListViews" Margin="2" HorizontalAlignment="Stretch">Nested ListViews</Button>
+        <Button x:Name="navigateToListViewAnchoring" AutomationProperties.Name="navigateToListViewAnchoring" Margin="2" HorizontalAlignment="Stretch">ListView Anchoring</Button>
     </StackPanel>
 </local:TestPage>
diff --git a/src/controls/dev/CommonStyles/TestUI/ListViewPage.xaml.cs b/src/controls/dev/CommonStyles/TestUI/ListViewPage.xaml.cs
index 72fd6e4b24..3181ad891b 100644
--- a/src/controls/dev/CommonStyles/TestUI/ListViewPage.xaml.cs
+++ b/src/controls/dev/CommonStyles/TestUI/ListViewPage.xaml.cs
@@ -15,6 +15,7 @@ public ListViewPage()
             navigateToListView.Click += delegate { Frame.NavigateWithoutAnimation(typeof(ListViewBasePage), false /*use GridView*/); };
             navigateToGroupedListView.Click += delegate { Frame.NavigateWithoutAnimation(typeof(GroupedListViewBasePage), false /*use GridView*/); };
             navigateToNestedListViews.Click += delegate { Frame.NavigateWithoutAnimation(typeof(NestedListViewsPage)); };
+            navigateToListViewAnchoring.Click += delegate { Frame.NavigateWithoutAnimation(typeof(ListViewAnchoringPage)); };
         }
     }
 }
diff --git a/src/controls/dev/CommonStyles/TestUI/NewWindowRootPage.xaml b/src/controls/dev/CommonStyles/TestUI/NewWindowRootPage.xaml
new file mode 100644
index 0000000000..790e565c1e
--- /dev/null
+++ b/src/controls/dev/CommonStyles/TestUI/NewWindowRootPage.xaml
@@ -0,0 +1,62 @@
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<local:TestPage
+    x:Class="MUXControlsTestApp.NewWindowRootPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:MUXControlsTestApp"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="40"
+        ColumnDefinitions="Auto, Auto"
+        RowDefinitions="Auto, Auto, Auto">
+
+        <StackPanel Orientation="Horizontal">
+            <TextBlock Text="NewWindowRootPage" FontSize="20" Margin="20" Grid.ColumnSpan="2"/>
+            <CheckBox x:Name="TestContentLoadedCheckBox" AutomationProperties.AutomationId="__TestContentLoadedCheckBox" Content="TestContentLoadedCheckbox"
+                IsChecked="False" IsTabStop="False" IsHitTestVisible="False" Width="0" Height="0" Opacity="0"/>
+        </StackPanel>
+        
+        <StackPanel Grid.Row="1">
+            <TextBlock Text="ScrollViewer:" FontSize="16" Margin="6"/>
+            <ScrollViewer Width="200" Height="400" Margin="20">
+                <StackPanel>
+                    <Rectangle Fill="LightGray" Width="160" Height="160"/>
+                    <Rectangle Fill="Gray" Width="160" Height="160"/>
+                    <Rectangle Fill="DarkGray" Width="160" Height="160"/>
+                    <Rectangle Fill="LightGray" Width="160" Height="160"/>
+                    <Rectangle Fill="Gray" Width="160" Height="160"/>
+                    <Rectangle Fill="DarkGray" Width="160" Height="160"/>
+                </StackPanel>
+            </ScrollViewer>
+        </StackPanel>
+
+        <StackPanel Grid.Row="2">
+            <TextBlock Text="ScrollView:" FontSize="16" Margin="6"/>
+            <ScrollView Width="200" Height="400" Margin="20">
+                <StackPanel>
+                    <Rectangle Fill="LightGray" Width="160" Height="160"/>
+                    <Rectangle Fill="Gray" Width="160" Height="160"/>
+                    <Rectangle Fill="DarkGray" Width="160" Height="160"/>
+                    <Rectangle Fill="LightGray" Width="160" Height="160"/>
+                    <Rectangle Fill="Gray" Width="160" Height="160"/>
+                    <Rectangle Fill="DarkGray" Width="160" Height="160"/>
+                </StackPanel>
+            </ScrollView>
+        </StackPanel>
+
+        <StackPanel Grid.Column="1" Grid.Row="1">
+            <TextBlock Text="ListView:" FontSize="16" Margin="6"/>
+            <ListView Width="200" Height="400" Margin="20" Background="LightGray"
+                AllowDrop="True" CanReorderItems="True">
+                <ListViewItem Height="160">One</ListViewItem>
+                <ListViewItem Height="160">Two</ListViewItem>
+                <ListViewItem Height="160">Three</ListViewItem>
+                <ListViewItem Height="160">Four</ListViewItem>
+                <ListViewItem Height="160">Five</ListViewItem>
+                <ListViewItem Height="160">Six</ListViewItem>
+            </ListView>
+        </StackPanel>
+    </Grid>
+</local:TestPage>
diff --git a/src/controls/dev/CommonStyles/TestUI/NewWindowRootPage.xaml.cs b/src/controls/dev/CommonStyles/TestUI/NewWindowRootPage.xaml.cs
new file mode 100644
index 0000000000..c4594206de
--- /dev/null
+++ b/src/controls/dev/CommonStyles/TestUI/NewWindowRootPage.xaml.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using Microsoft.UI.Xaml.Controls;
+
+namespace MUXControlsTestApp
+{
+    public sealed partial class NewWindowRootPage : TestPage
+    {
+        public NewWindowRootPage()
+        {
+            this.InitializeComponent();
+        }
+    }
+}
diff --git a/src/controls/dev/CommonStyles/TestUI/TextControlsPage.xaml.cs b/src/controls/dev/CommonStyles/TestUI/TextControlsPage.xaml.cs
index 2bb9d4cc0d..c43345c135 100644
--- a/src/controls/dev/CommonStyles/TestUI/TextControlsPage.xaml.cs
+++ b/src/controls/dev/CommonStyles/TestUI/TextControlsPage.xaml.cs
@@ -3,6 +3,7 @@
 using System.Collections.ObjectModel;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using MUXControlsTestApp.Utilities;
 
 namespace MUXControlsTestApp
 {
@@ -21,12 +22,12 @@ private void ResizeRootGrid(object sender, RoutedEventArgs e)
         {
             if (isRootGridDefaultSize)
             {
-                TestFrame.Instance.SetRootGridSizeToCustomSize(1, 1);
+                this.FindVisualParentByType<TestFrame>().SetRootGridSizeToCustomSize(1, 1);
             }
             else
             {
                 // Reset to default size
-                TestFrame.Instance.SetRootGridSizeToCustomSize(-1, -1);
+                this.FindVisualParentByType<TestFrame>().SetRootGridSizeToCustomSize(-1, -1);
             }
             isRootGridDefaultSize = !isRootGridDefaultSize;
         }
diff --git a/src/controls/dev/CommonStyles/TestUI/VisualPropertiesPage.xaml b/src/controls/dev/CommonStyles/TestUI/VisualPropertiesPage.xaml
new file mode 100644
index 0000000000..feba2b75b7
--- /dev/null
+++ b/src/controls/dev/CommonStyles/TestUI/VisualPropertiesPage.xaml
@@ -0,0 +1,196 @@
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<local:TestPage
+    x:Class="MUXControlsTestApp.VisualPropertiesPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:MUXControlsTestApp"
+    xmlns:controls="using:Microsoft.UI.Xaml.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
+    mc:Ignorable="d"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+    <Grid x:Name="BackgroundGrid" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="*"/>
+        </Grid.ColumnDefinitions>
+
+        <ScrollViewer>
+            <StackPanel Padding="28" Width="250">
+                <ComboBox x:Name="ForegroundPropertyComboBox" Header="ForegroundProperty" SelectionChanged="ForegroundPropertyComboBox_SelectionChanged">
+                    <x:String>Red</x:String>
+                </ComboBox>
+
+                <ComboBox x:Name="BackgroundPropertyComboBox" Header="BackgroundProperty" SelectionChanged="BackgroundPropertyComboBox_SelectionChanged" Margin="0,24,0,0">
+                    <x:String>Purple</x:String>
+                </ComboBox>
+            </StackPanel>
+        </ScrollViewer>
+
+        <Grid Grid.Column="1" Background="{ThemeResource LayerFillColorDefaultBrush}" Padding="24">
+            <ScrollViewer>
+                <StackPanel x:Name="ControlStackPanel" Spacing="8">
+                    <!--Binding does not work with Data Template, so hard-coding Foreground and Background properties here -->
+                    <StackPanel.Resources>
+                        <Style TargetType="controls:TreeViewItem">
+                            <Setter Property="Foreground" Value="Red" />
+                            <Setter Property="Background" Value="Purple" />
+                        </Style>
+                        <Style TargetType="controls:BreadcrumbBarItem">
+                            <Setter Property="Foreground" Value="Red" />
+                            <Setter Property="Background" Value="Purple" />
+                        </Style>
+                    </StackPanel.Resources>
+                    <controls:AnimatedIcon x:Name="DefaultAnimatedIcon" Width="20" HorizontalAlignment="Left" Foreground="Red">
+                        <controls:AnimatedIcon.Source>
+                            <animatedvisuals:AnimatedFindVisualSource />
+                        </controls:AnimatedIcon.Source>
+                    </controls:AnimatedIcon>
+
+                    <controls:AppBarButton x:Name="DefaultAppBarButton" Label="DefaultAppBarButton" />
+
+                    <controls:AppBarToggleButton x:Name="DefaultAppBarToggleButton" Label="DefaultAppBarToggleButton" />
+
+                    <controls:AutoSuggestBox x:Name="DefaultAutoSuggestBox" Header="AutoSuggestBox" />
+
+                    <controls:BreadcrumbBar x:Name="DefaultBreadCrumbBar">
+                        <controls:BreadcrumbBar.ItemTemplate>
+                            <DataTemplate x:DataType="local:BreadcrumbBarFolder">
+                                <controls:BreadcrumbBarItem 
+                                    Content="{Binding}"
+                                    AutomationProperties.Name="{Binding Name}">
+                                    <controls:BreadcrumbBarItem.ContentTemplate>
+                                        <DataTemplate>
+                                            <TextBlock Text="{Binding Name}"/>
+                                        </DataTemplate>
+                                    </controls:BreadcrumbBarItem.ContentTemplate>
+                                </controls:BreadcrumbBarItem>
+                            </DataTemplate>
+                        </controls:BreadcrumbBar.ItemTemplate>
+                    </controls:BreadcrumbBar>
+
+                    <controls:Button x:Name="DefaultButton" Content="DefaultButton" />
+
+                    <controls:CalendarDatePicker x:Name="DefaultCalendarDatePicker" />
+
+                    <controls:CalendarView x:Name="DefaultCalendarView" />
+
+                    <controls:CheckBox x:Name="DefaultCheckBox" Content="DefaultCheckBox" />
+
+                    <controls:ComboBox x:Name="DefaultComboBox" SelectedIndex="0">
+                        <x:String>ComboBoxItem1</x:String>
+                    </controls:ComboBox>
+
+                    <controls:CommandBar x:Name="DefaultCommandBar" HorizontalAlignment="Left">
+                        <controls:AppBarButton x:Name="DefaultCommandBarAppBarButton" Icon="Add" Label="Add" />
+                        <controls:CommandBar.SecondaryCommands>
+                            <controls:AppBarButton x:Name="DefaultCommandBarSecondaryAppBarButton" Icon="Setting" Label="Setting" />
+                        </controls:CommandBar.SecondaryCommands>
+                    </controls:CommandBar>
+
+                    <Button x:Name="ShowDialog" Content="Show dialog" Click="ShowDialog_Click" />
+
+                    <controls:ContentDialog x:Name="DefaultContentDialog" 
+                        Title="This is an example"
+                        PrimaryButtonText="Ok"
+                        CloseButtonText="Cancel"
+                        DefaultButton="Primary"/>
+
+                    <controls:DatePicker x:Name="DefaultDatePicker" />
+
+                    <controls:DropDownButton x:Name="DefaultDropDownButton" Content="DropDownButton" />
+                    
+                    <controls:Expander x:Name="DefaultExpander"
+                        Header="This text is in the header"
+                        Content="This is in the content"
+                        IsExpanded="True" />
+
+                    <controls:FlipView x:Name="DefaultFlipView" Width="100" Height="80" />
+                    <controls:HyperlinkButton x:Name="DefaultHyperlinkButton" Content="DefaultHyperlinkButton" />
+                    <controls:InfoBadge x:Name="DefaultInfoBadge" Value="5" Width="16" HorizontalAlignment="Left" />
+                    
+                    <controls:InfoBar x:Name="DefaultInfoBar" 
+                        IsOpen="True"
+                        Severity="Informational"
+                        Title="Title"
+                        Message="Essential app message for your users to be informed of, acknowledge, or take action on."/>
+
+                    <controls:MenuBar x:Name="DefaultMenuBar">
+                        <controls:MenuBarItem 
+                            x:Name="DefaultMenuBarItem" 
+                            Title="MenuBarItem" 
+                            Foreground="{Binding ElementName=DefaultMenuBar, Path=Foreground, Mode=OneWay}"
+                            Background="{Binding ElementName=DefaultMenuBar, Path=Background, Mode=OneWay}" />
+                    </controls:MenuBar>
+
+                    <controls:NavigationView x:Name="DefaultNavigationView">
+                        <NavigationView.MenuItems>
+                            <controls:NavigationViewItem 
+                            x:Name="DefaultNavigationViewItem" 
+                            Icon="Home"
+                            Content="NavigationViewItem" 
+                            Foreground="{Binding ElementName=DefaultNavigationView, Path=Foreground, Mode=OneWay}"
+                            Background="{Binding ElementName=DefaultNavigationView, Path=Background, Mode=OneWay}" />
+                        </NavigationView.MenuItems>    
+                    </controls:NavigationView>
+
+                    <controls:NumberBox x:Name="DefaultNumberBox" Header="DefaultNumberBox" Value="10" />
+                    <controls:PasswordBox x:Name="DefaultPasswordBox" />
+                    <controls:PersonPicture x:Name="DefaultPersonPicture" Initials="KL"/>
+                    <controls:PipsPager x:Name="DefaultPipsPager" />
+                    <controls:ProgressBar x:Name="DefaultProgressBar" Value="50"/>
+                    <controls:ProgressRing x:Name="DefaultProgressRing" Value="50"/>
+
+                    <controls:RadioButtons x:Name="DefaultRadioButtons">
+                        <controls:RadioButton 
+                            x:Name="DefaultRadioButton" 
+                            Content="RadioButton"
+                            Foreground="{Binding ElementName=DefaultMenuBar, Path=Foreground, Mode=OneWay}"
+                            Background="{Binding ElementName=DefaultMenuBar, Path=Background, Mode=OneWay}" />
+                    </controls:RadioButtons>
+
+                    <controls:RatingControl x:Name="DefaultRatingControl" Value="3" Caption="DefaultRatingControl"/>
+                    <RepeatButton x:Name="DefaultRepeatButton" Content="DefaultRepeatButton" />
+                    <controls:RichEditBox x:Name="DefaultRichEditBox" />
+                    
+                    <controls:RichTextBlock x:Name="DefaultRichTextBlock" Foreground="Red">
+                        <Paragraph>This is a default RichTextBlock</Paragraph>
+                    </controls:RichTextBlock>
+
+                    <controls:Slider x:Name="DefaultSlider" Value="50"/>
+                    <controls:SplitButton x:Name="DefaultSplitButton">Split Button</controls:SplitButton>
+
+                    <controls:TabView x:Name="DefaultTabView">
+                        <controls:TabViewItem 
+                            x:Name="DefaultTabViewItem"
+                            Header="TabViewItem" 
+                            Foreground="{Binding ElementName=DefaultTabView, Path=Foreground, Mode=OneWay}"
+                            Background="{Binding ElementName=DefaultTabView, Path=Background, Mode=OneWay}"/>
+                         <controls:TabViewItem 
+                            x:Name="DefaultTabViewItem2"
+                            Header="TabViewItem2" 
+                            Foreground="{Binding ElementName=DefaultTabView, Path=Foreground, Mode=OneWay}"
+                            Background="{Binding ElementName=DefaultTabView, Path=Background, Mode=OneWay}"/>
+                    </controls:TabView>
+
+                    <controls:TeachingTip x:Name="DefaultTeachingTip"
+                        IsOpen="True"
+                        Title="TeachingTip Title"
+                        Subtitle="This is a default TeachingTip">
+                        <TeachingTip.IconSource>
+                            <SymbolIconSource Symbol="Refresh" />
+                        </TeachingTip.IconSource>
+                    </controls:TeachingTip>
+
+                    <controls:TextBox x:Name="DefaultTextBox" />
+                    <controls:TimePicker x:Name="DefaultTimePicker" />
+                    <ToggleButton x:Name="DefaultToggleButton" Content="DefaultToggleButton" />
+                    <controls:ToggleSplitButton x:Name="DefaultToggleSplitButton" Content="DefaultToggleSplitButton" />
+                    <controls:ToggleSwitch x:Name="DefaultToggleSwitch" Header="DefaultToggleSwitch" />
+                    <controls:TreeView x:Name="DefaultTreeView" SelectionMode="Multiple" MinWidth="345" MaxHeight="400"/>
+                </StackPanel>
+            </ScrollViewer>
+        </Grid>
+    </Grid>
+</local:TestPage>
diff --git a/src/controls/dev/CommonStyles/TestUI/VisualPropertiesPage.xaml.cs b/src/controls/dev/CommonStyles/TestUI/VisualPropertiesPage.xaml.cs
new file mode 100644
index 0000000000..a48fb2436d
--- /dev/null
+++ b/src/controls/dev/CommonStyles/TestUI/VisualPropertiesPage.xaml.cs
@@ -0,0 +1,128 @@
+using Microsoft.UI;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+namespace MUXControlsTestApp
+{
+    public class BreadcrumbBarFolder
+    {
+        public string Name { get; set; }
+        public SolidColorBrush Foreground { get; set; }
+        public SolidColorBrush Background { get; set; }
+    }
+
+    [TopLevelTestPage(Name = "VisualProperties")]
+    public sealed partial class VisualPropertiesPage : TestPage
+    {
+        TreeViewNode treeViewFolder;
+
+        public VisualPropertiesPage()
+        {
+            this.InitializeComponent();
+
+            Loaded += VisualPropertiesPage_Loaded;
+
+            DefaultBreadCrumbBar.ItemsSource = new ObservableCollection<BreadcrumbBarFolder>{
+                new BreadcrumbBarFolder { Name = "Home"},
+                new BreadcrumbBarFolder { Name = "Folder1" },
+                new BreadcrumbBarFolder { Name = "Folder2" },
+                new BreadcrumbBarFolder { Name = "Folder3" },
+            };
+
+            InitializeSampleTreeView();
+        }
+
+        private void VisualPropertiesPage_Loaded(object sender, RoutedEventArgs e)
+        {
+            ForegroundPropertyComboBox.SelectedIndex = 0;
+            BackgroundPropertyComboBox.SelectedIndex = 0;
+        }
+
+        private void ForegroundPropertyComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            string colorName = e.AddedItems[0].ToString();
+            SolidColorBrush color;
+
+            switch (colorName)
+            {
+                case "Red":
+                    color = new SolidColorBrush(Colors.Red);
+                    break;
+                case "Blue":
+                    color = new SolidColorBrush(Colors.Blue);
+                    break;
+                default:
+                    throw new Exception($"Invalid argument: {colorName}");
+            }
+
+            SetControlStackPanelForeground(color);
+        }
+
+        private void SetControlStackPanelForeground(SolidColorBrush color)
+        {
+
+            foreach (var child in ControlStackPanel.Children)
+            {
+                if (child is Control)
+                {
+                    (child as Control).Foreground = color;
+                }
+            } 
+        }
+
+        private void BackgroundPropertyComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            string colorName = e.AddedItems[0].ToString();
+            SolidColorBrush color;
+
+            switch (colorName)
+            {
+                case "Green":
+                    color = new SolidColorBrush(Colors.Green);
+                    break;
+                case "Purple":
+                    color = new SolidColorBrush(Colors.Purple);
+                    break;
+                default:
+                    throw new Exception($"Invalid argument: {colorName}");
+            }
+
+            SetControlStackPanelBackground(color);
+        }
+
+        private void SetControlStackPanelBackground(SolidColorBrush color)
+        {
+
+            foreach (var child in ControlStackPanel.Children)
+            {
+                if (child is Control)
+                {
+                    (child as Control).Background = color;
+                }
+            } 
+        }
+
+        private void InitializeSampleTreeView()
+        {
+            treeViewFolder = new TreeViewNode() { Content = "TreeViewFolder" };
+            treeViewFolder.IsExpanded = true;
+            treeViewFolder.Children.Add(new TreeViewNode() { Content = "TreeViewItem1" });
+
+            DefaultTreeView.RootNodes.Add(treeViewFolder);
+        }
+
+        private async void ShowDialog_Click(object sender, RoutedEventArgs e)
+        {
+            await DefaultContentDialog.ShowAsync();
+        }
+    }
+}
diff --git a/src/controls/dev/CommonStyles/TestUI/WindowPage.xaml b/src/controls/dev/CommonStyles/TestUI/WindowPage.xaml
new file mode 100644
index 0000000000..26a7d3529a
--- /dev/null
+++ b/src/controls/dev/CommonStyles/TestUI/WindowPage.xaml
@@ -0,0 +1,17 @@
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<local:TestPage
+    x:Class="MUXControlsTestApp.WindowPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:MUXControlsTestApp"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="40">
+        <Button x:Name="btnOpenNewWindowRootPage" AutomationProperties.Name="btnOpenNewWindowRootPage" Margin="2" HorizontalAlignment="Stretch"
+            Content="Open new Window with NewWindowRootPage" Click="BtnOpenNewWindowRootPage_Click"/>
+        <Button x:Name="btnOpenNewMainPage" AutomationProperties.Name="btnOpenNewMainPage" Margin="2" HorizontalAlignment="Stretch"
+            Content="Open new Window with MainPage" Click="BtnOpenNewMainPage_Click"/>
+    </StackPanel>
+</local:TestPage>
diff --git a/src/controls/dev/CommonStyles/TestUI/WindowPage.xaml.cs b/src/controls/dev/CommonStyles/TestUI/WindowPage.xaml.cs
new file mode 100644
index 0000000000..07e45643e6
--- /dev/null
+++ b/src/controls/dev/CommonStyles/TestUI/WindowPage.xaml.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+
+namespace MUXControlsTestApp
+{
+    [TopLevelTestPage(Name="Window")]
+    public sealed partial class WindowPage : TestPage
+    {
+        public WindowPage()
+        {
+            this.InitializeComponent();
+        }
+
+        private void BtnOpenNewWindowRootPage_Click(object sender, RoutedEventArgs e)
+        {
+            Window newWindow = new Window() { Title = "MUXControlsTestApp.Desktop - Secondary NewWindowRootPage" };
+            TestFrame rootFrame = new TestFrame(typeof(NewWindowRootPage));
+            newWindow.Content = rootFrame;
+            rootFrame.NavigateWithoutAnimation(typeof(NewWindowRootPage));
+            newWindow.Activate();
+        }
+
+        private void BtnOpenNewMainPage_Click(object sender, RoutedEventArgs e)
+        {
+            Window newWindow = new Window() { Title = "MUXControlsTestApp.Desktop - Secondary MainPage" };
+            TestFrame rootFrame = new TestFrame(typeof(MainPage));
+            newWindow.Content = rootFrame;
+            rootFrame.NavigateWithoutAnimation(typeof(MainPage));
+            newWindow.Activate();
+        }
+    }
+}
diff --git a/src/controls/dev/Expander/Expander.cpp b/src/controls/dev/Expander/Expander.cpp
index 3497d0958e..a7df1eba0f 100644
--- a/src/controls/dev/Expander/Expander.cpp
+++ b/src/controls/dev/Expander/Expander.cpp
@@ -87,7 +87,7 @@ void Expander::OnContentSizeChanged(const winrt::IInspectable&, const winrt::Siz
 
     auto const height = args.NewSize().Height;
     templateSettings->ContentHeight(height);
-    templateSettings->NegativeContentHeight(-1 * height);
+    templateSettings->NegativeContentHeight(-1 * static_cast<double>(height));
 }
 
 
diff --git a/src/controls/dev/Generated/PipsPager.properties.cpp b/src/controls/dev/Generated/PipsPager.properties.cpp
index 06c3f9fc81..5090b60912 100644
--- a/src/controls/dev/Generated/PipsPager.properties.cpp
+++ b/src/controls/dev/Generated/PipsPager.properties.cpp
@@ -24,6 +24,7 @@ GlobalDependencyProperty PipsPagerProperties::s_PreviousButtonVisibilityProperty
 GlobalDependencyProperty PipsPagerProperties::s_SelectedPageIndexProperty{ nullptr };
 GlobalDependencyProperty PipsPagerProperties::s_SelectedPipStyleProperty{ nullptr };
 GlobalDependencyProperty PipsPagerProperties::s_TemplateSettingsProperty{ nullptr };
+GlobalDependencyProperty PipsPagerProperties::s_WrapModeProperty{ nullptr };
 
 PipsPagerProperties::PipsPagerProperties()
     : m_selectedIndexChangedEventSource{static_cast<PipsPager*>(this)}
@@ -154,6 +155,17 @@ void PipsPagerProperties::EnsureProperties()
                 ValueHelper<winrt::PipsPagerTemplateSettings>::BoxedDefaultValue(),
                 winrt::PropertyChangedCallback(&OnTemplateSettingsPropertyChanged));
     }
+    if (!s_WrapModeProperty)
+    {
+        s_WrapModeProperty =
+            InitializeDependencyProperty(
+                L"WrapMode",
+                winrt::name_of<winrt::PipsPagerWrapMode>(),
+                winrt::name_of<winrt::PipsPager>(),
+                false /* isAttached */,
+                ValueHelper<winrt::PipsPagerWrapMode>::BoxValueIfNecessary(winrt::PipsPagerWrapMode::None),
+                winrt::PropertyChangedCallback(&OnWrapModePropertyChanged));
+    }
 }
 
 void PipsPagerProperties::ClearProperties()
@@ -169,6 +181,7 @@ void PipsPagerProperties::ClearProperties()
     s_SelectedPageIndexProperty = nullptr;
     s_SelectedPipStyleProperty = nullptr;
     s_TemplateSettingsProperty = nullptr;
+    s_WrapModeProperty = nullptr;
 }
 
 void PipsPagerProperties::OnMaxVisiblePipsPropertyChanged(
@@ -259,6 +272,14 @@ void PipsPagerProperties::OnTemplateSettingsPropertyChanged(
     winrt::get_self<PipsPager>(owner)->OnPropertyChanged(args);
 }
 
+void PipsPagerProperties::OnWrapModePropertyChanged(
+    winrt::DependencyObject const& sender,
+    winrt::DependencyPropertyChangedEventArgs const& args)
+{
+    auto owner = sender.as<winrt::PipsPager>();
+    winrt::get_self<PipsPager>(owner)->OnPropertyChanged(args);
+}
+
 void PipsPagerProperties::MaxVisiblePips(int value)
 {
     [[gsl::suppress(con)]]
@@ -402,6 +423,19 @@ winrt::PipsPagerTemplateSettings PipsPagerProperties::TemplateSettings()
     return ValueHelper<winrt::PipsPagerTemplateSettings>::CastOrUnbox(static_cast<PipsPager*>(this)->GetValue(s_TemplateSettingsProperty));
 }
 
+void PipsPagerProperties::WrapMode(winrt::PipsPagerWrapMode const& value)
+{
+    [[gsl::suppress(con)]]
+    {
+    static_cast<PipsPager*>(this)->SetValue(s_WrapModeProperty, ValueHelper<winrt::PipsPagerWrapMode>::BoxValueIfNecessary(value));
+    }
+}
+
+winrt::PipsPagerWrapMode PipsPagerProperties::WrapMode()
+{
+    return ValueHelper<winrt::PipsPagerWrapMode>::CastOrUnbox(static_cast<PipsPager*>(this)->GetValue(s_WrapModeProperty));
+}
+
 winrt::event_token PipsPagerProperties::SelectedIndexChanged(winrt::TypedEventHandler<winrt::PipsPager, winrt::PipsPagerSelectedIndexChangedEventArgs> const& value)
 {
     return m_selectedIndexChangedEventSource.add(value);
diff --git a/src/controls/dev/Generated/PipsPager.properties.h b/src/controls/dev/Generated/PipsPager.properties.h
index c4ef986016..f58deef2f2 100644
--- a/src/controls/dev/Generated/PipsPager.properties.h
+++ b/src/controls/dev/Generated/PipsPager.properties.h
@@ -42,6 +42,9 @@ class PipsPagerProperties
     void TemplateSettings(winrt::PipsPagerTemplateSettings const& value);
     winrt::PipsPagerTemplateSettings TemplateSettings();
 
+    void WrapMode(winrt::PipsPagerWrapMode const& value);
+    winrt::PipsPagerWrapMode WrapMode();
+
     static winrt::DependencyProperty MaxVisiblePipsProperty() { return s_MaxVisiblePipsProperty; }
     static winrt::DependencyProperty NextButtonStyleProperty() { return s_NextButtonStyleProperty; }
     static winrt::DependencyProperty NextButtonVisibilityProperty() { return s_NextButtonVisibilityProperty; }
@@ -53,6 +56,7 @@ class PipsPagerProperties
     static winrt::DependencyProperty SelectedPageIndexProperty() { return s_SelectedPageIndexProperty; }
     static winrt::DependencyProperty SelectedPipStyleProperty() { return s_SelectedPipStyleProperty; }
     static winrt::DependencyProperty TemplateSettingsProperty() { return s_TemplateSettingsProperty; }
+    static winrt::DependencyProperty WrapModeProperty() { return s_WrapModeProperty; }
 
     static GlobalDependencyProperty s_MaxVisiblePipsProperty;
     static GlobalDependencyProperty s_NextButtonStyleProperty;
@@ -65,6 +69,7 @@ class PipsPagerProperties
     static GlobalDependencyProperty s_SelectedPageIndexProperty;
     static GlobalDependencyProperty s_SelectedPipStyleProperty;
     static GlobalDependencyProperty s_TemplateSettingsProperty;
+    static GlobalDependencyProperty s_WrapModeProperty;
 
     winrt::event_token SelectedIndexChanged(winrt::TypedEventHandler<winrt::PipsPager, winrt::PipsPagerSelectedIndexChangedEventArgs> const& value);
     void SelectedIndexChanged(winrt::event_token const& token);
@@ -117,4 +122,8 @@ class PipsPagerProperties
     static void OnTemplateSettingsPropertyChanged(
         winrt::DependencyObject const& sender,
         winrt::DependencyPropertyChangedEventArgs const& args);
+
+    static void OnWrapModePropertyChanged(
+        winrt::DependencyObject const& sender,
+        winrt::DependencyPropertyChangedEventArgs const& args);
 };
diff --git a/src/controls/dev/Generated/ScrollPresenter.properties.cpp b/src/controls/dev/Generated/ScrollPresenter.properties.cpp
index d21bf41268..2cd699d9f0 100644
--- a/src/controls/dev/Generated/ScrollPresenter.properties.cpp
+++ b/src/controls/dev/Generated/ScrollPresenter.properties.cpp
@@ -40,6 +40,7 @@ ScrollPresenterProperties::ScrollPresenterProperties()
     , m_scrollCompletedEventSource{static_cast<ScrollPresenter*>(this)}
     , m_stateChangedEventSource{static_cast<ScrollPresenter*>(this)}
     , m_viewChangedEventSource{static_cast<ScrollPresenter*>(this)}
+    , m_viewChangingEventSource{static_cast<ScrollPresenter*>(this)}
     , m_zoomAnimationStartingEventSource{static_cast<ScrollPresenter*>(this)}
     , m_zoomCompletedEventSource{static_cast<ScrollPresenter*>(this)}
 {
@@ -766,6 +767,16 @@ void ScrollPresenterProperties::ViewChanged(winrt::event_token const& token)
     m_viewChangedEventSource.remove(token);
 }
 
+winrt::event_token ScrollPresenterProperties::ViewChanging(winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::ScrollingViewChangingEventArgs> const& value)
+{
+    return m_viewChangingEventSource.add(value);
+}
+
+void ScrollPresenterProperties::ViewChanging(winrt::event_token const& token)
+{
+    m_viewChangingEventSource.remove(token);
+}
+
 winrt::event_token ScrollPresenterProperties::ZoomAnimationStarting(winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::ScrollingZoomAnimationStartingEventArgs> const& value)
 {
     return m_zoomAnimationStartingEventSource.add(value);
diff --git a/src/controls/dev/Generated/ScrollPresenter.properties.h b/src/controls/dev/Generated/ScrollPresenter.properties.h
index 58f3f44bcf..9f5b265ad4 100644
--- a/src/controls/dev/Generated/ScrollPresenter.properties.h
+++ b/src/controls/dev/Generated/ScrollPresenter.properties.h
@@ -115,6 +115,8 @@ class ScrollPresenterProperties
     void StateChanged(winrt::event_token const& token);
     winrt::event_token ViewChanged(winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::IInspectable> const& value);
     void ViewChanged(winrt::event_token const& token);
+    winrt::event_token ViewChanging(winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::ScrollingViewChangingEventArgs> const& value);
+    void ViewChanging(winrt::event_token const& token);
     winrt::event_token ZoomAnimationStarting(winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::ScrollingZoomAnimationStartingEventArgs> const& value);
     void ZoomAnimationStarting(winrt::event_token const& token);
     winrt::event_token ZoomCompleted(winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::ScrollingZoomCompletedEventArgs> const& value);
@@ -127,6 +129,7 @@ class ScrollPresenterProperties
     event_source<winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::ScrollingScrollCompletedEventArgs>> m_scrollCompletedEventSource;
     event_source<winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::IInspectable>> m_stateChangedEventSource;
     event_source<winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::IInspectable>> m_viewChangedEventSource;
+    event_source<winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::ScrollingViewChangingEventArgs>> m_viewChangingEventSource;
     event_source<winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::ScrollingZoomAnimationStartingEventArgs>> m_zoomAnimationStartingEventSource;
     event_source<winrt::TypedEventHandler<winrt::ScrollPresenter, winrt::ScrollingZoomCompletedEventArgs>> m_zoomCompletedEventSource;
 
diff --git a/src/controls/dev/Generated/ScrollView.properties.cpp b/src/controls/dev/Generated/ScrollView.properties.cpp
index daf2c6178c..8d3d11a9e7 100644
--- a/src/controls/dev/Generated/ScrollView.properties.cpp
+++ b/src/controls/dev/Generated/ScrollView.properties.cpp
@@ -44,6 +44,7 @@ ScrollViewProperties::ScrollViewProperties()
     , m_scrollCompletedEventSource{static_cast<ScrollView*>(this)}
     , m_stateChangedEventSource{static_cast<ScrollView*>(this)}
     , m_viewChangedEventSource{static_cast<ScrollView*>(this)}
+    , m_viewChangingEventSource{static_cast<ScrollView*>(this)}
     , m_zoomAnimationStartingEventSource{static_cast<ScrollView*>(this)}
     , m_zoomCompletedEventSource{static_cast<ScrollView*>(this)}
 {
@@ -902,6 +903,16 @@ void ScrollViewProperties::ViewChanged(winrt::event_token const& token)
     m_viewChangedEventSource.remove(token);
 }
 
+winrt::event_token ScrollViewProperties::ViewChanging(winrt::TypedEventHandler<winrt::ScrollView, winrt::ScrollingViewChangingEventArgs> const& value)
+{
+    return m_viewChangingEventSource.add(value);
+}
+
+void ScrollViewProperties::ViewChanging(winrt::event_token const& token)
+{
+    m_viewChangingEventSource.remove(token);
+}
+
 winrt::event_token ScrollViewProperties::ZoomAnimationStarting(winrt::TypedEventHandler<winrt::ScrollView, winrt::ScrollingZoomAnimationStartingEventArgs> const& value)
 {
     return m_zoomAnimationStartingEventSource.add(value);
diff --git a/src/controls/dev/Generated/ScrollView.properties.h b/src/controls/dev/Generated/ScrollView.properties.h
index 0585ef82b1..2c4c99c3e7 100644
--- a/src/controls/dev/Generated/ScrollView.properties.h
+++ b/src/controls/dev/Generated/ScrollView.properties.h
@@ -135,6 +135,8 @@ class ScrollViewProperties
     void StateChanged(winrt::event_token const& token);
     winrt::event_token ViewChanged(winrt::TypedEventHandler<winrt::ScrollView, winrt::IInspectable> const& value);
     void ViewChanged(winrt::event_token const& token);
+    winrt::event_token ViewChanging(winrt::TypedEventHandler<winrt::ScrollView, winrt::ScrollingViewChangingEventArgs> const& value);
+    void ViewChanging(winrt::event_token const& token);
     winrt::event_token ZoomAnimationStarting(winrt::TypedEventHandler<winrt::ScrollView, winrt::ScrollingZoomAnimationStartingEventArgs> const& value);
     void ZoomAnimationStarting(winrt::event_token const& token);
     winrt::event_token ZoomCompleted(winrt::TypedEventHandler<winrt::ScrollView, winrt::ScrollingZoomCompletedEventArgs> const& value);
@@ -147,6 +149,7 @@ class ScrollViewProperties
     event_source<winrt::TypedEventHandler<winrt::ScrollView, winrt::ScrollingScrollCompletedEventArgs>> m_scrollCompletedEventSource;
     event_source<winrt::TypedEventHandler<winrt::ScrollView, winrt::IInspectable>> m_stateChangedEventSource;
     event_source<winrt::TypedEventHandler<winrt::ScrollView, winrt::IInspectable>> m_viewChangedEventSource;
+    event_source<winrt::TypedEventHandler<winrt::ScrollView, winrt::ScrollingViewChangingEventArgs>> m_viewChangingEventSource;
     event_source<winrt::TypedEventHandler<winrt::ScrollView, winrt::ScrollingZoomAnimationStartingEventArgs>> m_zoomAnimationStartingEventSource;
     event_source<winrt::TypedEventHandler<winrt::ScrollView, winrt::ScrollingZoomCompletedEventArgs>> m_zoomCompletedEventSource;
 
diff --git a/src/controls/dev/Generated/StackLayout.properties.cpp b/src/controls/dev/Generated/StackLayout.properties.cpp
index 90370eec5f..990394531c 100644
--- a/src/controls/dev/Generated/StackLayout.properties.cpp
+++ b/src/controls/dev/Generated/StackLayout.properties.cpp
@@ -13,7 +13,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls
 
 #include "StackLayout.g.cpp"
 
-GlobalDependencyProperty StackLayoutProperties::s_DisableVirtualizationProperty{ nullptr };
+GlobalDependencyProperty StackLayoutProperties::s_IsVirtualizationEnabledProperty{ nullptr };
 GlobalDependencyProperty StackLayoutProperties::s_OrientationProperty{ nullptr };
 GlobalDependencyProperty StackLayoutProperties::s_SpacingProperty{ nullptr };
 
@@ -24,16 +24,16 @@ StackLayoutProperties::StackLayoutProperties()
 
 void StackLayoutProperties::EnsureProperties()
 {
-    if (!s_DisableVirtualizationProperty)
+    if (!s_IsVirtualizationEnabledProperty)
     {
-        s_DisableVirtualizationProperty =
+        s_IsVirtualizationEnabledProperty =
             InitializeDependencyProperty(
-                L"DisableVirtualization",
+                L"IsVirtualizationEnabled",
                 winrt::name_of<bool>(),
                 winrt::name_of<winrt::StackLayout>(),
                 false /* isAttached */,
-                ValueHelper<bool>::BoxedDefaultValue(),
-                winrt::PropertyChangedCallback(&OnDisableVirtualizationPropertyChanged));
+                ValueHelper<bool>::BoxValueIfNecessary(true),
+                winrt::PropertyChangedCallback(&OnIsVirtualizationEnabledPropertyChanged));
     }
     if (!s_OrientationProperty)
     {
@@ -61,12 +61,12 @@ void StackLayoutProperties::EnsureProperties()
 
 void StackLayoutProperties::ClearProperties()
 {
-    s_DisableVirtualizationProperty = nullptr;
+    s_IsVirtualizationEnabledProperty = nullptr;
     s_OrientationProperty = nullptr;
     s_SpacingProperty = nullptr;
 }
 
-void StackLayoutProperties::OnDisableVirtualizationPropertyChanged(
+void StackLayoutProperties::OnIsVirtualizationEnabledPropertyChanged(
     winrt::DependencyObject const& sender,
     winrt::DependencyPropertyChangedEventArgs const& args)
 {
@@ -90,17 +90,17 @@ void StackLayoutProperties::OnSpacingPropertyChanged(
     winrt::get_self<StackLayout>(owner)->OnPropertyChanged(args);
 }
 
-void StackLayoutProperties::DisableVirtualization(bool value)
+void StackLayoutProperties::IsVirtualizationEnabled(bool value)
 {
     [[gsl::suppress(con)]]
     {
-    static_cast<StackLayout*>(this)->SetValue(s_DisableVirtualizationProperty, ValueHelper<bool>::BoxValueIfNecessary(value));
+    static_cast<StackLayout*>(this)->SetValue(s_IsVirtualizationEnabledProperty, ValueHelper<bool>::BoxValueIfNecessary(value));
     }
 }
 
-bool StackLayoutProperties::DisableVirtualization()
+bool StackLayoutProperties::IsVirtualizationEnabled()
 {
-    return ValueHelper<bool>::CastOrUnbox(static_cast<StackLayout*>(this)->GetValue(s_DisableVirtualizationProperty));
+    return ValueHelper<bool>::CastOrUnbox(static_cast<StackLayout*>(this)->GetValue(s_IsVirtualizationEnabledProperty));
 }
 
 void StackLayoutProperties::Orientation(winrt::Orientation const& value)
diff --git a/src/controls/dev/Generated/StackLayout.properties.h b/src/controls/dev/Generated/StackLayout.properties.h
index ddd61b333a..dfa8b13c9b 100644
--- a/src/controls/dev/Generated/StackLayout.properties.h
+++ b/src/controls/dev/Generated/StackLayout.properties.h
@@ -9,8 +9,8 @@ class StackLayoutProperties
 public:
     StackLayoutProperties();
 
-    void DisableVirtualization(bool value);
-    bool DisableVirtualization();
+    void IsVirtualizationEnabled(bool value);
+    bool IsVirtualizationEnabled();
 
     void Orientation(winrt::Orientation const& value);
     winrt::Orientation Orientation();
@@ -18,18 +18,18 @@ class StackLayoutProperties
     void Spacing(double value);
     double Spacing();
 
-    static winrt::DependencyProperty DisableVirtualizationProperty() { return s_DisableVirtualizationProperty; }
+    static winrt::DependencyProperty IsVirtualizationEnabledProperty() { return s_IsVirtualizationEnabledProperty; }
     static winrt::DependencyProperty OrientationProperty() { return s_OrientationProperty; }
     static winrt::DependencyProperty SpacingProperty() { return s_SpacingProperty; }
 
-    static GlobalDependencyProperty s_DisableVirtualizationProperty;
+    static GlobalDependencyProperty s_IsVirtualizationEnabledProperty;
     static GlobalDependencyProperty s_OrientationProperty;
     static GlobalDependencyProperty s_SpacingProperty;
 
     static void EnsureProperties();
     static void ClearProperties();
 
-    static void OnDisableVirtualizationPropertyChanged(
+    static void OnIsVirtualizationEnabledPropertyChanged(
         winrt::DependencyObject const& sender,
         winrt::DependencyPropertyChangedEventArgs const& args);
 
diff --git a/src/controls/dev/Generated/TabView.properties.cpp b/src/controls/dev/Generated/TabView.properties.cpp
index a959129fe3..e3646ffbf6 100644
--- a/src/controls/dev/Generated/TabView.properties.cpp
+++ b/src/controls/dev/Generated/TabView.properties.cpp
@@ -18,6 +18,7 @@ GlobalDependencyProperty TabViewProperties::s_AddTabButtonCommandParameterProper
 GlobalDependencyProperty TabViewProperties::s_AllowDropTabsProperty{ nullptr };
 GlobalDependencyProperty TabViewProperties::s_CanDragTabsProperty{ nullptr };
 GlobalDependencyProperty TabViewProperties::s_CanReorderTabsProperty{ nullptr };
+GlobalDependencyProperty TabViewProperties::s_CanTearOutTabsProperty{ nullptr };
 GlobalDependencyProperty TabViewProperties::s_CloseButtonOverlayModeProperty{ nullptr };
 GlobalDependencyProperty TabViewProperties::s_IsAddTabButtonVisibleProperty{ nullptr };
 GlobalDependencyProperty TabViewProperties::s_SelectedIndexProperty{ nullptr };
@@ -34,6 +35,8 @@ GlobalDependencyProperty TabViewProperties::s_TabWidthModeProperty{ nullptr };
 
 TabViewProperties::TabViewProperties()
     : m_addTabButtonClickEventSource{static_cast<TabView*>(this)}
+    , m_externalTornOutTabsDroppedEventSource{static_cast<TabView*>(this)}
+    , m_externalTornOutTabsDroppingEventSource{static_cast<TabView*>(this)}
     , m_selectionChangedEventSource{static_cast<TabView*>(this)}
     , m_tabCloseRequestedEventSource{static_cast<TabView*>(this)}
     , m_tabDragCompletedEventSource{static_cast<TabView*>(this)}
@@ -42,6 +45,8 @@ TabViewProperties::TabViewProperties()
     , m_tabItemsChangedEventSource{static_cast<TabView*>(this)}
     , m_tabStripDragOverEventSource{static_cast<TabView*>(this)}
     , m_tabStripDropEventSource{static_cast<TabView*>(this)}
+    , m_tabTearOutRequestedEventSource{static_cast<TabView*>(this)}
+    , m_tabTearOutWindowRequestedEventSource{static_cast<TabView*>(this)}
 {
     EnsureProperties();
 }
@@ -103,6 +108,17 @@ void TabViewProperties::EnsureProperties()
                 ValueHelper<bool>::BoxValueIfNecessary(true),
                 nullptr);
     }
+    if (!s_CanTearOutTabsProperty)
+    {
+        s_CanTearOutTabsProperty =
+            InitializeDependencyProperty(
+                L"CanTearOutTabs",
+                winrt::name_of<bool>(),
+                winrt::name_of<winrt::TabView>(),
+                false /* isAttached */,
+                ValueHelper<bool>::BoxValueIfNecessary(false),
+                winrt::PropertyChangedCallback(&OnCanTearOutTabsPropertyChanged));
+    }
     if (!s_CloseButtonOverlayModeProperty)
     {
         s_CloseButtonOverlayModeProperty =
@@ -255,6 +271,7 @@ void TabViewProperties::ClearProperties()
     s_AllowDropTabsProperty = nullptr;
     s_CanDragTabsProperty = nullptr;
     s_CanReorderTabsProperty = nullptr;
+    s_CanTearOutTabsProperty = nullptr;
     s_CloseButtonOverlayModeProperty = nullptr;
     s_IsAddTabButtonVisibleProperty = nullptr;
     s_SelectedIndexProperty = nullptr;
@@ -270,6 +287,14 @@ void TabViewProperties::ClearProperties()
     s_TabWidthModeProperty = nullptr;
 }
 
+void TabViewProperties::OnCanTearOutTabsPropertyChanged(
+    winrt::DependencyObject const& sender,
+    winrt::DependencyPropertyChangedEventArgs const& args)
+{
+    auto owner = sender.as<winrt::TabView>();
+    winrt::get_self<TabView>(owner)->OnCanTearOutTabsPropertyChanged(args);
+}
+
 void TabViewProperties::OnCloseButtonOverlayModePropertyChanged(
     winrt::DependencyObject const& sender,
     winrt::DependencyPropertyChangedEventArgs const& args)
@@ -375,6 +400,19 @@ bool TabViewProperties::CanReorderTabs()
     return ValueHelper<bool>::CastOrUnbox(static_cast<TabView*>(this)->GetValue(s_CanReorderTabsProperty));
 }
 
+void TabViewProperties::CanTearOutTabs(bool value)
+{
+    [[gsl::suppress(con)]]
+    {
+    static_cast<TabView*>(this)->SetValue(s_CanTearOutTabsProperty, ValueHelper<bool>::BoxValueIfNecessary(value));
+    }
+}
+
+bool TabViewProperties::CanTearOutTabs()
+{
+    return ValueHelper<bool>::CastOrUnbox(static_cast<TabView*>(this)->GetValue(s_CanTearOutTabsProperty));
+}
+
 void TabViewProperties::CloseButtonOverlayMode(winrt::TabViewCloseButtonOverlayMode const& value)
 {
     [[gsl::suppress(con)]]
@@ -554,6 +592,26 @@ void TabViewProperties::AddTabButtonClick(winrt::event_token const& token)
     m_addTabButtonClickEventSource.remove(token);
 }
 
+winrt::event_token TabViewProperties::ExternalTornOutTabsDropped(winrt::TypedEventHandler<winrt::TabView, winrt::TabViewExternalTornOutTabsDroppedEventArgs> const& value)
+{
+    return m_externalTornOutTabsDroppedEventSource.add(value);
+}
+
+void TabViewProperties::ExternalTornOutTabsDropped(winrt::event_token const& token)
+{
+    m_externalTornOutTabsDroppedEventSource.remove(token);
+}
+
+winrt::event_token TabViewProperties::ExternalTornOutTabsDropping(winrt::TypedEventHandler<winrt::TabView, winrt::TabViewExternalTornOutTabsDroppingEventArgs> const& value)
+{
+    return m_externalTornOutTabsDroppingEventSource.add(value);
+}
+
+void TabViewProperties::ExternalTornOutTabsDropping(winrt::event_token const& token)
+{
+    m_externalTornOutTabsDroppingEventSource.remove(token);
+}
+
 winrt::event_token TabViewProperties::SelectionChanged(winrt::SelectionChangedEventHandler const& value)
 {
     return m_selectionChangedEventSource.add(value);
@@ -633,3 +691,23 @@ void TabViewProperties::TabStripDrop(winrt::event_token const& token)
 {
     m_tabStripDropEventSource.remove(token);
 }
+
+winrt::event_token TabViewProperties::TabTearOutRequested(winrt::TypedEventHandler<winrt::TabView, winrt::TabViewTabTearOutRequestedEventArgs> const& value)
+{
+    return m_tabTearOutRequestedEventSource.add(value);
+}
+
+void TabViewProperties::TabTearOutRequested(winrt::event_token const& token)
+{
+    m_tabTearOutRequestedEventSource.remove(token);
+}
+
+winrt::event_token TabViewProperties::TabTearOutWindowRequested(winrt::TypedEventHandler<winrt::TabView, winrt::TabViewTabTearOutWindowRequestedEventArgs> const& value)
+{
+    return m_tabTearOutWindowRequestedEventSource.add(value);
+}
+
+void TabViewProperties::TabTearOutWindowRequested(winrt::event_token const& token)
+{
+    m_tabTearOutWindowRequestedEventSource.remove(token);
+}
diff --git a/src/controls/dev/Generated/TabView.properties.h b/src/controls/dev/Generated/TabView.properties.h
index 3abe65ab82..54cddd4db5 100644
--- a/src/controls/dev/Generated/TabView.properties.h
+++ b/src/controls/dev/Generated/TabView.properties.h
@@ -24,6 +24,9 @@ class TabViewProperties
     void CanReorderTabs(bool value);
     bool CanReorderTabs();
 
+    void CanTearOutTabs(bool value);
+    bool CanTearOutTabs();
+
     void CloseButtonOverlayMode(winrt::TabViewCloseButtonOverlayMode const& value);
     winrt::TabViewCloseButtonOverlayMode CloseButtonOverlayMode();
 
@@ -68,6 +71,7 @@ class TabViewProperties
     static winrt::DependencyProperty AllowDropTabsProperty() { return s_AllowDropTabsProperty; }
     static winrt::DependencyProperty CanDragTabsProperty() { return s_CanDragTabsProperty; }
     static winrt::DependencyProperty CanReorderTabsProperty() { return s_CanReorderTabsProperty; }
+    static winrt::DependencyProperty CanTearOutTabsProperty() { return s_CanTearOutTabsProperty; }
     static winrt::DependencyProperty CloseButtonOverlayModeProperty() { return s_CloseButtonOverlayModeProperty; }
     static winrt::DependencyProperty IsAddTabButtonVisibleProperty() { return s_IsAddTabButtonVisibleProperty; }
     static winrt::DependencyProperty SelectedIndexProperty() { return s_SelectedIndexProperty; }
@@ -87,6 +91,7 @@ class TabViewProperties
     static GlobalDependencyProperty s_AllowDropTabsProperty;
     static GlobalDependencyProperty s_CanDragTabsProperty;
     static GlobalDependencyProperty s_CanReorderTabsProperty;
+    static GlobalDependencyProperty s_CanTearOutTabsProperty;
     static GlobalDependencyProperty s_CloseButtonOverlayModeProperty;
     static GlobalDependencyProperty s_IsAddTabButtonVisibleProperty;
     static GlobalDependencyProperty s_SelectedIndexProperty;
@@ -103,6 +108,10 @@ class TabViewProperties
 
     winrt::event_token AddTabButtonClick(winrt::TypedEventHandler<winrt::TabView, winrt::IInspectable> const& value);
     void AddTabButtonClick(winrt::event_token const& token);
+    winrt::event_token ExternalTornOutTabsDropped(winrt::TypedEventHandler<winrt::TabView, winrt::TabViewExternalTornOutTabsDroppedEventArgs> const& value);
+    void ExternalTornOutTabsDropped(winrt::event_token const& token);
+    winrt::event_token ExternalTornOutTabsDropping(winrt::TypedEventHandler<winrt::TabView, winrt::TabViewExternalTornOutTabsDroppingEventArgs> const& value);
+    void ExternalTornOutTabsDropping(winrt::event_token const& token);
     winrt::event_token SelectionChanged(winrt::SelectionChangedEventHandler const& value);
     void SelectionChanged(winrt::event_token const& token);
     winrt::event_token TabCloseRequested(winrt::TypedEventHandler<winrt::TabView, winrt::TabViewTabCloseRequestedEventArgs> const& value);
@@ -119,8 +128,14 @@ class TabViewProperties
     void TabStripDragOver(winrt::event_token const& token);
     winrt::event_token TabStripDrop(winrt::DragEventHandler const& value);
     void TabStripDrop(winrt::event_token const& token);
+    winrt::event_token TabTearOutRequested(winrt::TypedEventHandler<winrt::TabView, winrt::TabViewTabTearOutRequestedEventArgs> const& value);
+    void TabTearOutRequested(winrt::event_token const& token);
+    winrt::event_token TabTearOutWindowRequested(winrt::TypedEventHandler<winrt::TabView, winrt::TabViewTabTearOutWindowRequestedEventArgs> const& value);
+    void TabTearOutWindowRequested(winrt::event_token const& token);
 
     event_source<winrt::TypedEventHandler<winrt::TabView, winrt::IInspectable>> m_addTabButtonClickEventSource;
+    event_source<winrt::TypedEventHandler<winrt::TabView, winrt::TabViewExternalTornOutTabsDroppedEventArgs>> m_externalTornOutTabsDroppedEventSource;
+    event_source<winrt::TypedEventHandler<winrt::TabView, winrt::TabViewExternalTornOutTabsDroppingEventArgs>> m_externalTornOutTabsDroppingEventSource;
     event_source<winrt::SelectionChangedEventHandler> m_selectionChangedEventSource;
     event_source<winrt::TypedEventHandler<winrt::TabView, winrt::TabViewTabCloseRequestedEventArgs>> m_tabCloseRequestedEventSource;
     event_source<winrt::TypedEventHandler<winrt::TabView, winrt::TabViewTabDragCompletedEventArgs>> m_tabDragCompletedEventSource;
@@ -129,10 +144,16 @@ class TabViewProperties
     event_source<winrt::TypedEventHandler<winrt::TabView, winrt::IVectorChangedEventArgs>> m_tabItemsChangedEventSource;
     event_source<winrt::DragEventHandler> m_tabStripDragOverEventSource;
     event_source<winrt::DragEventHandler> m_tabStripDropEventSource;
+    event_source<winrt::TypedEventHandler<winrt::TabView, winrt::TabViewTabTearOutRequestedEventArgs>> m_tabTearOutRequestedEventSource;
+    event_source<winrt::TypedEventHandler<winrt::TabView, winrt::TabViewTabTearOutWindowRequestedEventArgs>> m_tabTearOutWindowRequestedEventSource;
 
     static void EnsureProperties();
     static void ClearProperties();
 
+    static void OnCanTearOutTabsPropertyChanged(
+        winrt::DependencyObject const& sender,
+        winrt::DependencyPropertyChangedEventArgs const& args);
+
     static void OnCloseButtonOverlayModePropertyChanged(
         winrt::DependencyObject const& sender,
         winrt::DependencyPropertyChangedEventArgs const& args);
diff --git a/src/controls/dev/Generated/TitleBar.properties.cpp b/src/controls/dev/Generated/TitleBar.properties.cpp
new file mode 100644
index 0000000000..249f49e1d3
--- /dev/null
+++ b/src/controls/dev/Generated/TitleBar.properties.cpp
@@ -0,0 +1,390 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+// DO NOT EDIT! This file was generated by CustomTasks.DependencyPropertyCodeGen
+#include "pch.h"
+#include "common.h"
+#include "TitleBar.h"
+
+namespace winrt::Microsoft::UI::Xaml::Controls
+{
+    CppWinRTActivatableClassWithDPFactory(TitleBar)
+}
+
+#include "TitleBar.g.cpp"
+
+GlobalDependencyProperty TitleBarProperties::s_ContentProperty{ nullptr };
+GlobalDependencyProperty TitleBarProperties::s_FooterProperty{ nullptr };
+GlobalDependencyProperty TitleBarProperties::s_HeaderProperty{ nullptr };
+GlobalDependencyProperty TitleBarProperties::s_IconSourceProperty{ nullptr };
+GlobalDependencyProperty TitleBarProperties::s_IsBackButtonVisibleProperty{ nullptr };
+GlobalDependencyProperty TitleBarProperties::s_IsBackEnabledProperty{ nullptr };
+GlobalDependencyProperty TitleBarProperties::s_IsPaneToggleButtonVisibleProperty{ nullptr };
+GlobalDependencyProperty TitleBarProperties::s_SubtitleProperty{ nullptr };
+GlobalDependencyProperty TitleBarProperties::s_TemplateSettingsProperty{ nullptr };
+GlobalDependencyProperty TitleBarProperties::s_TitleProperty{ nullptr };
+
+TitleBarProperties::TitleBarProperties()
+    : m_backRequestedEventSource{static_cast<TitleBar*>(this)}
+    , m_paneToggleRequestedEventSource{static_cast<TitleBar*>(this)}
+{
+    EnsureProperties();
+}
+
+void TitleBarProperties::EnsureProperties()
+{
+    if (!s_ContentProperty)
+    {
+        s_ContentProperty =
+            InitializeDependencyProperty(
+                L"Content",
+                winrt::name_of<winrt::IInspectable>(),
+                winrt::name_of<winrt::TitleBar>(),
+                false /* isAttached */,
+                ValueHelper<winrt::IInspectable>::BoxedDefaultValue(),
+                winrt::PropertyChangedCallback(&OnContentPropertyChanged));
+    }
+    if (!s_FooterProperty)
+    {
+        s_FooterProperty =
+            InitializeDependencyProperty(
+                L"Footer",
+                winrt::name_of<winrt::IInspectable>(),
+                winrt::name_of<winrt::TitleBar>(),
+                false /* isAttached */,
+                ValueHelper<winrt::IInspectable>::BoxedDefaultValue(),
+                winrt::PropertyChangedCallback(&OnFooterPropertyChanged));
+    }
+    if (!s_HeaderProperty)
+    {
+        s_HeaderProperty =
+            InitializeDependencyProperty(
+                L"Header",
+                winrt::name_of<winrt::IInspectable>(),
+                winrt::name_of<winrt::TitleBar>(),
+                false /* isAttached */,
+                ValueHelper<winrt::IInspectable>::BoxedDefaultValue(),
+                winrt::PropertyChangedCallback(&OnHeaderPropertyChanged));
+    }
+    if (!s_IconSourceProperty)
+    {
+        s_IconSourceProperty =
+            InitializeDependencyProperty(
+                L"IconSource",
+                winrt::name_of<winrt::IconSource>(),
+                winrt::name_of<winrt::TitleBar>(),
+                false /* isAttached */,
+                ValueHelper<winrt::IconSource>::BoxedDefaultValue(),
+                winrt::PropertyChangedCallback(&OnIconSourcePropertyChanged));
+    }
+    if (!s_IsBackButtonVisibleProperty)
+    {
+        s_IsBackButtonVisibleProperty =
+            InitializeDependencyProperty(
+                L"IsBackButtonVisible",
+                winrt::name_of<bool>(),
+                winrt::name_of<winrt::TitleBar>(),
+                false /* isAttached */,
+                ValueHelper<bool>::BoxValueIfNecessary(false),
+                winrt::PropertyChangedCallback(&OnIsBackButtonVisiblePropertyChanged));
+    }
+    if (!s_IsBackEnabledProperty)
+    {
+        s_IsBackEnabledProperty =
+            InitializeDependencyProperty(
+                L"IsBackEnabled",
+                winrt::name_of<bool>(),
+                winrt::name_of<winrt::TitleBar>(),
+                false /* isAttached */,
+                ValueHelper<bool>::BoxValueIfNecessary(true),
+                winrt::PropertyChangedCallback(&OnIsBackEnabledPropertyChanged));
+    }
+    if (!s_IsPaneToggleButtonVisibleProperty)
+    {
+        s_IsPaneToggleButtonVisibleProperty =
+            InitializeDependencyProperty(
+                L"IsPaneToggleButtonVisible",
+                winrt::name_of<bool>(),
+                winrt::name_of<winrt::TitleBar>(),
+                false /* isAttached */,
+                ValueHelper<bool>::BoxValueIfNecessary(false),
+                winrt::PropertyChangedCallback(&OnIsPaneToggleButtonVisiblePropertyChanged));
+    }
+    if (!s_SubtitleProperty)
+    {
+        s_SubtitleProperty =
+            InitializeDependencyProperty(
+                L"Subtitle",
+                winrt::name_of<winrt::hstring>(),
+                winrt::name_of<winrt::TitleBar>(),
+                false /* isAttached */,
+                ValueHelper<winrt::hstring>::BoxedDefaultValue(),
+                winrt::PropertyChangedCallback(&OnSubtitlePropertyChanged));
+    }
+    if (!s_TemplateSettingsProperty)
+    {
+        s_TemplateSettingsProperty =
+            InitializeDependencyProperty(
+                L"TemplateSettings",
+                winrt::name_of<winrt::TitleBarTemplateSettings>(),
+                winrt::name_of<winrt::TitleBar>(),
+                false /* isAttached */,
+                ValueHelper<winrt::TitleBarTemplateSettings>::BoxedDefaultValue(),
+                winrt::PropertyChangedCallback(&OnTemplateSettingsPropertyChanged));
+    }
+    if (!s_TitleProperty)
+    {
+        s_TitleProperty =
+            InitializeDependencyProperty(
+                L"Title",
+                winrt::name_of<winrt::hstring>(),
+                winrt::name_of<winrt::TitleBar>(),
+                false /* isAttached */,
+                ValueHelper<winrt::hstring>::BoxedDefaultValue(),
+                winrt::PropertyChangedCallback(&OnTitlePropertyChanged));
+    }
+}
+
+void TitleBarProperties::ClearProperties()
+{
+    s_ContentProperty = nullptr;
+    s_FooterProperty = nullptr;
+    s_HeaderProperty = nullptr;
+    s_IconSourceProperty = nullptr;
+    s_IsBackButtonVisibleProperty = nullptr;
+    s_IsBackEnabledProperty = nullptr;
+    s_IsPaneToggleButtonVisibleProperty = nullptr;
+    s_SubtitleProperty = nullptr;
+    s_TemplateSettingsProperty = nullptr;
+    s_TitleProperty = nullptr;
+}
+
+void TitleBarProperties::OnContentPropertyChanged(
+    winrt::DependencyObject const& sender,
+    winrt::DependencyPropertyChangedEventArgs const& args)
+{
+    auto owner = sender.as<winrt::TitleBar>();
+    winrt::get_self<TitleBar>(owner)->OnPropertyChanged(args);
+}
+
+void TitleBarProperties::OnFooterPropertyChanged(
+    winrt::DependencyObject const& sender,
+    winrt::DependencyPropertyChangedEventArgs const& args)
+{
+    auto owner = sender.as<winrt::TitleBar>();
+    winrt::get_self<TitleBar>(owner)->OnPropertyChanged(args);
+}
+
+void TitleBarProperties::OnHeaderPropertyChanged(
+    winrt::DependencyObject const& sender,
+    winrt::DependencyPropertyChangedEventArgs const& args)
+{
+    auto owner = sender.as<winrt::TitleBar>();
+    winrt::get_self<TitleBar>(owner)->OnPropertyChanged(args);
+}
+
+void TitleBarProperties::OnIconSourcePropertyChanged(
+    winrt::DependencyObject const& sender,
+    winrt::DependencyPropertyChangedEventArgs const& args)
+{
+    auto owner = sender.as<winrt::TitleBar>();
+    winrt::get_self<TitleBar>(owner)->OnPropertyChanged(args);
+}
+
+void TitleBarProperties::OnIsBackButtonVisiblePropertyChanged(
+    winrt::DependencyObject const& sender,
+    winrt::DependencyPropertyChangedEventArgs const& args)
+{
+    auto owner = sender.as<winrt::TitleBar>();
+    winrt::get_self<TitleBar>(owner)->OnPropertyChanged(args);
+}
+
+void TitleBarProperties::OnIsBackEnabledPropertyChanged(
+    winrt::DependencyObject const& sender,
+    winrt::DependencyPropertyChangedEventArgs const& args)
+{
+    auto owner = sender.as<winrt::TitleBar>();
+    winrt::get_self<TitleBar>(owner)->OnPropertyChanged(args);
+}
+
+void TitleBarProperties::OnIsPaneToggleButtonVisiblePropertyChanged(
+    winrt::DependencyObject const& sender,
+    winrt::DependencyPropertyChangedEventArgs const& args)
+{
+    auto owner = sender.as<winrt::TitleBar>();
+    winrt::get_self<TitleBar>(owner)->OnPropertyChanged(args);
+}
+
+void TitleBarProperties::OnSubtitlePropertyChanged(
+    winrt::DependencyObject const& sender,
+    winrt::DependencyPropertyChangedEventArgs const& args)
+{
+    auto owner = sender.as<winrt::TitleBar>();
+    winrt::get_self<TitleBar>(owner)->OnPropertyChanged(args);
+}
+
+void TitleBarProperties::OnTemplateSettingsPropertyChanged(
+    winrt::DependencyObject const& sender,
+    winrt::DependencyPropertyChangedEventArgs const& args)
+{
+    auto owner = sender.as<winrt::TitleBar>();
+    winrt::get_self<TitleBar>(owner)->OnPropertyChanged(args);
+}
+
+void TitleBarProperties::OnTitlePropertyChanged(
+    winrt::DependencyObject const& sender,
+    winrt::DependencyPropertyChangedEventArgs const& args)
+{
+    auto owner = sender.as<winrt::TitleBar>();
+    winrt::get_self<TitleBar>(owner)->OnPropertyChanged(args);
+}
+
+void TitleBarProperties::Content(winrt::IInspectable const& value)
+{
+    [[gsl::suppress(con)]]
+    {
+    static_cast<TitleBar*>(this)->SetValue(s_ContentProperty, ValueHelper<winrt::IInspectable>::BoxValueIfNecessary(value));
+    }
+}
+
+winrt::IInspectable TitleBarProperties::Content()
+{
+    return ValueHelper<winrt::IInspectable>::CastOrUnbox(static_cast<TitleBar*>(this)->GetValue(s_ContentProperty));
+}
+
+void TitleBarProperties::Footer(winrt::IInspectable const& value)
+{
+    [[gsl::suppress(con)]]
+    {
+    static_cast<TitleBar*>(this)->SetValue(s_FooterProperty, ValueHelper<winrt::IInspectable>::BoxValueIfNecessary(value));
+    }
+}
+
+winrt::IInspectable TitleBarProperties::Footer()
+{
+    return ValueHelper<winrt::IInspectable>::CastOrUnbox(static_cast<TitleBar*>(this)->GetValue(s_FooterProperty));
+}
+
+void TitleBarProperties::Header(winrt::IInspectable const& value)
+{
+    [[gsl::suppress(con)]]
+    {
+    static_cast<TitleBar*>(this)->SetValue(s_HeaderProperty, ValueHelper<winrt::IInspectable>::BoxValueIfNecessary(value));
+    }
+}
+
+winrt::IInspectable TitleBarProperties::Header()
+{
+    return ValueHelper<winrt::IInspectable>::CastOrUnbox(static_cast<TitleBar*>(this)->GetValue(s_HeaderProperty));
+}
+
+void TitleBarProperties::IconSource(winrt::IconSource const& value)
+{
+    [[gsl::suppress(con)]]
+    {
+    static_cast<TitleBar*>(this)->SetValue(s_IconSourceProperty, ValueHelper<winrt::IconSource>::BoxValueIfNecessary(value));
+    }
+}
+
+winrt::IconSource TitleBarProperties::IconSource()
+{
+    return ValueHelper<winrt::IconSource>::CastOrUnbox(static_cast<TitleBar*>(this)->GetValue(s_IconSourceProperty));
+}
+
+void TitleBarProperties::IsBackButtonVisible(bool value)
+{
+    [[gsl::suppress(con)]]
+    {
+    static_cast<TitleBar*>(this)->SetValue(s_IsBackButtonVisibleProperty, ValueHelper<bool>::BoxValueIfNecessary(value));
+    }
+}
+
+bool TitleBarProperties::IsBackButtonVisible()
+{
+    return ValueHelper<bool>::CastOrUnbox(static_cast<TitleBar*>(this)->GetValue(s_IsBackButtonVisibleProperty));
+}
+
+void TitleBarProperties::IsBackEnabled(bool value)
+{
+    [[gsl::suppress(con)]]
+    {
+    static_cast<TitleBar*>(this)->SetValue(s_IsBackEnabledProperty, ValueHelper<bool>::BoxValueIfNecessary(value));
+    }
+}
+
+bool TitleBarProperties::IsBackEnabled()
+{
+    return ValueHelper<bool>::CastOrUnbox(static_cast<TitleBar*>(this)->GetValue(s_IsBackEnabledProperty));
+}
+
+void TitleBarProperties::IsPaneToggleButtonVisible(bool value)
+{
+    [[gsl::suppress(con)]]
+    {
+    static_cast<TitleBar*>(this)->SetValue(s_IsPaneToggleButtonVisibleProperty, ValueHelper<bool>::BoxValueIfNecessary(value));
+    }
+}
+
+bool TitleBarProperties::IsPaneToggleButtonVisible()
+{
+    return ValueHelper<bool>::CastOrUnbox(static_cast<TitleBar*>(this)->GetValue(s_IsPaneToggleButtonVisibleProperty));
+}
+
+void TitleBarProperties::Subtitle(winrt::hstring const& value)
+{
+    [[gsl::suppress(con)]]
+    {
+    static_cast<TitleBar*>(this)->SetValue(s_SubtitleProperty, ValueHelper<winrt::hstring>::BoxValueIfNecessary(value));
+    }
+}
+
+winrt::hstring TitleBarProperties::Subtitle()
+{
+    return ValueHelper<winrt::hstring>::CastOrUnbox(static_cast<TitleBar*>(this)->GetValue(s_SubtitleProperty));
+}
+
+void TitleBarProperties::TemplateSettings(winrt::TitleBarTemplateSettings const& value)
+{
+    [[gsl::suppress(con)]]
+    {
+    static_cast<TitleBar*>(this)->SetValue(s_TemplateSettingsProperty, ValueHelper<winrt::TitleBarTemplateSettings>::BoxValueIfNecessary(value));
+    }
+}
+
+winrt::TitleBarTemplateSettings TitleBarProperties::TemplateSettings()
+{
+    return ValueHelper<winrt::TitleBarTemplateSettings>::CastOrUnbox(static_cast<TitleBar*>(this)->GetValue(s_TemplateSettingsProperty));
+}
+
+void TitleBarProperties::Title(winrt::hstring const& value)
+{
+    [[gsl::suppress(con)]]
+    {
+    static_cast<TitleBar*>(this)->SetValue(s_TitleProperty, ValueHelper<winrt::hstring>::BoxValueIfNecessary(value));
+    }
+}
+
+winrt::hstring TitleBarProperties::Title()
+{
+    return ValueHelper<winrt::hstring>::CastOrUnbox(static_cast<TitleBar*>(this)->GetValue(s_TitleProperty));
+}
+
+winrt::event_token TitleBarProperties::BackRequested(winrt::TypedEventHandler<winrt::TitleBar, winrt::IInspectable> const& value)
+{
+    return m_backRequestedEventSource.add(value);
+}
+
+void TitleBarProperties::BackRequested(winrt::event_token const& token)
+{
+    m_backRequestedEventSource.remove(token);
+}
+
+winrt::event_token TitleBarProperties::PaneToggleRequested(winrt::TypedEventHandler<winrt::TitleBar, winrt::IInspectable> const& value)
+{
+    return m_paneToggleRequestedEventSource.add(value);
+}
+
+void TitleBarProperties::PaneToggleRequested(winrt::event_token const& token)
+{
+    m_paneToggleRequestedEventSource.remove(token);
+}
diff --git a/src/controls/dev/GeneratedExperimental/TitleBar.properties.h b/src/controls/dev/Generated/TitleBar.properties.h
similarity index 50%
rename from src/controls/dev/GeneratedExperimental/TitleBar.properties.h
rename to src/controls/dev/Generated/TitleBar.properties.h
index 45c4c45be4..7436131c9c 100644
--- a/src/controls/dev/GeneratedExperimental/TitleBar.properties.h
+++ b/src/controls/dev/Generated/TitleBar.properties.h
@@ -9,8 +9,14 @@ class TitleBarProperties
 public:
     TitleBarProperties();
 
-    void CustomContent(winrt::IInspectable const& value);
-    winrt::IInspectable CustomContent();
+    void Content(winrt::IInspectable const& value);
+    winrt::IInspectable Content();
+
+    void Footer(winrt::IInspectable const& value);
+    winrt::IInspectable Footer();
+
+    void Header(winrt::IInspectable const& value);
+    winrt::IInspectable Header();
 
     void IconSource(winrt::IconSource const& value);
     winrt::IconSource IconSource();
@@ -21,35 +27,60 @@ class TitleBarProperties
     void IsBackEnabled(bool value);
     bool IsBackEnabled();
 
+    void IsPaneToggleButtonVisible(bool value);
+    bool IsPaneToggleButtonVisible();
+
+    void Subtitle(winrt::hstring const& value);
+    winrt::hstring Subtitle();
+
     void TemplateSettings(winrt::TitleBarTemplateSettings const& value);
     winrt::TitleBarTemplateSettings TemplateSettings();
 
     void Title(winrt::hstring const& value);
     winrt::hstring Title();
 
-    static winrt::DependencyProperty CustomContentProperty() { return s_CustomContentProperty; }
+    static winrt::DependencyProperty ContentProperty() { return s_ContentProperty; }
+    static winrt::DependencyProperty FooterProperty() { return s_FooterProperty; }
+    static winrt::DependencyProperty HeaderProperty() { return s_HeaderProperty; }
     static winrt::DependencyProperty IconSourceProperty() { return s_IconSourceProperty; }
     static winrt::DependencyProperty IsBackButtonVisibleProperty() { return s_IsBackButtonVisibleProperty; }
     static winrt::DependencyProperty IsBackEnabledProperty() { return s_IsBackEnabledProperty; }
+    static winrt::DependencyProperty IsPaneToggleButtonVisibleProperty() { return s_IsPaneToggleButtonVisibleProperty; }
+    static winrt::DependencyProperty SubtitleProperty() { return s_SubtitleProperty; }
     static winrt::DependencyProperty TemplateSettingsProperty() { return s_TemplateSettingsProperty; }
     static winrt::DependencyProperty TitleProperty() { return s_TitleProperty; }
 
-    static GlobalDependencyProperty s_CustomContentProperty;
+    static GlobalDependencyProperty s_ContentProperty;
+    static GlobalDependencyProperty s_FooterProperty;
+    static GlobalDependencyProperty s_HeaderProperty;
     static GlobalDependencyProperty s_IconSourceProperty;
     static GlobalDependencyProperty s_IsBackButtonVisibleProperty;
     static GlobalDependencyProperty s_IsBackEnabledProperty;
+    static GlobalDependencyProperty s_IsPaneToggleButtonVisibleProperty;
+    static GlobalDependencyProperty s_SubtitleProperty;
     static GlobalDependencyProperty s_TemplateSettingsProperty;
     static GlobalDependencyProperty s_TitleProperty;
 
     winrt::event_token BackRequested(winrt::TypedEventHandler<winrt::TitleBar, winrt::IInspectable> const& value);
     void BackRequested(winrt::event_token const& token);
+    winrt::event_token PaneToggleRequested(winrt::TypedEventHandler<winrt::TitleBar, winrt::IInspectable> const& value);
+    void PaneToggleRequested(winrt::event_token const& token);
 
     event_source<winrt::TypedEventHandler<winrt::TitleBar, winrt::IInspectable>> m_backRequestedEventSource;
+    event_source<winrt::TypedEventHandler<winrt::TitleBar, winrt::IInspectable>> m_paneToggleRequestedEventSource;
 
     static void EnsureProperties();
     static void ClearProperties();
 
-    static void OnCustomContentPropertyChanged(
+    static void OnContentPropertyChanged(
+        winrt::DependencyObject const& sender,
+        winrt::DependencyPropertyChangedEventArgs const& args);
+
+    static void OnFooterPropertyChanged(
+        winrt::DependencyObject const& sender,
+        winrt::DependencyPropertyChangedEventArgs const& args);
+
+    static void OnHeaderPropertyChanged(
         winrt::DependencyObject const& sender,
         winrt::DependencyPropertyChangedEventArgs const& args);
 
@@ -61,6 +92,22 @@ class TitleBarProperties
         winrt::DependencyObject const& sender,
         winrt::DependencyPropertyChangedEventArgs const& args);
 
+    static void OnIsBackEnabledPropertyChanged(
+        winrt::DependencyObject const& sender,
+        winrt::DependencyPropertyChangedEventArgs const& args);
+
+    static void OnIsPaneToggleButtonVisiblePropertyChanged(
+        winrt::DependencyObject const& sender,
+        winrt::DependencyPropertyChangedEventArgs const& args);
+
+    static void OnSubtitlePropertyChanged(
+        winrt::DependencyObject const& sender,
+        winrt::DependencyPropertyChangedEventArgs const& args);
+
+    static void OnTemplateSettingsPropertyChanged(
+        winrt::DependencyObject const& sender,
+        winrt::DependencyPropertyChangedEventArgs const& args);
+
     static void OnTitlePropertyChanged(
         winrt::DependencyObject const& sender,
         winrt::DependencyPropertyChangedEventArgs const& args);
diff --git a/src/controls/dev/GeneratedExperimental/TitleBarAutomationPeer.properties.cpp b/src/controls/dev/Generated/TitleBarAutomationPeer.properties.cpp
similarity index 87%
rename from src/controls/dev/GeneratedExperimental/TitleBarAutomationPeer.properties.cpp
rename to src/controls/dev/Generated/TitleBarAutomationPeer.properties.cpp
index af3641ac8a..567097eeb3 100644
--- a/src/controls/dev/GeneratedExperimental/TitleBarAutomationPeer.properties.cpp
+++ b/src/controls/dev/Generated/TitleBarAutomationPeer.properties.cpp
@@ -6,7 +6,7 @@
 #include "common.h"
 #include "TitleBarAutomationPeer.h"
 
-namespace winrt::Microsoft::Experimental::UI::Xaml::Controls
+namespace winrt::Microsoft::UI::Xaml::Controls
 {
     CppWinRTActivatableClassWithBasicFactory(TitleBarAutomationPeer)
 }
diff --git a/src/controls/dev/Generated/TitleBarTemplateSettings.properties.cpp b/src/controls/dev/Generated/TitleBarTemplateSettings.properties.cpp
new file mode 100644
index 0000000000..71ca4c01e2
--- /dev/null
+++ b/src/controls/dev/Generated/TitleBarTemplateSettings.properties.cpp
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+// DO NOT EDIT! This file was generated by CustomTasks.DependencyPropertyCodeGen
+#include "pch.h"
+#include "common.h"
+#include "TitleBarTemplateSettings.h"
+
+namespace winrt::Microsoft::UI::Xaml::Controls
+{
+    CppWinRTActivatableClassWithDPFactory(TitleBarTemplateSettings)
+}
+
+#include "TitleBarTemplateSettings.g.cpp"
+
+GlobalDependencyProperty TitleBarTemplateSettingsProperties::s_IconElementProperty{ nullptr };
+
+TitleBarTemplateSettingsProperties::TitleBarTemplateSettingsProperties()
+{
+    EnsureProperties();
+}
+
+void TitleBarTemplateSettingsProperties::EnsureProperties()
+{
+    if (!s_IconElementProperty)
+    {
+        s_IconElementProperty =
+            InitializeDependencyProperty(
+                L"IconElement",
+                winrt::name_of<winrt::IconElement>(),
+                winrt::name_of<winrt::TitleBarTemplateSettings>(),
+                false /* isAttached */,
+                ValueHelper<winrt::IconElement>::BoxedDefaultValue(),
+                nullptr);
+    }
+}
+
+void TitleBarTemplateSettingsProperties::ClearProperties()
+{
+    s_IconElementProperty = nullptr;
+}
+
+void TitleBarTemplateSettingsProperties::IconElement(winrt::IconElement const& value)
+{
+    [[gsl::suppress(con)]]
+    {
+    static_cast<TitleBarTemplateSettings*>(this)->SetValue(s_IconElementProperty, ValueHelper<winrt::IconElement>::BoxValueIfNecessary(value));
+    }
+}
+
+winrt::IconElement TitleBarTemplateSettingsProperties::IconElement()
+{
+    return ValueHelper<winrt::IconElement>::CastOrUnbox(static_cast<TitleBarTemplateSettings*>(this)->GetValue(s_IconElementProperty));
+}
diff --git a/src/controls/dev/GeneratedExperimental/TitleBarTemplateSettings.properties.h b/src/controls/dev/Generated/TitleBarTemplateSettings.properties.h
similarity index 52%
rename from src/controls/dev/GeneratedExperimental/TitleBarTemplateSettings.properties.h
rename to src/controls/dev/Generated/TitleBarTemplateSettings.properties.h
index 46dd0786f5..bc110ebde4 100644
--- a/src/controls/dev/GeneratedExperimental/TitleBarTemplateSettings.properties.h
+++ b/src/controls/dev/Generated/TitleBarTemplateSettings.properties.h
@@ -9,22 +9,12 @@ class TitleBarTemplateSettingsProperties
 public:
     TitleBarTemplateSettingsProperties();
 
-    void CustomColumnGridLength(winrt::GridLength const& value);
-    winrt::GridLength CustomColumnGridLength();
-
     void IconElement(winrt::IconElement const& value);
     winrt::IconElement IconElement();
 
-    void TitleColumnGridLength(winrt::GridLength const& value);
-    winrt::GridLength TitleColumnGridLength();
-
-    static winrt::DependencyProperty CustomColumnGridLengthProperty() { return s_CustomColumnGridLengthProperty; }
     static winrt::DependencyProperty IconElementProperty() { return s_IconElementProperty; }
-    static winrt::DependencyProperty TitleColumnGridLengthProperty() { return s_TitleColumnGridLengthProperty; }
 
-    static GlobalDependencyProperty s_CustomColumnGridLengthProperty;
     static GlobalDependencyProperty s_IconElementProperty;
-    static GlobalDependencyProperty s_TitleColumnGridLengthProperty;
 
     static void EnsureProperties();
     static void ClearProperties();
diff --git a/src/controls/dev/GeneratedExperimental/ExperimentalXamlControlsResources.properties.cpp b/src/controls/dev/GeneratedExperimental/ExperimentalXamlControlsResources.properties.cpp
deleted file mode 100644
index f0b7f6c6b9..0000000000
--- a/src/controls/dev/GeneratedExperimental/ExperimentalXamlControlsResources.properties.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-// DO NOT EDIT! This file was generated by CustomTasks.DependencyPropertyCodeGen
-#include "pch.h"
-#include "common.h"
-#include "ExperimentalXamlControlsResources.h"
-
-namespace winrt::Microsoft::Experimental::UI::Xaml::Controls
-{
-    CppWinRTActivatableClassWithBasicFactory(ExperimentalXamlControlsResources)
-}
-
-#include "ExperimentalXamlControlsResources.g.cpp"
-
-
diff --git a/src/controls/dev/GeneratedExperimental/SampleControl.properties.cpp b/src/controls/dev/GeneratedExperimental/SampleControl.properties.cpp
deleted file mode 100644
index 3b90e4096a..0000000000
--- a/src/controls/dev/GeneratedExperimental/SampleControl.properties.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-// DO NOT EDIT! This file was generated by CustomTasks.DependencyPropertyCodeGen
-#include "pch.h"
-#include "common.h"
-#include "SampleControl.h"
-
-namespace winrt::Microsoft::Experimental::UI::Xaml::Controls
-{
-    CppWinRTActivatableClassWithDPFactory(SampleControl)
-}
-
-#include "SampleControl.g.cpp"
-
-GlobalDependencyProperty SampleControlProperties::s_PlaceholderProperty{ nullptr };
-
-SampleControlProperties::SampleControlProperties()
-{
-    EnsureProperties();
-}
-
-void SampleControlProperties::EnsureProperties()
-{
-    if (!s_PlaceholderProperty)
-    {
-        s_PlaceholderProperty =
-            InitializeDependencyProperty(
-                L"Placeholder",
-                winrt::name_of<winrt::IInspectable>(),
-                winrt::name_of<winrt::SampleControl>(),
-                false /* isAttached */,
-                ValueHelper<winrt::IInspectable>::BoxedDefaultValue(),
-                winrt::PropertyChangedCallback(&OnPlaceholderPropertyChanged));
-    }
-}
-
-void SampleControlProperties::ClearProperties()
-{
-    s_PlaceholderProperty = nullptr;
-}
-
-void SampleControlProperties::OnPlaceholderPropertyChanged(
-    winrt::DependencyObject const& sender,
-    winrt::DependencyPropertyChangedEventArgs const& args)
-{
-    auto owner = sender.as<winrt::SampleControl>();
-    winrt::get_self<SampleControl>(owner)->OnPropertyChanged(args);
-}
-
-void SampleControlProperties::Placeholder(winrt::IInspectable const& value)
-{
-    [[gsl::suppress(con)]]
-    {
-    static_cast<SampleControl*>(this)->SetValue(s_PlaceholderProperty, ValueHelper<winrt::IInspectable>::BoxValueIfNecessary(value));
-    }
-}
-
-winrt::IInspectable SampleControlProperties::Placeholder()
-{
-    return ValueHelper<winrt::IInspectable>::CastOrUnbox(static_cast<SampleControl*>(this)->GetValue(s_PlaceholderProperty));
-}
diff --git a/src/controls/dev/GeneratedExperimental/SampleControl.properties.h b/src/controls/dev/GeneratedExperimental/SampleControl.properties.h
deleted file mode 100644
index 88c4292ddf..0000000000
--- a/src/controls/dev/GeneratedExperimental/SampleControl.properties.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-// DO NOT EDIT! This file was generated by CustomTasks.DependencyPropertyCodeGen
-#pragma once
-
-class SampleControlProperties
-{
-public:
-    SampleControlProperties();
-
-    void Placeholder(winrt::IInspectable const& value);
-    winrt::IInspectable Placeholder();
-
-    static winrt::DependencyProperty PlaceholderProperty() { return s_PlaceholderProperty; }
-
-    static GlobalDependencyProperty s_PlaceholderProperty;
-
-    static void EnsureProperties();
-    static void ClearProperties();
-
-    static void OnPlaceholderPropertyChanged(
-        winrt::DependencyObject const& sender,
-        winrt::DependencyPropertyChangedEventArgs const& args);
-};
diff --git a/src/controls/dev/GeneratedExperimental/TitleBar.properties.cpp b/src/controls/dev/GeneratedExperimental/TitleBar.properties.cpp
deleted file mode 100644
index 8db0df4787..0000000000
--- a/src/controls/dev/GeneratedExperimental/TitleBar.properties.cpp
+++ /dev/null
@@ -1,227 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-// DO NOT EDIT! This file was generated by CustomTasks.DependencyPropertyCodeGen
-#include "pch.h"
-#include "common.h"
-#include "TitleBar.h"
-
-namespace winrt::Microsoft::Experimental::UI::Xaml::Controls
-{
-    CppWinRTActivatableClassWithDPFactory(TitleBar)
-}
-
-#include "TitleBar.g.cpp"
-
-GlobalDependencyProperty TitleBarProperties::s_CustomContentProperty{ nullptr };
-GlobalDependencyProperty TitleBarProperties::s_IconSourceProperty{ nullptr };
-GlobalDependencyProperty TitleBarProperties::s_IsBackButtonVisibleProperty{ nullptr };
-GlobalDependencyProperty TitleBarProperties::s_IsBackEnabledProperty{ nullptr };
-GlobalDependencyProperty TitleBarProperties::s_TemplateSettingsProperty{ nullptr };
-GlobalDependencyProperty TitleBarProperties::s_TitleProperty{ nullptr };
-
-TitleBarProperties::TitleBarProperties()
-    : m_backRequestedEventSource{static_cast<TitleBar*>(this)}
-{
-    EnsureProperties();
-}
-
-void TitleBarProperties::EnsureProperties()
-{
-    if (!s_CustomContentProperty)
-    {
-        s_CustomContentProperty =
-            InitializeDependencyProperty(
-                L"CustomContent",
-                winrt::name_of<winrt::IInspectable>(),
-                winrt::name_of<winrt::TitleBar>(),
-                false /* isAttached */,
-                ValueHelper<winrt::IInspectable>::BoxedDefaultValue(),
-                winrt::PropertyChangedCallback(&OnCustomContentPropertyChanged));
-    }
-    if (!s_IconSourceProperty)
-    {
-        s_IconSourceProperty =
-            InitializeDependencyProperty(
-                L"IconSource",
-                winrt::name_of<winrt::IconSource>(),
-                winrt::name_of<winrt::TitleBar>(),
-                false /* isAttached */,
-                ValueHelper<winrt::IconSource>::BoxedDefaultValue(),
-                winrt::PropertyChangedCallback(&OnIconSourcePropertyChanged));
-    }
-    if (!s_IsBackButtonVisibleProperty)
-    {
-        s_IsBackButtonVisibleProperty =
-            InitializeDependencyProperty(
-                L"IsBackButtonVisible",
-                winrt::name_of<bool>(),
-                winrt::name_of<winrt::TitleBar>(),
-                false /* isAttached */,
-                ValueHelper<bool>::BoxedDefaultValue(),
-                winrt::PropertyChangedCallback(&OnIsBackButtonVisiblePropertyChanged));
-    }
-    if (!s_IsBackEnabledProperty)
-    {
-        s_IsBackEnabledProperty =
-            InitializeDependencyProperty(
-                L"IsBackEnabled",
-                winrt::name_of<bool>(),
-                winrt::name_of<winrt::TitleBar>(),
-                false /* isAttached */,
-                ValueHelper<bool>::BoxedDefaultValue(),
-                nullptr);
-    }
-    if (!s_TemplateSettingsProperty)
-    {
-        s_TemplateSettingsProperty =
-            InitializeDependencyProperty(
-                L"TemplateSettings",
-                winrt::name_of<winrt::TitleBarTemplateSettings>(),
-                winrt::name_of<winrt::TitleBar>(),
-                false /* isAttached */,
-                ValueHelper<winrt::TitleBarTemplateSettings>::BoxedDefaultValue(),
-                nullptr);
-    }
-    if (!s_TitleProperty)
-    {
-        s_TitleProperty =
-            InitializeDependencyProperty(
-                L"Title",
-                winrt::name_of<winrt::hstring>(),
-                winrt::name_of<winrt::TitleBar>(),
-                false /* isAttached */,
-                ValueHelper<winrt::hstring>::BoxedDefaultValue(),
-                winrt::PropertyChangedCallback(&OnTitlePropertyChanged));
-    }
-}
-
-void TitleBarProperties::ClearProperties()
-{
-    s_CustomContentProperty = nullptr;
-    s_IconSourceProperty = nullptr;
-    s_IsBackButtonVisibleProperty = nullptr;
-    s_IsBackEnabledProperty = nullptr;
-    s_TemplateSettingsProperty = nullptr;
-    s_TitleProperty = nullptr;
-}
-
-void TitleBarProperties::OnCustomContentPropertyChanged(
-    winrt::DependencyObject const& sender,
-    winrt::DependencyPropertyChangedEventArgs const& args)
-{
-    auto owner = sender.as<winrt::TitleBar>();
-    winrt::get_self<TitleBar>(owner)->OnCustomContentPropertyChanged(args);
-}
-
-void TitleBarProperties::OnIconSourcePropertyChanged(
-    winrt::DependencyObject const& sender,
-    winrt::DependencyPropertyChangedEventArgs const& args)
-{
-    auto owner = sender.as<winrt::TitleBar>();
-    winrt::get_self<TitleBar>(owner)->OnIconSourcePropertyChanged(args);
-}
-
-void TitleBarProperties::OnIsBackButtonVisiblePropertyChanged(
-    winrt::DependencyObject const& sender,
-    winrt::DependencyPropertyChangedEventArgs const& args)
-{
-    auto owner = sender.as<winrt::TitleBar>();
-    winrt::get_self<TitleBar>(owner)->OnIsBackButtonVisiblePropertyChanged(args);
-}
-
-void TitleBarProperties::OnTitlePropertyChanged(
-    winrt::DependencyObject const& sender,
-    winrt::DependencyPropertyChangedEventArgs const& args)
-{
-    auto owner = sender.as<winrt::TitleBar>();
-    winrt::get_self<TitleBar>(owner)->OnTitlePropertyChanged(args);
-}
-
-void TitleBarProperties::CustomContent(winrt::IInspectable const& value)
-{
-    [[gsl::suppress(con)]]
-    {
-    static_cast<TitleBar*>(this)->SetValue(s_CustomContentProperty, ValueHelper<winrt::IInspectable>::BoxValueIfNecessary(value));
-    }
-}
-
-winrt::IInspectable TitleBarProperties::CustomContent()
-{
-    return ValueHelper<winrt::IInspectable>::CastOrUnbox(static_cast<TitleBar*>(this)->GetValue(s_CustomContentProperty));
-}
-
-void TitleBarProperties::IconSource(winrt::IconSource const& value)
-{
-    [[gsl::suppress(con)]]
-    {
-    static_cast<TitleBar*>(this)->SetValue(s_IconSourceProperty, ValueHelper<winrt::IconSource>::BoxValueIfNecessary(value));
-    }
-}
-
-winrt::IconSource TitleBarProperties::IconSource()
-{
-    return ValueHelper<winrt::IconSource>::CastOrUnbox(static_cast<TitleBar*>(this)->GetValue(s_IconSourceProperty));
-}
-
-void TitleBarProperties::IsBackButtonVisible(bool value)
-{
-    [[gsl::suppress(con)]]
-    {
-    static_cast<TitleBar*>(this)->SetValue(s_IsBackButtonVisibleProperty, ValueHelper<bool>::BoxValueIfNecessary(value));
-    }
-}
-
-bool TitleBarProperties::IsBackButtonVisible()
-{
-    return ValueHelper<bool>::CastOrUnbox(static_cast<TitleBar*>(this)->GetValue(s_IsBackButtonVisibleProperty));
-}
-
-void TitleBarProperties::IsBackEnabled(bool value)
-{
-    [[gsl::suppress(con)]]
-    {
-    static_cast<TitleBar*>(this)->SetValue(s_IsBackEnabledProperty, ValueHelper<bool>::BoxValueIfNecessary(value));
-    }
-}
-
-bool TitleBarProperties::IsBackEnabled()
-{
-    return ValueHelper<bool>::CastOrUnbox(static_cast<TitleBar*>(this)->GetValue(s_IsBackEnabledProperty));
-}
-
-void TitleBarProperties::TemplateSettings(winrt::TitleBarTemplateSettings const& value)
-{
-    [[gsl::suppress(con)]]
-    {
-    static_cast<TitleBar*>(this)->SetValue(s_TemplateSettingsProperty, ValueHelper<winrt::TitleBarTemplateSettings>::BoxValueIfNecessary(value));
-    }
-}
-
-winrt::TitleBarTemplateSettings TitleBarProperties::TemplateSettings()
-{
-    return ValueHelper<winrt::TitleBarTemplateSettings>::CastOrUnbox(static_cast<TitleBar*>(this)->GetValue(s_TemplateSettingsProperty));
-}
-
-void TitleBarProperties::Title(winrt::hstring const& value)
-{
-    [[gsl::suppress(con)]]
-    {
-    static_cast<TitleBar*>(this)->SetValue(s_TitleProperty, ValueHelper<winrt::hstring>::BoxValueIfNecessary(value));
-    }
-}
-
-winrt::hstring TitleBarProperties::Title()
-{
-    return ValueHelper<winrt::hstring>::CastOrUnbox(static_cast<TitleBar*>(this)->GetValue(s_TitleProperty));
-}
-
-winrt::event_token TitleBarProperties::BackRequested(winrt::TypedEventHandler<winrt::TitleBar, winrt::IInspectable> const& value)
-{
-    return m_backRequestedEventSource.add(value);
-}
-
-void TitleBarProperties::BackRequested(winrt::event_token const& token)
-{
-    m_backRequestedEventSource.remove(token);
-}
diff --git a/src/controls/dev/GeneratedExperimental/TitleBarTemplateSettings.properties.cpp b/src/controls/dev/GeneratedExperimental/TitleBarTemplateSettings.properties.cpp
deleted file mode 100644
index 24c07056a6..0000000000
--- a/src/controls/dev/GeneratedExperimental/TitleBarTemplateSettings.properties.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-// DO NOT EDIT! This file was generated by CustomTasks.DependencyPropertyCodeGen
-#include "pch.h"
-#include "common.h"
-#include "TitleBarTemplateSettings.h"
-
-namespace winrt::Microsoft::Experimental::UI::Xaml::Controls
-{
-    CppWinRTActivatableClassWithDPFactory(TitleBarTemplateSettings)
-}
-
-#include "TitleBarTemplateSettings.g.cpp"
-
-GlobalDependencyProperty TitleBarTemplateSettingsProperties::s_CustomColumnGridLengthProperty{ nullptr };
-GlobalDependencyProperty TitleBarTemplateSettingsProperties::s_IconElementProperty{ nullptr };
-GlobalDependencyProperty TitleBarTemplateSettingsProperties::s_TitleColumnGridLengthProperty{ nullptr };
-
-TitleBarTemplateSettingsProperties::TitleBarTemplateSettingsProperties()
-{
-    EnsureProperties();
-}
-
-void TitleBarTemplateSettingsProperties::EnsureProperties()
-{
-    if (!s_CustomColumnGridLengthProperty)
-    {
-        s_CustomColumnGridLengthProperty =
-            InitializeDependencyProperty(
-                L"CustomColumnGridLength",
-                winrt::name_of<winrt::GridLength>(),
-                winrt::name_of<winrt::TitleBarTemplateSettings>(),
-                false /* isAttached */,
-                ValueHelper<winrt::GridLength>::BoxValueIfNecessary(c_customColumnGridLengthDefault),
-                nullptr);
-    }
-    if (!s_IconElementProperty)
-    {
-        s_IconElementProperty =
-            InitializeDependencyProperty(
-                L"IconElement",
-                winrt::name_of<winrt::IconElement>(),
-                winrt::name_of<winrt::TitleBarTemplateSettings>(),
-                false /* isAttached */,
-                ValueHelper<winrt::IconElement>::BoxedDefaultValue(),
-                nullptr);
-    }
-    if (!s_TitleColumnGridLengthProperty)
-    {
-        s_TitleColumnGridLengthProperty =
-            InitializeDependencyProperty(
-                L"TitleColumnGridLength",
-                winrt::name_of<winrt::GridLength>(),
-                winrt::name_of<winrt::TitleBarTemplateSettings>(),
-                false /* isAttached */,
-                ValueHelper<winrt::GridLength>::BoxValueIfNecessary(c_titleColumnGridLengthDefault),
-                nullptr);
-    }
-}
-
-void TitleBarTemplateSettingsProperties::ClearProperties()
-{
-    s_CustomColumnGridLengthProperty = nullptr;
-    s_IconElementProperty = nullptr;
-    s_TitleColumnGridLengthProperty = nullptr;
-}
-
-void TitleBarTemplateSettingsProperties::CustomColumnGridLength(winrt::GridLength const& value)
-{
-    [[gsl::suppress(con)]]
-    {
-    static_cast<TitleBarTemplateSettings*>(this)->SetValue(s_CustomColumnGridLengthProperty, ValueHelper<winrt::GridLength>::BoxValueIfNecessary(value));
-    }
-}
-
-winrt::GridLength TitleBarTemplateSettingsProperties::CustomColumnGridLength()
-{
-    return ValueHelper<winrt::GridLength>::CastOrUnbox(static_cast<TitleBarTemplateSettings*>(this)->GetValue(s_CustomColumnGridLengthProperty));
-}
-
-void TitleBarTemplateSettingsProperties::IconElement(winrt::IconElement const& value)
-{
-    [[gsl::suppress(con)]]
-    {
-    static_cast<TitleBarTemplateSettings*>(this)->SetValue(s_IconElementProperty, ValueHelper<winrt::IconElement>::BoxValueIfNecessary(value));
-    }
-}
-
-winrt::IconElement TitleBarTemplateSettingsProperties::IconElement()
-{
-    return ValueHelper<winrt::IconElement>::CastOrUnbox(static_cast<TitleBarTemplateSettings*>(this)->GetValue(s_IconElementProperty));
-}
-
-void TitleBarTemplateSettingsProperties::TitleColumnGridLength(winrt::GridLength const& value)
-{
-    [[gsl::suppress(con)]]
-    {
-    static_cast<TitleBarTemplateSettings*>(this)->SetValue(s_TitleColumnGridLengthProperty, ValueHelper<winrt::GridLength>::BoxValueIfNecessary(value));
-    }
-}
-
-winrt::GridLength TitleBarTemplateSettingsProperties::TitleColumnGridLength()
-{
-    return ValueHelper<winrt::GridLength>::CastOrUnbox(static_cast<TitleBarTemplateSettings*>(this)->GetValue(s_TitleColumnGridLengthProperty));
-}
diff --git a/src/controls/dev/ItemContainer/TestUI/ItemContainerSummaryPage.xaml.cs b/src/controls/dev/ItemContainer/TestUI/ItemContainerSummaryPage.xaml.cs
index 89d397629f..8d39859f03 100644
--- a/src/controls/dev/ItemContainer/TestUI/ItemContainerSummaryPage.xaml.cs
+++ b/src/controls/dev/ItemContainer/TestUI/ItemContainerSummaryPage.xaml.cs
@@ -16,7 +16,9 @@ namespace MUXControlsTestApp
 {
     public sealed partial class ItemContainerSummaryPage : TestPage
     {
+#if MUX_PRERELEASE
         private double itemInvoked = 0;
+#endif
 
         public ItemContainerSummaryPage()
         {
diff --git a/src/controls/dev/ItemsView/APITests/ItemsViewTests.cs b/src/controls/dev/ItemsView/APITests/ItemsViewTests.cs
index 3bd9d52b75..32ce58dd5e 100644
--- a/src/controls/dev/ItemsView/APITests/ItemsViewTests.cs
+++ b/src/controls/dev/ItemsView/APITests/ItemsViewTests.cs
@@ -12,6 +12,7 @@
 using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Markup;
 using Microsoft.UI.Xaml.Media;
+using MUXControlsTestApp;
 using MUXControlsTestApp.Utilities;
 
 using WEX.TestExecution;
@@ -1114,16 +1115,16 @@ public void VerifyItemsViewUIASelectionProviderBehavior()
                 });
 
                 IdleSynchronizer.Wait();
-              
-                BringItemIntoView(49, itemsView, scrollViewBringingIntoViewEvent, scrollViewScrollCompletedEvent);
+
                 Log.Comment("Scroll to last item.");
+                BringItemIntoView(49, itemsView, scrollViewBringingIntoViewEvent, scrollViewScrollCompletedEvent);
 
                 RunOnUIThread.Execute(() =>
                 {
                     Log.Comment("Extracting last ItemContainer.");
                     itemContainer = itemsRepeater.TryGetElement(49) as ItemContainer;
                     Verify.IsNotNull(itemContainer);
-                    Log.Comment("ItemContainer is null as it is out of view and not realized.");
+                    Log.Comment("ItemContainer is non-null as it is in view and realized.");
 
                     Log.Comment("Selecting last ItemContainer");
                     itemContainer.IsSelected = true;
@@ -1143,8 +1144,8 @@ public void VerifyItemsViewUIASelectionProviderBehavior()
                     Log.Comment("ItemContainer SelectionContainer returns parent ItemsView.");
                 });
 
-                BringItemIntoView(0, itemsView, scrollViewBringingIntoViewEvent, scrollViewScrollCompletedEvent);
                 Log.Comment("Scroll back to first item.");
+                BringItemIntoView(0, itemsView, scrollViewBringingIntoViewEvent, scrollViewScrollCompletedEvent);
 
                 RunOnUIThread.Execute(() =>
                 {
@@ -1208,6 +1209,7 @@ public void HandleItemsInfoRequestedWithTemporaryAndExtraInfo()
 
         [TestMethod]
         [TestProperty("Description", "Handles the LinedFlowLayout.ItemsInfoRequested event and triggers various exceptions exercising LinedFlowLayoutItemsInfoRequestedEventArgs APIs.")]
+        [TestProperty("TestPass:MinOSVer", WindowsOSVersion._19H1)] // Unstable on RS5. See bug 49647616.
         public void TriggerLinedFlowLayoutItemsInfoRequestedEventArgsExceptions()
         {
             TriggerLinedFlowLayoutItemsInfoRequestedEventArgsException(LinedFlowLayoutItemsInfoRequestedEventArgsExceptionTrigger.ItemsRangeStartIndexNegative);
@@ -1613,8 +1615,7 @@ private void HandleItemsInfoRequested(bool useSizeArrays, bool useExtraInfo, boo
             {
                 "ItemsView",
                 "ScrollView",
-                "ItemsRepeater",
-                "LinedFlowLayout"
+                "ItemsRepeater"
             };
 
             using (PrivateLoggingHelper privateIVLoggingHelper = new PrivateLoggingHelper(types, isLoggingInfoLevel: true, isLoggingVerboseLevel: true))
@@ -2061,7 +2062,7 @@ private void BringItemIntoView(
                 scrollViewBringingIntoViewEvent.Reset();
                 scrollViewScrollCompletedEvent.Reset();
 
-                Log.Comment("Invoking ItemsView.StartBringItemIntoView(250)");
+                Log.Comment("Invoking ItemsView.StartBringItemIntoView(" + index + ")");
 
                 BringIntoViewOptions bringIntoViewOptions = new BringIntoViewOptions()
                 {
diff --git a/src/controls/dev/ItemsView/InteractionTests/ItemsViewTestsWithInputHelper.cs b/src/controls/dev/ItemsView/InteractionTests/ItemsViewTestsWithInputHelper.cs
index f57299cf9b..bc4b109dfd 100644
--- a/src/controls/dev/ItemsView/InteractionTests/ItemsViewTestsWithInputHelper.cs
+++ b/src/controls/dev/ItemsView/InteractionTests/ItemsViewTestsWithInputHelper.cs
@@ -389,7 +389,7 @@ public void VerifyItemsViewIsItemInvokedEnabledWithoutItemContainerAndMultipleSe
         [TestProperty("Ignore", "True")] // Bug 41224237: ItemsViewTestsWithInputHelper.PanItemsView fails in the lab
         public void PanItemsView()
         {
-            Log.Comment("Selecting ItemsView tests");
+            Log.Comment("Selecting ItemsView interactive tests");
 
             using (var setup = new TestSetupHelper(new[] { "ItemsView Tests", "navigateToInteractiveTests" }))
             {
@@ -779,7 +779,7 @@ public void BringFocusedItemIntoView()
         [TestProperty("Description", "Ensures clicking ItemContainer in ItemsView brings it into view.")]
         public void ClickedItemBroughtIntoView()
         {
-            Log.Comment("Selecting ItemsView tests");
+            Log.Comment("Selecting ItemsView interactive tests");
 
             using (var setup = new TestSetupHelper(new[] { "ItemsView Tests", "navigateToInteractiveTests" }))
             {
@@ -1184,7 +1184,6 @@ public void UseLinedFlowLayoutWithoutMinWidth()
             }
         }
 
-
         [TestMethod]
         [TestProperty("TestSuite", "B")]
         [TestProperty("Description", "Tests LinedFlowLayout without setting its LineHeight in the fast path.")]
@@ -1273,6 +1272,82 @@ public void UseLinedFlowLayoutWithoutLineHeight()
             }
         }
 
+        [TestMethod]
+        [TestProperty("TestSuite", "B")]
+        [TestProperty("Description", "Tests ItemsSource item insertions and removals, followed by item selections.")]
+        public void InsertAndRemoveItems()
+        {
+            Log.Comment("Selecting ItemsView interactive tests");
+
+            using (var setup = new TestSetupHelper(new[] { "ItemsView Tests", "navigateToInteractiveTests" }))
+            {
+                Log.Comment("Retrieving cmbLayout");
+                ComboBox cmbLayout = new ComboBox(FindElement.ById("cmbLayout"));
+                Verify.IsNotNull(cmbLayout, "Verifying that cmbLayout was found");
+
+                Log.Comment("Retrieving cmbItemTemplate");
+                ComboBox cmbItemTemplate = new ComboBox(FindElement.ById("cmbItemTemplate"));
+                Verify.IsNotNull(cmbItemTemplate, "Verifying that cmbItemTemplate was found");
+
+                Log.Comment("Retrieving cmbItemsSource");
+                ComboBox cmbItemsSource = new ComboBox(FindElement.ById("cmbItemsSource"));
+                Verify.IsNotNull(cmbItemsSource, "Verifying that cmbItemsSource was found");
+
+                Log.Comment("Retrieving txtItemsSourceIndexes");
+                Edit itemsSourceIndexesTextBox = new Edit(FindElement.ById("txtItemsSourceIndexes"));
+                Verify.IsNotNull(itemsSourceIndexesTextBox, "Verifying that itemsSourceIndexesTextBox was found");
+
+                Log.Comment("Retrieving btnInsertItems");
+                Button btnInsertItems = new Button(FindElement.ById("btnInsertItems"));
+                Verify.IsNotNull(btnInsertItems, "Verifying that btnInsertItems was found");
+
+                Log.Comment("Retrieving btnRemoveItems");
+                Button btnRemoveItems = new Button(FindElement.ById("btnRemoveItems"));
+                Verify.IsNotNull(btnRemoveItems, "Verifying that btnRemoveItems was found");
+
+                Log.Comment("Retrieving itemsView");
+                UIObject itemsViewUIObject = FindElement.ByName("itemsView");
+                Verify.IsNotNull(itemsViewUIObject, "Verifying that itemsView was found");
+
+                Log.Comment("Changing cmbLayout selection to 'LinedFlowLayout'");
+                cmbLayout.SelectItemByName("LinedFlowLayout");
+                Log.Comment("Selection is now {0}", cmbLayout.Selection[0].Name);
+
+                Log.Comment("Changing ItemTemplate selection to 'Recipe DataTemplate (Medium ItemContainer)'");
+                cmbItemTemplate.SelectItemByName("Recipe DataTemplate (Medium ItemContainer)");
+                Log.Comment("Selection is now {0}", cmbItemTemplate.Selection[0].Name);
+
+                Log.Comment("Changing ItemsSource selection to 'ObservableCollection<Recipe>'");
+                cmbItemsSource.SelectItemByName("ObservableCollection<Recipe>");
+                Log.Comment("Selection is now {0}", cmbItemsSource.Selection[0].Name);
+
+                Log.Comment("Changing txtItemsSourceIndexes text to '0, 0, 0'");
+                itemsSourceIndexesTextBox.SetValueAndWait("0, 0, 0");
+                Wait.ForIdle();
+
+                Log.Comment("Removing the first 3 items");
+                btnRemoveItems.Invoke();
+                Wait.ForIdle();
+
+                Log.Comment("Inserting the first 3 items");
+                btnInsertItems.Invoke();
+                Wait.ForIdle();
+
+                for (int index = 0; index < 4; index++)
+                {
+                    Log.Comment("Clicking on ItemsView item {0} to select it.", index);
+                    itemsViewUIObject.Click(PointerButtons.Primary, 40.0 + (100 * index), 40.0);
+                    Wait.ForIdle();
+                    int currentItemIndex = GetCurrentItemIndex();
+                    Verify.AreEqual(index, currentItemIndex, "Verifying CurrentItemIndex is " + index);
+                }
+
+                ResetItemsView(cmbItemsSource, cmbLayout);
+
+                // Output-debug-string-level "None" is automatically restored when landing back on the ScrollView test page.
+            }
+        }
+
         // When clearItemAspectRatios is True, the LinedFlowLayout::m_aspectRatios field is cleared before an ItemsView.StartBringItemIntoView call
         // to minimize the average-items-per-line stability during the operation. 
         private void StartBringItemIntoView(bool clearItemAspectRatios)
@@ -1968,7 +2043,7 @@ private string GetSelectedItems()
 
         private void KeyboardNavigationWithLayout(string layout, bool useLateralMoves)
         {
-            Log.Comment("Selecting ItemsView tests");
+            Log.Comment("Selecting ItemsView interactive tests");
 
             using (var setup = new TestSetupHelper(new[] { "ItemsView Tests", "navigateToInteractiveTests" }))
             {
@@ -2098,7 +2173,7 @@ private void KeyboardNavigationWithLayout(string layout, bool useLateralMoves)
 
         private void KeyboardNavigationWithFastKeystrokes(string layout, Key key)
         {
-            Log.Comment("Selecting ItemsView tests");
+            Log.Comment("Selecting ItemsView interactive tests");
 
             ICollection<string> outputDebugStringComponentTypes = new[] { "ScrollView", "ItemsView" };
 
@@ -2293,7 +2368,7 @@ private void KeyboardNavigationWithFastKeystrokes(string layout, Key key)
 
         private void VerifyItemsViewItemInvokedEvent(bool useItemContainer, bool isItemInvokedEnabled, string selectionMode)
         {
-            Log.Comment("Selecting ItemsView tests");
+            Log.Comment("Selecting ItemsView interactive tests");
 
             using (var setup = new TestSetupHelper(new[] { "ItemsView Tests", "navigateToInteractiveTests" }))
             {
@@ -2374,7 +2449,7 @@ private void VerifyItemsViewItemInvokedEvent(bool useItemContainer, bool isItemI
 
         private void TabNavigationThroughItemsView(bool useItemContainer, string selectionMode)
         {
-            Log.Comment("Selecting ItemsView tests");
+            Log.Comment("Selecting ItemsView interactive tests");
 
             using (var setup = new TestSetupHelper(new[] { "ItemsView Tests", "navigateToInteractiveTests" }))
             {
diff --git a/src/controls/dev/ItemsView/ItemsView.cpp b/src/controls/dev/ItemsView/ItemsView.cpp
index cb1685e243..524185506d 100644
--- a/src/controls/dev/ItemsView/ItemsView.cpp
+++ b/src/controls/dev/ItemsView/ItemsView.cpp
@@ -1759,7 +1759,7 @@ int ItemsView::GetItemInternal(
 
                     if (useKeyboardNavigationReferenceHorizontalOffset)
                     {
-                        signedHorizontalDistance = elementZoomedRect.X + elementZoomedRect.Width / 2.0f - keyboardNavigationReferenceOffset * zoomFactor;
+                        signedHorizontalDistance = static_cast<double>(elementZoomedRect.X) + elementZoomedRect.Width / 2.0 - static_cast<double>(keyboardNavigationReferenceOffset) * zoomFactor;
                     }
                     else
                     {
@@ -1773,7 +1773,7 @@ int ItemsView::GetItemInternal(
 
                     if (useKeyboardNavigationReferenceVerticalOffset)
                     {
-                        signedVerticalDistance = elementZoomedRect.Y + elementZoomedRect.Height / 2.0f - keyboardNavigationReferenceOffset * zoomFactor;
+                        signedVerticalDistance = static_cast<double>(elementZoomedRect.Y) + elementZoomedRect.Height / 2.0 - static_cast<double>(keyboardNavigationReferenceOffset) * zoomFactor;
                     }
                     else
                     {
diff --git a/src/controls/dev/ItemsView/ItemsViewInteractions.cpp b/src/controls/dev/ItemsView/ItemsViewInteractions.cpp
index bfb82f6b0a..8462e1b644 100644
--- a/src/controls/dev/ItemsView/ItemsViewInteractions.cpp
+++ b/src/controls/dev/ItemsView/ItemsViewInteractions.cpp
@@ -356,28 +356,28 @@ void ItemsView::GetDistanceToKeyboardNavigationReferenceOffset(
     const double roundingMargin = roundingScaleFactor <= 1.0 ? 0.5 : 2.0 / roundingScaleFactor;
 
     if (focusNavigationDirection == winrt::FocusNavigationDirection::Up &&
-        elementRect.Y + elementRect.Height > currentElementRect.Y + roundingMargin)
+        static_cast<double>(elementRect.Y) + static_cast<double>(elementRect.Height) > static_cast<double>(currentElementRect.Y) + roundingMargin)
     {
         // This element is disqualified because it is not placed at the top of currentElement.
         return;
     }
 
     if (focusNavigationDirection == winrt::FocusNavigationDirection::Down &&
-        elementRect.Y + roundingMargin < currentElementRect.Y + currentElementRect.Height)
+        static_cast<double>(elementRect.Y) + roundingMargin < static_cast<double>(currentElementRect.Y) + static_cast<double>(currentElementRect.Height))
     {
         // This element is disqualified because it is not placed at the bottom of currentElement.
         return;
     }
 
     if (focusNavigationDirection == winrt::FocusNavigationDirection::Left &&
-        elementRect.X + elementRect.Width > currentElementRect.X + roundingMargin)
+        static_cast<double>(elementRect.X) + static_cast<double>(elementRect.Width) > static_cast<double>(currentElementRect.X) + roundingMargin)
     {
         // This element is disqualified because it is not placed at the left of currentElement.
         return;
     }
 
     if (focusNavigationDirection == winrt::FocusNavigationDirection::Right &&
-        elementRect.X + roundingMargin < currentElementRect.X + currentElementRect.Width)
+        static_cast<double>(elementRect.X) + roundingMargin < static_cast<double>(currentElementRect.X) + static_cast<double>(currentElementRect.Width))
     {
         // This element is disqualified because it is not placed at the right of currentElement.
         return;
diff --git a/src/controls/dev/ItemsView/TestUI/ItemsViewInteractiveTestsPage.xaml b/src/controls/dev/ItemsView/TestUI/ItemsViewInteractiveTestsPage.xaml
index 8f4bd6a8d7..0b17d53722 100644
--- a/src/controls/dev/ItemsView/TestUI/ItemsViewInteractiveTestsPage.xaml
+++ b/src/controls/dev/ItemsView/TestUI/ItemsViewInteractiveTestsPage.xaml
@@ -149,6 +149,13 @@
 
             <CheckBox x:Name="chkHandleItemsInfoRequested" AutomationProperties.AutomationId="chkHandleItemsInfoRequested" Content="Handle ItemsInfoRequested?" Margin="6,2,2,2" Checked="ChkHandleItemsInfoRequested_IsCheckedChanged" Unchecked="ChkHandleItemsInfoRequested_IsCheckedChanged"/>
             <CheckBox x:Name="chkUseFastPath" AutomationProperties.AutomationId="chkUseFastPath" Content="Use Fast Path?" Margin="2" Checked="ChkUseFastPath_IsCheckedChanged" Unchecked="ChkUseFastPath_IsCheckedChanged"/>
+
+            <CheckBox x:Name="chkUseAppAnimator" AutomationProperties.AutomationId="chkUseAppAnimator" Content="Use App Animator?" Margin="2" Checked="ChkUseAppAnimator_IsCheckedChanged" Unchecked="ChkUseAppAnimator_IsCheckedChanged"/>
+
+            <TextBlock Text="ItemsSource Indexes:" Margin="6,2,2,2" VerticalAlignment="Center"/>
+            <TextBox x:Name="txtItemsSourceIndexes" AutomationProperties.AutomationId="txtItemsSourceIndexes" Text="0" VerticalAlignment="Center" Width="75"/>
+            <Button x:Name="btnInsertItems" AutomationProperties.AutomationId="btnInsertItems" Margin="6,2,2,2" VerticalAlignment="Center" Content="Insert Items" Click="BtnInsertItems_Click"/>
+            <Button x:Name="btnRemoveItems" AutomationProperties.AutomationId="btnRemoveItems" Margin="6,2,2,2" VerticalAlignment="Center" Content="Remove Items" Click="BtnRemoveItems_Click"/>
         </StackPanel>
 
         <StackPanel Orientation="Horizontal">
diff --git a/src/controls/dev/ItemsView/TestUI/ItemsViewInteractiveTestsPage.xaml.cs b/src/controls/dev/ItemsView/TestUI/ItemsViewInteractiveTestsPage.xaml.cs
index b1d9703762..ba8e5dc7ee 100644
--- a/src/controls/dev/ItemsView/TestUI/ItemsViewInteractiveTestsPage.xaml.cs
+++ b/src/controls/dev/ItemsView/TestUI/ItemsViewInteractiveTestsPage.xaml.cs
@@ -30,6 +30,7 @@ public sealed partial class ItemsViewInteractiveTestsPage : TestPage
         private StackLayout _stackLayout = null;
         private UniformGridLayout _uniformGridLayout = null;
         private UIElement _oldFocusedElement = null;
+        private LinedFlowLayoutItemCollectionTransitionProvider _linedFlowLayoutItemCollectionTransitionProvider = null;
 
         public ItemsViewInteractiveTestsPage()
         {
@@ -49,6 +50,7 @@ private void ItemsViewInteractiveTestsPage_Loaded(object sender, RoutedEventArgs
             UpdateItemsViewIsItemInvokedEnabled();
             UpdateItemsViewSelectionMode();
             UpdateItemsInfoRequestedCheckBoxes();
+            UpdateAppAnimatorCheckBox();
 
             ScrollView scrollView = ItemsViewTestHooks.GetScrollViewPart(this.itemsView);
 
@@ -91,6 +93,11 @@ private void ChkUseFastPath_IsCheckedChanged(object sender, RoutedEventArgs args
             UpdateItemsInfoRequestedHandler();
         }
 
+        private void ChkUseAppAnimator_IsCheckedChanged(object sender, RoutedEventArgs args)
+        {
+            UpdateAppAnimator();
+        }
+
         private void ChkLogItemsRepeaterMessages_Checked(object sender, RoutedEventArgs e)
         {
             MUXControlsTestHooks.SetOutputDebugStringLevelForType(
@@ -310,6 +317,7 @@ private void CmbLayout_SelectionChanged(object sender, SelectionChangedEventArgs
 
                     UpdateLinedFlowLayoutLineHeight();
                     UpdateItemsInfoRequestedCheckBoxes();
+                    UpdateAppAnimatorCheckBox();
                 }
             }
             catch (Exception ex)
@@ -508,6 +516,151 @@ private void BtnGetCurrentItemIndex_Click(object sender, RoutedEventArgs e)
             }
         }
 
+        private void BtnInsertItems_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (txtItemsSourceIndexes != null && txtStatus != null)
+                {
+                    txtStatus.Text = "InsertItems ...";
+
+                    string[] indexes = txtItemsSourceIndexes.Text.Split(',');
+
+                    foreach (string index in indexes)
+                    {
+                        InsertItem(int.Parse(index));
+                    }
+
+                    txtStatus.Text = "InsertItems. Done.";
+
+                    if (_oldFocusedElement != null)
+                    {
+                        _oldFocusedElement.Focus(FocusState.Programmatic);
+                        _oldFocusedElement = null;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                _fullLogs.Add(ex.ToString());
+            }
+        }
+
+        private void BtnRemoveItems_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (txtItemsSourceIndexes != null && txtStatus != null)
+                {
+                    txtStatus.Text = "RemoveItems ...";
+
+                    string[] indexes = txtItemsSourceIndexes.Text.Split(',');
+
+                    foreach (string index in indexes)
+                    {
+                        RemoveItem(int.Parse(index));
+                    }
+
+                    txtStatus.Text = "RemoveItems. Done.";
+                }
+            }
+            catch (Exception ex)
+            {
+                _fullLogs.Add(ex.ToString());
+            }
+        }
+
+        private void InsertItem(int index)
+        {
+            try
+            {
+                if (itemsView != null && cmbItemsSource != null)
+                {
+                    switch (cmbItemsSource.SelectedIndex)
+                    {
+                        case 1:                            
+                            if (_lstRecipes != null)
+                            {
+                                int rank = _lstRecipes.Count;
+                                Recipe recipe = new Recipe
+                                {
+                                    ImageUri = new Uri(string.Format("ms-appx:///Images/recipe{0}.png", rank % 8 + 1)),
+                                    Description = rank + " - " + _lorem.Substring(0, rank)
+                                };
+
+                                _lstRecipes.Insert(index, recipe);
+                            }
+                            break;
+                        case 2:
+                            if (_lstLargeRecipes != null)
+                            {
+                                int rank = _lstLargeRecipes.Count;
+                                Recipe recipe = new Recipe
+                                {
+                                    ImageUri = new Uri(string.Format("ms-appx:///Images/recipe{0}.png", rank % 8 + 1)),
+                                    Description = rank + " - " + _lorem.Substring(0, rank % 50 + 1)
+                                };
+
+                                _lstLargeRecipes.Insert(index, recipe);
+                            }
+                            break;
+                        case 3:
+                            if (_colRecipes != null)
+                            {
+                                int rank = _colRecipes.Count;
+                                Recipe recipe = new Recipe
+                                {
+                                    ImageUri = new Uri(string.Format("ms-appx:///Images/recipe{0}.png", rank % 8 + 1)),
+                                    Description = rank + " - " + _lorem.Substring(0, 2 * rank)
+                                };
+
+                                _colRecipes.Insert(index, recipe);
+                            }
+                            break;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                _fullLogs.Add(ex.ToString());
+            }
+        }
+
+        private void RemoveItem(int index)
+        {
+            try
+            {
+                if (itemsView != null && cmbItemsSource != null)
+                {
+                    switch (cmbItemsSource.SelectedIndex)
+                    {
+                        case 1:
+                            if (_lstRecipes != null)
+                            {
+                                _lstRecipes.RemoveAt(index);
+                            }
+                            break;
+                        case 2:
+                            if (_lstLargeRecipes != null)
+                            {
+                                _lstLargeRecipes.RemoveAt(index);
+                            }
+                            break;
+                        case 3:
+                            if (_colRecipes != null)
+                            {
+                                _colRecipes.RemoveAt(index);
+                            }
+                            break;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                _fullLogs.Add(ex.ToString());
+            }
+        }
+
         private void UpdateItemsInfoRequestedCheckBoxes()
         {
             chkHandleItemsInfoRequested.Visibility = chkUseFastPath.Visibility = cmbLayout.SelectedIndex == 1 ? Visibility.Visible : Visibility.Collapsed;
@@ -518,6 +671,22 @@ private void UpdateItemsInfoRequestedCheckBoxes()
             }
         }
 
+        private void UpdateAppAnimatorCheckBox()
+        {
+            if (cmbLayout.SelectedIndex == 1)
+            {
+                chkUseAppAnimator.Visibility = Visibility.Visible;
+                if (itemsView != null)
+                {
+                    chkUseAppAnimator.IsChecked = itemsView.ItemTransitionProvider != null;
+                }
+            }
+            else
+            {
+                chkUseAppAnimator.Visibility = Visibility.Collapsed;
+            }
+        }
+
         private void UpdateItemsInfoRequestedHandler()
         {
             if (_linedFlowLayout != null)
@@ -533,6 +702,32 @@ private void UpdateItemsInfoRequestedHandler()
             }
         }
 
+        private void UpdateAppAnimator()
+        {
+            if (itemsView != null && chkUseAppAnimator != null)
+            {
+                if (chkUseAppAnimator.IsChecked == true)
+                {
+                    if (itemsView.ItemTransitionProvider == null)
+                    {
+                        if (_linedFlowLayoutItemCollectionTransitionProvider == null)
+                        {
+                            _linedFlowLayoutItemCollectionTransitionProvider = new LinedFlowLayoutItemCollectionTransitionProvider();
+                        }
+
+                        itemsView.ItemTransitionProvider = _linedFlowLayoutItemCollectionTransitionProvider;
+                    }
+                }
+                else
+                {
+                    if (itemsView.ItemTransitionProvider != null)
+                    {
+                        itemsView.ItemTransitionProvider = null;
+                    }
+                }
+            }
+        }
+
         private void UpdateItemsViewIsItemInvokedEnabled()
         {
             if (itemsView != null)
diff --git a/src/controls/dev/Lights/MaterialHelper.cpp b/src/controls/dev/Lights/MaterialHelper.cpp
index 94f9f3bc62..d2d8ccdb52 100644
--- a/src/controls/dev/Lights/MaterialHelper.cpp
+++ b/src/controls/dev/Lights/MaterialHelper.cpp
@@ -11,10 +11,6 @@
 #include "RevealHoverLight.h"
 #include "ResourceAccessor.h"
 #include "LifetimeHandler.h"
-#include <FrameworkUdk/Containment.h>
-
-// Bug 50308952: [1.5 servicing] Add workaround to WinUI for UISettings RPC_E_WRONG_THREAD issue that is being hit by Photos app
-#define WINAPPSDK_CHANGEID_50308952 50308952
 
 /* static */
 bool MaterialHelperBase::SimulateDisabledByPolicy()
@@ -309,21 +305,8 @@ MaterialHelper::MaterialHelper()
     }
 
     winrt::UISettings uiSettings; // Make an instance to be able to listen for changes.
-                                  // Convert to IUISettings4 because (a) we're only using the APIs off that interface and (b) some platforms don't implement this.
     m_uiSettings = uiSettings.try_as<winrt::IUISettings4>();
-    if (m_uiSettings)
-    {
-        // If we failed to attach to this event then just assume that the running OS (like OneCore) doesn't have this
-        // implemented yet. Can be removed once MSFT#11982393 is fixed.
-        try
-        {
-            m_advancedEffectsEnabledChangedToken = m_uiSettings.AdvancedEffectsEnabledChanged({ this, &MaterialHelper::OnUISettingsChanged });
-        }
-        catch (winrt::hresult_error)
-        {
-            m_uiSettings = nullptr;
-        }
-    }
+    m_advancedEffectsEnabledChangedToken = m_uiSettings.AdvancedEffectsEnabledChanged({ this, &MaterialHelper::OnUISettingsChanged });
 
     UpdatePolicyStatus(true /* onUIThread */);
 }
@@ -427,26 +410,19 @@ void MaterialHelper::UpdatePolicyStatus(bool onUIThread)
         const bool isEnergySaverMode = m_energySaverStatusChangedRevokerValid ? winrt::PowerManager::EnergySaverStatus() == winrt::EnergySaverStatus::On : true;
         const bool areEffectsFast = m_compositionCapabilities ? (m_compositionCapabilities.AreEffectsFast() || m_ignoreAreEffectsFast) : false;
 
+        // We are hitting an issue in Photos where UISettings::AdvancedEffectsEnabled is returning RPC_E_WRONG_THREAD.
+        // We work around this issue by;
+        //   1. Use a fresh instance of UISettings instead of the cached m_uiSettings.
+        //   2. Ignore RPC_E_WRONG_THREAD and use a fallback value.
         bool advancedEffectsEnabled = false;
-        if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_50308952>())
+        try
         {
-            // We are hitting an issue in Photos where UISettings::AdvancedEffectsEnabled is returning RPC_E_WRONG_THREAD.
-            // We work around this issue by;
-            //   1. Use a fresh instance of UISettings instead of the cached m_uiSettings.
-            //   2. Ignore RPC_E_WRONG_THREAD and use a fallback value.
-            try
-            {
-                winrt::UISettings uiSettings;
-                advancedEffectsEnabled = uiSettings.AdvancedEffectsEnabled();
-            }
-            catch (winrt::hresult_error e)
-            {
-                if (e.to_abi() != RPC_E_WRONG_THREAD) { throw; }
-            }
+            winrt::UISettings uiSettings;
+            advancedEffectsEnabled = uiSettings.AdvancedEffectsEnabled();
         }
-        else
+        catch (winrt::hresult_error e)
         {
-            advancedEffectsEnabled = m_uiSettings ? m_uiSettings.AdvancedEffectsEnabled() : true;
+            if (e.to_abi() != RPC_E_WRONG_THREAD) { throw; }
         }
 
         bool isDisabledByPolicy = m_simulateDisabledByPolicy || (isEnergySaverMode || !areEffectsFast || !advancedEffectsEnabled);
diff --git a/src/controls/dev/MapControl/InteractionTests/MapControlTests.cs b/src/controls/dev/MapControl/InteractionTests/MapControlTests.cs
index 83e5f4ed82..7644de7ac1 100644
--- a/src/controls/dev/MapControl/InteractionTests/MapControlTests.cs
+++ b/src/controls/dev/MapControl/InteractionTests/MapControlTests.cs
@@ -37,5 +37,111 @@ public void TestCleanup()
             TestCleanupHelper.Cleanup();
         }
 
+        [TestMethod]
+        [TestProperty("TestPass:MinOSVer", WindowsOSVersion._19H1)]
+        public void AddMultipleElementsOnMap()
+        {
+            using (var setup = new TestSetupHelper("MapControl Tests")) 
+            {
+                //Wait for map to load
+                var map = FindElement.ByName("Map Application");
+                Wait.RetryUntilEvalFuncSuccessOrTimeout(
+                    () => { return (map = FindElement.ByName("Map Application")) != null; },
+                    retryTimoutByMilliseconds: 3000
+                );
+
+                // Get map contents
+                var elements = map.Descendants[0].Descendants;
+
+                //Verify that the interactive map is the only element
+                Verify.AreEqual(1, elements.Count);
+
+                // Add a layer
+                var addLayerButton = FindElement.ByName<Button>("Add Layer");
+                addLayerButton.Invoke();
+                Wait.ForIdle();
+
+                // Add a pins
+                var addPinButton = FindElement.ByName<Button>("Add Pin");
+                var latitudeTextBox = FindElement.ById<Edit>("latitudePinText");
+                var longitudeTextBox = FindElement.ById<Edit>("longitudePinText");
+
+                KeyboardHelper.EnterText(latitudeTextBox, "0");
+                KeyboardHelper.EnterText(longitudeTextBox, "0");
+                Wait.ForIdle();
+                addPinButton.Invoke();
+                Wait.ForIdle();
+
+                KeyboardHelper.EnterText(latitudeTextBox, "10");
+                KeyboardHelper.EnterText(longitudeTextBox, "10");
+                Wait.ForIdle();
+                addPinButton.Invoke();
+
+                //Verify that the two pins were added
+                Wait.RetryUntilEvalFuncSuccessOrTimeout(
+                    () => { return (elements.Count) == 5; },
+                    retryTimoutByMilliseconds: 3000
+                );
+                Verify.AreEqual(5, elements.Count); 
+            }
+        }
+
+        [TestMethod]
+        [TestProperty("TestPass:MinOSVer", WindowsOSVersion._19H1)]
+        public void ValidadePinClickEvent()
+        {
+            using (var setup = new TestSetupHelper("MapControl Tests")) 
+            {
+                //Wait for map to load
+                var map = FindElement.ByName("Map Application");
+                Wait.RetryUntilEvalFuncSuccessOrTimeout(
+                    () => { return (map = FindElement.ByName("Map Application")) != null; },
+                    retryTimoutByMilliseconds: 3000
+                );
+
+                // Get map contents
+                var elements = map.Descendants[0].Descendants;
+
+                // Add a layer
+                var addLayerButton = FindElement.ByName<Button>("Add Layer");
+                addLayerButton.Invoke();
+                Wait.ForIdle();
+
+                // Add a pin
+                var addPinButton = FindElement.ByName<Button>("Add Pin");
+                var latitudeTextBox = FindElement.ById<Edit>("latitudePinText");
+                var longitudeTextBox = FindElement.ById<Edit>("longitudePinText");
+
+                KeyboardHelper.EnterText(latitudeTextBox, "0");
+                KeyboardHelper.EnterText(longitudeTextBox, "0");
+                Wait.ForIdle();
+                addPinButton.Invoke();
+
+                //Check pin was created
+                Wait.RetryUntilEvalFuncSuccessOrTimeout(
+                    () => { return (elements.Count) == 3; },
+                    retryTimoutByMilliseconds: 3000
+                );
+                Verify.AreEqual(3, elements.Count); 
+
+                // Click on the pin
+                var pin = elements[1];
+                InputHelper.LeftClick(pin);
+                Wait.ForIdle();
+
+                //Check pin was deleted
+                Wait.RetryUntilEvalFuncSuccessOrTimeout(
+                    () => { return (elements.Count) == 1; },
+                    retryTimoutByMilliseconds: 3000
+                );
+                Verify.AreEqual(1, elements.Count); 
+
+                //Check if both click events were raised
+                var logBox = new Edit(FindElement.ById("output"));
+                Verify.IsTrue(logBox.GetText().Contains("Layer Clicked"));
+                Verify.IsTrue(logBox.GetText().Contains("Map Clicked"));
+
+            }
+        }
     }
 }
diff --git a/src/controls/dev/MapControl/MapControl.cpp b/src/controls/dev/MapControl/MapControl.cpp
index 791b6c34d1..aa6b4fbdba 100644
--- a/src/controls/dev/MapControl/MapControl.cpp
+++ b/src/controls/dev/MapControl/MapControl.cpp
@@ -85,15 +85,16 @@ winrt::IAsyncOperation<winrt::hstring> MapControl::InitializeWebMap()
         const auto centerPosition = center.Position();
         pos = std::format(L"{},{}", centerPosition.Longitude, centerPosition.Latitude);
     }
-    auto token = IsValidMapServiceToken() ? MapServiceToken() : L"";
-    auto parameters =  std::format(L"{},\"{}\"", pos, token);
+
+    auto token = winrt::Windows::Data::Json::JsonValue::CreateStringValue(MapServiceToken());
+    // Initializing Azure Maps on WebView
+    // params: longitude, latitude, mapServiceToken
+    auto script = std::format(L"initializeMap({},{});", pos, token.Stringify().c_str());
 
     if (auto webView = m_webView.get())
     {
         auto core = webView.CoreWebView2();
-        // Initializing Azure Maps on WebView
-        // params: longitude, latitude, mapServiceToken
-        returnedValue = co_await core.ExecuteScriptAsync(L"initializeMap(" + parameters + L");");
+        returnedValue = co_await core.ExecuteScriptAsync(script);
 
         for (uint32_t i = 0; i < Layers().Size(); i++)
         {
@@ -113,10 +114,7 @@ void MapControl::OnPropertyChanged(const winrt::DependencyPropertyChangedEventAr
 
     if (property == s_MapServiceTokenProperty)
     {
-        if (IsValidMapServiceToken())
-        {
-            UpdateMapServiceTokenInWebPage();
-        }
+        UpdateMapServiceTokenInWebPage();
     }
     else if (property == s_CenterProperty)
     {
@@ -132,13 +130,6 @@ void MapControl::OnPropertyChanged(const winrt::DependencyPropertyChangedEventAr
     }
 }
 
-bool MapControl::IsValidMapServiceToken()
-{
-    // This token is passed as a JavaScript param in double quotes. Make sure the token itself doesn't contain any.
-    return !MapServiceToken().empty()
-        && std::all_of(MapServiceToken().begin(), MapServiceToken().end(), [](wchar_t i){return i != '"';});
-}
-
 // Updates Azure Maps Authentication Key on WebView
 winrt::fire_and_forget MapControl::UpdateMapServiceTokenInWebPage()
 {
@@ -147,7 +138,9 @@ winrt::fire_and_forget MapControl::UpdateMapServiceTokenInWebPage()
         auto core = co_await GetCoreWebView2();
         // Sends new token to WebView
         // params: mapServiceToken
-        co_await core.ExecuteScriptAsync(L"updateMapServiceToken(\"" + MapServiceToken() + L"\");");
+        auto token = winrt::Windows::Data::Json::JsonValue::CreateStringValue(MapServiceToken());
+        auto script = std::format(L"updateMapServiceToken({});", token.Stringify().c_str());
+        co_await core.ExecuteScriptAsync(script);
 
         for (uint32_t i = 0; i < Layers().Size(); i++)
         {
@@ -201,22 +194,22 @@ void MapControl::WebMessageReceived(winrt::WebView2 sender, winrt::CoreWebView2W
         winrt::Windows::Data::Json::JsonObject obj = winrt::Windows::Data::Json::JsonObject();
         if (winrt::Windows::Data::Json::JsonObject::TryParse(jsonAsString, obj))
         {
-            auto type = obj.GetNamedObject(L"type");
+            auto type = obj.TryLookup(L"type");
             // Handles click events on MapElements
             if (type.GetString() == L"pushpinClickEvent")
             {
-                auto clickedLayer = Layers().GetAt(static_cast<uint32_t>(obj.GetNamedObject(L"layer").GetNumber())).try_as<MapElementsLayer>();
+                auto clickedLayer = Layers().GetAt(static_cast<uint32_t>(obj.TryLookup(L"layer").GetNumber())).try_as<MapElementsLayer>();
                 auto location = winrt::Geopoint{ winrt::BasicGeoposition{
-                    obj.GetNamedObject(L"coordinate").GetNamedValue(L"longitude").GetNumber(),
-                    obj.GetNamedObject(L"coordinate").GetNamedValue(L"latitude").GetNumber() }};
+                    obj.TryLookup(L"coordinate").GetObject().TryLookup(L"longitude").GetNumber(),
+                    obj.TryLookup(L"coordinate").GetObject().TryLookup(L"latitude").GetNumber() }};
 
-                auto pointId = obj.GetNamedObject(L"point").GetString();
+                auto pointId = obj.TryLookup(L"point").GetNumber();
                 winrt::MapElement clickedElement{nullptr};
                 auto elements = clickedLayer->MapElements();
                 for (uint32_t i = 0; i < elements.Size(); i++)
                 {
                     auto elem = elements.GetAt(i);
-                    if (winrt::get_self<MapElement>(elem)->Id == pointId)
+                    if (winrt::get_self<MapElement>(elem)->Id == winrt::to_hstring(pointId))
                     {
                         clickedElement = elem.try_as<winrt::MapElement>();
                     }
@@ -295,6 +288,8 @@ void MapControl::OnLayersVectorChanged(const winrt::IObservableVector<winrt::Map
 
 winrt::fire_and_forget MapControl::OnLayerAdded(const winrt::MapElementsLayer layer)
 {
+    auto mapLayer = winrt::get_self<MapElementsLayer>(layer);
+    mapLayer->SetParentMapControl(*this);
     if (auto webView = m_webView.get())
     {
         auto core = co_await GetCoreWebView2();
@@ -351,7 +346,7 @@ winrt::fire_and_forget MapControl::UpdateMapIcon(winrt::Geopoint mapIconPoint, w
     }
 }
 
-winrt::fire_and_forget MapControl::LayerElementsChanged(const winrt::MapElementsLayer& layer, const winrt::IObservableVector<winrt::MapElement>& elements, const winrt::Collections::IVectorChangedEventArgs& args, winrt::hstring elementId)
+winrt::IAsyncAction MapControl::LayerElementsChanged(const winrt::MapElementsLayer& layer, winrt::IVector<winrt::MapElement> elements, const winrt::Collections::IVectorChangedEventArgs& args, winrt::hstring elementId)
 {
     const auto index = args.Index();
     auto layerId = winrt::get_self<MapElementsLayer>(layer)->Id;
@@ -380,6 +375,7 @@ winrt::fire_and_forget MapControl::LayerElementsChanged(const winrt::MapElements
         break;
     }
     }
+    co_return;
 }
 
 winrt::IAsyncOperation<winrt::hstring> MapControl::GetMapHtmlContent()
diff --git a/src/controls/dev/MapControl/MapControl.h b/src/controls/dev/MapControl/MapControl.h
index ac0c9b7ec2..ebaf2088c7 100644
--- a/src/controls/dev/MapControl/MapControl.h
+++ b/src/controls/dev/MapControl/MapControl.h
@@ -24,14 +24,13 @@ class MapControl :
     void OnApplyTemplate();
     void OnPropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args);
 
-    winrt::fire_and_forget LayerElementsChanged(const winrt::MapElementsLayer& layer, const winrt::IObservableVector<winrt::MapElement>& elements, const winrt::Collections::IVectorChangedEventArgs& args, winrt::hstring elementId);
+    winrt::IAsyncAction LayerElementsChanged(const winrt::MapElementsLayer& layer, winrt::IVector<winrt::MapElement> elements, const winrt::Collections::IVectorChangedEventArgs& args, winrt::hstring elementId);
     winrt::fire_and_forget MapControl::UpdateMapIcon(winrt::Geopoint mapIconPoint, winrt::hstring pointId, winrt::hstring layerId);
 
 private:
- 
+
     tracker_ref<winrt::WebView2> m_webView{ this };
 
-    bool IsValidMapServiceToken();
     winrt::IAsyncOperation<winrt::hstring> InitializeWebMap();
     winrt::fire_and_forget SetUpWebView();
     winrt::fire_and_forget OnLayerAdded(const winrt::MapElementsLayer layer);
diff --git a/src/controls/dev/MapControl/MapElementsLayer.cpp b/src/controls/dev/MapControl/MapElementsLayer.cpp
index aafbaac958..968a6110fb 100644
--- a/src/controls/dev/MapControl/MapElementsLayer.cpp
+++ b/src/controls/dev/MapControl/MapElementsLayer.cpp
@@ -23,6 +23,11 @@ MapElementsLayer::MapElementsLayer()
 
 }
 
+void MapElementsLayer::SetParentMapControl(const winrt::MapControl& parent)
+{
+    m_parentMapControl = winrt::make_weak(parent);
+}
+
 void  MapElementsLayer::OnPropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args)
 {
     winrt::IDependencyProperty property = args.Property();
@@ -33,42 +38,50 @@ void MapElementsLayer::RaiseMapElementClick(MapElementClickEventArgs const& args
     m_mapElementClickEventSource(*this, args);
 }
 
-void MapElementsLayer::OnMapElementsVectorChanged(const winrt::IObservableVector<winrt::MapElement>& sender, const winrt::Collections::IVectorChangedEventArgs& args)
+winrt::fire_and_forget MapElementsLayer::HandleMapElementsChanged(const winrt::IObservableVector<winrt::MapElement>& sender, const winrt::Collections::IVectorChangedEventArgs& args)
 {
     const auto index = args.Index();
-    auto map = winrt::get_self<MapControl>(SharedHelpers::GetAncestorOfType<winrt::MapControl>(winrt::VisualTreeHelper::GetParent(*this)));
-    if (map)
+    if (const auto& mapControl = m_parentMapControl.get())
     {
-        if (index)
+        auto mapControlImpl = winrt::get_self<MapControl>(mapControl);
+        switch (args.CollectionChange())
         {
-            map->LayerElementsChanged(*this, sender, args, m_elementIds.GetAt(index));
-        }
-        else 
-        {
-            map->LayerElementsChanged(*this, sender, args, L"");
+            case winrt::Collections::CollectionChange::ItemInserted:
+            {
+                co_await mapControlImpl->LayerElementsChanged(*this, MapElements(), args, L"");
+                m_elementIds.Append(winrt::get_self<MapElement>(MapElements().GetAt(index))->Id);
+                break;
+            }
+            case winrt::Collections::CollectionChange::ItemRemoved:
+            {
+                co_await mapControlImpl->LayerElementsChanged(*this, MapElements(), args, m_elementIds.GetAt(index));
+                m_elementIds.RemoveAt(index);
+                break;
+            }
+            case winrt::Collections::CollectionChange::ItemChanged:
+            {
+                auto elements = MapElements();
+                co_await mapControlImpl->LayerElementsChanged(*this, elements, args, m_elementIds.GetAt(index));
+                m_elementIds.SetAt(index, winrt::get_self<MapElement>(elements.GetAt(index))->Id);
+                break;
+            }
+            case winrt::Collections::CollectionChange::Reset:
+            {
+                auto elements = MapElements();
+                co_await mapControlImpl->LayerElementsChanged(*this, elements, args, L"");
+                m_elementIds.Clear();
+                for (uint32_t i = 0; i < elements.Size(); i++)
+                {
+                    auto elementId = winrt::get_self<MapElement>(elements.GetAt(i))->Id;
+                    m_elementIds.Append(elementId);
+                }
+                break;
+            }
         }
     }
+}
 
-    switch (args.CollectionChange())
-    {
-    case winrt::Collections::CollectionChange::ItemInserted:
-        m_elementIds.Append(winrt::get_self<MapElement>(sender.GetAt(index))->Id);
-        break;
-    case winrt::Collections::CollectionChange::ItemRemoved:
-        m_elementIds.RemoveAt(index);
-        break;
-    case winrt::Collections::CollectionChange::ItemChanged:
-        m_elementIds.SetAt(index, winrt::get_self<MapElement>(sender.GetAt(index))->Id);
-        break;
-    case winrt::Collections::CollectionChange::Reset:
-    {
-        m_elementIds.Clear();
-        for (uint32_t i = 0; i < sender.Size(); i++)
-        {
-            auto elementId = winrt::get_self<MapElement>(sender.GetAt(i))->Id;
-            m_elementIds.Append(elementId);
-        }
-        break;
-    }
-    }
-}
\ No newline at end of file
+void MapElementsLayer::OnMapElementsVectorChanged(const winrt::IObservableVector<winrt::MapElement>& sender, const winrt::Collections::IVectorChangedEventArgs& args)
+{
+    HandleMapElementsChanged(sender, args);
+}
diff --git a/src/controls/dev/MapControl/MapElementsLayer.h b/src/controls/dev/MapControl/MapElementsLayer.h
index 6476005a27..163c08e5a8 100644
--- a/src/controls/dev/MapControl/MapElementsLayer.h
+++ b/src/controls/dev/MapControl/MapElementsLayer.h
@@ -25,4 +25,10 @@ class MapElementsLayer :
     void OnPropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args);
     void RaiseMapElementClick(MapElementClickEventArgs const& args);
     void OnMapElementsVectorChanged(const winrt::IObservableVector<winrt::MapElement>&, const winrt::Collections::IVectorChangedEventArgs& args);
+    void SetParentMapControl(const winrt::MapControl& parent);
+
+private:
+    winrt::weak_ref<winrt::MapControl> m_parentMapControl{ nullptr };
+    winrt::fire_and_forget HandleMapElementsChanged(const winrt::IObservableVector<winrt::MapElement>&, const winrt::Collections::IVectorChangedEventArgs& args);
+
 };
diff --git a/src/controls/dev/SampleControl/TestUI/SampleControlPage.xaml.cs b/src/controls/dev/MapControl/TestUI/MapControlApiKey.cs
similarity index 67%
rename from src/controls/dev/SampleControl/TestUI/SampleControlPage.xaml.cs
rename to src/controls/dev/MapControl/TestUI/MapControlApiKey.cs
index 248115f1c6..25cd5a4505 100644
--- a/src/controls/dev/SampleControl/TestUI/SampleControlPage.xaml.cs
+++ b/src/controls/dev/MapControl/TestUI/MapControlApiKey.cs
@@ -9,16 +9,13 @@
 using Microsoft.UI.Xaml.Markup;
 using Windows.UI;
 using System.Windows.Input;
-
-using Microsoft.Experimental.UI.Xaml.Controls;
+using Windows.Devices.Geolocation;
+using System.Collections.Generic;
 
 namespace MUXControlsTestApp
 {
-    public sealed partial class SampleControlPage : TestPage
+    public static class MapControlApiKey
     {
-        public SampleControlPage()
-        {
-            this.InitializeComponent();
-        }
+        public const string AzureMapsToken = "<AzureMapsToken>";
     }
-}
+}
\ No newline at end of file
diff --git a/src/controls/dev/MapControl/TestUI/MapControlPage.xaml b/src/controls/dev/MapControl/TestUI/MapControlPage.xaml
index f9bb92d2a5..cc0f3d328a 100644
--- a/src/controls/dev/MapControl/TestUI/MapControlPage.xaml
+++ b/src/controls/dev/MapControl/TestUI/MapControlPage.xaml
@@ -11,15 +11,60 @@
     mc:Ignorable="d">
 
     <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Margin="12">
-        <StackPanel Orientation="Vertical">
-            <StackPanel Orientation="Horizontal">
-                <PasswordBox Width="300" x:Name="MapServiceToken" PlaceholderText="Map Service Token"/>
-                <Button Content="Go" Click="GoButton_Click" />
+        <StackPanel Orientation="Horizontal">
+            <StackPanel Orientation="Vertical">
+                <StackPanel Orientation="Horizontal">
+                    <PasswordBox Width="300" x:Name="MapServiceToken" PlaceholderText="Map Service Token"/>
+                    <Button Content="Go" Click="GoButton_Click" />
+                </StackPanel>
+                <controls:MapControl x:Name="myMap" 
+                                    Width="800" 
+                                    Height="600" 
+                                    InteractiveControlsVisible="False"/>
+            </StackPanel>
+            <StackPanel Orientation="Vertical">
+                <TextBlock>Interactive Controls Visibility</TextBlock>
+                <ToggleSwitch x:Name="controlsSwitch" Toggled="ToggleSwitch_Toggled"/>
+
+                <StackPanel Height="20"/>
+
+                <TextBlock>Zoom</TextBlock>
+                <StackPanel Orientation="Horizontal">
+                    <TextBox x:Name="zoomText" />
+                    <Button Click="SetZoom_Click">Set Zoom</Button>
+                </StackPanel>
+
+                <StackPanel Height="20"/>
+
+                <TextBlock>Center</TextBlock>
+                <StackPanel Orientation="Horizontal">
+                    <TextBox x:Name="latitudeText" PlaceholderText="latitude"/>
+                    <TextBox x:Name="longitudeText" PlaceholderText="longitude"/>
+                </StackPanel>
+                <Button Click="CenterButton_Click">Set center</Button>
+
+                <StackPanel Height="20"/>
+
+                <TextBlock>Layers</TextBlock>
+                <ComboBox x:Name="layersSelection"/>
+                <StackPanel Orientation="Horizontal">
+                    <Button Click="AddLayer_Click">Add Layer</Button>
+                </StackPanel>
+
+                <StackPanel Height="20"/>
+
+                <TextBlock>Pins</TextBlock>
+                <StackPanel Orientation="Horizontal">
+                    <TextBox x:Name="latitudePinText" AutomationProperties.AutomationId="latitudePinText" PlaceholderText="latitude"/>
+                    <TextBox x:Name="longitudePinText" AutomationProperties.AutomationId="longitudePinText" PlaceholderText="longitude"/>
+                </StackPanel>
+                <Button Click="AddPin_Click">Add Pin</Button>
+
+                <StackPanel Height="20"/>
+
+                <TextBlock>Output</TextBlock>
+                <TextBox x:Name="output" AutomationProperties.AutomationId="output" IsReadOnly="true"/>
             </StackPanel>
-            <controls:MapControl x:Name="myMap" 
-                                Width="800" 
-                                Height="600" 
-                                InteractiveControlsVisible="True"/>
         </StackPanel>
     </Grid>
 </local:TestPage>
diff --git a/src/controls/dev/MapControl/TestUI/MapControlPage.xaml.cs b/src/controls/dev/MapControl/TestUI/MapControlPage.xaml.cs
index 1534b38a8b..1c62ac8520 100644
--- a/src/controls/dev/MapControl/TestUI/MapControlPage.xaml.cs
+++ b/src/controls/dev/MapControl/TestUI/MapControlPage.xaml.cs
@@ -20,31 +20,88 @@ public sealed partial class MapControlPage : TestPage
         public MapControlPage()
         {
             this.InitializeComponent();
+
+            myMap.MapServiceToken = MapControlApiKey.AzureMapsToken;
             
             BasicGeoposition firstCenterPosition = new BasicGeoposition() { Latitude = 0, Longitude = 0 };
             Geopoint firstCenterPoint = new Geopoint(firstCenterPosition);
             myMap.Center = firstCenterPoint;
 
-            var iconLayer = new MapElementsLayer
-            {
-                MapElements = new List<MapElement>()
-                {
-                    new MapIcon
-                    {
-                        Location = new Geopoint(new BasicGeoposition
-                        {
-                            Latitude = 14.865162,
-                            Longitude = -14.858078
-                        }),
-                    }
-                }
-            };
-            myMap.Layers.Add(iconLayer);
+            myMap.MapElementClick += Map_MapElementClick;
+            myMap.MapServiceErrorOccurred += Map_MapServiceErrorOccurred;
         }
 
         private void GoButton_Click(object sender, RoutedEventArgs e)
         {
             myMap.MapServiceToken = MapServiceToken.Password;
         }
+
+        private void Map_MapServiceErrorOccurred(MapControl sender, MapControlMapServiceErrorOccurredEventArgs args)
+        {
+            output.Text += args.DiagnosticMessage;
+        }
+
+        private void ToggleSwitch_Toggled(object sender, RoutedEventArgs e)
+        {
+            ToggleSwitch toggleSwitch = sender as ToggleSwitch;
+            if (toggleSwitch != null)
+            {
+                myMap.InteractiveControlsVisible = toggleSwitch.IsOn;
+            }
+        }
+        private void CenterButton_Click(object sender, RoutedEventArgs e)
+        {
+            BasicGeoposition centerPosition = new BasicGeoposition()
+            { 
+                Latitude = double.Parse(latitudeText.Text), 
+                Longitude = double.Parse(longitudeText.Text)
+            };
+            Geopoint centerPoint = new Geopoint(centerPosition);
+            myMap.Center = centerPoint;
+        }
+        private void SetZoom_Click(object sender, RoutedEventArgs e)
+        {
+            myMap.ZoomLevel = double.Parse(zoomText.Text);
+        }
+        private void AddPin_Click(object sender, RoutedEventArgs e)
+        {
+            BasicGeoposition position = new BasicGeoposition()
+            {
+                Latitude = double.Parse(latitudePinText.Text),
+                Longitude = double.Parse(longitudePinText.Text)
+            };
+            Geopoint point = new Geopoint(position);
+
+            var icon = new MapIcon
+            {
+                Location = point,
+            };
+
+            var selectedLayer = layersSelection.SelectedItem as MapElementsLayer;
+            selectedLayer.MapElements.Add(icon);
+        }
+        private void AddLayer_Click(object sender, RoutedEventArgs e)
+        {
+            var newLayer = new MapElementsLayer{};
+
+            newLayer.MapElementClick += Layer_MapElementClick;
+            myMap.Layers.Add(newLayer);
+            layersSelection.Items.Add(newLayer);
+            if(layersSelection.SelectedIndex == -1)
+            {
+                layersSelection.SelectedIndex = 0;
+            }
+        }
+
+        private void Layer_MapElementClick(MapElementsLayer sender, MapElementClickEventArgs args)
+        {
+            var icon = args.Element as MapIcon;
+            sender.MapElements.Remove(icon);
+            output.Text += "Layer Clicked\n";            
+        }
+        private void Map_MapElementClick(MapControl sender, MapElementClickEventArgs args)
+        {
+            output.Text += "Map Clicked\n";
+        }
     }
 }
diff --git a/src/controls/dev/MapControl/TestUI/MapControl_TestUI.projitems b/src/controls/dev/MapControl/TestUI/MapControl_TestUI.projitems
index 2a6ab3ad2b..ef64b83f35 100644
--- a/src/controls/dev/MapControl/TestUI/MapControl_TestUI.projitems
+++ b/src/controls/dev/MapControl/TestUI/MapControl_TestUI.projitems
@@ -19,5 +19,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)MapControlPage.xaml.cs">
       <DependentUpon>MapControlPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)MapControlApiKey.cs"/>
   </ItemGroup>
 </Project>
diff --git a/src/controls/dev/MapControl/map.html b/src/controls/dev/MapControl/map.html
index 43a49ace5a..f009f32ab9 100644
--- a/src/controls/dev/MapControl/map.html
+++ b/src/controls/dev/MapControl/map.html
@@ -5,6 +5,556 @@
     <link href="https://atlas.microsoft.com/sdk/javascript/mapcontrol/2/atlas.min.css" rel="stylesheet" />
     <script src="https://atlas.microsoft.com/sdk/javascript/mapcontrol/2/atlas.min.js"></script>
     <script src="https://atlas.microsoft.com/sdk/javascript/service/2/atlas-service.min.js"></script>
+    <script>
+    /*
+    This module contains the HtmlMarkerLayer class, which is a layer that renders HTML markers on the map.
+    Source: https://learn.microsoft.com/en-us/samples/azure-samples/azure-maps-html-marker-layer/azure-maps-html-marker-layer-module/
+
+    azure-maps-html-marker-layer Version: 0.0.1
+    MIT License - Copyright (c) Microsoft Corporation.
+    */
+    
+    !function(e, y) {
+        "use strict";
+        var o = function(e, t) {
+            return (o = Object.setPrototypeOf || {
+                __proto__: []
+            }instanceof Array && function(e, t) {
+                e.__proto__ = t
+            }
+            || function(e, t) {
+                for (var r in t)
+                    t.hasOwnProperty(r) && (e[r] = t[r])
+            }
+            )(e, t)
+        };
+        function t(e, t) {
+            function r() {
+                this.constructor = e
+            }
+            o(e, t),
+            e.prototype = null === t ? Object.create(t) : (r.prototype = t.prototype,
+            new r)
+        }
+        var n = function() {
+            return (n = Object.assign || function(e) {
+                for (var t, r = 1, o = arguments.length; r < o; r++)
+                    for (var a in t = arguments[r])
+                        Object.prototype.hasOwnProperty.call(t, a) && (e[a] = t[a]);
+                return e
+            }
+            ).apply(this, arguments)
+        };
+        function a(e, n, s, l) {
+            return new (s = s || Promise)(function(r, t) {
+                function o(e) {
+                    try {
+                        i(l.next(e))
+                    } catch (e) {
+                        t(e)
+                    }
+                }
+                function a(e) {
+                    try {
+                        i(l.throw(e))
+                    } catch (e) {
+                        t(e)
+                    }
+                }
+                function i(e) {
+                    var t;
+                    e.done ? r(e.value) : ((t = e.value)instanceof s ? t : new s(function(e) {
+                        e(t)
+                    }
+                    )).then(o, a)
+                }
+                i((l = l.apply(e, n || [])).next())
+            }
+            )
+        }
+        function g(r, o) {
+            var a, i, n, e, s = {
+                label: 0,
+                sent: function() {
+                    if (1 & n[0])
+                        throw n[1];
+                    return n[1]
+                },
+                trys: [],
+                ops: []
+            };
+            return e = {
+                next: t(0),
+                throw: t(1),
+                return: t(2)
+            },
+            "function" == typeof Symbol && (e[Symbol.iterator] = function() {
+                return this
+            }
+            ),
+            e;
+            function t(t) {
+                return function(e) {
+                    return function(t) {
+                        if (a)
+                            throw new TypeError("Generator is already executing.");
+                        for (; s; )
+                            try {
+                                if (a = 1,
+                                i && (n = 2 & t[0] ? i.return : t[0] ? i.throw || ((n = i.return) && n.call(i),
+                                0) : i.next) && !(n = n.call(i, t[1])).done)
+                                    return n;
+                                switch (i = 0,
+                                n && (t = [2 & t[0], n.value]),
+                                t[0]) {
+                                case 0:
+                                case 1:
+                                    n = t;
+                                    break;
+                                case 4:
+                                    return s.label++,
+                                    {
+                                        value: t[1],
+                                        done: !1
+                                    };
+                                case 5:
+                                    s.label++,
+                                    i = t[1],
+                                    t = [0];
+                                    continue;
+                                case 7:
+                                    t = s.ops.pop(),
+                                    s.trys.pop();
+                                    continue;
+                                default:
+                                    if (!(n = 0 < (n = s.trys).length && n[n.length - 1]) && (6 === t[0] || 2 === t[0])) {
+                                        s = 0;
+                                        continue
+                                    }
+                                    if (3 === t[0] && (!n || t[1] > n[0] && t[1] < n[3])) {
+                                        s.label = t[1];
+                                        break
+                                    }
+                                    if (6 === t[0] && s.label < n[1]) {
+                                        s.label = n[1],
+                                        n = t;
+                                        break
+                                    }
+                                    if (n && s.label < n[2]) {
+                                        s.label = n[2],
+                                        s.ops.push(t);
+                                        break
+                                    }
+                                    n[2] && s.ops.pop(),
+                                    s.trys.pop();
+                                    continue
+                                }
+                                t = o.call(r, s)
+                            } catch (e) {
+                                t = [6, e],
+                                i = 0
+                            } finally {
+                                a = n = 0
+                            }
+                        if (5 & t[0])
+                            throw t[1];
+                        return {
+                            value: t[0] ? t[1] : void 0,
+                            done: !0
+                        }
+                    }([t, e])
+                }
+            }
+        }
+        var r = (i.merge = function(e, t) {
+            for (var r = window || global, o = 0, a = e.split("."); o < a.length; o++) {
+                var i = a[o];
+                if (!r[i])
+                    return t;
+                r = r[i]
+            }
+            return n(n({}, r), t)
+        }
+        ,
+        i);
+        function i() {}
+        var s, l = (t(u, s = y.layer.BubbleLayer),
+        u.prototype.getOptions = function() {
+            return Object.assign({}, this._options)
+        }
+        ,
+        u.prototype.setOptions = function(e) {
+            var t = this._options
+              , r = {}
+              , o = !1;
+            e.source && t.source !== e.source && (t.source = e.source,
+            r.source = e.source,
+            o = !0),
+            e.sourceLayer && t.sourceLayer !== e.sourceLayer && (t.sourceLayer = e.sourceLayer,
+            r.sourceLayer = e.sourceLayer,
+            o = !0),
+            e.filter && t.filter !== e.filter && (t.filter = e.filter,
+            r.filter = e.filter,
+            o = !0),
+            "number" == typeof e.minZoom && t.minZoom !== e.minZoom && (t.minZoom = e.minZoom,
+            r.minZoom = e.minZoom),
+            "number" == typeof e.maxZoom && t.maxZoom !== e.maxZoom && (t.maxZoom = e.maxZoom,
+            r.maxZoom = e.maxZoom),
+            void 0 !== e.visible && t.visible !== e.visible && (t.visible = e.visible,
+            r.visible = e.visible),
+            e.markerCallback && t.markerCallback != e.markerCallback && (t.markerCallback = e.markerCallback,
+            o = !0),
+            "boolean" == typeof e.updateWhileMoving && t.updateWhileMoving !== e.updateWhileMoving && (t.updateWhileMoving = e.updateWhileMoving),
+            o ? this._clearCache(!0) : this._updateMarkers(),
+            s.prototype.setOptions.call(this, r)
+        }
+        ,
+        u.prototype.update = function() {
+            this._clearCache(!0),
+            this._updateMarkers()
+        }
+        ,
+        u.prototype.onAdd = function(e) {
+            var t = this
+              , r = e.events;
+            e && (r.remove("moveend", t._updateMarkers),
+            r.remove("move", t._mapMoved),
+            r.remove("sourcedata", t._sourceUpdated)),
+            (r = (t._map = e).events).add("moveend", t._updateMarkers),
+            r.add("move", t._mapMoved),
+            r.add("sourcedata", t._sourceUpdated),
+            s.prototype.onAdd.call(this, e)
+        }
+        ,
+        u.prototype.onRemove = function() {
+            var e = this
+              , t = e._map;
+            if (t) {
+                var r = t.events;
+                r.remove("moveend", e._updateMarkers),
+                r.remove("move", e._mapMoved),
+                r.remove("sourcedata", e._sourceUpdated)
+            }
+            e._clearCache(!1),
+            e._map = null,
+            s.prototype.onRemove.call(this)
+        }
+        ,
+        u.prototype._getSourceClass = function() {
+            var e = this.getSource();
+            return "string" == typeof e && null !== this._map ? this._map.sources.getById(e) : e instanceof y.source.Source ? e : null
+        }
+        ,
+        u.prototype._clearCache = function(e) {
+            var t = this;
+            if (t._markerCache = {},
+            t._map)
+                for (var r = 0, o = t._markers.length; r < o; r++) {
+                    var a = t._markers[r];
+                    t._removeEvents(a),
+                    a._eventsAttached = !1,
+                    t._map.markers.remove(a)
+                }
+            t._markers = [],
+            t._markerIds = [],
+            e && t._updateMarkers()
+        }
+        ,
+        u.prototype._getMarker = function(o, a, i) {
+            var n = this
+              , s = n._markerCache
+              , e = n._options;
+            if (o = o || a.join(",") + JSON.stringify(i || {}),
+            s[o])
+                return s[o];
+            var t = e.markerCallback(o, a, i);
+            if (!(t instanceof y.HtmlMarker))
+                return new Promise(function(r) {
+                    t.then(function(e) {
+                        var t = n._getExtendedMarker(e, o, a, i);
+                        t && (s[o] = t,
+                        r(t))
+                    })
+                }
+                );
+            var r = n._getExtendedMarker(t, o, a, i);
+            return r ? (s[o] = r,
+            Promise.resolve(r)) : null
+        }
+        ,
+        u.prototype._getExtendedMarker = function(e, t, r, o) {
+            var a = e;
+            return a ? (a.properties = o,
+            a.id = t,
+            a.setOptions({
+                position: r
+            }),
+            a) : null
+        }
+        ,
+        u.prototype._addEvents = function(t) {
+            var r = this;
+            r._supportedEvents.forEach(function(e) {
+                r.map.events.add(e, t, r._wrappedEvent)
+            })
+        }
+        ,
+        u.prototype._removeEvents = function(t) {
+            var r = this;
+            r._supportedEvents.forEach(function(e) {
+                r.map.events.remove(e, t, r._wrappedEvent)
+            })
+        }
+        ,
+        u);
+        function u(e, t, r) {
+            var o = s.call(this, e, t) || this;
+            return o._options = {
+                minZoom: 0,
+                maxZoom: 24,
+                visible: !0,
+                updateWhileMoving: !1,
+                filter: ["==", ["geometry-type"], "Point"],
+                markerCallback: function(e, t, r) {
+                    return r.cluster ? new y.HtmlMarker({
+                        position: t,
+                        text: r.point_count_abbreviated
+                    }) : new y.HtmlMarker({
+                        position: t
+                    })
+                }
+            },
+            o._markers = [],
+            o._markerIds = [],
+            o._markerCache = {},
+            o._supportedEvents = ["click", "contextmenu", "dblclick", "drag", "dragstart", "dragend", "keydown", "keypress", "keyup", "mousedown", "mouseenter", "mouseleave", "mousemove", "mouseout", "mouseover", "mouseup"],
+            o._mapMoved = function() {
+                o._options.updateWhileMoving && o._updateMarkers()
+            }
+            ,
+            o._sourceUpdated = function(e) {
+                var t = o._getSourceClass();
+                t && t.getId() === e.source.id && (o._timer && clearTimeout(o._timer),
+                o._timer = setTimeout(o._sourceUpdater, 33))
+            }
+            ,
+            o._sourceUpdater = function() {
+                o._timer = null,
+                o._clearCache(!0)
+            }
+            ,
+            o._updateMarkers = function() {
+                return a(o, void 0, void 0, function() {
+                    var t, r, o, a, i, n, s, l, u, c, p, d, m, h, f, v, _, k;
+                    return g(this, function(e) {
+                        switch (e.label) {
+                        case 0:
+                            if (r = (t = this)._map,
+                            o = t._markers,
+                            a = t._options,
+                            i = r ? r.getCamera().zoom : void 0,
+                            !(a.visible && void 0 !== i && i >= a.minZoom && i <= a.maxZoom))
+                                return [3, 5];
+                            n = t.getSource(),
+                            s = "string" == typeof n ? n : n.getId(),
+                            l = r.map.querySourceFeatures(s, {
+                                sourceLayer: t.getOptions().sourceLayer,
+                                filter: a.filter
+                            }),
+                            u = [],
+                            c = [],
+                            v = f = h = m = d = p = void 0,
+                            k = 0,
+                            _ = l.length,
+                            e.label = 1;
+                        case 1:
+                            return k < _ ? (p = v = null,
+                            l[k]instanceof y.Shape ? "Point" === (h = l[k]).getType() && (m = h.getCoordinates(),
+                            d = h.getProperties(),
+                            p = h.getId()) : "Point" === (f = l[k]).geometry.type && (m = f.geometry.coordinates,
+                            (d = f.properties) && d.cluster ? p = "cluster_" + f.properties.cluster_id : f.id && (p = f.id)),
+                            m ? [4, t._getMarker(p, m, d)] : [3, 3]) : [3, 4];
+                        case 2:
+                            (v = e.sent())._eventsAttached || (t._addEvents(v),
+                            v._eventsAttached = !0),
+                            v && (v.id && c.push(v.id),
+                            v.id && -1 !== t._markerIds.indexOf(v.id) || (u.push(v),
+                            r.markers.add(v))),
+                            e.label = 3;
+                        case 3:
+                            return k++,
+                            [3, 1];
+                        case 4:
+                            for (k = o.length - 1; 0 <= k; k--)
+                                o[k].id && -1 !== c.indexOf(o[k].id) || (r.markers.remove(o[k]),
+                                o.splice(k, 1));
+                            return t._markers = o.concat(u),
+                            t._markerIds = c,
+                            [3, 6];
+                        case 5:
+                            0 < t._markers.length && (r.markers.remove(t._markers),
+                            t._markers = []),
+                            e.label = 6;
+                        case 6:
+                            return [2]
+                        }
+                    })
+                })
+            }
+            ,
+            o._wrappedEvent = function(e) {
+                o.map.events.invoke(e.type, o, e)
+            }
+            ,
+            s.prototype.setOptions.call(o, {
+                color: "transparent",
+                radius: 0,
+                strokeWidth: 0
+            }),
+            o.setOptions(r || {}),
+            o
+        }
+        var b, c = Object.freeze({
+            __proto__: null,
+            HtmlMarkerLayer: l
+        }), p = (t(C, b = y.HtmlMarker),
+        C.prototype.getTotalValue = function() {
+            return this._total
+        }
+        ,
+        C.prototype.getSliceValue = function(e) {
+            var t = this._options.values;
+            return 0 <= e && e < t.length ? t[e] : 0
+        }
+        ,
+        C.prototype.getSlicePercentage = function(e) {
+            return 0 < this._total ? Math.round(this.getSliceValue(e) / this._total * 1e4) / 100 : 0
+        }
+        ,
+        C.prototype.getOptions = function() {
+            return Object.assign({}, b.prototype.getOptions.call(this), this._options)
+        }
+        ,
+        C.prototype.setOptions = function(e) {
+            var t = this._options
+              , r = JSON.stringify
+              , o = !1;
+            e.radius && 0 < e.radius && e.radius != t.radius && (t.radius = e.radius,
+            o = !0),
+            0 <= e.innerRadius && e.innerRadius != t.innerRadius && (t.innerRadius = e.innerRadius,
+            o = !0),
+            e.colors && r(e.colors) !== r(t.colors) && (t.colors = e.colors,
+            o = !0),
+            e.fillColor && r(e.fillColor) !== r(t.fillColor) && (t.fillColor = e.fillColor,
+            o = !0),
+            e.strokeColor && e.strokeColor !== t.strokeColor && (t.strokeColor = e.strokeColor,
+            o = !0),
+            0 <= e.strokeWidth && e.strokeWidth != t.strokeWidth && (t.strokeWidth = e.strokeWidth,
+            o = !0),
+            void 0 !== e.tooltipCallback && t.tooltipCallback != e.tooltipCallback && (t.tooltipCallback = e.tooltipCallback,
+            o = !0),
+            e.values && r(e.values) !== r(t.values) && (t.values = e.values,
+            o = !0),
+            void 0 !== e.text && e.text !== t.text && (b.prototype.setOptions.call(this, {
+                text: e.text
+            }),
+            o = !0),
+            void 0 !== e.textClassName && e.textClassName !== t.textClassName && (t.textClassName = e.textClassName,
+            o = !0),
+            o && this._render(),
+            b.prototype.setOptions.call(this, e)
+        }
+        ,
+        C.prototype._render = function() {
+            var e = this
+              , t = e._options
+              , r = t.values
+              , o = t.radius
+              , a = 0
+              , i = 0;
+            if (r) {
+                e._total = r.reduce(function(e, t) {
+                    return e + t
+                }, 0);
+                for (var n = C._moreColors, s = Math.random, l = Math.round, u = 0; r.length > t.colors.length; )
+                    n.length < r.length && n.push("hsl(" + l(360 * s()) + "," + (l(20 * s()) + 70) + "%," + (l(40 * s()) + 30) + "%)"),
+                    t.colors.push(n[u]),
+                    u++;
+                var c = o + t.strokeWidth
+                  , p = ['<svg xmlns="http://www.w3.org/2000/svg" width="' + 2 * c + 'px" height="' + 2 * c + 'px">']
+                  , d = ""
+                  , m = void 0;
+                if (0 < t.innerRadius && t.innerRadius <= t.radius && (m = "piechart-innercircle-" + l(1e7 * s()),
+                p.push('<defs><mask id="' + m + '"><rect width="100%" height="100%" fill="white"/><circle r="' + t.innerRadius + '" cx="' + c + '" cy="' + c + '" fill="black"/></mask></defs>\n                    <circle r="' + t.innerRadius + '" cx="' + c + '" cy="' + c + '" style="fill:' + t.fillColor + ";stroke:" + t.strokeColor + ";stroke-width:" + 2 * t.strokeWidth + 'px;"/>')),
+                0 < e._total)
+                    for (var h = t.tooltipCallback, f = 2 * Math.PI / e._total, v = 0; v < r.length; v++) {
+                        i = f * r[v],
+                        h && (d = h(e, v));
+                        var _ = v < t.colors.length ? t.colors[v] : n[v];
+                        p.push(e._createSlice(c, c, o, a, i, _, d, m)),
+                        a += i
+                    }
+                var k = e.getOptions().text;
+                k && p.push('<text x="' + c + '" y="' + (c + 7) + '" style="font-size:16px;font-family:arial;fill:#000;font-weight:bold;" class="' + (t.textClassName || "") + '" text-anchor="middle">' + k + "</text>"),
+                p.push("</svg>"),
+                b.prototype.getOptions.call(this).htmlContent.innerHTML = p.join("")
+            }
+        }
+        ,
+        C.prototype._createSlice = function(e, t, r, o, a, i, n, s) {
+            var l = this._options
+              , u = Math.PI
+              , c = "";
+            if (s && (c = ' mask="url(#' + s + '"'),
+            2 * u * .99 < a)
+                return '<circle r="' + r + '" cx="' + e + '" cy="' + t + '" style="fill:' + i + ";stroke:" + l.strokeColor + ";stroke-width:" + l.strokeWidth + 'px;"' + c + "><title>" + n + "</title></circle>";
+            var p = Math.sin
+              , d = Math.cos
+              , m = e + r * p(o)
+              , h = t - r * d(o)
+              , f = e + r * p(o + a)
+              , v = t - r * d(o + a)
+              , _ = (l.innerRadius,
+            p(o),
+            l.innerRadius,
+            d(o),
+            l.innerRadius,
+            p(o + a),
+            l.innerRadius,
+            d(o + a),
+            0);
+            return u < a && (_ = 1),
+            '<path d="M' + e + " " + t + " L " + m + " " + h + " A " + r + "," + r + " 0 " + _ + " 1 " + f + " " + v + 'z" style="fill:' + i + ";stroke:" + l.strokeColor + ";stroke-width:" + l.strokeWidth + 'px;"' + c + "><title>" + n + "</title></path>"
+        }
+        ,
+        C._moreColors = [],
+        C);
+        function C(e) {
+            var t = b.call(this, e) || this;
+            return t._options = {
+                values: [],
+                radius: 40,
+                colors: ["#d7191c", "#fdae61", "#ffffbf", "#abdda4", "#2b83ba"],
+                fillColor: "transparent",
+                strokeWidth: 0,
+                strokeColor: "#666666",
+                innerRadius: 0
+            },
+            t._total = 0,
+            t.properties = {},
+            b.prototype.setOptions.call(t, {
+                htmlContent: document.createElement("div"),
+                pixelOffset: [0, 0],
+                anchor: "center"
+            }),
+            t.setOptions(e),
+            t
+        }
+        var d = r.merge("atlas.layer", c);
+        e.PieChartMarker = p,
+        e.layer = d
+    }(this.atlas = this.atlas || {}, atlas);
+    </script>
 </head>
 
 <style>
@@ -32,8 +582,10 @@
         var map;
         var symbolLayers = [];
         var layersData = {};
-        var pointsData = [];
+        var pointsData = {};
         var dataSource;
+        var id = 1;
+        var controls = [];
 
         function initializeMap(longitude, latitude, mapServiceToken) {
             try {
@@ -64,7 +616,16 @@
         function addSymbolLayer() {
             try {
                 var layerSource = new atlas.source.DataSource();
-                var newLayer = new atlas.layer.SymbolLayer(layerSource, null);
+                var newLayer = new atlas.layer.HtmlMarkerLayer(layerSource, null, {
+                    markerCallback: (id, position, properties) => {
+                        const pin = new atlas.HtmlMarker({
+                            position: position,
+                            id: id
+                        });
+                        pin.getElement().setAttribute('tabindex', 0);
+                        return pin;
+                    }
+                });
 
                 layersData[newLayer.getId()] = layerSource;
                 pointsData[newLayer.getId()] = {};
@@ -84,18 +645,19 @@
         }
 
         function addPoint(longitude, latitude, layerId) {
-            var point = new atlas.Shape(new atlas.data.Point([longitude, latitude]));
+            var point = new atlas.data.Feature(new atlas.data.Point([longitude, latitude]), {name: 'MapElement'}, id);
+            id++;
             try {
                 map.events.add('ready', function () {
                     layersData[layerId].add([point]);
-                    pointsData[layersData][point.getId()] = point;
+                    pointsData[layerId][point.id] = point;
                 });
             }
             catch (error) {
                 sendErrorInfo(error);
             }
 
-            return point.getId();
+            return point.id;
         }
 
         function updatePoint(longitude, latitude, pointId, layerId) {
@@ -113,9 +675,9 @@
 
         function removePoint(pointId, layerId) {
             try {
-                map.events.add( 'ready', function() {
+                map.events.add('ready', function() {
+                    layersData[layerId].remove(pointsData[layerId][pointId]);
                     delete pointsData[layerId][pointId];
-                    layersData[layerId].remove(pointId);
                 });
             }
             catch (error) {
@@ -150,16 +712,18 @@
 
         function interactiveControlsVisible(enable) {
             if (enable) {
-                map.controls.add([
+                controls = [
                     new atlas.control.ZoomControl(),
                     new atlas.control.CompassControl(),
                     new atlas.control.PitchControl(),
                     new atlas.control.StyleControl()
-                ], {
+                ]
+                map.controls.add(controls, {
                     position: "top-right"
                 });
             } else {
-                map.controls.clear();
+                map.controls.remove(controls);
+                controls = [];
             }
         }
 
@@ -199,42 +763,29 @@
         }
 
         function sendPushpinClickInfo(e) {
-            var latitude = e.position[1];
-            var longitude = e.position[0];
-            var layerClicked = 0;
-            var pointClicked = 0;
             try {
-                var layer = map.layers.getLayerById(e.layerId);
-                for (var i = 0; i < symbolLayers.length; i++) {
-                    if (layer == symbolLayers[i]){
-                        layerClicked = i;
-                    }
-                }
-                var layer = layersData[e.layerId];
-                for (var pointId in layer) {
-                    var pointCoordinate = layer[pointId].getCoordinates();
-                    if (pointCoordinate[0] == longitude && pointCoordinate[1] == latitude) {
-                        pointClicked = pointId;
-                    }
-                }
-            }
-            catch (error) {
+                const latitude = e.target.options.position[0];
+                const longitude = e.target.options.position[1];
+                const pointClicked = e.target.id || 'Unknown';
+
+                const coordinate = {
+                    latitude,
+                    longitude,
+                };
+
+                const message = {
+                    type: 'pushpinClickEvent',
+                    coordinate,
+                    layer: 0,
+                    point: pointClicked,
+                    text: 'Pushpin clicked!',
+                };
+
+                console.log('Sending message:', message);
+                window.chrome.webview.postMessage(message);
+            } catch (error) {
                 sendErrorInfo(error);
             }
-
-            const coordinate = {
-                "latitude": latitude,
-                "longitude": longitude,
-            }
-            const message = {
-                "type": "pushpinClickEvent",
-                "coordinate": coordinate,
-                "layer": layerClicked,
-                "point": pointClicked,
-                "text": "Pushpin clicked!"
-            };
-
-            window.chrome.webview.postMessage(message);
         }
 
         function getMapLayers() {
diff --git a/src/controls/dev/MenuBar/MenuBarItem.xaml b/src/controls/dev/MenuBar/MenuBarItem.xaml
index ffbcd65933..610d324972 100644
--- a/src/controls/dev/MenuBar/MenuBarItem.xaml
+++ b/src/controls/dev/MenuBar/MenuBarItem.xaml
@@ -1,6 +1,7 @@
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
 <ResourceDictionary xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:controls="using:Microsoft.UI.Xaml.Controls" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
   <Style TargetType="controls:MenuBarItem">
+    <Setter Property="Foreground" Value="{ThemeResource MenuBarItemForeground}" />
     <Setter Property="Background" Value="{ThemeResource MenuBarItemBackground}" />
     <Setter Property="BorderThickness" Value="{ThemeResource MenuBarItemBorderThickness}" />
     <Setter Property="BorderBrush" Value="{ThemeResource MenuBarItemBorderBrush}" />
@@ -52,10 +53,10 @@
               </VisualStateGroup>
             </VisualStateManager.VisualStateGroups>
             <Border x:Name="Background" Background="{TemplateBinding Background}" CornerRadius="{TemplateBinding CornerRadius}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" />
-            <Button x:Name="ContentButton" Content="{TemplateBinding Title}" Background="Transparent" BorderThickness="0" VerticalAlignment="Stretch" Padding="{StaticResource MenuBarItemButtonPadding}" IsTabStop="False" AutomationProperties.AccessibilityView="Raw" />
+            <Button x:Name="ContentButton" Content="{TemplateBinding Title}" Foreground="{TemplateBinding Foreground}" Background="Transparent" BorderThickness="0" VerticalAlignment="Stretch" Padding="{StaticResource MenuBarItemButtonPadding}" IsTabStop="False" AutomationProperties.AccessibilityView="Raw" />
           </Grid>
         </ControlTemplate>
       </Setter.Value>
     </Setter>
   </Style>
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/src/controls/dev/MenuBar/MenuBar_themeresources.xaml b/src/controls/dev/MenuBar/MenuBar_themeresources.xaml
index 8cc6b2b527..96cf1b1e78 100644
--- a/src/controls/dev/MenuBar/MenuBar_themeresources.xaml
+++ b/src/controls/dev/MenuBar/MenuBar_themeresources.xaml
@@ -3,6 +3,7 @@
   <ResourceDictionary.ThemeDictionaries>
     <ResourceDictionary x:Key="Default">
       <StaticResource x:Key="MenuBarBackground" ResourceKey="SubtleFillColorTransparentBrush" />
+      <StaticResource x:Key="MenuBarItemForeground" ResourceKey="TextFillColorPrimaryBrush" />
       <StaticResource x:Key="MenuBarItemBackground" ResourceKey="SubtleFillColorTransparentBrush" />
       <StaticResource x:Key="MenuBarItemBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
       <StaticResource x:Key="MenuBarItemBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
@@ -15,6 +16,7 @@
     </ResourceDictionary>
     <ResourceDictionary x:Key="Light">
       <StaticResource x:Key="MenuBarBackground" ResourceKey="SubtleFillColorTransparentBrush" />
+      <StaticResource x:Key="MenuBarItemForeground" ResourceKey="TextFillColorPrimaryBrush" />
       <StaticResource x:Key="MenuBarItemBackground" ResourceKey="SubtleFillColorTransparentBrush" />
       <StaticResource x:Key="MenuBarItemBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
       <StaticResource x:Key="MenuBarItemBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
@@ -27,6 +29,7 @@
     </ResourceDictionary>
     <ResourceDictionary x:Key="HighContrast">
       <StaticResource x:Key="MenuBarBackground" ResourceKey="SystemControlTransparentBrush" />
+      <StaticResource x:Key="MenuBarItemForeground" ResourceKey="SystemColorButtonTextColorBrush" />
       <StaticResource x:Key="MenuBarItemBackground" ResourceKey="SystemControlTransparentBrush" />
       <StaticResource x:Key="MenuBarItemBackgroundPointerOver" ResourceKey="SystemControlBackgroundListLowBrush" />
       <StaticResource x:Key="MenuBarItemBackgroundPressed" ResourceKey="SystemControlBackgroundListMediumBrush" />
@@ -41,4 +44,4 @@
   <x:Double x:Key="MenuBarHeight">40</x:Double>
   <Thickness x:Key="MenuBarItemButtonPadding">10,4,10,4</Thickness>
   <Thickness x:Key="MenuBarItemMargin">4,4,4,4</Thickness>
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/src/controls/dev/NavigationView/NavigationView.cpp b/src/controls/dev/NavigationView/NavigationView.cpp
index 305bb3c885..ea5f8a7a13 100644
--- a/src/controls/dev/NavigationView/NavigationView.cpp
+++ b/src/controls/dev/NavigationView/NavigationView.cpp
@@ -454,7 +454,7 @@ void NavigationView::OnApplyTemplate()
         if (auto stackLayout = leftNavRepeater.Layout().try_as<winrt::StackLayout>())
         {
             auto stackLayoutImpl = winrt::get_self<StackLayout>(stackLayout);
-            stackLayoutImpl->DisableVirtualization(true);
+            stackLayoutImpl->IsVirtualizationEnabled(false);
         }
 
         m_leftNavItemsRepeaterElementPreparedRevoker = leftNavRepeater.ElementPrepared(winrt::auto_revoke, { this, &NavigationView::OnRepeaterElementPrepared });
@@ -476,7 +476,7 @@ void NavigationView::OnApplyTemplate()
         if (auto stackLayout = topNavRepeater.Layout().try_as<winrt::StackLayout>())
         {
             auto stackLayoutImpl = winrt::get_self<StackLayout>(stackLayout);
-            stackLayoutImpl->DisableVirtualization(true);
+            stackLayoutImpl->IsVirtualizationEnabled(false);
         }
 
         m_topNavItemsRepeaterElementPreparedRevoker = topNavRepeater.ElementPrepared(winrt::auto_revoke, { this, &NavigationView::OnRepeaterElementPrepared });
@@ -499,7 +499,7 @@ void NavigationView::OnApplyTemplate()
         if (auto stackLayout = topNavListOverflowRepeater.Layout().try_as<winrt::StackLayout>())
         {
             auto stackLayoutImpl = winrt::get_self<StackLayout>(stackLayout);
-            stackLayoutImpl->DisableVirtualization(true);
+            stackLayoutImpl->IsVirtualizationEnabled(false);
         }
 
         m_topNavOverflowItemsRepeaterElementPreparedRevoker = topNavListOverflowRepeater.ElementPrepared(winrt::auto_revoke, { this, &NavigationView::OnRepeaterElementPrepared });
@@ -541,7 +541,7 @@ void NavigationView::OnApplyTemplate()
         if (auto stackLayout = leftFooterMenuNavRepeater.Layout().try_as<winrt::StackLayout>())
         {
             auto stackLayoutImpl = winrt::get_self<StackLayout>(stackLayout);
-            stackLayoutImpl->DisableVirtualization(true);
+            stackLayoutImpl->IsVirtualizationEnabled(false);
         }
 
         m_leftNavFooterMenuItemsRepeaterElementPreparedRevoker = leftFooterMenuNavRepeater.ElementPrepared(winrt::auto_revoke, { this, &NavigationView::OnRepeaterElementPrepared });
@@ -564,7 +564,7 @@ void NavigationView::OnApplyTemplate()
         if (auto stackLayout = topFooterMenuNavRepeater.Layout().try_as<winrt::StackLayout>())
         {
             auto stackLayoutImpl = winrt::get_self<StackLayout>(stackLayout);
-            stackLayoutImpl->DisableVirtualization(true);
+            stackLayoutImpl->IsVirtualizationEnabled(false);
         }
 
         m_topNavFooterMenuItemsRepeaterElementPreparedRevoker = topFooterMenuNavRepeater.ElementPrepared(winrt::auto_revoke, { this, &NavigationView::OnRepeaterElementPrepared });
@@ -2281,6 +2281,9 @@ winrt::UIElement NavigationView::FindSelectionIndicator(const winrt::IInspectabl
                 // Indicator was not found, so maybe the layout hasn't updated yet.
                 // So let's do that now.
                 container.UpdateLayout();
+                // Before manually calling ApplyTemplate, make sure the NavigationViewItem is aware
+                // of its owning NavigationView (it is required info for the NavigationViewItem ApplyTemplate process).
+                winrt::get_self<NavigationViewItem>(container)->SetNavigationViewParent(*this);
                 container.ApplyTemplate();
                 return winrt::get_self<NavigationViewItem>(container)->GetSelectionIndicator();
             }
diff --git a/src/controls/dev/NavigationView/NavigationViewItem.cpp b/src/controls/dev/NavigationView/NavigationViewItem.cpp
index 285413d8f1..5413b525b8 100644
--- a/src/controls/dev/NavigationView/NavigationViewItem.cpp
+++ b/src/controls/dev/NavigationView/NavigationViewItem.cpp
@@ -161,7 +161,7 @@ void NavigationViewItem::LoadMenuItemsHost()
             if (auto stackLayout = repeater.Layout().try_as<winrt::StackLayout>())
             {
                 auto stackLayoutImpl = winrt::get_self<StackLayout>(stackLayout);
-                stackLayoutImpl->DisableVirtualization(true);
+                stackLayoutImpl->IsVirtualizationEnabled(false);
             }
 
             // Primary element setup happens in NavigationView
diff --git a/src/controls/dev/NavigationView/NavigationViewItemPresenter.cpp b/src/controls/dev/NavigationView/NavigationViewItemPresenter.cpp
index 63e82938e0..8825f074ad 100644
--- a/src/controls/dev/NavigationView/NavigationViewItemPresenter.cpp
+++ b/src/controls/dev/NavigationView/NavigationViewItemPresenter.cpp
@@ -23,12 +23,17 @@ void NavigationViewItemPresenter::UnhookEventsAndClearFields()
 {
     m_expandCollapseChevronPointerPressedRevoker.revoke();
     m_expandCollapseChevronPointerReleasedRevoker.revoke();
+    m_expandCollapseChevronPointerExitedRevoker.revoke();
+    m_expandCollapseChevronPointerCanceledRevoker.revoke();
+    m_expandCollapseChevronPointerCaptureLostRevoker.revoke();
 
     m_contentGrid.set(nullptr);
     m_infoBadgePresenter.set(nullptr);
     m_expandCollapseChevron.set(nullptr);
     m_chevronExpandedStoryboard.set(nullptr);
     m_chevronCollapsedStoryboard.set(nullptr);
+
+    m_isChevronPressed = false;
 }
 
 void NavigationViewItemPresenter::OnApplyTemplate()
@@ -83,15 +88,56 @@ void NavigationViewItemPresenter::LoadChevron()
 
                 m_expandCollapseChevronPointerPressedRevoker = expandCollapseChevron.PointerPressed(winrt::auto_revoke, { this, &NavigationViewItemPresenter::OnExpandCollapseChevronPointerPressed });
                 m_expandCollapseChevronPointerReleasedRevoker = expandCollapseChevron.PointerReleased(winrt::auto_revoke, { this, &NavigationViewItemPresenter::OnExpandCollapseChevronPointerReleased });
+
+                m_expandCollapseChevronPointerCanceledRevoker = AddRoutedEventHandler<RoutedEventType::PointerCanceled>(
+                    *this,
+                    { this, &NavigationViewItemPresenter::OnExpandCollapseChevronPointerCanceled },
+                    true /*handledEventsToo*/);
+                    
+                m_expandCollapseChevronPointerExitedRevoker = AddRoutedEventHandler<RoutedEventType::PointerExited>(
+                    *this,
+                    { this, &NavigationViewItemPresenter::OnExpandCollapseChevronPointerExited },
+                    true /*handledEventsToo*/);
+
+                m_expandCollapseChevronPointerCaptureLostRevoker = AddRoutedEventHandler<RoutedEventType::PointerCaptureLost>(
+                    *this,
+                    { this, &NavigationViewItemPresenter::OnExpandCollapseChevronPointerCaptureLost },
+                    true /*handledEventsToo*/);
             }
         }
     }
 }
 
+
+void NavigationViewItemPresenter::ResetTrackedPointerId()
+{
+    m_trackedPointerId = 0;
+}
+
+// Returns False when the provided pointer Id matches the currently tracked Id.
+// When there is no currently tracked Id, sets the tracked Id to the provided Id and returns False.
+// Returns True when the provided pointer Id does not match the currently tracked Id.
+bool NavigationViewItemPresenter::IgnorePointerId(const winrt::PointerRoutedEventArgs& args)
+{
+    uint32_t pointerId = args.Pointer().PointerId();
+
+    if (m_trackedPointerId == 0)
+    {
+        m_trackedPointerId = pointerId;
+    }
+    else if (m_trackedPointerId != pointerId)
+    {
+        return true;
+    }
+    return false;
+}
+
 void NavigationViewItemPresenter::OnExpandCollapseChevronPointerPressed(const winrt::IInspectable& sender, const winrt::PointerRoutedEventArgs& args)
 {
+    const bool ignorePointerId = IgnorePointerId(args);
     const auto pointerProperties = args.GetCurrentPoint(*this).Properties();
-    if (!pointerProperties.IsLeftButtonPressed() ||
+    if (ignorePointerId ||
+        !pointerProperties.IsLeftButtonPressed() ||
         args.Handled())
     {
         // We are only interested in the primary action of the pointer device 
@@ -100,20 +146,63 @@ void NavigationViewItemPresenter::OnExpandCollapseChevronPointerPressed(const wi
         return;
     }
 
+    m_isChevronPressed = true;
     args.Handled(true);
 }
 
 void NavigationViewItemPresenter::OnExpandCollapseChevronPointerReleased(const winrt::IInspectable& sender, const winrt::PointerRoutedEventArgs& args)
 {
+    if (IgnorePointerId(args))
+    {
+        return;
+    }
+
     const auto navigationViewItem = GetNavigationViewItem();
     const auto pointerProperties = args.GetCurrentPoint(*this).Properties();
     if (!args.Handled() &&
+        m_isChevronPressed &&
         pointerProperties.PointerUpdateKind() == winrt::PointerUpdateKind::LeftButtonReleased &&
         navigationViewItem)
     {
         navigationViewItem->OnExpandCollapseChevronPointerReleased();
         args.Handled(true);
     }
+
+    m_isChevronPressed = false;
+    ResetTrackedPointerId();
+}
+
+void NavigationViewItemPresenter::OnExpandCollapseChevronPointerCanceled(const winrt::IInspectable& sender, const winrt::PointerRoutedEventArgs& args)
+{
+    if (IgnorePointerId(args))
+    {
+        return;
+    }
+
+    m_isChevronPressed = false;
+    ResetTrackedPointerId();
+}
+
+void NavigationViewItemPresenter::OnExpandCollapseChevronPointerExited(const winrt::IInspectable& sender, const winrt::PointerRoutedEventArgs& args)
+{
+    if (IgnorePointerId(args))
+    {
+        return;
+    }
+
+    m_isChevronPressed = false;
+    ResetTrackedPointerId();
+}
+
+void NavigationViewItemPresenter::OnExpandCollapseChevronPointerCaptureLost(const winrt::IInspectable& sender, const winrt::PointerRoutedEventArgs& args)
+{
+    if (IgnorePointerId(args))
+    {
+        return;
+    }
+
+    m_isChevronPressed = false;
+    ResetTrackedPointerId();
 }
 
 void NavigationViewItemPresenter::RotateExpandCollapseChevron(bool isExpanded)
diff --git a/src/controls/dev/NavigationView/NavigationViewItemPresenter.h b/src/controls/dev/NavigationView/NavigationViewItemPresenter.h
index aa0e257791..785cf151d6 100644
--- a/src/controls/dev/NavigationView/NavigationViewItemPresenter.h
+++ b/src/controls/dev/NavigationView/NavigationViewItemPresenter.h
@@ -39,11 +39,19 @@ class NavigationViewItemPresenter:
     NavigationViewItem * GetNavigationViewItem();
     void UpdateMargin();
     void UnhookEventsAndClearFields();
+    void ResetTrackedPointerId();
+    bool IgnorePointerId(const winrt::PointerRoutedEventArgs& args);
 
     void OnExpandCollapseChevronPointerPressed(const winrt::IInspectable& sender, const winrt::PointerRoutedEventArgs& args);
     void OnExpandCollapseChevronPointerReleased(const winrt::IInspectable& sender, const winrt::PointerRoutedEventArgs& args);
+    void OnExpandCollapseChevronPointerExited(const winrt::IInspectable& sender, const winrt::PointerRoutedEventArgs& args);
+    void OnExpandCollapseChevronPointerCanceled(const winrt::IInspectable& sender, const winrt::PointerRoutedEventArgs& args);
+    void OnExpandCollapseChevronPointerCaptureLost(const winrt::IInspectable& sender, const winrt::PointerRoutedEventArgs& args);
 
+    bool m_isChevronPressed{ false };
     double m_compactPaneLengthValue { 40 };
+    double m_leftIndentation{ 0 };
+    uint32_t m_trackedPointerId{ 0 };
 
     NavigationViewItemHelper<NavigationViewItemPresenter> m_helper{ this };
     tracker_ref<winrt::Grid> m_contentGrid{ this };
@@ -52,9 +60,10 @@ class NavigationViewItemPresenter:
 
     winrt::UIElement::PointerPressed_revoker m_expandCollapseChevronPointerPressedRevoker{};
     winrt::UIElement::PointerReleased_revoker m_expandCollapseChevronPointerReleasedRevoker{};
-
-    double m_leftIndentation{ 0 };
-
+    RoutedEventHandler_revoker m_expandCollapseChevronPointerExitedRevoker{};
+    RoutedEventHandler_revoker m_expandCollapseChevronPointerCanceledRevoker{};
+    RoutedEventHandler_revoker m_expandCollapseChevronPointerCaptureLostRevoker{};
+    
     tracker_ref<winrt::Storyboard> m_chevronExpandedStoryboard{ this };
     tracker_ref<winrt::Storyboard> m_chevronCollapsedStoryboard{ this };
 };
diff --git a/src/controls/dev/NavigationView/NavigationView_ApiTests/NavigationViewTests.cs b/src/controls/dev/NavigationView/NavigationView_ApiTests/NavigationViewTests.cs
index 88e672fa91..0efd15ca69 100644
--- a/src/controls/dev/NavigationView/NavigationView_ApiTests/NavigationViewTests.cs
+++ b/src/controls/dev/NavigationView/NavigationView_ApiTests/NavigationViewTests.cs
@@ -54,7 +54,9 @@ private NavigationView SetupNavigationView(NavigationViewPaneDisplayMode paneDis
             RunOnUIThread.Execute(() =>
             {
                 navView = new NavigationView();
-                navView.MenuItems.Add(new NavigationViewItem() { Content = "Undo", Icon = new SymbolIcon(Symbol.Undo) });
+                var undoNVI = new NavigationViewItem() { Content = "Undo", Icon = new SymbolIcon(Symbol.Undo) };
+                undoNVI.Resources.Add("NavigationViewItemIconBackground", new SolidColorBrush(Colors.Red));
+                navView.MenuItems.Add(undoNVI);
                 navView.MenuItems.Add(new NavigationViewItem() { Content = "Cut", Icon = new SymbolIcon(Symbol.Cut) });
 
                 navView.PaneTitle = "Title";
@@ -1437,17 +1439,22 @@ public void VerifySelectingACollapsedItemShowsSelectionIndicator()
 
             IdleSynchronizer.Wait();
 
+            selectionChangedEvent.Reset();
+
             RunOnUIThread.Execute(() =>
             {
                 Category newItem2 = new("Menu Item 5", "MI5", "Icon", null, true);
                 subCategories.Add(newItem2);
+                // This doesn't use SelectItem. I'm guessing we're testing for adding an item and immediately selecting
+                // it, rather than waiting for it to render first.
                 navView.SelectedItem = newItem2;
             });
 
             selectionChangedEvent.WaitOne();
             IdleSynchronizer.Wait();
 
-            Verify.IsTrue(ItemHasSelectionIndicator(navView, "Menu Item 5"));
+            // Disabled - see Bug 50123187: NavigationViewTests.VerifySelectingACollapsedItemShowsSelectionIndicator is unstable
+            //Verify.IsTrue(ItemHasSelectionIndicator(navView, "Menu Item 5"));
         }
 
         [TestMethod]
diff --git a/src/controls/dev/NavigationView/NavigationView_InteractionTests/FocusBehaviorTests.cs b/src/controls/dev/NavigationView/NavigationView_InteractionTests/FocusBehaviorTests.cs
index 463668df11..b7a00f3d08 100644
--- a/src/controls/dev/NavigationView/NavigationView_InteractionTests/FocusBehaviorTests.cs
+++ b/src/controls/dev/NavigationView/NavigationView_InteractionTests/FocusBehaviorTests.cs
@@ -302,6 +302,13 @@ public void TabNavigationHierarchicalTest()
                     Button togglePaneButton = new Button(FindElement.ById("TogglePaneButton"));
                     Button getSelectItemButton = new Button(FindElement.ByName("GetSelectedItemLabelButton"));
 
+                    Log.Comment("Deselect Menu Item 1");
+                    UIObject menuItem1 = FindElement.ByName("Menu Item 1");
+                    menuItem1.SetFocus();
+                    AutomationElement menuItem1AE = AutomationElement.FocusedElement;
+                    SelectionItemPattern menuItem1SIP = menuItem1AE.GetCurrentPattern(SelectionItemPattern.Pattern) as SelectionItemPattern;
+                    menuItem1SIP.RemoveFromSelection();
+
                     VerifyTabNavigationWithoutMenuItemSelected();
                     VerifyTabNavigationWithMenuItemSelected();
                     VerifyTabNavigationWithSettingsItemVisible();
@@ -315,7 +322,6 @@ void VerifyTabNavigationWithoutMenuItemSelected()
 
                         Verify.AreEqual("No Item Selected", GetSelectedItem());
 
-                        UIObject menuItem1 = FindElement.ByName("Menu Item 1");
                         UIObject menuItem29 = FindElement.ByName("Menu Item 29 (Selectable)");
 
                         // Set focus on the pane's toggle button.
diff --git a/src/controls/dev/NavigationView/NavigationView_InteractionTests/SelectionTests.cs b/src/controls/dev/NavigationView/NavigationView_InteractionTests/SelectionTests.cs
index 6568a994d7..34475e2e81 100644
--- a/src/controls/dev/NavigationView/NavigationView_InteractionTests/SelectionTests.cs
+++ b/src/controls/dev/NavigationView/NavigationView_InteractionTests/SelectionTests.cs
@@ -547,5 +547,24 @@ public void VerifySettingCustomSelectedItemInConstructorWorks()
                 Verify.IsFalse(Convert.ToBoolean(thirdItem.GetProperty(UIProperty.Get("SelectionItem.IsSelected"))));
             }
         }
+
+        [TestMethod]
+        public void VerifyNVIItemsRepeaterIsLoadedAfterSelectionSetInMarkup()
+        {
+            using (var setup = new TestSetupHelper(new[] { "NavigationView Tests", "HierarchicalNavigationView Markup Test" }))
+            {
+                Log.Comment("Verifying first item is selected.");
+                var firstItem = FindElement.ById("MI1");
+                Verify.IsTrue(Convert.ToBoolean(firstItem.GetProperty(UIProperty.Get("SelectionItem.IsSelected"))));
+
+                Log.Comment("Clicking on first item to expand it.");
+                InputHelper.LeftClick(firstItem);
+                Wait.ForIdle();
+
+                Log.Comment("Verifying children are shown.");
+                var secondItem = FindElement.ById("MI2");
+                Verify.IsNotNull(secondItem, "Second item should be visible after expanding parent item.");
+            }
+        }
     }
 }
diff --git a/src/controls/dev/NavigationView/NavigationView_InteractionTests/TopModeTests.cs b/src/controls/dev/NavigationView/NavigationView_InteractionTests/TopModeTests.cs
index 430fff519d..78bd5867cf 100644
--- a/src/controls/dev/NavigationView/NavigationView_InteractionTests/TopModeTests.cs
+++ b/src/controls/dev/NavigationView/NavigationView_InteractionTests/TopModeTests.cs
@@ -752,5 +752,42 @@ void VerifyOverflowButtonIsCollapsed()
                 }
             }
         }
+
+        [TestMethod]
+        public void TopNavigationChevronClickTest()
+        {
+            using (var setup = new TestSetupHelper(new[] { "NavigationView Tests", "HierarchicalNavigationView Markup Test" }))
+            {
+                Log.Comment("Set PaneDisplayMode to Top");
+                var panelDisplayModeComboBox = new ComboBox(FindElement.ByName("PaneDisplayModeCombobox"));
+                panelDisplayModeComboBox.SelectItemByName("Top");
+                Wait.ForIdle();
+
+                UIObject menuItem1 = FindElement.ByName("Menu Item 1");
+                Verify.IsNotNull(menuItem1);
+
+                UIObject menuItem2 = FindElement.ByName("Menu Item 2");
+                Verify.IsNull(menuItem2, "Menu Item 2 should not be visible.");
+
+                ClickOnNavigationViewItemChevron(menuItem1);
+
+                menuItem2 = FindElement.ByName("Menu Item 2");
+                Verify.IsNotNull(menuItem2, "Menu Item 2 should be visible.");
+
+                ClickOnNavigationViewItemChevron(menuItem1);
+
+                ElementCache.Refresh();
+
+                menuItem2 = FindElement.ByName("Menu Item 2");
+                Verify.IsNull(menuItem2, "Menu Item 2 should not be visible.");
+            }
+        }
+
+        private void ClickOnNavigationViewItemChevron(UIObject nvi)
+        {
+            Log.Comment("Click On NavigationViewItem Chevron");
+            InputHelper.LeftClick(nvi, nvi.BoundingRectangle.Width - 20, nvi.BoundingRectangle.Height / 2 + 10);
+            Wait.ForIdle();
+        }
     }
 }
diff --git a/src/controls/dev/NavigationView/NavigationView_themeresources.xaml b/src/controls/dev/NavigationView/NavigationView_themeresources.xaml
index 9424310780..aa3ff11b2c 100644
--- a/src/controls/dev/NavigationView/NavigationView_themeresources.xaml
+++ b/src/controls/dev/NavigationView/NavigationView_themeresources.xaml
@@ -42,6 +42,7 @@
       <StaticResource x:Key="NavigationViewItemBorderBrushSelectedPointerOver" ResourceKey="SubtleFillColorTransparentBrush" />
       <StaticResource x:Key="NavigationViewItemBorderBrushSelectedPressed" ResourceKey="SubtleFillColorTransparentBrush" />
       <StaticResource x:Key="NavigationViewItemBorderBrushSelectedDisabled" ResourceKey="SubtleFillColorTransparentBrush" />
+      <StaticResource x:Key="NavigationViewItemIconBackground" ResourceKey="SystemControlTransparentBrush" />
       <StaticResource x:Key="NavigationViewItemSeparatorForeground" ResourceKey="DividerStrokeColorDefaultBrush" />
       <StaticResource x:Key="NavigationViewItemHeaderForeground" ResourceKey="TextFillColorSecondaryBrush" />
       <StaticResource x:Key="NavigationViewSelectionIndicatorForeground" ResourceKey="AccentFillColorDefaultBrush" />
@@ -107,6 +108,7 @@
       <StaticResource x:Key="NavigationViewItemBorderBrushSelectedPointerOver" ResourceKey="SubtleFillColorTransparentBrush" />
       <StaticResource x:Key="NavigationViewItemBorderBrushSelectedPressed" ResourceKey="SubtleFillColorTransparentBrush" />
       <StaticResource x:Key="NavigationViewItemBorderBrushSelectedDisabled" ResourceKey="SubtleFillColorTransparentBrush" />
+      <StaticResource x:Key="NavigationViewItemIconBackground" ResourceKey="SystemControlTransparentBrush" />
       <StaticResource x:Key="NavigationViewItemSeparatorForeground" ResourceKey="DividerStrokeColorDefaultBrush" />
       <StaticResource x:Key="NavigationViewItemHeaderForeground" ResourceKey="TextFillColorSecondaryBrush" />
       <StaticResource x:Key="NavigationViewSelectionIndicatorForeground" ResourceKey="AccentFillColorDefaultBrush" />
@@ -172,6 +174,7 @@
       <StaticResource x:Key="NavigationViewItemBorderBrushSelectedPointerOver" ResourceKey="SystemControlHighlightAltTransparentRevealBorderBrush" />
       <StaticResource x:Key="NavigationViewItemBorderBrushSelectedPressed" ResourceKey="SystemControlHighlightAltTransparentRevealBorderBrush" />
       <StaticResource x:Key="NavigationViewItemBorderBrushSelectedDisabled" ResourceKey="SystemControlTransparentBrush" />
+      <StaticResource x:Key="NavigationViewItemIconBackground" ResourceKey="SystemControlTransparentBrush" />
       <StaticResource x:Key="NavigationViewItemSeparatorForeground" ResourceKey="SystemColorWindowTextColorBrush" />
       <StaticResource x:Key="NavigationViewItemHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
       <SolidColorBrush x:Key="NavigationViewSelectionIndicatorForeground" Color="{ThemeResource SystemColorHighlightTextColor}" />
@@ -607,7 +610,7 @@
                 </Grid.ColumnDefinitions>
                 <Border x:Name="IconColumn" Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.SmallerIconWidth}">
                   <Viewbox x:Name="IconBox" Height="{ThemeResource NavigationViewItemOnLeftIconBoxHeight}" HorizontalAlignment="Center" Margin="{ThemeResource NavigationViewItemOnLeftIconBoxMargin}">
-                    <ContentPresenter x:Name="Icon" Content="{TemplateBinding Icon}" Foreground="{TemplateBinding Foreground}" local:AnimatedIcon.State="Normal" xmlns:local="using:Microsoft.UI.Xaml.Controls" />
+                    <ContentPresenter x:Name="Icon" Content="{TemplateBinding Icon}" Foreground="{TemplateBinding Foreground}" Background="{ThemeResource NavigationViewItemIconBackground}" local:AnimatedIcon.State="Normal" xmlns:local="using:Microsoft.UI.Xaml.Controls" />
                   </Viewbox>
                 </Border>
                 <ContentPresenter x:Name="ContentPresenter" Grid.Column="1" Margin="{ThemeResource NavigationViewItemContentPresenterMargin}" ContentTransitions="{TemplateBinding ContentTransitions}" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Foreground="{TemplateBinding Foreground}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" Padding="{TemplateBinding Padding}" AutomationProperties.AccessibilityView="Raw" />
@@ -708,7 +711,7 @@
                 <RowDefinition Height="*" />
               </Grid.RowDefinitions>
               <Viewbox x:Name="IconBox" Grid.Row="1" Grid.Column="1" Height="16" Margin="0" VerticalAlignment="Center" HorizontalAlignment="Center">
-                <ContentPresenter x:Name="Icon" Content="{TemplateBinding Icon}" Foreground="{TemplateBinding Foreground}" local:AnimatedIcon.State="Normal" xmlns:local="using:Microsoft.UI.Xaml.Controls" />
+                <ContentPresenter x:Name="Icon" Content="{TemplateBinding Icon}" Foreground="{TemplateBinding Foreground}" Background="{ThemeResource NavigationViewItemIconBackground}" local:AnimatedIcon.State="Normal" xmlns:local="using:Microsoft.UI.Xaml.Controls" />
               </Viewbox>
               <ContentPresenter x:Name="InfoBadgePresenter" Grid.Column="2" VerticalAlignment="Center" Content="{TemplateBinding InfoBadge}" />
             </Grid>
@@ -883,7 +886,7 @@
                 <ColumnDefinition Width="Auto" />
               </Grid.ColumnDefinitions>
               <Viewbox x:Name="IconBox" Height="16" Width="16" Margin="12,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Center">
-                <ContentPresenter x:Name="Icon" Content="{TemplateBinding Icon}" Foreground="{TemplateBinding Foreground}" local:AnimatedIcon.State="Normal" xmlns:local="using:Microsoft.UI.Xaml.Controls" />
+                <ContentPresenter x:Name="Icon" Content="{TemplateBinding Icon}" Foreground="{TemplateBinding Foreground}" Background="{ThemeResource NavigationViewItemIconBackground}" local:AnimatedIcon.State="Normal" xmlns:local="using:Microsoft.UI.Xaml.Controls" />
               </Viewbox>
               <ContentPresenter x:Name="ContentPresenter" Grid.Column="1" Margin="{ThemeResource TopNavigationViewItemContentPresenterMargin}" TextWrapping="NoWrap" Foreground="{TemplateBinding Foreground}" ContentTransitions="{TemplateBinding ContentTransitions}" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" VerticalAlignment="Center" AutomationProperties.AccessibilityView="Raw" />
               <Grid x:Name="ExpandCollapseChevron" Grid.Column="2" Visibility="Collapsed" HorizontalAlignment="Right" Width="40" Margin="{ThemeResource TopNavigationViewItemExpandChevronMargin}" Background="Transparent">
@@ -1054,7 +1057,7 @@
                   <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
                 <Viewbox x:Name="IconBox" Height="16" Width="16" Margin="16,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Center">
-                  <ContentPresenter x:Name="Icon" Content="{TemplateBinding Icon}" Foreground="{TemplateBinding Foreground}" local:AnimatedIcon.State="Normal" xmlns:local="using:Microsoft.UI.Xaml.Controls" />
+                  <ContentPresenter x:Name="Icon" Content="{TemplateBinding Icon}" Foreground="{TemplateBinding Foreground}" Background="{ThemeResource NavigationViewItemIconBackground}" local:AnimatedIcon.State="Normal" xmlns:local="using:Microsoft.UI.Xaml.Controls" />
                 </Viewbox>
                 <ContentPresenter x:Name="ContentPresenter" Grid.Column="1" Margin="{ThemeResource TopNavigationViewItemOnOverflowContentPresenterMargin}" Foreground="{TemplateBinding Foreground}" TextWrapping="NoWrap" ContentTransitions="{TemplateBinding ContentTransitions}" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" VerticalAlignment="Center" AutomationProperties.AccessibilityView="Raw" />
                 <Grid x:Load="False" x:Name="ExpandCollapseChevron" Grid.Column="3" Visibility="Collapsed" HorizontalAlignment="Right" Width="40" Margin="{ThemeResource TopNavigationViewItemOnOverflowExpandChevronMargin}" Padding="{ThemeResource TopNavigationViewItemOnOverflowExpandChevronPadding}" Background="Transparent">
diff --git a/src/controls/dev/NavigationView/TestUI/Hierarchical/HierarchicalNavigationViewMarkup.xaml b/src/controls/dev/NavigationView/TestUI/Hierarchical/HierarchicalNavigationViewMarkup.xaml
index 0fbdd7a87b..735c16f772 100644
--- a/src/controls/dev/NavigationView/TestUI/Hierarchical/HierarchicalNavigationViewMarkup.xaml
+++ b/src/controls/dev/NavigationView/TestUI/Hierarchical/HierarchicalNavigationViewMarkup.xaml
@@ -21,7 +21,10 @@
             PaneClosed="NavView_PaneClosed"
             PaneOpened="NavView_PaneOpened">
             <muxcontrols:NavigationView.MenuItems>
-                <muxcontrols:NavigationViewItem Content="Menu Item 1" x:Name="MI1" SelectsOnInvoked="False"  Icon="Home">
+                <muxcontrols:NavigationViewItem Content="Menu Item 1" x:Name="MI1" Icon="Home" IsSelected="True">
+                <muxcontrols:NavigationViewItem.Resources>
+                    <SolidColorBrush x:Key="NavigationViewItemIconBackground" Color="Red" />
+                </muxcontrols:NavigationViewItem.Resources>
                     <muxcontrols:NavigationViewItem.MenuItems>
                         <muxcontrols:NavigationViewItem Content="Menu Item 2" x:Name="MI2" SelectsOnInvoked="False" Icon="Save">
                             <muxcontrols:NavigationViewItem.MenuItems>
diff --git a/src/controls/dev/NumberBox/InteractionTests/NumberBoxTests.cs b/src/controls/dev/NumberBox/InteractionTests/NumberBoxTests.cs
index fcb933fd64..b7a63cfa89 100644
--- a/src/controls/dev/NumberBox/InteractionTests/NumberBoxTests.cs
+++ b/src/controls/dev/NumberBox/InteractionTests/NumberBoxTests.cs
@@ -43,7 +43,7 @@ public void UpDownTest()
             using (var setup = new TestSetupHelper("NumberBox Tests"))
             {
                 RangeValueSpinner numBox = FindElement.ByName<RangeValueSpinner>("TestNumberBox");
-                numBox.SetValue(0);
+                numBox.SetValue(1);
 
                 ComboBox spinModeComboBox = FindElement.ByName<ComboBox>("SpinModeComboBox");
                 spinModeComboBox.SelectItemByName("Inline");
@@ -52,6 +52,23 @@ public void UpDownTest()
                 Button upButton = FindButton(numBox, "Increase");
                 Button downButton = FindButton(numBox, "Decrease");
 
+                Log.Comment("Change SmallChange value to 0.01");
+                RangeValueSpinner smallChangeNumBox = FindElement.ByName<RangeValueSpinner>("SmallChangeNumberBox");
+                EnterText(smallChangeNumBox, "0.01");
+                Wait.ForIdle();
+
+                Log.Comment("Verify that up button increases value by 0.01");
+                upButton.InvokeAndWait();
+                Edit edit = FindTextBox(numBox);
+                Verify.AreEqual("1.01", edit.GetText());
+
+                Log.Comment("Change Value to 0");
+                numBox.SetValue(0);
+
+                Log.Comment("Change SmallChange value to 1");
+                EnterText(smallChangeNumBox, "1");
+                Wait.ForIdle();
+
                 Log.Comment("Verify that up button increases value by 1");
                 upButton.InvokeAndWait();
                 Verify.AreEqual(1, numBox.Value);
@@ -61,7 +78,6 @@ public void UpDownTest()
                 Verify.AreEqual(0, numBox.Value);
 
                 Log.Comment("Change SmallChange value to 5");
-                RangeValueSpinner smallChangeNumBox = FindElement.ByName<RangeValueSpinner>("SmallChangeNumberBox");
                 smallChangeNumBox.SetValue(5);
                 Wait.ForIdle();
 
@@ -189,6 +205,30 @@ public void ValueTextTest()
                 Log.Comment("Verify that even if the value doesn't change, the textbox text is updated");
                 EnterText(numBox, " 15 ");
                 Verify.AreEqual("15", edit.GetText());
+
+                Log.Comment("Verify that there is no rounding error for value 25.8");
+                EnterText(numBox, "25.8");
+                Verify.AreEqual("25.8", edit.GetText());
+
+                Log.Comment("Verify that there is no rounding error for value 0.0001");
+                EnterText(numBox, "0.0001");
+                Verify.AreEqual("0.0001", edit.GetText());
+
+                Log.Comment("Verify that there is no rounding error for value 294.1");
+                EnterText(numBox, "294.1");
+                Verify.AreEqual("294.1", edit.GetText());
+
+                Log.Comment("Verify that there is no rounding error for value 2924.8");
+                EnterText(numBox, "2924.8");
+                Verify.AreEqual("2924.8", edit.GetText());
+
+                Log.Comment("Verify that there is no rounding error for value 1.01");
+                EnterText(numBox, "1.01");
+                Verify.AreEqual("1.01", edit.GetText());
+
+                Log.Comment("Verify that there is no rounding error for value 0.03");
+                EnterText(numBox, "0.03");
+                Verify.AreEqual("0.03", edit.GetText());
             }
         }
 
diff --git a/src/controls/dev/NumberBox/NumberBox.cpp b/src/controls/dev/NumberBox/NumberBox.cpp
index f7402739da..0dd65f5216 100644
--- a/src/controls/dev/NumberBox/NumberBox.cpp
+++ b/src/controls/dev/NumberBox/NumberBox.cpp
@@ -214,10 +214,7 @@ void NumberBox::OnApplyTemplate()
 
     m_isEnabledChangedRevoker = IsEnabledChanged(winrt::auto_revoke, { this,  &NumberBox::OnIsEnabledChanged });
 
-   // printf() defaults to 6 digits. 6 digits are sufficient for most
-    // users under most circumstances, while simultaneously avoiding most
-    // rounding errors for instance during double/float conversion.
-    m_displayRounder.Increment(1e-6);
+    m_displayRounder.SignificantDigits(10);
 
     UpdateSpinButtonPlacement();
     UpdateSpinButtonEnabled();
diff --git a/src/controls/dev/NumberBox/NumberBox.h b/src/controls/dev/NumberBox/NumberBox.h
index c3c6f26331..34086e68af 100644
--- a/src/controls/dev/NumberBox/NumberBox.h
+++ b/src/controls/dev/NumberBox/NumberBox.h
@@ -101,7 +101,7 @@ class NumberBox :
     bool m_valueUpdating{ false };
     bool m_textUpdating{ false };
 
-    winrt::IncrementNumberRounder m_displayRounder{};
+    winrt::SignificantDigitsNumberRounder m_displayRounder{};
 
     tracker_ref<winrt::TextBox> m_textBox{ this };
     tracker_ref<winrt::ContentPresenter> m_headerPresenter{ this };
diff --git a/src/controls/dev/NumberBox/NumberBox.xaml b/src/controls/dev/NumberBox/NumberBox.xaml
index 58ccc82220..c7e930c0b0 100644
--- a/src/controls/dev/NumberBox/NumberBox.xaml
+++ b/src/controls/dev/NumberBox/NumberBox.xaml
@@ -109,7 +109,7 @@
               <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
             <ContentPresenter x:Name="HeaderContentPresenter" Grid.ColumnSpan="3" Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}" FontWeight="Normal" Foreground="{ThemeResource TextControlHeaderForeground}" Margin="{ThemeResource TextBoxTopHeaderMargin}" FontSize="{TemplateBinding FontSize}" FontFamily="{TemplateBinding FontFamily}" TextWrapping="Wrap" VerticalAlignment="Top" Visibility="Collapsed" x:DeferLoadStrategy="Lazy" />
-            <TextBox x:Name="InputBox" Grid.Row="1" Grid.ColumnSpan="3" Style="{StaticResource NumberBoxTextBoxStyle}" InputScope="{TemplateBinding InputScope}" PlaceholderText="{TemplateBinding PlaceholderText}" SelectionFlyout="{TemplateBinding SelectionFlyout}" SelectionHighlightColor="{TemplateBinding SelectionHighlightColor}" TextReadingOrder="{TemplateBinding TextReadingOrder}" PreventKeyboardDisplayOnProgrammaticFocus="{TemplateBinding PreventKeyboardDisplayOnProgrammaticFocus}" FontSize="{TemplateBinding FontSize}" FontWeight="{TemplateBinding FontWeight}" FontFamily="{TemplateBinding FontFamily}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Padding="{TemplateBinding Padding}" Foreground="{TemplateBinding Foreground}" TextAlignment="{TemplateBinding TextAlignment}" CornerRadius="{TemplateBinding CornerRadius}" />
+            <TextBox x:Name="InputBox" Grid.Row="1" Grid.ColumnSpan="3" Style="{StaticResource NumberBoxTextBoxStyle}" InputScope="{TemplateBinding InputScope}" PlaceholderText="{TemplateBinding PlaceholderText}" SelectionFlyout="{TemplateBinding SelectionFlyout}" SelectionHighlightColor="{TemplateBinding SelectionHighlightColor}" TextReadingOrder="{TemplateBinding TextReadingOrder}" PreventKeyboardDisplayOnProgrammaticFocus="{TemplateBinding PreventKeyboardDisplayOnProgrammaticFocus}" FontSize="{TemplateBinding FontSize}" FontWeight="{TemplateBinding FontWeight}" FontFamily="{TemplateBinding FontFamily}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Padding="{TemplateBinding Padding}" Foreground="{TemplateBinding Foreground}" TextAlignment="{TemplateBinding TextAlignment}" CornerRadius="{TemplateBinding CornerRadius}" />
             <Popup x:Name="UpDownPopup" Grid.Row="1" Grid.Column="1" VerticalOffset="{ThemeResource NumberBoxPopupVerticalOffset}" HorizontalOffset="{ThemeResource NumberBoxPopupHorizonalOffset}" ShouldConstrainToRootBounds="False" HorizontalAlignment="Left">
               <Grid x:Name="PopupContentRoot" Padding="6" Background="{ThemeResource NumberBoxPopupBackground}" BorderBrush="{ThemeResource NumberBoxPopupBorderBrush}" BorderThickness="{ThemeResource NumberBoxPopupBorderThickness}" CornerRadius="{ThemeResource OverlayCornerRadius}">
                 <Grid.RowDefinitions>
@@ -366,4 +366,4 @@
       </Setter.Value>
     </Setter>
   </Style>
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/src/controls/dev/PagerControl/PagerControl.cpp b/src/controls/dev/PagerControl/PagerControl.cpp
index a13ff44bb6..5da4927088 100644
--- a/src/controls/dev/PagerControl/PagerControl.cpp
+++ b/src/controls/dev/PagerControl/PagerControl.cpp
@@ -136,7 +136,7 @@ void PagerControl::OnApplyTemplate()
         m_numberBox.set(numberBox);
         if (numberBox)
         {
-            numberBox.Value(SelectedPageIndex() + 1);
+            numberBox.Value(static_cast<double>(SelectedPageIndex()) + 1);
             winrt::AutomationProperties::SetName(numberBox, ResourceAccessor::GetLocalizedStringResource(SR_PagerControlPageTextName));
             m_numberBoxValueChangedRevoker = numberBox.ValueChanged(winrt::auto_revoke, { this,&PagerControl::NumberBoxValueChanged });
         }
@@ -335,7 +335,7 @@ void PagerControl::OnSelectedPageIndexChange(const int oldValue)
     }
     if (const auto numBox = m_numberBox.get())
     {
-        numBox.Value(SelectedPageIndex() + 1);
+        numBox.Value(static_cast<double>(SelectedPageIndex()) + 1);
     }
 
     UpdateOnEdgeButtonVisualStates();
diff --git a/src/controls/dev/PersonPicture/APITests/PersonPictureTests.cs b/src/controls/dev/PersonPicture/APITests/PersonPictureTests.cs
index 45784b281a..a618b2cd09 100644
--- a/src/controls/dev/PersonPicture/APITests/PersonPictureTests.cs
+++ b/src/controls/dev/PersonPicture/APITests/PersonPictureTests.cs
@@ -161,7 +161,7 @@ public void VerifyVSMStatesForPhotosAndInitials()
                 personPicture.IsGroup = false;
                 personPicture.Initials = "JS";
                 Content.UpdateLayout();
-                Verify.AreEqual(initialsTextBlock.FontFamily.Source, "Segoe UI");
+                Verify.AreEqual(initialsTextBlock.FontFamily.Source, "Segoe UI Variable");
                 Verify.AreEqual(initialsTextBlock.Text, "JS");
 
                 personPicture.Initials = "";
diff --git a/src/controls/dev/PipsPager/InteractionTests/PipsPagerElements.cs b/src/controls/dev/PipsPager/InteractionTests/PipsPagerElements.cs
index ece50308b0..090057f070 100644
--- a/src/controls/dev/PipsPager/InteractionTests/PipsPagerElements.cs
+++ b/src/controls/dev/PipsPager/InteractionTests/PipsPagerElements.cs
@@ -20,6 +20,7 @@ public class PipsPagerElements
         private ComboBox NumberOfPagesComboBox;
         private ComboBox MaxVisualIndicatorsComboBox;
         private ComboBox OrientationComboBox;
+        private ComboBox WrapModeComboBox;
         private CheckBox PreviousPageButtonIsVisibleCheckBox;
         private CheckBox PreviousPageButtonIsEnabledCheckBox;
         private CheckBox NextPageButtonIsVisibleCheckBox;
@@ -87,6 +88,10 @@ public ComboBox GetOrientationComboBox()
         {
             return GetElement(ref OrientationComboBox, "TestPipsPagerOrientationComboBox");
         }
+        public ComboBox GetWrapModeComboBox()
+        {
+            return GetElement(ref WrapModeComboBox, "TestPipsPagerWrapModeComboBox");
+        }
         public TextBlock GetCurrentPageTextBlock()
         {
             return GetElement(ref CurrentPageTextBlock, "CurrentPageIndexTextBlock");
diff --git a/src/controls/dev/PipsPager/InteractionTests/PipsPagerTestBase.cs b/src/controls/dev/PipsPager/InteractionTests/PipsPagerTestBase.cs
index 41cca9c4f7..48a6092e18 100644
--- a/src/controls/dev/PipsPager/InteractionTests/PipsPagerTestBase.cs
+++ b/src/controls/dev/PipsPager/InteractionTests/PipsPagerTestBase.cs
@@ -101,6 +101,11 @@ protected void SetOrientation(OrientationType orientation)
         {
             elements.GetOrientationComboBox().SelectItemByName($"{orientation}Orientation");
         }
+        
+        protected void SetWrapMode(WrapMode wrapMode)
+        {
+            elements.GetWrapModeComboBox().SelectItemByName($"{wrapMode}");
+        }
 
         protected void VerifyOrientationChanged(OrientationType orientation)
         {
@@ -167,6 +172,11 @@ protected string GetSelectedNumberOfPages()
 
         protected int GetSelectedNumberOfPagesAsInt32()
         {
+            var selectedNumberOfPages = GetSelectedNumberOfPages();
+            if (selectedNumberOfPages == "Infinite")
+            {
+                return -1;
+            }
             return Convert.ToInt32(GetSelectedNumberOfPages());
         }
         protected void VerifyNumberOfPages(string numberOfPages)
@@ -196,10 +206,17 @@ public enum ButtonVisibilityMode
         public enum NumberOfPagesOptions
         {
             Zero,
+            One,
             Five,
             Ten,
             Twenty,
             Infinite
         }
+
+        public enum WrapMode
+        {
+            None,
+            Wrap
+        }
     }
 }
diff --git a/src/controls/dev/PipsPager/InteractionTests/PipsPagerTests.cs b/src/controls/dev/PipsPager/InteractionTests/PipsPagerTests.cs
index ae3c6c8a6f..5f6201ccd1 100644
--- a/src/controls/dev/PipsPager/InteractionTests/PipsPagerTests.cs
+++ b/src/controls/dev/PipsPager/InteractionTests/PipsPagerTests.cs
@@ -385,5 +385,80 @@ public void PipsPagerRTLDoesNotCrash()
                 InputHelper.LeftClick(elements.GetNextPageButton());
             }
         }
+
+        [TestMethod]
+        [TestProperty("TestSuite", "F")]
+        public void PipsPagerWrapModeNavigation()
+        {
+            using (var setup = new TestSetupHelper("PipsPager Tests"))
+            {
+                elements = new PipsPagerElements();
+                SetPreviousPageButtonVisibilityMode(ButtonVisibilityMode.Visible);
+                SetNextPageButtonVisibilityMode(ButtonVisibilityMode.Visible);
+
+                ChangeNumberOfPages(NumberOfPagesOptions.Twenty);
+                VerifyNumberOfPages("20");
+
+                SetWrapMode(WrapMode.Wrap);
+
+                VerifySelectedPageIndex(0);
+
+                InputHelper.LeftClick(elements.GetPreviousPageButton());
+
+                VerifySelectedPageIndex(19);
+
+                InputHelper.LeftClick(elements.GetNextPageButton());
+
+                VerifySelectedPageIndex(0);
+            }
+        }
+
+        [TestMethod]
+        [TestProperty("TestSuite", "F")]
+        public void PipsPagerWrapModeNavigationInfinitePages()
+        {
+            using (var setup = new TestSetupHelper("PipsPager Tests"))
+            {
+                elements = new PipsPagerElements();
+                SetPreviousPageButtonVisibilityMode(ButtonVisibilityMode.Visible);
+                SetNextPageButtonVisibilityMode(ButtonVisibilityMode.Visible);
+
+                SetWrapMode(WrapMode.Wrap);
+
+                ChangeNumberOfPages(NumberOfPagesOptions.Infinite);
+                VerifyNumberOfPages("Infinite");
+
+                InputHelper.LeftClick(elements.GetNextPageButton());
+                InputHelper.LeftClick(elements.GetPreviousPageButton());
+
+                VerifySelectedPageIndex(0);
+
+                VerifyPageButtonWithVisibilityModeSet(ButtonType.Previous, ButtonVisibilityMode.Collapsed);
+                VerifyPageButtonWithVisibilityModeSet(ButtonType.Next, ButtonVisibilityMode.Visible);
+            }
+        }
+
+        [TestMethod]
+        [TestProperty("TestSuite", "F")]
+        public void PipsPagerWrapModeNavigationButtonsHiddenInOnePageScenario()
+        {
+            using (var setup = new TestSetupHelper("PipsPager Tests"))
+            {
+                elements = new PipsPagerElements();
+
+                SetWrapMode(WrapMode.Wrap);
+
+                ChangeNumberOfPages(NumberOfPagesOptions.One);
+                VerifyNumberOfPages("1");
+
+                SetPreviousPageButtonVisibilityMode(ButtonVisibilityMode.Visible);
+                SetNextPageButtonVisibilityMode(ButtonVisibilityMode.Visible);
+
+                VerifySelectedPageIndex(0);
+
+                VerifyPageButtonWithVisibilityModeSet(ButtonType.Previous, ButtonVisibilityMode.Collapsed);
+                VerifyPageButtonWithVisibilityModeSet(ButtonType.Next, ButtonVisibilityMode.Collapsed);
+            }
+        }
     }
 }
diff --git a/src/controls/dev/PipsPager/PipsPager.cpp b/src/controls/dev/PipsPager/PipsPager.cpp
index 5a9d4d1a41..781133b07a 100644
--- a/src/controls/dev/PipsPager/PipsPager.cpp
+++ b/src/controls/dev/PipsPager/PipsPager.cpp
@@ -10,6 +10,7 @@
 #include "PipsPagerTemplateSettings.h"
 #include "PipsPagerSelectedIndexChangedEventArgs.h"
 #include "PipsPagerAutomationPeer.h"
+#include "StackLayout.h"
 
 typedef winrt::PipsPagerButtonVisibility ButtonVisibility;
 
@@ -67,6 +68,11 @@ PipsPager::PipsPager()
     SetDefaultStyleKey(this);
 }
 
+PipsPager::~PipsPager()
+{
+    RestoreLayoutVirtualization();
+}
+
 void PipsPager::OnApplyTemplate()
 {
     winrt::AutomationProperties::SetName(*this, ResourceAccessor::GetLocalizedStringResource(SR_PipsPagerNameText));
@@ -96,6 +102,8 @@ void PipsPager::OnApplyTemplate()
     m_pipsPagerElementPreparedRevoker.revoke();
     m_pipsAreaGettingFocusRevoker.revoke();
     m_pipsAreaBringIntoViewRequestedRevoker.revoke();
+    m_itemsRepeaterStackLayoutChangedRevoker.revoke();
+    RestoreLayoutVirtualization();
     [this](const winrt::ItemsRepeater repeater)
     {
         m_pipsPagerRepeater.set(repeater);
@@ -104,6 +112,12 @@ void PipsPager::OnApplyTemplate()
             m_pipsPagerElementPreparedRevoker = repeater.ElementPrepared(winrt::auto_revoke, { this, &PipsPager::OnElementPrepared });
             m_pipsAreaGettingFocusRevoker = repeater.GettingFocus(winrt::auto_revoke, { this, &PipsPager::OnPipsAreaGettingFocus });
             m_pipsAreaBringIntoViewRequestedRevoker = repeater.BringIntoViewRequested(winrt::auto_revoke, { this, &PipsPager::OnPipsAreaBringIntoViewRequested });
+            
+            m_itemsRepeaterStackLayoutChangedRevoker = RegisterPropertyChanged(repeater,
+            winrt::ItemsRepeater::LayoutProperty(),
+            { this, &PipsPager::OnItemsRepeaterLayoutChanged });
+
+            UpdateLayoutVirtualization();
         }
     }(GetTemplateChildT<winrt::ItemsRepeater>(c_pipsPagerRepeaterName, *this));
 
@@ -189,17 +203,18 @@ void PipsPager::UpdateIndividualNavigationButtonVisualState(
     const wstring_view& enabledStateName,
     const wstring_view& disabledStateName) {
 
-    const auto ifGenerallyVisible = !hiddenOnEdgeCondition && NumberOfPages() != 0 && MaxVisiblePips() > 0;
+    const auto isGenerallyVisible = (!hiddenOnEdgeCondition || (IsWrapEnabled() && NumberOfPages() > 1)) && 
+                                     NumberOfPages() != 0 && MaxVisiblePips() > 0;
     if (visibility != ButtonVisibility::Collapsed)
     {
-        if ((visibility == ButtonVisibility::Visible || m_isPointerOver || m_isFocused) && ifGenerallyVisible)
+        if ((visibility == ButtonVisibility::Visible || m_isPointerOver || m_isFocused) && isGenerallyVisible)
         {
             winrt::VisualStateManager::GoToState(*this, visibleStateName, false);
             winrt::VisualStateManager::GoToState(*this, enabledStateName, false);
         }
         else
         {
-            if (!ifGenerallyVisible)
+            if (!isGenerallyVisible)
             {
                 winrt::VisualStateManager::GoToState(*this, disabledStateName, false);
             }
@@ -216,13 +231,13 @@ void PipsPager::UpdateNavigationButtonVisualStates() {
     const int selectedPageIndex = SelectedPageIndex();
     const int numberOfPages = NumberOfPages();
 
-    auto const ifPreviousButtonHiddenOnEdge = selectedPageIndex == 0;
-    UpdateIndividualNavigationButtonVisualState(ifPreviousButtonHiddenOnEdge, PreviousButtonVisibility(),
+    auto const isPreviousButtonHiddenOnEdge = selectedPageIndex == 0;
+    UpdateIndividualNavigationButtonVisualState(isPreviousButtonHiddenOnEdge, PreviousButtonVisibility(),
         c_previousPageButtonVisibleVisualState, c_previousPageButtonHiddenVisualState,
         c_previousPageButtonEnabledVisualState, c_previousPageButtonDisabledVisualState);
 
-    auto const ifNextButtonHiddenOnEdge = selectedPageIndex == numberOfPages - 1;
-    UpdateIndividualNavigationButtonVisualState(ifNextButtonHiddenOnEdge, NextButtonVisibility(),
+    auto const isNextButtonHiddenOnEdge = selectedPageIndex == numberOfPages - 1;
+    UpdateIndividualNavigationButtonVisualState(isNextButtonHiddenOnEdge, NextButtonVisibility(),
         c_nextPageButtonVisibleVisualState, c_nextPageButtonHiddenVisualState,
         c_nextPageButtonEnabledVisualState, c_nextPageButtonDisabledVisualState);
 }
@@ -276,7 +291,7 @@ double PipsPager::CalculateScrollViewerSize(const double defaultPipSize, const d
     {
         numberOfPagesToDisplay = maxVisualIndicators;
     }
-    return defaultPipSize * (numberOfPagesToDisplay - 1) + selectedPipSize;
+    return defaultPipSize * (static_cast<double>(numberOfPagesToDisplay) - 1) + selectedPipSize;
 }
 
 void PipsPager::SetScrollViewerMaxSize() {
@@ -436,6 +451,12 @@ void PipsPager::OnSelectedPageIndexChanged(const int oldValue)
     }
 }
 
+void PipsPager::OnWrapModeChanged()
+{
+    UpdateLayoutVirtualization();
+    UpdateNavigationButtonVisualStates();
+}
+
 void PipsPager::OnOrientationChanged()
 {
     if (Orientation() == winrt::Orientation::Horizontal)
@@ -505,14 +526,47 @@ void PipsPager::OnNavigationButtonVisibilityChanged(const ButtonVisibility visib
 
 void PipsPager::OnPreviousButtonClicked(const IInspectable& sender, const winrt::RoutedEventArgs& e)
 {
-    // In this method, SelectedPageIndex is always greater than 0.
-    SelectedPageIndex(SelectedPageIndex() - 1);
+    // Navigation buttons are hidden in this scenario.
+    // However in case someone re-templates the control and
+    // leaves the buttons active, we want to make sure
+    // we don't navigate to a non-existent index.
+    if (NumberOfPages() == 0 || NumberOfPages() == 1)
+    {
+        return;
+    }
+
+    auto newPageIndex = std::max(0, SelectedPageIndex() - 1);
+
+    if (IsWrapEnabled() && NumberOfPages() > -1 &&
+        SelectedPageIndex() == 0)
+    {
+        newPageIndex = NumberOfPages() - 1;
+    }
+
+    SelectedPageIndex(newPageIndex);
 }
 
 void PipsPager::OnNextButtonClicked(const IInspectable& sender, const winrt::RoutedEventArgs& e)
 {
-    // In this method, SelectedPageIndex is always less than maximum.
-    SelectedPageIndex(SelectedPageIndex() + 1);
+    // Navigation buttons are hidden in this scenario.
+    // However in case someone re-templates the control and
+    // leaves the buttons active, we want to make sure
+    // we don't navigate to a non-existent index.
+    if (NumberOfPages() == 0 || NumberOfPages() == 1)
+    {
+        return;
+    }
+
+    auto newPageIndex = NumberOfPages() > -1 ? 
+                            std::min(SelectedPageIndex() + 1, NumberOfPages() - 1) : SelectedPageIndex() + 1;
+    
+    if (IsWrapEnabled() &&
+        SelectedPageIndex() == (NumberOfPages() - 1))
+    {
+        newPageIndex = 0;
+    }
+
+    SelectedPageIndex(newPageIndex);
 }
 
 
@@ -636,6 +690,44 @@ void PipsPager::OnScrollViewerBringIntoViewRequested(const IInspectable& sender,
     args.Handled(true);
 }
 
+void PipsPager::OnItemsRepeaterLayoutChanged(const winrt::DependencyObject& /*sender*/, const winrt::DependencyProperty& args)
+{
+    RestoreLayoutVirtualization();
+    UpdateLayoutVirtualization();
+}
+
+void PipsPager::RestoreLayoutVirtualization()
+{
+    // Make sure to reset the layout virtualization settings on old layout
+    if (auto stackLayout = m_itemsRepeaterStackLayout.get())
+    {
+        auto stackLayoutImpl = winrt::get_self<StackLayout>(stackLayout);
+        stackLayoutImpl->IsVirtualizationEnabled(m_cachedIsVirtualizationEnabledFlag);
+    }
+    m_itemsRepeaterStackLayout = nullptr;
+    m_cachedIsVirtualizationEnabledFlag = true;
+}
+
+void PipsPager::UpdateLayoutVirtualization()
+{
+    if (auto repeater = m_pipsPagerRepeater.get())
+    {
+        if (auto stackLayout = repeater.Layout().try_as<winrt::StackLayout>())
+        {
+            // Turn off virtualization when wrap around is enabled
+            // in order to avoid a bug where the pips disappear
+            // when navigating to the last page from the first page
+            auto stackLayoutImpl = winrt::get_self<StackLayout>(stackLayout);
+            if (m_itemsRepeaterStackLayout.get() == nullptr)
+            {
+                m_cachedIsVirtualizationEnabledFlag = stackLayoutImpl->IsVirtualizationEnabled();
+                m_itemsRepeaterStackLayout = winrt::make_weak(stackLayout);
+            }
+            stackLayoutImpl->IsVirtualizationEnabled(!IsWrapEnabled());
+        }
+    }
+}
+
 void PipsPager::OnPropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args)
 {
     winrt::IDependencyProperty property = args.Property();
@@ -652,6 +744,10 @@ void PipsPager::OnPropertyChanged(const winrt::DependencyPropertyChangedEventArg
         else if (property == MaxVisiblePipsProperty()) {
             OnMaxVisiblePipsChanged();
         }
+        else if (property == WrapModeProperty())
+        {
+            OnWrapModeChanged();
+        }
         else if (property == PreviousButtonVisibilityProperty())
         {
             OnNavigationButtonVisibilityChanged(PreviousButtonVisibility(), c_previousPageButtonCollapsedVisualState, c_previousPageButtonDisabledVisualState);
diff --git a/src/controls/dev/PipsPager/PipsPager.h b/src/controls/dev/PipsPager/PipsPager.h
index daeeba208c..c23c5754f1 100644
--- a/src/controls/dev/PipsPager/PipsPager.h
+++ b/src/controls/dev/PipsPager/PipsPager.h
@@ -20,6 +20,7 @@ class PipsPager :
 {
 public:
     PipsPager();
+    ~PipsPager();
 
     /* IFrameworkElement */
     void OnApplyTemplate();
@@ -46,6 +47,7 @@ class PipsPager :
         const wstring_view& collapsedStateName,
         const wstring_view& disabledStateName);
     void OnOrientationChanged();
+    void OnWrapModeChanged();
 
     winrt::UIElement GetSelectedItem();
 
@@ -70,6 +72,9 @@ class PipsPager :
     void UpdateSelectedPip(const int index);
     void UpdatePipOrientation(const winrt::Control& pip);
     void ApplyStyleToPipAndUpdateOrientation(const winrt::FrameworkElement& pip, const winrt::Style& style);
+    void RestoreLayoutVirtualization();
+    void UpdateLayoutVirtualization();
+    bool IsWrapEnabled(){ return WrapMode() == winrt::PipsPagerWrapMode::Wrap; };
     /* Eventing */
     void RaiseSelectedIndexChanged();
 
@@ -80,6 +85,9 @@ class PipsPager :
     void OnPipsAreaBringIntoViewRequested(const IInspectable& sender, const winrt::BringIntoViewRequestedEventArgs& args);
     void OnScrollViewerBringIntoViewRequested(const IInspectable& sender, const winrt::BringIntoViewRequestedEventArgs& args);
 
+    /* Event listeners */
+    void OnItemsRepeaterLayoutChanged(const winrt::DependencyObject& /*sender*/, const winrt::DependencyProperty& args);
+
     /* Pips Logic */
     void UpdatePipsItems(const int numberOfPages, int maxVisualIndicators);
     void OnElementPrepared(winrt::ItemsRepeater sender, winrt::ItemsRepeaterElementPreparedEventArgs args);
@@ -98,6 +106,7 @@ class PipsPager :
     winrt::UIElement::GettingFocus_revoker m_pipsAreaGettingFocusRevoker{};
     winrt::ItemsRepeater::BringIntoViewRequested_revoker m_pipsAreaBringIntoViewRequestedRevoker{};
     winrt::FxScrollViewer::BringIntoViewRequested_revoker m_scrollViewerBringIntoViewRequestedRevoker{};
+    PropertyChanged_revoker m_itemsRepeaterStackLayoutChangedRevoker{};
     /* Items */
     winrt::IObservableVector<int> m_pipsPagerItems{};
 
@@ -107,4 +116,6 @@ class PipsPager :
     int m_lastSelectedPageIndex{ -1 };
     bool m_isPointerOver{ false };
     bool m_isFocused{ false };
+    winrt::weak_ref<winrt::StackLayout> m_itemsRepeaterStackLayout{ nullptr };
+    bool m_cachedIsVirtualizationEnabledFlag{ true };
 };
diff --git a/src/controls/dev/PipsPager/PipsPager.idl b/src/controls/dev/PipsPager/PipsPager.idl
index 4816235aa8..fa3192433f 100644
--- a/src/controls/dev/PipsPager/PipsPager.idl
+++ b/src/controls/dev/PipsPager/PipsPager.idl
@@ -10,6 +10,14 @@ enum PipsPagerButtonVisibility
     Collapsed
 };
 
+[MUX_PUBLIC_V7]
+[webhosthidden]
+enum PipsPagerWrapMode
+{
+    None,
+    Wrap
+};
+
 [MUX_PUBLIC]
 [default_interface]
 [webhosthidden]
@@ -71,6 +79,13 @@ unsealed runtimeclass PipsPager : Microsoft.UI.Xaml.Controls.Control
     static Microsoft.UI.Xaml.DependencyProperty NextButtonStyleProperty{ get; };
     static Microsoft.UI.Xaml.DependencyProperty SelectedPipStyleProperty{ get; };
     static Microsoft.UI.Xaml.DependencyProperty NormalPipStyleProperty{ get; };
+
+    [MUX_PUBLIC_V7]
+    {
+        [MUX_DEFAULT_VALUE("winrt::PipsPagerWrapMode::None")]
+        PipsPagerWrapMode WrapMode;
+        static Microsoft.UI.Xaml.DependencyProperty WrapModeProperty{ get; };
+    }
 };
 
 }
diff --git a/src/controls/dev/PipsPager/TestUI/PipsPagerPage.xaml b/src/controls/dev/PipsPager/TestUI/PipsPagerPage.xaml
index c50c291ec8..5fc02959f1 100644
--- a/src/controls/dev/PipsPager/TestUI/PipsPagerPage.xaml
+++ b/src/controls/dev/PipsPager/TestUI/PipsPagerPage.xaml
@@ -12,7 +12,7 @@
 
     <Grid Background="Transparent">
         <Grid.RowDefinitions>
-            <RowDefinition Height="300"/>
+            <RowDefinition Height="400"/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
@@ -39,8 +39,9 @@
                 <ComboBoxItem x:Name="VisibleOnPointerOverNextButton" AutomationProperties.Name="VisibleOnPointerOverNextButton">VisibleOnPointerOver</ComboBoxItem>
                 <ComboBoxItem x:Name="CollapsedNextButton" AutomationProperties.Name="CollapsedNextButton">Collapsed</ComboBoxItem>
             </ComboBox>
-            <ComboBox x:Name="TestPipsPagerNumberOfPagesComboBox" Header="Number of pages" SelectedIndex="4">
+            <ComboBox x:Name="TestPipsPagerNumberOfPagesComboBox" Header="Number of pages" SelectedIndex="5">
                 <ComboBoxItem x:Name="ZeroNumberOfPages" AutomationProperties.Name="ZeroNumberOfPages">0 Pages</ComboBoxItem>
+                <ComboBoxItem x:Name="OneNumberOfPages" AutomationProperties.Name="OneNumberOfPages">1 Page</ComboBoxItem>
                 <ComboBoxItem x:Name="FiveNumberOfPages" AutomationProperties.Name="FiveNumberOfPages">5 Pages</ComboBoxItem>
                 <ComboBoxItem x:Name="TenNumberOfPages" AutomationProperties.Name="TenNumberOfPages">10 Pages</ComboBoxItem>
                 <ComboBoxItem x:Name="TwentyNumberOfPages" AutomationProperties.Name="TwentyNumberOfPages">20 Pages</ComboBoxItem>
@@ -56,6 +57,10 @@
                 <ComboBoxItem x:Name="VerticalOrientation" AutomationProperties.Name="VerticalOrientation">Vertical</ComboBoxItem>
                 <ComboBoxItem x:Name="HorizontalOrientation" AutomationProperties.Name="HorizontalOrientation">Horizontal</ComboBoxItem>
             </ComboBox>
+            <ComboBox x:Name="TestPipsPagerWrapModeComboBox" Header="WrapMode" SelectedIndex="0">
+                <ComboBoxItem x:Name="None" AutomationProperties.Name="None">None</ComboBoxItem>
+                <ComboBoxItem x:Name="Wrap" AutomationProperties.Name="Wrap">Wrap</ComboBoxItem>
+            </ComboBox>
         </StackPanel>
         <StackPanel Orientation="Vertical" Grid.Column="2" Margin="100, 0, 0, 0">
             <TextBlock Text="Previous Page Button"/>
@@ -81,6 +86,10 @@
             <TextBlock x:Name="CurrentMaxVisiblePipsTextBlock"/>
             <TextBlock x:Name="FocusedPageIndexTextBlock" Text="Current focused page index: "/>
             <TextBlock x:Name="CurrentOrientationTextBlock"/>
+            <StackPanel Orientation="Horizontal">
+                <Button Content="Skip To Last Page" Click="SkipToLastPage"/>
+                <Button Content="Skip To First Page" Click="SkipToFirstPage"/>
+            </StackPanel>
         </StackPanel>
 
         <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Vertical">
diff --git a/src/controls/dev/PipsPager/TestUI/PipsPagerPage.xaml.cs b/src/controls/dev/PipsPager/TestUI/PipsPagerPage.xaml.cs
index fdf50dabbc..98077f2a9d 100644
--- a/src/controls/dev/PipsPager/TestUI/PipsPagerPage.xaml.cs
+++ b/src/controls/dev/PipsPager/TestUI/PipsPagerPage.xaml.cs
@@ -55,6 +55,7 @@ private void OnLoad(object sender, RoutedEventArgs args)
             TestPipsPagerNumberOfPagesComboBox.SelectionChanged += OnNumberOfPagesChanged;
             TestPipsPagerMaxVisiblePipsComboBox.SelectionChanged += OnMaxVisiblePipsChanged;
             TestPipsPagerOrientationComboBox.SelectionChanged += OnOrientationChanged;
+            TestPipsPagerWrapModeComboBox.SelectionChanged += OnWrapModeChanged;
             TestPipsPager.PointerEntered += TestPipsPager_PointerEntered;
             TestPipsPager.PointerExited += TestPipsPager_PointerExited;
             TestPipsPager.GotFocus += TestPipsPager_GotFocus;
@@ -76,6 +77,16 @@ private void OnLoad(object sender, RoutedEventArgs args)
             CurrentOrientationTextBlock.Text = GetCurrentOrientation();
         }
 
+        private void SkipToLastPage(object sender, RoutedEventArgs args)
+        {
+            TestPipsPager.SelectedPageIndex = TestPipsPager.NumberOfPages - 1;
+        }
+
+        private void SkipToFirstPage(object sender, RoutedEventArgs args)
+        {
+            TestPipsPager.SelectedPageIndex = 0;
+        }
+
         private void OnGetPipsPagerButtonSizesClicked(object sender, RoutedEventArgs args)
         {
             //Button horizontalOrientationButton;
@@ -199,6 +210,11 @@ public void OnOrientationChanged(object sender, SelectionChangedEventArgs e)
             CurrentOrientationTextBlock.Text = GetCurrentOrientation();
         }
 
+        public void OnWrapModeChanged(object sender, SelectionChangedEventArgs e)
+        {
+            TestPipsPager.WrapMode = (sender as ComboBox).SelectedIndex == 0 ? PipsPagerWrapMode.None : PipsPagerWrapMode.Wrap;
+        }
+
         private PipsPagerButtonVisibility ConvertComboBoxItemToVisibilityEnum(ComboBoxItem item, PipsPagerButtonVisibility defaultValue)
         {
             PipsPagerButtonVisibility newVisibility = defaultValue;
diff --git a/src/controls/dev/RatingControl/APITests/RatingControlTests.cs b/src/controls/dev/RatingControl/APITests/RatingControlTests.cs
index 8aaec5ace9..470f1e404c 100644
--- a/src/controls/dev/RatingControl/APITests/RatingControlTests.cs
+++ b/src/controls/dev/RatingControl/APITests/RatingControlTests.cs
@@ -2,21 +2,15 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Threading;
 
 using MUXControlsTestApp.Utilities;
 
-using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media.Imaging;
-using Common;
 
 using WEX.TestExecution;
 using WEX.TestExecution.Markup;
-using WEX.Logging.Interop;
 
 namespace Microsoft.UI.Xaml.Tests.MUXControls.ApiTests
 {
@@ -121,5 +115,159 @@ public void VerifyValuesCoercion()
                 Verify.AreEqual(ratingControl.Value, 1.0, "Should coerce set Value above MaxRating back to MaxRating");
             });
         }
+
+        [TestMethod]
+        [TestProperty("IsolationLevel", "Method")] // This test alters the application resources, so it's isolated from other tests.
+        public void VerifySizeIsChangeableFromResource()
+        {
+            ManualResetEvent loadedEvent = new(false);
+            ManualResetEvent unloadedEvent = new(false);
+            double originalWidth = 0;
+            double previousWidth = 0;
+
+            RunOnUIThread.Execute(() =>
+            {
+                var ratingControl = new RatingControl();
+
+                ratingControl.Loaded += (sender, e) =>
+                {
+                    originalWidth = ratingControl.ActualWidth;
+                    previousWidth = originalWidth;
+                    loadedEvent.Set();
+                };
+
+                ratingControl.Unloaded += (sender, e) => unloadedEvent.Set();
+
+                Content = ratingControl;
+            });
+
+            loadedEvent.WaitOne();
+            IdleSynchronizer.Wait();
+
+            RunOnUIThread.Execute(() =>
+            {
+                Content = null;
+            });
+
+            unloadedEvent.WaitOne();
+            IdleSynchronizer.Wait();
+
+            RunOnUIThread.Execute(() =>
+            {
+                Application.Current.Resources["RatingControlFontSizeForRendering"] = 20.0;
+
+                var ratingControl = new RatingControl();
+
+                ratingControl.Loaded += (sender, e) =>
+                {
+                    Verify.IsLessThan(ratingControl.ActualWidth, previousWidth);
+                    previousWidth = ratingControl.ActualWidth;
+                    loadedEvent.Set();
+                };
+
+                ratingControl.Unloaded += (sender, e) => unloadedEvent.Set();
+
+                Content = ratingControl;
+            });
+
+            loadedEvent.WaitOne();
+            IdleSynchronizer.Wait();
+
+            RunOnUIThread.Execute(() =>
+            {
+                Content = null;
+            });
+
+            unloadedEvent.WaitOne();
+            IdleSynchronizer.Wait();
+
+            RunOnUIThread.Execute(() =>
+            {
+                Application.Current.Resources["RatingControlItemSpacing"] = 20.0;
+
+                var ratingControl = new RatingControl();
+
+                ratingControl.Loaded += (sender, e) =>
+                {
+                    Verify.IsGreaterThan(ratingControl.ActualWidth, previousWidth);
+                    previousWidth = ratingControl.ActualWidth;
+                    loadedEvent.Set();
+                };
+
+                ratingControl.Unloaded += (sender, e) => unloadedEvent.Set();
+
+                Content = ratingControl;
+            });
+
+            loadedEvent.WaitOne();
+            IdleSynchronizer.Wait();
+
+            RunOnUIThread.Execute(() =>
+            {
+                Content = null;
+            });
+
+            unloadedEvent.WaitOne();
+            IdleSynchronizer.Wait();
+
+            RunOnUIThread.Execute(() =>
+            {
+                Application.Current.Resources["RatingControlFontSizeForRendering"] = 48.0;
+                Application.Current.Resources.Remove("RatingControlItemSpacing");
+
+                var ratingControl = new RatingControl();
+
+                ratingControl.Loaded += (sender, e) =>
+                {
+                    Verify.IsGreaterThan(ratingControl.ActualWidth, originalWidth);
+                    Verify.IsGreaterThan(ratingControl.ActualWidth, previousWidth);
+                    previousWidth = ratingControl.ActualWidth;
+                    loadedEvent.Set();
+                };
+
+                ratingControl.Unloaded += (sender, e) => unloadedEvent.Set();
+
+                Content = ratingControl;
+            });
+
+            loadedEvent.WaitOne();
+            IdleSynchronizer.Wait();
+
+            RunOnUIThread.Execute(() =>
+            {
+                Content = null;
+            });
+
+            unloadedEvent.WaitOne();
+            IdleSynchronizer.Wait();
+
+            RunOnUIThread.Execute(() =>
+            {
+                Application.Current.Resources["RatingControlItemSpacing"] = 2.0;
+
+                var ratingControl = new RatingControl();
+
+                ratingControl.Loaded += (sender, e) =>
+                {
+                    Verify.IsLessThan(ratingControl.ActualWidth, previousWidth);
+                    loadedEvent.Set();
+                };
+
+                ratingControl.Unloaded += (sender, e) => unloadedEvent.Set();
+
+                Content = ratingControl;
+            });
+
+            loadedEvent.WaitOne();
+            IdleSynchronizer.Wait();
+
+            RunOnUIThread.Execute(() =>
+            {
+                Content = null;
+            });
+
+            unloadedEvent.WaitOne();
+            IdleSynchronizer.Wait();
+        }
     }
 }
diff --git a/src/controls/dev/RatingControl/RatingControl.cpp b/src/controls/dev/RatingControl/RatingControl.cpp
index 31bf10ac29..fce6b661ee 100644
--- a/src/controls/dev/RatingControl/RatingControl.cpp
+++ b/src/controls/dev/RatingControl/RatingControl.cpp
@@ -13,19 +13,19 @@
 
 const float c_horizontalScaleAnimationCenterPoint = 0.5f;
 const float c_verticalScaleAnimationCenterPoint = 0.8f;
-const winrt::Thickness c_focusVisualMargin = { -8, -7, -8, 0 };
-const int c_defaultRatingFontSizeForRendering = 32; // (32 = 2 * [default fontsize] -- because of double size rendering), remove when MSFT #10030063 is done
-const int c_defaultItemSpacing = 8;
+
+const float c_captionTopMarginSlope = 0.3f;
+const float c_captionTopMarginIntercept = -20.4f;
 
 const float c_mouseOverScale = 0.8f;
 const float c_touchOverScale = 1.0f;
 const float c_noPointerOverMagicNumber = -100;
 
-// 22 = 20(compensate for the -20 margin on StackPanel) + 2(magic number makes the text and star center-aligned)
-const float c_defaultCaptionTopMargin = 22;
-
 const int c_noValueSetSentinel = -1;
 
+const wchar_t c_fontSizeForRenderingKey[] = L"RatingControlFontSizeForRendering";
+const wchar_t c_itemSpacingKey[] = L"RatingControlItemSpacing";
+
 RatingControl::RatingControl()
 {
     __RP_Marker_ClassById(RuntimeProfiler::ProfId_RatingControl);
@@ -41,8 +41,10 @@ RatingControl::~RatingControl()
 
 float RatingControl::RenderingRatingFontSize()
 {
+    EnsureResourcesLoaded();
+
     // MSFT #10030063 Replacing with Rating size DPs
-    return (float)(c_defaultRatingFontSizeForRendering * GetUISettings().TextScaleFactor());
+    return (float)(m_fontSizeForRendering * GetUISettings().TextScaleFactor());
 }
 
 float RatingControl::ActualRatingFontSize()
@@ -53,26 +55,36 @@ float RatingControl::ActualRatingFontSize()
 // TODO MSFT #10030063: Convert to itemspacing DP
 double RatingControl::ItemSpacing()
 {
+    EnsureResourcesLoaded();
+
     // Stars are rendered 2x size and we use expression animation to shrink them down to desired size,
     // which will create those spacings (not system margin).
     // Since text scale factor won't affect system margins,
     // when stars get bigger, the spacing will become smaller.
     // Therefore we should include TextScaleFactor when calculating item spacing
     // in order to get correct total width and star center positions.
-    const double defaultFontSize = c_defaultRatingFontSizeForRendering / 2;
-    return c_defaultItemSpacing - (GetUISettings().TextScaleFactor() - 1.0) * defaultFontSize / 2;
+    const double defaultFontSize = m_fontSizeForRendering / 2;
+    return m_itemSpacing - (GetUISettings().TextScaleFactor() - 1.0) * defaultFontSize / 2;
 }
 
 void RatingControl::UpdateCaptionMargins()
 {
     // We manually set margins to caption text to make it center-aligned with the stars
-    // because star vertical center is 0.8 instead of the normal 0.5.
     // When text scale changes we need to update top margin to make the text follow start center.
     if (auto captionTextBlock = m_captionTextBlock.safe_get())
     {
+        double captionStackPanelTopMargin = 0;
+
+        if (auto captionStackPanel = m_captionStackPanel.safe_get())
+        {
+            captionStackPanelTopMargin = captionStackPanel.Margin().Top;
+        }
+
+        EnsureResourcesLoaded();
+
         double textScaleFactor = GetUISettings().TextScaleFactor();
         winrt::Thickness margin = captionTextBlock.Margin();
-        margin.Top = c_defaultCaptionTopMargin - (ActualRatingFontSize() * c_verticalScaleAnimationCenterPoint);
+        margin.Top = static_cast<double>(c_captionTopMarginSlope * RenderingRatingFontSize() + c_captionTopMarginIntercept - captionStackPanelTopMargin);
 
         captionTextBlock.Margin(margin);
     }
@@ -85,6 +97,11 @@ void RatingControl::OnApplyTemplate()
     // Retrieve pointers to stable controls 
     winrt::IControlProtected thisAsControlProtected = *this;
 
+    if (auto captionStackPanel = GetTemplateChildT<winrt::StackPanel>(L"CaptionStackPanel", thisAsControlProtected))
+    {
+        m_captionStackPanel.set(captionStackPanel);
+    }
+
     if (auto captionTextBlock = GetTemplateChildT<winrt::TextBlock>(L"Caption", thisAsControlProtected))
     {
         m_captionTextBlock.set(captionTextBlock);
@@ -112,14 +129,6 @@ void RatingControl::OnApplyTemplate()
     // using the A button before it actually receives key input from gamepad.
     FocusEngaged({ this, &RatingControl::OnFocusEngaged });
     FocusDisengaged({ this, &RatingControl::OnFocusDisengaged });
-    IsFocusEngagementEnabled(true);
-
-    // I've picked values so that these LOOK like the redlines, but these
-    // values are not actually from the redlines because the redlines don't
-    // consistently pick "distance from glyph"/"distance from edge of textbox"
-    // so it's not possible to actually just have a consistent sizing model
-    // here based on the redlines.
-    FocusVisualMargin(c_focusVisualMargin);
 
     IsEnabledChanged({ this, &RatingControl::OnIsEnabledChanged });
     m_fontFamilyChangedToken.value = RegisterPropertyChangedCallback(
@@ -268,7 +277,7 @@ void RatingControl::UpdateRatingItemsAppearance()
         {
             // Handle clips on stars
             float width = RenderingRatingFontSize();
-            if (i + 1 > value)
+            if (static_cast<double>(i) + 1 > value)
             {
                 if (i < value)
                 {
@@ -317,9 +326,9 @@ void RatingControl::ApplyScaleExpressionAnimation(const winrt::UIElement& uiElem
     uiElementVisual.StartAnimation(L"Scale.X", ea);
     uiElementVisual.StartAnimation(L"Scale.Y", ea);
 
-    // Star size = 16. 0.5 and 0.8 are just arbitrary center point chosen in design spec
-    // 32 = star size * 2 because of the rendering at double size we do
-    uiElementVisual.CenterPoint(winrt::float3(c_defaultRatingFontSizeForRendering * c_horizontalScaleAnimationCenterPoint, c_defaultRatingFontSizeForRendering * c_verticalScaleAnimationCenterPoint, 0.0f));
+    EnsureResourcesLoaded();
+
+    uiElementVisual.CenterPoint(winrt::float3(static_cast<float>(m_fontSizeForRendering * c_horizontalScaleAnimationCenterPoint), static_cast<float>(m_fontSizeForRendering * c_verticalScaleAnimationCenterPoint), 0.0f));
 }
 
 void RatingControl::PopulateStackPanelWithItems(wstring_view templateName, const winrt::StackPanel& stackPanel, RatingControlStates state)
@@ -327,6 +336,8 @@ void RatingControl::PopulateStackPanelWithItems(wstring_view templateName, const
     winrt::IInspectable lookup = winrt::Application::Current().Resources().Lookup(box_value(templateName));
     auto dt = lookup.as<winrt::DataTemplate>();
 
+    EnsureResourcesLoaded();
+
     for (int i = 0; i < MaxRating(); i++)
     {
         if (auto ui = dt.LoadContent().as<winrt::UIElement>())
@@ -336,6 +347,32 @@ void RatingControl::PopulateStackPanelWithItems(wstring_view templateName, const
             ApplyScaleExpressionAnimation(ui, i);
         }
     }
+
+    // If we have at least one item, we'll use the first item as a representative element to determine some values.
+    if (MaxRating() >= 1)
+    {
+        auto firstItem = stackPanel.Children().GetAt(0).as<winrt::UIElement>();
+        firstItem.Measure({ std::numeric_limits<float>::infinity(), std::numeric_limits<float>::infinity() });
+        auto defaultItemSpacing = firstItem.DesiredSize().Width - ActualRatingFontSize();
+
+        // We want the caption to be 12 pixels away from the right-hand side of the last item,
+        // so we'll give it a left margin that accounts for the built-in item spacing.
+        if (auto captionTextBlock = m_captionTextBlock.get())
+        {
+            auto margin = captionTextBlock.Margin();
+            margin.Left = 12 - defaultItemSpacing;
+            captionTextBlock.Margin(margin);
+        }
+
+        // If we have at least two items, we'll need to apply the item spacing.
+        // We'll calculate the default item spacing using the first item, and then
+        // subtract it from the desired item spacing to get the Spacing property
+        // to apply to the stack panel.
+        if (MaxRating() >= 2)
+        {
+            stackPanel.Spacing(ItemSpacing() - defaultItemSpacing);
+        }
+    }
 }
 
 void RatingControl::CustomizeRatingItem(const winrt::UIElement& ui, RatingControlStates type)
@@ -346,6 +383,7 @@ void RatingControl::CustomizeRatingItem(const winrt::UIElement& ui, RatingContro
         {
             textBlock.FontFamily(FontFamily());
             textBlock.Text(GetAppropriateGlyph(type));
+            textBlock.FontSize(m_fontSizeForRendering);
         }
     }
     else if (IsItemInfoPresentAndImageInfo())
@@ -362,6 +400,14 @@ void RatingControl::CustomizeRatingItem(const winrt::UIElement& ui, RatingContro
         MUX_FAIL_FAST_MSG("Runtime error, ItemInfo property is null");
     }
 
+    if (auto fe = ui.try_as<winrt::FrameworkElement>())
+    {
+        // The default top margin is -8, but we want to increase or decrease that so that the center of the stars stays in a consistent place.
+        // To do that, we'll add on half of the difference between the actual font size and its default value.
+        auto margin = fe.Margin();
+        margin.Top = -8 + (16 - ActualRatingFontSize());
+        fe.Margin(margin);
+    }
 }
 
 void RatingControl::CustomizeStackPanel(const winrt::StackPanel& stackPanel, RatingControlStates state)
@@ -754,13 +800,16 @@ void RatingControl::OnPointerMovedOverBackgroundStackPanel(const winrt::IInspect
 {
     if (!IsReadOnly())
     {
-        const auto point = args.GetCurrentPoint(m_backgroundStackPanel.get());
-        const float xPosition = point.Position().X;
+        if (auto backgroundStackPanel = m_backgroundStackPanel.get())
+        {
+            const auto point = args.GetCurrentPoint(backgroundStackPanel);
+            const float xPosition = point.Position().X;
 
-        m_mousePercentage = static_cast<double>(xPosition) / CalculateActualRatingWidth();
+            m_mousePercentage = static_cast<double>(xPosition - m_firstItemOffset) / CalculateActualRatingWidth();
 
-        UpdateRatingItemsAppearance();
-        args.Handled(true);
+            UpdateRatingItemsAppearance();
+            args.Handled(true);
+        }
     }
 }
 
@@ -769,6 +818,17 @@ void RatingControl::OnPointerEnteredBackgroundStackPanel(const winrt::IInspectab
     if (!IsReadOnly())
     {
         m_isPointerOver = true;
+
+        if (auto backgroundStackPanel = m_backgroundStackPanel.get())
+        {
+            if (MaxRating() >= 1)
+            {
+                auto firstItem = backgroundStackPanel.Children().GetAt(0).as<winrt::UIElement>();
+                auto firstItemOffsetPoint = firstItem.TransformToVisual(backgroundStackPanel).TransformPoint({ 0, 0 });
+                m_firstItemOffset = firstItemOffsetPoint.X;
+            }
+        }
+
         args.Handled(true);
     }
 }
@@ -871,7 +931,7 @@ double RatingControl::CalculateActualRatingWidth()
     // TODO: replace hardcoding
     // MSFT #10030063
     // (max rating * rating size) + ((max rating - 1) * item spacing)
-    return (MaxRating() * ActualRatingFontSize()) + ((MaxRating() - 1) * ItemSpacing());
+    return (static_cast<double>(MaxRating()) * ActualRatingFontSize()) + ((static_cast<double>(MaxRating()) - 1) * ItemSpacing());
 }
 
 // IControlOverrides
@@ -1148,3 +1208,40 @@ winrt::UISettings RatingControl::GetUISettings()
     static winrt::UISettings uiSettings = winrt::UISettings();
     return uiSettings;
 }
+
+void RatingControl::EnsureResourcesLoaded()
+{
+    if (!m_resourcesLoaded)
+    {
+        auto fontSizeForRenderingKey = box_value(c_fontSizeForRenderingKey);
+        auto itemSpacingKey = box_value(c_itemSpacingKey);
+
+        if (Resources().HasKey(fontSizeForRenderingKey))
+        {
+            m_fontSizeForRendering = unbox_value<double>(Resources().Lookup(fontSizeForRenderingKey));
+        }
+        else if (winrt::Application::Current().Resources().HasKey(fontSizeForRenderingKey))
+        {
+            m_fontSizeForRendering = unbox_value<double>(winrt::Application::Current().Resources().Lookup(fontSizeForRenderingKey));
+        }
+        else
+        {
+            m_fontSizeForRendering = c_defaultFontSizeForRendering;
+        }
+
+        if (Resources().HasKey(itemSpacingKey))
+        {
+            m_itemSpacing = unbox_value<double>(Resources().Lookup(itemSpacingKey));
+        }
+        else if (winrt::Application::Current().Resources().HasKey(itemSpacingKey))
+        {
+            m_itemSpacing = unbox_value<double>(winrt::Application::Current().Resources().Lookup(itemSpacingKey));
+        }
+        else
+        {
+            m_itemSpacing = c_defaultItemSpacing;
+        }
+
+        m_resourcesLoaded = true;
+    }
+}
diff --git a/src/controls/dev/RatingControl/RatingControl.h b/src/controls/dev/RatingControl/RatingControl.h
index fdf875ab5d..4391c0662c 100644
--- a/src/controls/dev/RatingControl/RatingControl.h
+++ b/src/controls/dev/RatingControl/RatingControl.h
@@ -127,7 +127,10 @@ class RatingControl :
     double ItemSpacing();
     void UpdateCaptionMargins();
 
+    void EnsureResourcesLoaded();
+
     // Private members
+    tracker_ref<winrt::StackPanel> m_captionStackPanel{ this };
     tracker_ref<winrt::TextBlock> m_captionTextBlock{ this };
 
     winrt::CompositionPropertySet m_sharedPointerPropertySet{ nullptr };
@@ -139,6 +142,7 @@ class RatingControl :
     bool m_isPointerDown{ false };
     bool m_hasPointerCapture{ false };
     double m_mousePercentage{ 0.0 };
+    double m_firstItemOffset{ 0.0 };
 
     RatingInfoType m_infoType{ RatingInfoType::Font };
 
@@ -162,4 +166,11 @@ class RatingControl :
     static winrt::UISettings GetUISettings();
 
     DispatcherHelper m_dispatcherHelper{ *this };
+
+    const double c_defaultFontSizeForRendering{ 32.0 };
+    const double c_defaultItemSpacing{ 8.0 };
+
+    bool m_resourcesLoaded{ false };
+    double m_fontSizeForRendering{ c_defaultFontSizeForRendering };
+    double m_itemSpacing{ c_defaultItemSpacing };
 };
diff --git a/src/controls/dev/RatingControl/RatingControl.xaml b/src/controls/dev/RatingControl/RatingControl.xaml
index 96e5dc4cef..eb61163e35 100644
--- a/src/controls/dev/RatingControl/RatingControl.xaml
+++ b/src/controls/dev/RatingControl/RatingControl.xaml
@@ -7,10 +7,17 @@
     <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
     <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
     <Setter Property="ItemInfo" Value="{ThemeResource MUX_RatingControlDefaultFontInfo}" />
+    <!-- I've picked values so that these LOOK like the redlines, but these
+         values are not actually from the redlines because the redlines don't
+         consistently pick "distance from glyph"/"distance from edge of textbox"
+         so it's not possible to actually just have a consistent sizing model
+         here based on the redlines. -->
+    <Setter Property="FocusVisualMargin" Value="-8,-7,-8,0" />
+    <Setter Property="IsFocusEngagementEnabled" Value="True" />
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="controls:RatingControl">
-          <Grid x:Name="LayoutRoot">
+          <Grid x:Name="LayoutRoot" Background="{TemplateBinding Background}">
             <VisualStateManager.VisualStateGroups>
               <VisualStateGroup x:Name="CommonStates">
                 <VisualState x:Name="Disabled">
@@ -45,9 +52,9 @@
                 </VisualState>
               </VisualStateGroup>
             </VisualStateManager.VisualStateGroups>
-            <StackPanel Orientation="Horizontal" Grid.Row="0" Margin="-20,-20,-20,-20">
+            <StackPanel x:Name="CaptionStackPanel" Orientation="Horizontal" Grid.Row="0" Margin="-20,-20,-20,-20">
               <StackPanel x:Name="RatingBackgroundStackPanel" Orientation="Horizontal" Background="Transparent" Margin="20,20,0,20" />
-              <TextBlock x:Name="Caption" Height="32" Margin="4,9,20,0" TextLineBounds="TrimToBaseline" Style="{ThemeResource CaptionTextBlockStyle}" Foreground="{ThemeResource RatingControlCaptionForeground}" VerticalAlignment="Center" IsHitTestVisible="False" AutomationProperties.AccessibilityView="Raw" AutomationProperties.Name="RatingCaption" Text="{TemplateBinding Caption}" />
+              <TextBlock x:Name="Caption" Height="32" Margin="4,9,20,0" TextLineBounds="TrimToBaseline" Style="{ThemeResource CaptionTextBlockStyle}" Foreground="{TemplateBinding Foreground}" VerticalAlignment="Center" IsHitTestVisible="False" AutomationProperties.AccessibilityView="Raw" AutomationProperties.Name="RatingCaption" Text="{TemplateBinding Caption}" />
               <!-- 4 = 8 item spacing +4 of magic redline spacing -8 to compensate for scale of the last RatingItem -->
               <!-- NB: The redlines say 8px, but it's really 12 px because:
                                 Designer note: The value between the last glyph and first text character is 12px.
@@ -65,4 +72,4 @@
       </Setter.Value>
     </Setter>
   </Style>
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/src/controls/dev/RatingControl/RatingControl_themeresources.xaml b/src/controls/dev/RatingControl/RatingControl_themeresources.xaml
index 72adbaf510..bf980521d4 100644
--- a/src/controls/dev/RatingControl/RatingControl_themeresources.xaml
+++ b/src/controls/dev/RatingControl/RatingControl_themeresources.xaml
@@ -35,13 +35,17 @@
       <controls:RatingItemFontInfo x:Key="MUX_RatingControlDefaultFontInfo" Glyph="&#xE735;" UnsetGlyph="&#xE734;" />
     </ResourceDictionary>
   </ResourceDictionary.ThemeDictionaries>
+  <!-- 32 = 2 * [default fontsize] - because of double size rendering, remove when MSFT #10030063 is done -->
+  <x:Double x:Key="RatingControlFontSizeForRendering">32</x:Double>
+  <x:Double x:Key="RatingControlItemSpacing">8</x:Double>
+  <x:Double x:Key="RatingControlCaptionTopMargin">2</x:Double>
   <DataTemplate x:Key="BackgroundGlyphDefaultTemplate">
     <!-- -8, -8 are to compensate for the default scale down, plus factoring in margins -->
-    <TextBlock Foreground="{ThemeResource RatingControlUnselectedForeground}" Margin="-8,-8,0,0" FontSize="32" Text="&#xE734;" AutomationProperties.AccessibilityView="Raw" FontFamily="{ThemeResource SymbolThemeFontFamily}" />
+    <TextBlock Foreground="{ThemeResource RatingControlUnselectedForeground}" Margin="-8,-8,0,0" FontSize="{StaticResource RatingControlFontSizeForRendering}" Text="&#xE734;" AutomationProperties.AccessibilityView="Raw" FontFamily="{ThemeResource SymbolThemeFontFamily}" />
   </DataTemplate>
   <DataTemplate x:Key="ForegroundGlyphDefaultTemplate">
     <!-- -8, -8 are to compensate for the default scale down, plus factoring in margins -->
-    <TextBlock Margin="-8,-8,0,0" FontSize="32" Text="&#xE735;" AutomationProperties.AccessibilityView="Raw" FontFamily="{ThemeResource SymbolThemeFontFamily}" />
+    <TextBlock Margin="-8,-8,0,0" FontSize="{StaticResource RatingControlFontSizeForRendering}" Text="&#xE735;" AutomationProperties.AccessibilityView="Raw" FontFamily="{ThemeResource SymbolThemeFontFamily}" />
   </DataTemplate>
   <DataTemplate x:Key="BackgroundImageDefaultTemplate">
     <Image Margin="-8,-8,0,0" AutomationProperties.AccessibilityView="Raw" />
@@ -49,4 +53,4 @@
   <DataTemplate x:Key="ForegroundImageDefaultTemplate">
     <Image Margin="-8,-8,0,0" AutomationProperties.AccessibilityView="Raw" />
   </DataTemplate>
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/src/controls/dev/RatingControl/TestUI/RatingControlPage.xaml b/src/controls/dev/RatingControl/TestUI/RatingControlPage.xaml
index f62c212985..30a6d628c8 100644
--- a/src/controls/dev/RatingControl/TestUI/RatingControlPage.xaml
+++ b/src/controls/dev/RatingControl/TestUI/RatingControlPage.xaml
@@ -213,6 +213,22 @@
                     </muxcontrols:RatingControl>
                     <TextBlock x:Name="PointerOverImageFallbackTextBlock" Text="^" AutomationProperties.AutomationId="PointerOverImageFallbackTextBlock"/>
                 </StackPanel>
+
+                <TextBlock Text="With resource overrides" />
+
+                <muxcontrols:RatingControl Value="3" Caption="RO1">
+                    <muxcontrols:RatingControl.Resources>
+                        <x:Double x:Key="RatingControlFontSizeForRendering">20</x:Double>
+                        <x:Double x:Key="RatingControlItemSpacing">20</x:Double>
+                    </muxcontrols:RatingControl.Resources>
+                </muxcontrols:RatingControl>
+
+                <muxcontrols:RatingControl Value="3" Caption="RO2">
+                    <muxcontrols:RatingControl.Resources>
+                        <x:Double x:Key="RatingControlFontSizeForRendering">48</x:Double>
+                        <x:Double x:Key="RatingControlItemSpacing">2</x:Double>
+                    </muxcontrols:RatingControl.Resources>
+                </muxcontrols:RatingControl>
             </StackPanel>
         </ScrollViewer>
     </StackPanel>
diff --git a/src/controls/dev/Repeater/APITests/EffectiveViewportScrollPresenterTests.cs b/src/controls/dev/Repeater/APITests/EffectiveViewportScrollPresenterTests.cs
index 43603eee24..78253b758a 100644
--- a/src/controls/dev/Repeater/APITests/EffectiveViewportScrollPresenterTests.cs
+++ b/src/controls/dev/Repeater/APITests/EffectiveViewportScrollPresenterTests.cs
@@ -372,7 +372,7 @@ public void CanBringIntoViewElements()
             viewChangedOffsets.Clear();
             Verify.IsTrue(indexRealized.WaitOne(DefaultWaitTimeInMS));
 
-            ValidateRealizedRange(repeater, 99, 106);
+            ValidateRealizedRange(repeater, 99, 107);
 
             RunOnUIThread.Execute(() =>
             {
@@ -424,7 +424,7 @@ public void CanBringIntoViewElements()
                 viewChangedOffsets.Clear();
             }
 
-            ValidateRealizedRange(repeater, 0, 6);
+            ValidateRealizedRange(repeater, 0, 7);
 
             RunOnUIThread.Execute(() =>
             {
@@ -445,7 +445,7 @@ public void CanBringIntoViewElements()
             IdleSynchronizer.Wait();
             Verify.IsTrue(indexRealized.WaitOne(DefaultWaitTimeInMS));
 
-            ValidateRealizedRange(repeater, 19, 26);
+            ValidateRealizedRange(repeater, 19, 27);
         }
 
         private void ValidateRealizedRange(
diff --git a/src/controls/dev/Repeater/APITests/EffectiveViewportScrollViewerTests.cs b/src/controls/dev/Repeater/APITests/EffectiveViewportScrollViewerTests.cs
index d642de9b02..8af0754e54 100644
--- a/src/controls/dev/Repeater/APITests/EffectiveViewportScrollViewerTests.cs
+++ b/src/controls/dev/Repeater/APITests/EffectiveViewportScrollViewerTests.cs
@@ -450,7 +450,7 @@ public void CanBringIntoViewElements()
             Verify.AreEqual(1, viewChangedOffsets.Count);
             viewChangedOffsets.Clear();
 
-            ValidateRealizedRange(repeater, 99, 106);
+            ValidateRealizedRange(repeater, 99, 107);
 
             RunOnUIThread.Execute(() =>
             {
@@ -483,7 +483,7 @@ public void CanBringIntoViewElements()
             Verify.IsTrue(viewChangeCompletedEvent.WaitOne(DefaultWaitTimeInMS));
             IdleSynchronizer.Wait();
             viewChangedOffsets.Clear();
-            ValidateRealizedRange(repeater, 0, 6);
+            ValidateRealizedRange(repeater, 0, 7);
 
             RunOnUIThread.Execute(() =>
             {
@@ -500,7 +500,7 @@ public void CanBringIntoViewElements()
 
             Verify.IsTrue(viewChangeCompletedEvent.WaitOne(DefaultWaitTimeInMS));
             IdleSynchronizer.Wait();
-            ValidateRealizedRange(repeater, 19, 26); 
+            ValidateRealizedRange(repeater, 19, 27); 
         }
 
         private void ValidateRealizedRange(
diff --git a/src/controls/dev/Repeater/APITests/FlowLayoutTests.cs b/src/controls/dev/Repeater/APITests/FlowLayoutTests.cs
index 28441301d3..a74210184f 100644
--- a/src/controls/dev/Repeater/APITests/FlowLayoutTests.cs
+++ b/src/controls/dev/Repeater/APITests/FlowLayoutTests.cs
@@ -174,7 +174,7 @@ public void ValidateResizingFirstItemResizesOtherItemsInGridLayout()
 
                             // Ensure width is not 100 before updating.
                             Verify.AreNotEqual(100, layoutBounds.Width);
-                            Verify.AreEqual(32, layoutBounds.Height);
+                            Verify.AreEqual(30, layoutBounds.Height);
                         }
 
                         // modify the first item's width, height, or both
@@ -1373,6 +1373,30 @@ public void ValidateGridLayoutWithSameOrientationAsScrolling()
             }
         }
 
+        // Make sure the UniformGridLayout handles infinite available measure size
+        // when items are sized and ItemsStretch is other than None.
+        [TestMethod]
+        public void VerifyUnconstrainedUniformGridLayout()
+        {
+            RunOnUIThread.Execute(() =>
+            {
+                var scrollViewer = XamlReader.Load(
+                    @"<ScrollViewer xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation'
+                        HorizontalScrollBarVisibility='Auto'>
+                        <LayoutPanel>
+                            <LayoutPanel.Layout>
+                                <UniformGridLayout ItemsStretch='Fill' MinItemWidth='100' MinItemHeight='100'/>
+                            </LayoutPanel.Layout>
+                            <Border/>
+                        </LayoutPanel>
+                    </ScrollViewer>") as ScrollViewer;
+
+                Content = scrollViewer;
+                scrollViewer.UpdateLayout();
+            });
+            IdleSynchronizer.Wait();
+        }
+
         [TestMethod]
         public void VerifyItemsGetFullSpaceInMajorDirectionWhenSmallerThanLineSize()
         {
@@ -1835,7 +1859,7 @@ private void ValidateDimensionForGridLayoutItemsIsBasedOnFirstItem(DimensionChoi
                         // Ensure bounds before updating.
                         Verify.AreNotEqual(100, layoutBounds.Width);
                         widthBeforeUpdate = layoutBounds.Width;
-                        Verify.AreEqual(32 /* itemHeight */, layoutBounds.Height);
+                        Verify.AreEqual(30 /* itemHeight */, layoutBounds.Height);
                     }
 
                     switch (dimension)
@@ -1844,7 +1868,7 @@ private void ValidateDimensionForGridLayoutItemsIsBasedOnFirstItem(DimensionChoi
                             ModifyElementSize(panel, 0 /*index*/, 100 /*itemWidth*/, Double.NaN /*itemHeight*/);
                             Content.InvalidateMeasure(); // Bug 16644056
                             Content.UpdateLayout();
-                            ValidateElementsSizeInGridLayout(panel, 100 /*itemWidth*/, 32 /*itemHeight*/);
+                            ValidateElementsSizeInGridLayout(panel, 100 /*itemWidth*/, 30 /*itemHeight*/);
                             break;
 
                         case DimensionChoice.Height:
@@ -1896,7 +1920,7 @@ private void ValidateAdaptabilityWhenChangingTheFirstElementForGridLayout(Dimens
                         // Ensure bounds before updating.
                         Verify.AreNotEqual(100, layoutBounds.Width);
                         widthBeforeUpdate = layoutBounds.Width;
-                        Verify.AreEqual(32 /* itemHeight */, layoutBounds.Height);
+                        Verify.AreEqual(30 /* itemHeight */, layoutBounds.Height);
                     }
 
                     switch (dimension)
@@ -1924,7 +1948,7 @@ private void ValidateAdaptabilityWhenChangingTheFirstElementForGridLayout(Dimens
                     switch (dimension)
                     {
                         case DimensionChoice.Width:
-                            ValidateElementsSizeInGridLayout(panel, 100 /*itemWidth*/, 32 /*itemHeight*/);
+                            ValidateElementsSizeInGridLayout(panel, 100 /*itemWidth*/, 30 /*itemHeight*/);
                             break;
 
                         case DimensionChoice.Height:
diff --git a/src/controls/dev/Repeater/APITests/LayoutTests.cs b/src/controls/dev/Repeater/APITests/LayoutTests.cs
index 81e5b0c9bb..e52c85313a 100644
--- a/src/controls/dev/Repeater/APITests/LayoutTests.cs
+++ b/src/controls/dev/Repeater/APITests/LayoutTests.cs
@@ -296,7 +296,7 @@ public void ValidateStackLayoutDisabledVirtualizationWithItemsRepeater()
             {
                 var repeater = new ItemsRepeater();
                 var stackLayout = new StackLayout();
-                stackLayout.DisableVirtualization = true;
+                stackLayout.IsVirtualizationEnabled = false;
                 repeater.Layout = stackLayout;
                 repeater.ItemsSource = Enumerable.Range(0, 10);
                 repeater.ItemTemplate = (DataTemplate)XamlReader.Load(
diff --git a/src/controls/dev/Repeater/BuildTreeScheduler.cpp b/src/controls/dev/Repeater/BuildTreeScheduler.cpp
index b1e3d31102..1bb6a6f7a9 100644
--- a/src/controls/dev/Repeater/BuildTreeScheduler.cpp
+++ b/src/controls/dev/Repeater/BuildTreeScheduler.cpp
@@ -6,6 +6,7 @@
 #include "QPCTimer.h"
 #include "BuildTreeScheduler.h"
 #include "RepeaterTestHooks.h"
+#include "MuxcTraceLogging.h"
 
 double BuildTreeScheduler::m_budgetInMs = 40.0;
 thread_local QPCTimer BuildTreeScheduler::m_timer{};
@@ -44,7 +45,11 @@ void BuildTreeScheduler::OnRendering(const winrt::IInspectable&, const winrt::II
 
     if (m_pendingWork.empty())
     {
-        // No more pending work, unhook from rendering event since being hooked up will case wux to try to 
+        TraceLoggingProviderWrite(
+            XamlTelemetryLogging, "BuildTreeScheduler_OutOfWork",
+            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
+        // No more pending work, unhook from rendering event since being hooked up will case wux to try to
         // call the event at 60 frames per second
         winrt::Microsoft::UI::Xaml::Media::CompositionTarget::CompositionTarget::Rendering(m_renderingToken);
         m_renderingToken.value = 0;
diff --git a/src/controls/dev/Repeater/FlowLayout.cpp b/src/controls/dev/Repeater/FlowLayout.cpp
index b5cc769b11..a64dfb2b4c 100644
--- a/src/controls/dev/Repeater/FlowLayout.cpp
+++ b/src/controls/dev/Repeater/FlowLayout.cpp
@@ -61,7 +61,7 @@ winrt::Size FlowLayout::MeasureOverride(
         LineSpacing(),
         std::numeric_limits<unsigned int>::max() /* maxItemsPerLine */,
         OrientationBasedMeasures::GetScrollOrientation(),
-        false /* disableVirtualization */,
+        true /* isVirtualizationEnabled */,
         LayoutId());
     return desiredSize;
 }
@@ -141,7 +141,7 @@ winrt::FlowLayoutAnchorInfo FlowLayout::GetAnchorForRealizationRect(
             MajorSize(realizationRect) > 0 &&
             DoesRealizationWindowOverlapExtent(realizationRect, MinorMajorRect(MinorStart(lastExtent), MajorStart(lastExtent), Minor(availableSize), static_cast<float>(extentMajorSize))))
         {
-            const double realizationWindowStartWithinExtent = MajorStart(realizationRect) - MajorStart(lastExtent);
+            const double realizationWindowStartWithinExtent = static_cast<double>(MajorStart(realizationRect)) - static_cast<double>(MajorStart(lastExtent));
             const int lineIndex = std::max(0, (int)(realizationWindowStartWithinExtent / averageLineSize));
             anchorIndex = (int)(lineIndex * averageItemsPerLine);
 
@@ -210,7 +210,7 @@ winrt::Rect FlowLayout::GetExtent(
             MajorStart(extent) = static_cast<float>(extentMajorStart);
             const int remainingItems = itemsCount - lastRealizedItemIndex - 1;
             const int remainingLinesAfterLast = static_cast<int>((remainingItems / averageItemsPerLine));
-            const double extentMajorSize = MajorEnd(lastRealizedLayoutBounds) - MajorStart(extent) + remainingLinesAfterLast * averageLineSize;
+            const double extentMajorSize = static_cast<double>(MajorEnd(lastRealizedLayoutBounds)) - static_cast<double>(MajorStart(extent)) + remainingLinesAfterLast * averageLineSize;
             MajorSize(extent) = static_cast<float>(extentMajorSize);
 
             // If the available size is infinite, we will have realized all the items in one line.
diff --git a/src/controls/dev/Repeater/FlowLayoutAlgorithm.cpp b/src/controls/dev/Repeater/FlowLayoutAlgorithm.cpp
index fc71d1ec02..59dc07abb4 100644
--- a/src/controls/dev/Repeater/FlowLayoutAlgorithm.cpp
+++ b/src/controls/dev/Repeater/FlowLayoutAlgorithm.cpp
@@ -6,6 +6,7 @@
 #include <ItemsRepeater.common.h>
 #include "FlowLayoutAlgorithm.h"
 #include "VirtualizingLayoutContext.h"
+#include "MuxcTraceLogging.h"
 
 void FlowLayoutAlgorithm::InitializeForContext(
     const winrt::VirtualizingLayoutContext& context,
@@ -35,7 +36,7 @@ winrt::Size FlowLayoutAlgorithm::Measure(
     double lineSpacing,
     unsigned int maxItemsPerLine,
     const ScrollOrientation& orientation,
-    const bool disableVirtualization,
+    const bool isVirtualizationEnabled,
     const wstring_view& layoutId)
 {
     SetScrollOrientation(orientation);
@@ -48,6 +49,15 @@ winrt::Size FlowLayoutAlgorithm::Measure(
         winrt::get_self<VirtualizingLayoutContext>(context)->Indent(), layoutId.data(),
         L"MeasureLayout Realization:", realizationRect.X, realizationRect.Y, realizationRect.Width, realizationRect.Height);
 
+    TraceLoggingProviderWrite(
+        XamlTelemetryLogging, "FlowLayoutAlgorithm_Measure",
+        TraceLoggingWideString(layoutId.data(), "LayoutId"),
+        TraceLoggingFloat32(realizationRect.X, "X"),
+        TraceLoggingFloat32(realizationRect.Y, "Y"),
+        TraceLoggingFloat32(realizationRect.Width, "Width"),
+        TraceLoggingFloat32(realizationRect.Height, "Height"),
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
     const auto suggestedAnchorIndex = m_context.get().RecommendedAnchorIndex();
     if (m_elementManager.IsIndexValidInData(suggestedAnchorIndex))
     {
@@ -58,14 +68,14 @@ winrt::Size FlowLayoutAlgorithm::Measure(
         }
     }
 
-    if(!disableVirtualization)
+    if(isVirtualizationEnabled)
     {
         m_elementManager.OnBeginMeasure(orientation);
     }
 
-    const int anchorIndex = GetAnchorIndex(availableSize, isWrapping, minItemSpacing, disableVirtualization, layoutId);
-    Generate(GenerateDirection::Forward, anchorIndex, availableSize, minItemSpacing, lineSpacing, maxItemsPerLine, disableVirtualization, layoutId);
-    Generate(GenerateDirection::Backward, anchorIndex, availableSize, minItemSpacing, lineSpacing, maxItemsPerLine, disableVirtualization, layoutId);
+    const int anchorIndex = GetAnchorIndex(availableSize, isWrapping, minItemSpacing, isVirtualizationEnabled, layoutId);
+    Generate(GenerateDirection::Forward, anchorIndex, availableSize, minItemSpacing, lineSpacing, maxItemsPerLine, isVirtualizationEnabled, layoutId);
+    Generate(GenerateDirection::Backward, anchorIndex, availableSize, minItemSpacing, lineSpacing, maxItemsPerLine, isVirtualizationEnabled, layoutId);
     if (isWrapping && IsReflowRequired())
     {
         ITEMSREPEATER_TRACE_INFO_DBG(nullptr, TRACE_MSG_METH_IND_STR_STR, METH_NAME, this,
@@ -74,7 +84,7 @@ winrt::Size FlowLayoutAlgorithm::Measure(
         const auto firstElementBounds = m_elementManager.GetLayoutBoundsForRealizedIndex(0);
         MinorStart(firstElementBounds) = 0;
         m_elementManager.SetLayoutBoundsForRealizedIndex(0, firstElementBounds);
-        Generate(GenerateDirection::Forward, 0 /*anchorIndex*/, availableSize, minItemSpacing, lineSpacing, maxItemsPerLine, disableVirtualization, layoutId);
+        Generate(GenerateDirection::Forward, 0 /*anchorIndex*/, availableSize, minItemSpacing, lineSpacing, maxItemsPerLine, isVirtualizationEnabled, layoutId);
     }
 
     RaiseLineArranged();
@@ -154,14 +164,14 @@ int FlowLayoutAlgorithm::GetAnchorIndex(
     const winrt::Size& availableSize,
     bool isWrapping,
     double minItemSpacing,
-    const bool disableVirtualization,
+    const bool isVirtualizationEnabled,
     const wstring_view& layoutId)
 {
     int anchorIndex = -1;
     winrt::Point anchorPosition{};
     auto context = m_context.get();
 
-    if (!IsVirtualizingContext() || disableVirtualization)
+    if (!IsVirtualizingContext() || !isVirtualizationEnabled)
     {
         // Non virtualizing host, start generating from the element 0
         anchorIndex = context.ItemCountCore() > 0 ? 0 : -1;
@@ -312,7 +322,7 @@ void FlowLayoutAlgorithm::Generate(
     double minItemSpacing,
     double lineSpacing,
     unsigned int maxItemsPerLine,
-    const bool disableVirtualization,
+    const bool isVirtualizationEnabled,
     const wstring_view& layoutId)
 {
     if (anchorIndex != -1)
@@ -320,10 +330,17 @@ void FlowLayoutAlgorithm::Generate(
         const int step = (direction == GenerateDirection::Forward) ? 1 : -1;
 
         ITEMSREPEATER_TRACE_VERBOSE_DBG(nullptr, TRACE_MSG_METH_IND_STR_STR_INT, METH_NAME, this,
-            winrt::get_self<VirtualizingLayoutContext>(m_context.get())->Indent(), layoutId.data(),            
+            winrt::get_self<VirtualizingLayoutContext>(m_context.get())->Indent(), layoutId.data(),
             direction == GenerateDirection::Forward ? L"Generating forward from anchor:" : L"Generating backward from anchor:",
             anchorIndex);
 
+        TraceLoggingProviderWrite(
+            XamlTelemetryLogging, "FlowLayoutAlgorithm_Generate",
+            TraceLoggingWideString(layoutId.data(), "LayoutId"),
+            TraceLoggingWideString(direction == GenerateDirection::Forward ? L"Forward" : L"Backward", "Direction"),
+            TraceLoggingInt32(anchorIndex, "Anchor"),
+            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
         int previousIndex = anchorIndex;
         int currentIndex = anchorIndex + step;
         const auto anchorBounds = m_elementManager.GetLayoutBoundsForDataIndex(anchorIndex);
@@ -333,7 +350,7 @@ void FlowLayoutAlgorithm::Generate(
         bool lineNeedsReposition = false;
 
         while (m_elementManager.IsIndexValidInData(currentIndex) &&
-              (disableVirtualization || ShouldContinueFillingUpSpace(previousIndex, direction)))
+              (!isVirtualizationEnabled || ShouldContinueFillingUpSpace(previousIndex, direction)))
         {
             // Ensure layout element.
             m_elementManager.EnsureElementRealized(direction == GenerateDirection::Forward, currentIndex, layoutId);
@@ -345,9 +362,23 @@ void FlowLayoutAlgorithm::Generate(
             const winrt::Rect currentBounds = winrt::Rect{ 0, 0, desiredSize.Width, desiredSize.Height };
             const auto previousElementBounds = m_elementManager.GetLayoutBoundsForDataIndex(previousIndex);
 
+            TraceLoggingProviderWrite(
+                XamlTelemetryLogging, "FlowLayoutAlgorithm_Generate_CurrentBounds",
+                TraceLoggingWideString(layoutId.data(), "LayoutId"),
+                TraceLoggingInt32(currentIndex, "CurrentIndex"),
+                TraceLoggingFloat32(currentBounds.X, "X"),
+                TraceLoggingFloat32(currentBounds.Y, "Y"),
+                TraceLoggingFloat32(currentBounds.Width, "Width"),
+                TraceLoggingFloat32(currentBounds.Height, "Height"),
+                TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
             if (direction == GenerateDirection::Forward)
             {
-                const double remainingSpace = Minor(availableSize) - (MinorStart(previousElementBounds) + MinorSize(previousElementBounds) + minItemSpacing + Minor(desiredSize));
+                const double remainingSpace = static_cast<double>(Minor(availableSize)) -
+                                              (static_cast<double>(MinorStart(previousElementBounds)) +
+                                               static_cast<double>(MinorSize(previousElementBounds)) +
+                                               minItemSpacing +
+                                               static_cast<double>(Minor(desiredSize)));
                 if (countInLine >= maxItemsPerLine || m_algorithmCallbacks->Algorithm_ShouldBreakLine(currentIndex, remainingSpace))
                 {
                     // No more space in this row. wrap to next row.
@@ -385,7 +416,7 @@ void FlowLayoutAlgorithm::Generate(
             else
             {
                 // Backward
-                const double remainingSpace = MinorStart(previousElementBounds) - (Minor(desiredSize) + static_cast<float>(minItemSpacing));
+                const double remainingSpace = MinorStart(previousElementBounds) - (Minor(desiredSize) + minItemSpacing);
                 if (countInLine >= maxItemsPerLine || m_algorithmCallbacks->Algorithm_ShouldBreakLine(currentIndex, remainingSpace))
                 {
                     // Does not fit, wrap to the previous row
diff --git a/src/controls/dev/Repeater/FlowLayoutAlgorithm.h b/src/controls/dev/Repeater/FlowLayoutAlgorithm.h
index 9bc1f0cd3a..edc869c22b 100644
--- a/src/controls/dev/Repeater/FlowLayoutAlgorithm.h
+++ b/src/controls/dev/Repeater/FlowLayoutAlgorithm.h
@@ -41,7 +41,7 @@ class FlowLayoutAlgorithm : OrientationBasedMeasures
         double lineSpacing,
         unsigned int maxItemsPerLine,
         const ScrollOrientation& orientation,
-        const bool disableVirtualization,
+        const bool isVirtualizationEnabled,
         const wstring_view& layoutId);
     winrt::Size Arrange(
         const winrt::Size& finalSize,
@@ -76,7 +76,7 @@ class FlowLayoutAlgorithm : OrientationBasedMeasures
         const winrt::Size& availableSize,
         bool isWrapping,
         double minItemSpacing,
-        const bool disableVirtualization,
+        const bool isVirtualizationEnabled,
         const wstring_view& layoutId);
     void Generate(
         GenerateDirection direction,
@@ -85,7 +85,7 @@ class FlowLayoutAlgorithm : OrientationBasedMeasures
         double minItemSpacing,
         double lineSpacing,
         unsigned int maxItemsPerLine,
-        const bool disableVirtualization,
+        const bool isVirtualizationEnabled,
         const wstring_view& layoutId);
     void MakeAnchor(
         const winrt::VirtualizingLayoutContext& context,
diff --git a/src/controls/dev/Repeater/ItemCollectionTransitionProvider.cpp b/src/controls/dev/Repeater/ItemCollectionTransitionProvider.cpp
index f92f303b92..e510308b04 100644
--- a/src/controls/dev/Repeater/ItemCollectionTransitionProvider.cpp
+++ b/src/controls/dev/Repeater/ItemCollectionTransitionProvider.cpp
@@ -10,22 +10,61 @@
 
 #pragma region IItemCollectionTransitionProvider
 
+ItemCollectionTransitionProvider::~ItemCollectionTransitionProvider()
+{
+    for (auto const& keepAliveTimerBatchPair : m_keepAliveTimersMap)
+    {
+        if (auto const& keepAliveTimer = keepAliveTimerBatchPair.first)
+        {
+            keepAliveTimer.Stop();
+        }
+    }
+}
+
 void ItemCollectionTransitionProvider::QueueTransition(winrt::ItemCollectionTransition const& transition)
 {
+    // When usesNewTransitionsBatch remains 'false', the provided transition is added to the current batch
+    // identified by the current m_transitionsBatch value.
+    bool usesNewTransitionsBatch = false;
+
+    if (!m_rendering)
+    {
+        // This marks the beginning of a new batch of transitions.
+        usesNewTransitionsBatch = true;
+        // The batch gets a new id.
+        m_transitionsBatch++;
+        m_rendering = winrt::CompositionTarget::Rendering(winrt::auto_revoke, { this, &ItemCollectionTransitionProvider::OnRendering });
+    }
+
     // We'll animate if animations are enabled and the transition provider has indicated we should animate this transition.
     if (SharedHelpers::IsAnimationsEnabled() && ShouldAnimate(transition))
     {
-        m_transitionsWithAnimations.Append(transition);
+        if (usesNewTransitionsBatch)
+        {
+            // Allocating a new array of ItemCollectionTransition with animations for this new batch.
+            const auto batchTransitionsPair = std::make_pair(m_transitionsBatch, winrt::single_threaded_vector<winrt::ItemCollectionTransition>());
+
+            m_transitionsWithAnimationsMap.insert(batchTransitionsPair);
+        }
+
+        const auto transitionsWithAnimations = m_transitionsWithAnimationsMap[m_transitionsBatch];
+
+        transitionsWithAnimations.Append(transition);
     }
 
     // To ensure proper VirtualizationInfo ordering, we still need to raise TransitionCompleted in a
     // CompositionTarget.Rendering handler, even if we aren't going to animate anything for this transition.
-    m_transitions.Append(transition);
-
-    if (!m_rendering)
+    if (usesNewTransitionsBatch)
     {
-        m_rendering = winrt::CompositionTarget::Rendering(winrt::auto_revoke, { this, &ItemCollectionTransitionProvider::OnRendering });
+        // Allocating a new array of ItemCollectionTransition for this new batch.
+        const auto batchTransitionsPair = std::make_pair(m_transitionsBatch, winrt::single_threaded_vector<winrt::ItemCollectionTransition>());
+
+        m_transitionsMap.insert(batchTransitionsPair);
     }
+
+    const auto transitions = m_transitionsMap[m_transitionsBatch];
+
+    transitions.Append(transition);
 }
 
 bool ItemCollectionTransitionProvider::ShouldAnimate(winrt::ItemCollectionTransition const& transition)
@@ -54,30 +93,104 @@ void ItemCollectionTransitionProvider::NotifyTransitionCompleted(winrt::ItemColl
     m_transitionCompletedEventSource(*this, winrt::make<ItemCollectionTransitionCompletedEventArgs>(transition));
 }
 
+void ItemCollectionTransitionProvider::CleanTransitionsBatch()
+{
+    // Called when none of a batch's transitions required a timer to keep them alive.
+    // No completion notification is expected and all transitions can be released.
+    m_transitionsWithAnimationsMap.erase(m_transitionsBatch);
+    m_transitionsMap.erase(m_transitionsBatch);
+}
+
+void ItemCollectionTransitionProvider::OnKeepAliveTimerTick(winrt::IInspectable const& sender, winrt::IInspectable const& /*args*/)
+{
+    // By the time this timer expires, all transitions associated with it are considered completed and they no longer need to be kept alive for
+    // ItemCollectionTransitionProgress::Complete() to successfully trigger a ItemCollectionTransitionProvider::NotifyTransitionCompleted call.
+    const auto keepAliveTimer = sender.try_as<winrt::DispatcherTimer>();
+
+    if (keepAliveTimer)
+    {
+        // The timer is stopped, all its associated transitions are released and so is the timer itself.
+        keepAliveTimer.Stop();
+
+        const auto keepAliveTimersIterator = m_keepAliveTimersMap.find(keepAliveTimer);
+
+        if (keepAliveTimersIterator == m_keepAliveTimersMap.end())
+        {
+            return;
+        }
+
+        const auto transitionsBatch = keepAliveTimersIterator->second;
+
+        m_transitionsWithAnimationsMap.erase(transitionsBatch);
+        m_transitionsMap.erase(transitionsBatch);
+
+        m_keepAliveTimersMap.erase(keepAliveTimersIterator);
+    }
+}
+
 void ItemCollectionTransitionProvider::OnRendering(winrt::IInspectable const& /*sender*/, winrt::IInspectable const& /*args*/)
 {
     m_rendering.revoke();
 
-    auto resetState = gsl::finally([this]()
+    bool keepAliveTimerRequired = false;
+
+    auto scopeGuard = gsl::finally([this, &keepAliveTimerRequired]()
     {
-        ResetState();
+        if (keepAliveTimerRequired)
+        {
+            // At least one transition in the batch requires a new 'keep alive' timer.
+            StartNewKeepAliveTimer();
+        }
+        else
+        {
+            // None of the transitions in the batch requires a 'keep alive' timer. Simply discard them all.
+            CleanTransitionsBatch();
+        }
     });
 
-    overridable().StartTransitions(m_transitionsWithAnimations);
+    const auto transitionsWithAnimations = m_transitionsWithAnimationsMap[m_transitionsBatch];
+
+    if (transitionsWithAnimations)
+    {
+        overridable().StartTransitions(transitionsWithAnimations);
+    }
 
     // We'll automatically raise TransitionCompleted on all of the transitions that were not actually animated
     // in order to guarantee that every transition queued receives a corresponding TransitionCompleted event.
-    for (auto const& transition : m_transitions)
+    const auto transitions = m_transitionsMap[m_transitionsBatch];
+
+    if (transitions)
     {
-        if (!transition.HasStarted())
+        for (auto const& transition : transitions)
         {
-            NotifyTransitionCompleted(transition);
+            if (transition.HasStarted())
+            {
+                keepAliveTimerRequired = true;
+            }
+            else
+            {
+                NotifyTransitionCompleted(transition);
+            }
         }
     }
 }
 
-void ItemCollectionTransitionProvider::ResetState()
+void ItemCollectionTransitionProvider::StartNewKeepAliveTimer()
 {
-    m_transitionsWithAnimations.Clear();
-    m_transitions.Clear();
+    // This timer delays the release of the batch's transitions so that ItemCollectionTransitionProgress::Complete()
+    // which uses transition weak references is able to trigger an ItemCollectionTransitionProvider::NotifyTransitionCompleted
+    // call for completion. This is important for TransitionManager::OnTransitionProviderTransitionCompleted to be able to
+    // update the ItemsRepeater's items ownership.
+    MUX_ASSERT(m_transitionsMap[m_transitionsBatch].Size() > 0);
+
+    auto timerDuration = 5s;
+    const auto keepAliveTimer = winrt::DispatcherTimer();
+
+    keepAliveTimer.Interval(winrt::TimeSpan::duration(timerDuration));
+    keepAliveTimer.Tick({ this, &ItemCollectionTransitionProvider::OnKeepAliveTimerTick });
+    keepAliveTimer.Start();
+
+    const auto keepAliveTimerBatchPair = std::make_pair(keepAliveTimer, m_transitionsBatch);
+
+    m_keepAliveTimersMap.insert(keepAliveTimerBatchPair);
 }
diff --git a/src/controls/dev/Repeater/ItemCollectionTransitionProvider.h b/src/controls/dev/Repeater/ItemCollectionTransitionProvider.h
index 269adb5181..f52aff1de4 100644
--- a/src/controls/dev/Repeater/ItemCollectionTransitionProvider.h
+++ b/src/controls/dev/Repeater/ItemCollectionTransitionProvider.h
@@ -16,6 +16,8 @@ class ItemCollectionTransitionProvider :
     public ItemCollectionTransitionProviderProperties
 {    
 public:
+    ~ItemCollectionTransitionProvider();
+
 #pragma region IItemCollectionTransitionProvider
 
     void QueueTransition(winrt::ItemCollectionTransition const& transition);
@@ -33,10 +35,14 @@ class ItemCollectionTransitionProvider :
     void NotifyTransitionCompleted(winrt::ItemCollectionTransition const& transition);
 
 private:
+    void CleanTransitionsBatch();
+    void OnKeepAliveTimerTick(const winrt::IInspectable& sender, const winrt::IInspectable& args);
     void OnRendering(const winrt::IInspectable& sender, const winrt::IInspectable& args);
-    void ResetState();
+    void StartNewKeepAliveTimer();
 
-    winrt::IVector<winrt::ItemCollectionTransition> m_transitions{ winrt::single_threaded_vector<winrt::ItemCollectionTransition>() };
-    winrt::IVector<winrt::ItemCollectionTransition> m_transitionsWithAnimations{ winrt::single_threaded_vector<winrt::ItemCollectionTransition>() };
+    uint32_t m_transitionsBatch{};
+    std::map<winrt::DispatcherTimer, uint32_t> m_keepAliveTimersMap;
+    std::map<uint32_t, winrt::IVector<winrt::ItemCollectionTransition>> m_transitionsMap;
+    std::map<uint32_t, winrt::IVector<winrt::ItemCollectionTransition>> m_transitionsWithAnimationsMap;
     winrt::CompositionTarget::Rendering_revoker m_rendering{};
 };
diff --git a/src/controls/dev/Repeater/ItemsRepeater.cpp b/src/controls/dev/Repeater/ItemsRepeater.cpp
index f02844dd8a..176aa5e9db 100644
--- a/src/controls/dev/Repeater/ItemsRepeater.cpp
+++ b/src/controls/dev/Repeater/ItemsRepeater.cpp
@@ -494,10 +494,12 @@ void ItemsRepeater::OnLoaded(const winrt::IInspectable& /*sender*/, const winrt:
 {
     // If we skipped an unload event, reset the scrollers now and invalidate measure so that we get a new
     // layout pass during which we will hookup new scrollers.
+    // The potential cache buffer is also reset so that the realization window regrows from scratch.
     if (_loadedCounter > _unloadedCounter)
     {
         InvalidateMeasure();
         m_viewportManager->ResetScrollers();
+        m_viewportManager->ResetLayoutRealizationWindowCacheBuffer();
     }
     ++_loadedCounter;
 }
@@ -508,9 +510,11 @@ void ItemsRepeater::OnUnloaded(const winrt::IInspectable& /*sender*/, const winr
 
     ++_unloadedCounter;
     // Only reset the scrollers if this unload event is in-sync.
+    // The potential cache buffer is also reset so that the realization window regrows from scratch.
     if (_unloadedCounter == _loadedCounter)
     {
         m_viewportManager->ResetScrollers();
+        m_viewportManager->ResetLayoutRealizationWindowCacheBuffer();
     }
 }
 
@@ -559,6 +563,9 @@ void ItemsRepeater::OnDataSourcePropertyChanged(const winrt::ItemsSourceView& ol
 
         if (auto const virtualLayout = layout.try_as<winrt::VirtualizingLayout>())
         {
+            // After a data source change, reset the potential cache buffer so that the realization window regrows from scratch.
+            m_viewportManager->ResetLayoutRealizationWindowCacheBuffer();
+
             virtualLayout.OnItemsChangedCore(GetLayoutContext(), newValue, args);
         }
         else if (auto const nonVirtualLayout = layout.try_as<winrt::NonVirtualizingLayout>())
diff --git a/src/controls/dev/Repeater/ItemsRepeater.idl b/src/controls/dev/Repeater/ItemsRepeater.idl
index bee57befce..71c9a33acb 100644
--- a/src/controls/dev/Repeater/ItemsRepeater.idl
+++ b/src/controls/dev/Repeater/ItemsRepeater.idl
@@ -487,8 +487,9 @@ unsealed runtimeclass StackLayout : VirtualizingLayout
 
     [MUX_PREVIEW]
     {
-        Boolean DisableVirtualization{ get; set; };
-        static Microsoft.UI.Xaml.DependencyProperty DisableVirtualizationProperty{ get; };
+        [MUX_DEFAULT_VALUE("true")]
+        Boolean IsVirtualizationEnabled{ get; set; };
+        static Microsoft.UI.Xaml.DependencyProperty IsVirtualizationEnabledProperty{ get; };
     }
 
    // Removing until we are ready to expose.
diff --git a/src/controls/dev/Repeater/LinedFlowLayout.cpp b/src/controls/dev/Repeater/LinedFlowLayout.cpp
index 628867a5ad..bbcf439928 100644
--- a/src/controls/dev/Repeater/LinedFlowLayout.cpp
+++ b/src/controls/dev/Repeater/LinedFlowLayout.cpp
@@ -451,7 +451,7 @@ winrt::Size LinedFlowLayout::MeasureOverride(
 #endif
         }
 
-        linesSpacing = (lineCount - 1) * LineSpacing();
+        linesSpacing = (static_cast<double>(lineCount) - 1) * LineSpacing();
 
         if (m_isVirtualizingContext && m_itemsInfoFirstIndex == -1 && m_aspectRatios != nullptr)
         {
@@ -648,7 +648,7 @@ void LinedFlowLayout::ArrangeConstrainedLines(
         float itemSpacing = minItemSpacing;
         const int lineItemsCount = m_lineItemCounts[sizedLineVectorIndex];
         const float lineArrangeWidth = GetItemsRangeArrangeWidth(sizedItemIndex /*beginSizedItemIndex*/, sizedItemIndex + lineItemsCount - 1 /*endSizedItemIndex*/, usesArrangeWidthInfo);
-        const double lineExtraAvailableWidth = m_previousAvailableWidth - lineArrangeWidth - itemSpacing * (lineItemsCount - 1);
+        const double lineExtraAvailableWidth = static_cast<double>(m_previousAvailableWidth) - lineArrangeWidth - itemSpacing * (static_cast<double>(lineItemsCount) - 1);
 
 #ifdef DBG
         float cumulatedWidthDbg = 0.0;
@@ -678,7 +678,7 @@ void LinedFlowLayout::ArrangeConstrainedLines(
 #endif
                     break;
                 case winrt::LinedFlowLayoutItemsJustification::SpaceEvenly:
-                    cumulatedOffset = static_cast<float>(lineExtraAvailableWidth / (lineItemsCount + 1));
+                    cumulatedOffset = static_cast<float>(lineExtraAvailableWidth / (static_cast<double>(lineItemsCount) + 1));
                     itemSpacing += cumulatedOffset;
 #ifdef DBG
                     cumulatedWidthDbg = 2.0f * cumulatedOffset;
@@ -694,7 +694,7 @@ void LinedFlowLayout::ArrangeConstrainedLines(
                 case winrt::LinedFlowLayoutItemsJustification::SpaceBetween:
                     if (lineItemsCount > 1)
                     {
-                        itemSpacing += static_cast<float>(lineExtraAvailableWidth / (lineItemsCount - 1));
+                        itemSpacing += static_cast<float>(lineExtraAvailableWidth / (static_cast<double>(lineItemsCount) - 1));
                     }
                     break;
                 }
@@ -705,7 +705,7 @@ void LinedFlowLayout::ArrangeConstrainedLines(
                 {
                     // Because of pixel snapping based on m_roundingScaleFactor, lineExtraAvailableWidth can be slightly different from 0.0.
                     // In that case we adjust the minItemSpacing by distributing the small delta equally.
-                    itemSpacing += static_cast<float>(lineExtraAvailableWidth / (lineItemsCount - 1));
+                    itemSpacing += static_cast<float>(lineExtraAvailableWidth / (static_cast<double>(lineItemsCount) - 1));
                 }
 #ifdef DBG
                 else
@@ -734,7 +734,7 @@ void LinedFlowLayout::ArrangeConstrainedLines(
                 }
 #endif
 
-                itemSpacing += static_cast<float>(lineExtraAvailableWidth / (lineItemsCount - 1));
+                itemSpacing += static_cast<float>(lineExtraAvailableWidth / (static_cast<double>(lineItemsCount) - 1));
             }
 #ifdef DBG
             else
@@ -761,7 +761,7 @@ void LinedFlowLayout::ArrangeConstrainedLines(
                     {
                         // Use the item info provided by the ItemsInfoRequested handler since the DesiredSize
                         // may be different from the computed arrange width when the item content failed to load properly.
-                        arrangeWidth = m_itemsInfoArrangeWidths[sizedItemIndex - itemsInfoArrangeWidthsOffset];
+                        arrangeWidth = m_itemsInfoArrangeWidths[static_cast<size_t>(sizedItemIndex) - itemsInfoArrangeWidthsOffset];
                     }
                     else
                     {
@@ -1386,11 +1386,11 @@ bool LinedFlowLayout::ComputeFrozenItemsRange(
 
     // Frozen lines before the first displayed line use 80% of a scroll viewport or 40% of the sized area whichever is largest.
     int nearFrozenLinesCount = std::min(static_cast<int>(c_frozenLinesRatio * linesPerScrollViewport) + 1, firstDisplayedLineIndex - m_firstSizedLineIndex);
-    nearFrozenLinesCount = std::max(nearFrozenLinesCount, static_cast<int>(c_frozenLinesRatio / 2.0 * (firstDisplayedLineIndex - m_firstSizedLineIndex)));
+    nearFrozenLinesCount = std::max(nearFrozenLinesCount, static_cast<int>(c_frozenLinesRatio / 2.0 * (static_cast<double>(firstDisplayedLineIndex) - m_firstSizedLineIndex)));
 
     // Frozen lines after the last displayed line use 80% of a scroll viewport or 40% of the sized area whichever is largest.
     int farFrozenLinesCount = std::min(static_cast<int>(c_frozenLinesRatio * linesPerScrollViewport) + 1, m_lastSizedLineIndex - lastDisplayedLineIndex);
-    farFrozenLinesCount = std::max(farFrozenLinesCount, static_cast<int>(c_frozenLinesRatio / 2.0 * (m_lastSizedLineIndex - lastDisplayedLineIndex)));
+    farFrozenLinesCount = std::max(farFrozenLinesCount, static_cast<int>(c_frozenLinesRatio / 2.0 * (static_cast<double>(m_lastSizedLineIndex) - lastDisplayedLineIndex)));
     
     m_firstFrozenLineIndex = firstDisplayedLineIndex - nearFrozenLinesCount;
     m_lastFrozenLineIndex = lastDisplayedLineIndex + farFrozenLinesCount;
@@ -1548,7 +1548,7 @@ void LinedFlowLayout::ComputeItemsLayoutDrawback(
     // The last line does not participate in the grading if it's smaller than the available width, whether ItemsStretch is Fill or not.
     if (!isLastSizedLineStretchEnabled) 
     {
-        const double lineWidthDelta = itemsLayout.m_lineItemWidths[sizedLineCount - 1] - availableWidth;
+        const double lineWidthDelta = itemsLayout.m_lineItemWidths[static_cast<size_t>(sizedLineCount) - 1] - availableWidth;
 
         if (lineWidthDelta > 0.0)
         {
@@ -1602,7 +1602,7 @@ void LinedFlowLayout::ComputeItemsLayoutWithLockedItems(
     {
         MUX_ASSERT(itemsLayout.m_lineItemCounts[lineVectorIndex] > 0);
 
-        m_lineItemCounts[beginLineVectorIndex + lineVectorIndex] = itemsLayout.m_lineItemCounts[lineVectorIndex];
+        m_lineItemCounts[static_cast<size_t>(beginLineVectorIndex) + lineVectorIndex] = itemsLayout.m_lineItemCounts[lineVectorIndex];
     }
 
     const bool itemsAreStretched = ItemsStretch() == winrt::LinedFlowLayoutItemsStretch::Fill;
@@ -1612,7 +1612,7 @@ void LinedFlowLayout::ComputeItemsLayoutWithLockedItems(
     {
         const int lineItemsCount = itemsLayout.m_lineItemCounts[lineVectorIndex];
         const double lineItemsWidth = itemsLayout.m_lineItemWidths[lineVectorIndex];
-        const double minItemSpacings = lineItemsCount > 1 ? (lineItemsCount - 1) * minItemSpacing : 0.0;
+        const double minItemSpacings = lineItemsCount > 1 ? (static_cast<double>(lineItemsCount) - 1) * minItemSpacing : 0.0;
         double scaleFactor = 1.0;
 
         if (lineItemsWidth - minItemSpacings > 0.0)
@@ -1879,9 +1879,9 @@ float LinedFlowLayout::ComputeItemsLayoutFastPath(
                     true /*forward*/,
                     itemIndex - lineItemCount /*sizedItemIndex*/,
                     lineItemCount + 1,
-                    lineWidth + minItemSpacing + arrangeWidth /*lineItemsWidth*/,
+                    static_cast<double>(lineWidth) + minItemSpacing + arrangeWidth /*lineItemsWidth*/,
                     availableWidth,
-                    lineItemCount * minItemSpacing /*minItemSpacings*/,
+                    static_cast<double>(lineItemCount) * minItemSpacing /*minItemSpacings*/,
                     actualLineHeight,
                     averageAspectRatio);
 
@@ -1894,7 +1894,7 @@ float LinedFlowLayout::ComputeItemsLayoutFastPath(
                     lineItemCount,
                     lineWidth /*lineItemsWidth*/,
                     availableWidth,
-                    (lineItemCount - 1) * minItemSpacing /*minItemSpacings*/,
+                    (static_cast<double>(lineItemCount) - 1) * minItemSpacing /*minItemSpacings*/,
                     actualLineHeight,
                     averageAspectRatio);
 
@@ -2044,7 +2044,7 @@ float LinedFlowLayout::ComputeItemsLayoutFastPath(
     }
 #endif
 
-    m_lineItemCounts.resize(lineIndex + 1, 0);
+    m_lineItemCounts.resize(static_cast<size_t>(lineIndex) + 1, 0);
 
 #ifdef DBG
     for (int lineIndexTmp = 0; lineIndexTmp <= lineIndex; lineIndexTmp++)
@@ -2734,21 +2734,21 @@ void LinedFlowLayout::CopyItemsInfo(
 
     for (int index = 0; index < copyCount; index++)
     {
-        SetDesiredAspectRatioFromItemsInfo(m_itemsInfoFirstIndex + newStart + index, oldItemsInfoDesiredAspectRatios[oldStart + index]);
+        SetDesiredAspectRatioFromItemsInfo(m_itemsInfoFirstIndex + newStart + index, oldItemsInfoDesiredAspectRatios[static_cast<size_t>(oldStart) + index]);
 
         MUX_ASSERT(m_itemsInfoDesiredAspectRatiosForRegularPath[newStart + index] == oldItemsInfoDesiredAspectRatios[oldStart + index]);
 
         if (oldItemsInfoMinWidths.size() > 0)
         {
-            m_itemsInfoMinWidthsForRegularPath[newStart + index] = oldItemsInfoMinWidths[oldStart + index];
+            m_itemsInfoMinWidthsForRegularPath[static_cast<size_t>(newStart) + index] = oldItemsInfoMinWidths[static_cast<size_t>(oldStart) + index];
         }
 
         if (oldItemsInfoMaxWidths.size() > 0)
         {
-            m_itemsInfoMaxWidthsForRegularPath[newStart + index] = oldItemsInfoMaxWidths[oldStart + index];
+            m_itemsInfoMaxWidthsForRegularPath[static_cast<size_t>(newStart) + index] = oldItemsInfoMaxWidths[static_cast<size_t>(oldStart) + index];
         }
 
-        SetArrangeWidthFromItemsInfo(m_itemsInfoFirstIndex + newStart + index, oldItemsInfoArrangeWidths[oldStart + index]);
+        SetArrangeWidthFromItemsInfo(m_itemsInfoFirstIndex + newStart + index, oldItemsInfoArrangeWidths[static_cast<size_t>(oldStart) + index]);
 
         MUX_ASSERT(m_itemsInfoArrangeWidths[newStart + index] == oldItemsInfoArrangeWidths[oldStart + index]);
     }
@@ -3579,7 +3579,7 @@ double LinedFlowLayout::GetDesiredAspectRatioFromItemsInfo(
         MUX_ASSERT(m_itemsInfoFirstIndex >= 0);
         MUX_ASSERT(itemIndex - m_itemsInfoFirstIndex < static_cast<int>(m_itemsInfoDesiredAspectRatiosForRegularPath.size()));
 
-        desiredAspectRatio = m_itemsInfoDesiredAspectRatiosForRegularPath[itemIndex - m_itemsInfoFirstIndex];
+        desiredAspectRatio = m_itemsInfoDesiredAspectRatiosForRegularPath[static_cast<size_t>(itemIndex) - m_itemsInfoFirstIndex];
     }
 
     return desiredAspectRatio;
@@ -3688,7 +3688,7 @@ void LinedFlowLayout::GetFirstAndLastDisplayedLineIndexes(
         return;
     }
 
-    const double linesSpacing = lineCount == 0 ? 0.0 : (lineCount - 1) * lineSpacing;
+    const double linesSpacing = lineCount == 0 ? 0.0 : (static_cast<double>(lineCount) - 1) * lineSpacing;
     const double scrollExtent = lineCount * actualLineHeight + linesSpacing;
     const double maxScrollOffset = std::max(0.0, scrollExtent - scrollViewport);
     const double lineSpacingPortion = lineSpacing / lineHeight;
@@ -3718,7 +3718,7 @@ void LinedFlowLayout::GetFirstAndLastDisplayedLineIndexes(
             const double fractionalFirstDisplayedLineIndex = nearDisplayed / lineHeight;
             const int roundedFirstDisplayedLineIndex = static_cast<int>(fractionalFirstDisplayedLineIndex);
 
-            if (roundedFirstDisplayedLineIndex + 1 - fractionalFirstDisplayedLineIndex <= lineSpacingPortion &&
+            if (static_cast<double>(roundedFirstDisplayedLineIndex) + 1 - fractionalFirstDisplayedLineIndex <= lineSpacingPortion &&
                 roundedFirstDisplayedLineIndex + 1 < lineCount)
             {
                 // The portion displayed before the first displayed item is smaller than the line spacing - it can be ignored.
@@ -3988,7 +3988,7 @@ void LinedFlowLayout::GetItemsInfoRequestedRange(
             }
         }
 
-        const double linesSpacing = lineCount == 0 ? 0.0 : (lineCount - 1) * lineSpacing;
+        const double linesSpacing = lineCount == 0 ? 0.0 : (static_cast<double>(lineCount) - 1) * lineSpacing;
         const double linesHeight = lineCount * actualLineHeight + linesSpacing;
         const double scrollViewport = context.VisibleRect().Height;
         const double scrollableSize = std::max(0.0, linesHeight - scrollViewport);
@@ -4196,7 +4196,7 @@ LinedFlowLayout::ItemsLayout LinedFlowLayout::GetItemsLayout(
 
             const double desiredMinWidth = GetMinWidthFromItemsInfo(sizedItemIndex);
             const double desiredMaxWidth = GetMaxWidthFromItemsInfo(sizedItemIndex);
-            double desiredAspectRatio = m_itemsInfoDesiredAspectRatiosForRegularPath[sizedItemIndex - m_itemsInfoFirstIndex];
+            double desiredAspectRatio = m_itemsInfoDesiredAspectRatiosForRegularPath[static_cast<size_t>(sizedItemIndex) - m_itemsInfoFirstIndex];
 
             if (desiredAspectRatio <= 0.0)
             {
@@ -4688,7 +4688,7 @@ float LinedFlowLayout::GetItemsRangeArrangeWidth(
             // Use the item info provided by the ItemsInfoRequested handler since the DesiredSize.Width 
             // may still be the MinWidth because the content is loading.
             // The use of m_itemsInfoArrangeWidths must be consistent with the one in LinedFlowLayout::ArrangeConstrainedLines.
-            cumulatedArrangeWidth += m_itemsInfoArrangeWidths[sizedItemIndex - itemsInfoArrangeWidthsOffset];
+            cumulatedArrangeWidth += m_itemsInfoArrangeWidths[static_cast<size_t>(sizedItemIndex) - itemsInfoArrangeWidthsOffset];
         }
         else if (m_elementManager.IsDataIndexRealized(sizedItemIndex))
         {
@@ -4855,7 +4855,7 @@ float LinedFlowLayout::GetLinesDesiredWidth()
 
     for (int lineIndex = firstLineIndex; lineIndex <= lastLineIndex; lineIndex++)
     {
-        const int lineItemsCount = m_lineItemCounts[lineIndex - m_firstSizedLineIndex];
+        const int lineItemsCount = m_lineItemCounts[static_cast<size_t>(lineIndex) - m_firstSizedLineIndex];
         float lineWidth{};
 
         for (int lineItemIndex = 0; lineItemIndex < lineItemsCount; lineItemIndex++)
@@ -4864,7 +4864,7 @@ float LinedFlowLayout::GetLinesDesiredWidth()
 
             if (usesArrangeWidthInfo)
             {
-                itemWidth = m_itemsInfoArrangeWidths[itemIndex - m_itemsInfoFirstIndex];
+                itemWidth = m_itemsInfoArrangeWidths[static_cast<size_t>(itemIndex) - m_itemsInfoFirstIndex];
             }
             else
             {
@@ -4913,7 +4913,7 @@ double LinedFlowLayout::GetMaxWidthFromItemsInfo(
         if (itemIndex - m_itemsInfoFirstIndex >= 0 &&
             itemIndex - m_itemsInfoFirstIndex < static_cast<int>(m_itemsInfoMaxWidthsForRegularPath.size()))
         {
-            return std::min(m_itemsInfoMaxWidth, m_itemsInfoMaxWidthsForRegularPath[itemIndex - m_itemsInfoFirstIndex]);
+            return std::min(m_itemsInfoMaxWidth, m_itemsInfoMaxWidthsForRegularPath[static_cast<size_t>(itemIndex) - m_itemsInfoFirstIndex]);
         }
     }
 
@@ -4941,7 +4941,7 @@ double LinedFlowLayout::GetMinWidthFromItemsInfo(
         if (itemIndex - m_itemsInfoFirstIndex >= 0 &&
             itemIndex - m_itemsInfoFirstIndex < static_cast<int>(m_itemsInfoMinWidthsForRegularPath.size()))
         {
-            return std::max(m_itemsInfoMinWidth, m_itemsInfoMinWidthsForRegularPath[itemIndex - m_itemsInfoFirstIndex]);
+            return std::max(m_itemsInfoMinWidth, m_itemsInfoMinWidthsForRegularPath[static_cast<size_t>(itemIndex) - m_itemsInfoFirstIndex]);
         }
     }
 
@@ -5170,10 +5170,21 @@ void LinedFlowLayout::InvalidateLayout(
 // Invokes InvalidateLayout asynchronously with only invalidateMeasure == True to trigger a new measure pass.
 void LinedFlowLayout::InvalidateMeasureAsync()
 {
+    auto weakThis = get_weak();
+
     m_dispatcherQueue.TryEnqueue(winrt::DispatcherQueueHandler(
-        [strongThis = get_strong()]()
+        [weakThis]()
     {
-        strongThis->InvalidateLayout(false /*forceRelayout*/, false /*resetItemsInfo*/, true /*invalidateMeasure*/);
+        if (winrt::WindowsXamlManager::GetForCurrentThread() == nullptr)
+        {
+            // Exit early if Xaml core has already shut down.
+            return;
+        }
+
+        if (auto strongThis = weakThis.get())
+        {
+            strongThis->InvalidateLayout(false /*forceRelayout*/, false /*resetItemsInfo*/, true /*invalidateMeasure*/);
+        }
     }));
 }
 
@@ -5190,23 +5201,18 @@ void LinedFlowLayout::InvalidateMeasureTimerStart(
 {
     MUX_ASSERT(!UsesArrangeWidthInfo());
 
-    winrt::DispatcherTimer invalidateMeasureTimer = nullptr;
-
     if (m_invalidateMeasureTimer)
     {
-        invalidateMeasureTimer = m_invalidateMeasureTimer.get();
-
-        if (invalidateMeasureTimer.IsEnabled())
+        if (m_invalidateMeasureTimer.IsEnabled())
         {
-            invalidateMeasureTimer.Stop();
+            m_invalidateMeasureTimer.Stop();
         }
     }
     else
     {
-        invalidateMeasureTimer = winrt::DispatcherTimer();
+        m_invalidateMeasureTimer = winrt::DispatcherTimer();
 
-        invalidateMeasureTimer.Tick({ this, &LinedFlowLayout::InvalidateMeasureTimerTick });
-        m_invalidateMeasureTimer.set(invalidateMeasureTimer);
+        m_invalidateMeasureTimer.Tick({ this, &LinedFlowLayout::InvalidateMeasureTimerTick });
     }
 
     m_invalidateMeasureTimerTickCount = tickCount;
@@ -5220,8 +5226,8 @@ void LinedFlowLayout::InvalidateMeasureTimerStart(
     LINEDFLOWLAYOUT_TRACE_INFO_DBG(*this, TRACE_MSG_METH_STR_INT, METH_NAME, this, L"tickCount", tickCount);
     LINEDFLOWLAYOUT_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_STR_INT, METH_NAME, this, L"timerInterval", timerInterval);
 
-    invalidateMeasureTimer.Interval(winrt::TimeSpan::duration(timerInterval));
-    invalidateMeasureTimer.Start();
+    m_invalidateMeasureTimer.Interval(winrt::TimeSpan::duration(timerInterval));
+    m_invalidateMeasureTimer.Start();
 }
 
 // Stops the timer used to trigger an asynchronous measure pass when no items info was provided by the ItemsInfoRequested event.
@@ -5236,12 +5242,9 @@ void LinedFlowLayout::InvalidateMeasureTimerStop(bool isForDestructor)
         LINEDFLOWLAYOUT_TRACE_INFO(*this, TRACE_MSG_METH, METH_NAME, this);
     }
 
-    if (winrt::DispatcherTimer invalidateMeasureTimer = isForDestructor ? m_invalidateMeasureTimer.safe_get() : m_invalidateMeasureTimer.get())
+    if (m_invalidateMeasureTimer && m_invalidateMeasureTimer.IsEnabled())
     {
-        if (invalidateMeasureTimer.IsEnabled())
-        {
-            invalidateMeasureTimer.Stop();
-        }
+        m_invalidateMeasureTimer.Stop();
     }
 }
 
@@ -5867,7 +5870,7 @@ std::tuple<int, float, LinedFlowLayout::ItemsInfo> LinedFlowLayout::MeasureConst
     MUX_ASSERT(lineCount >= 1);
 
     // In the multi-line cases, the last line does not contribute to the average evaluation because it is likely incomplete.
-    const double averageItemsPerLine = (lineCount == 1) ? m_itemCount : (m_itemCount - m_lineItemCounts[lineCount - 1]) / static_cast<double>(lineCount - 1);
+    const double averageItemsPerLine = (lineCount == 1) ? m_itemCount : (static_cast<double>(m_itemCount) - m_lineItemCounts[static_cast<size_t>(lineCount) - 1]) / (static_cast<double>(lineCount) - 1);
 
     SetAverageItemsPerLine(std::pair<double, double>(averageItemsPerLine /*averageItemsPerLineRaw*/, averageItemsPerLine /*averageItemsPerLineSnapped*/), false /*unlockItems*/);
 
@@ -6201,7 +6204,7 @@ int LinedFlowLayout::MeasureConstrainedLinesRegularPath(
                     lineCount = GetLineCount(m_averageItemsPerLine.second);
                     MUX_ASSERT(lineCount != 0);
 
-                    const double linesSpacing = (lineCount - 1) * lineSpacing;
+                    const double linesSpacing = (static_cast<double>(lineCount) - 1) * lineSpacing;
                     const double scrollExtent = lineCount * actualLineHeight + linesSpacing;
                     const double maxScrollOffset = std::max(0.0, scrollExtent - scrollViewport);
                     const double newScrollOffset = std::min(maxScrollOffset, GetRoundedDouble(scrollOffset * oldAverageItemsPerLine.second / newAverageItemsPerLine.second));
@@ -6285,7 +6288,7 @@ int LinedFlowLayout::MeasureConstrainedLines(
     MUX_ASSERT(m_isVirtualizingContext == IsVirtualizingContext(context));
 
     const double lineSpacing = LineSpacing();
-    const double linesSpacing = lineCount == 0 ? 0.0 : (lineCount - 1) * lineSpacing;
+    const double linesSpacing = lineCount == 0 ? 0.0 : (static_cast<double>(lineCount) - 1) * lineSpacing;
     const double linesHeight = lineCount * actualLineHeight + linesSpacing;
     const double clampedFarRealizationRect = std::max(0.0, std::min(linesHeight, static_cast<double>(farRealizationRect)));
     const int unrealizedFarLineCount = static_cast<int>((linesHeight - clampedFarRealizationRect) / (actualLineHeight + lineSpacing));
@@ -6426,7 +6429,7 @@ int LinedFlowLayout::MeasureConstrainedLines(
 
             for (int lineVectorIndex = oldFirstLineVectorIndex; lineVectorIndex <= oldLastLineVectorIndex; lineVectorIndex++)
             {
-                m_lineItemCounts[firstStillSizedLineIndex - m_firstSizedLineIndex + lineVectorIndex - oldFirstLineVectorIndex] =
+                m_lineItemCounts[static_cast<size_t>(firstStillSizedLineIndex) - m_firstSizedLineIndex + lineVectorIndex - oldFirstLineVectorIndex] =
                     oldLineItemCounts[lineVectorIndex];
 
                 lastStillSizedItemIndex += oldLineItemCounts[lineVectorIndex];
@@ -6498,7 +6501,7 @@ int LinedFlowLayout::MeasureConstrainedLines(
                     MUX_ASSERT(m_unsizedNearLineCount + sizedLineCount == lineCount);
 
                     unsizedNearItemCount -=
-                        std::min(unsizedNearItemCount, static_cast<int>(std::round((oldFirstSizedLineIndex - m_firstSizedLineIndex) * m_averageItemsPerLine.second)));
+                        std::min(unsizedNearItemCount, static_cast<int>(std::round((static_cast<double>(oldFirstSizedLineIndex) - m_firstSizedLineIndex) * m_averageItemsPerLine.second)));
                 }
                 else
                 {
@@ -6876,7 +6879,7 @@ void LinedFlowLayout::MeasureItemRange(
         {
             MUX_ASSERT(realizedItemIndex - itemsInfoArrangeWidthsOffset<static_cast<int>(m_itemsInfoArrangeWidths.size()));
 
-            const float arrangeWidth = m_itemsInfoArrangeWidths[realizedItemIndex - itemsInfoArrangeWidthsOffset];
+            const float arrangeWidth = m_itemsInfoArrangeWidths[static_cast<size_t>(realizedItemIndex) - itemsInfoArrangeWidthsOffset];
 
             if (arrangeWidth >= 0.0f)
             {
@@ -7254,14 +7257,14 @@ bool LinedFlowLayout::RequestItemsInfo(
         {
             LINEDFLOWLAYOUT_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_STR_DBL, METH_NAME, this, L"minWidth", m_itemsInfoMinWidthsForFastPath[index]);
 
-            m_itemsInfoMinWidthsForRegularPath[itemsInfoIndexStart + index] = m_itemsInfoMinWidthsForFastPath[index];
+            m_itemsInfoMinWidthsForRegularPath[static_cast<size_t>(itemsInfoIndexStart) + index] = m_itemsInfoMinWidthsForFastPath[index];
         }
 
         if (maxWidthsCount > 0 && index < maxWidthsCount)
         {
             LINEDFLOWLAYOUT_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_STR_DBL, METH_NAME, this, L"maxWidth", m_itemsInfoMaxWidthsForFastPath[index]);
 
-            m_itemsInfoMaxWidthsForRegularPath[itemsInfoIndexStart + index] = m_itemsInfoMaxWidthsForFastPath[index];
+            m_itemsInfoMaxWidthsForRegularPath[static_cast<size_t>(itemsInfoIndexStart) + index] = m_itemsInfoMaxWidthsForFastPath[index];
         }
     }
 
@@ -7389,7 +7392,7 @@ void LinedFlowLayout::SetDesiredAspectRatioFromItemsInfo(
     MUX_ASSERT(itemIndex - m_itemsInfoFirstIndex < static_cast<int>(m_itemsInfoDesiredAspectRatiosForRegularPath.size()));
 #endif
 
-    m_itemsInfoDesiredAspectRatiosForRegularPath[itemIndex - m_itemsInfoFirstIndex] = desiredAspectRatio;
+    m_itemsInfoDesiredAspectRatiosForRegularPath[static_cast<size_t>(itemIndex) - m_itemsInfoFirstIndex] = desiredAspectRatio;
 }
 
 // Returns the total arrange width for the provided index range.
diff --git a/src/controls/dev/Repeater/LinedFlowLayout.h b/src/controls/dev/Repeater/LinedFlowLayout.h
index bd31d67de5..36b99675a6 100644
--- a/src/controls/dev/Repeater/LinedFlowLayout.h
+++ b/src/controls/dev/Repeater/LinedFlowLayout.h
@@ -831,7 +831,7 @@ class LinedFlowLayout :
     // smaller than 7. The interval begins at 100ms and is then increased by 50% each time it is re-started, until
     // m_invalidateMeasureTimerTickCount reaches 7. By then the interval is 1.7s and the total time elapsed is about 5s
     // when the timer is no longer re-started.
-    tracker_ref<winrt::DispatcherTimer> m_invalidateMeasureTimer{ this };
+    winrt::DispatcherTimer m_invalidateMeasureTimer{ nullptr };
 
     // Fields used to support the LayoutsTestHooks
     int m_logItemIndexDbg{ -1 };
diff --git a/src/controls/dev/Repeater/Phaser.cpp b/src/controls/dev/Repeater/Phaser.cpp
index 0ff9b26e80..f4b9b02556 100644
--- a/src/controls/dev/Repeater/Phaser.cpp
+++ b/src/controls/dev/Repeater/Phaser.cpp
@@ -126,7 +126,7 @@ void Phaser::DoPhasedWorkCallback()
                     // If we are the first item or 
                     // If the current items phase is higher than the next items phase, then move to the next item.
                     if (currentIndex == 0 ||
-                        virtInfo->Phase() > m_pendingElements[currentIndex - 1].VirtInfo()->Phase())
+                        virtInfo->Phase() > m_pendingElements[static_cast<std::vector<ElementInfo>::size_type>(currentIndex) - 1].VirtInfo()->Phase())
                     {
                         currentIndex--;
                     }
@@ -155,7 +155,7 @@ void Phaser::DoPhasedWorkCallback()
                 bool nextItemIsVisible = SharedHelpers::DoRectsIntersect(visibleWindow, m_pendingElements[currentIndex].VirtInfo()->ArrangeBounds());
                 if (!nextItemIsVisible)
                 {
-                    bool haveVisibleItems = SharedHelpers::DoRectsIntersect(visibleWindow, m_pendingElements[pendingCount - 1].VirtInfo()->ArrangeBounds());
+                    bool haveVisibleItems = SharedHelpers::DoRectsIntersect(visibleWindow, m_pendingElements[static_cast<size_t>(pendingCount) - 1].VirtInfo()->ArrangeBounds());
                     if (haveVisibleItems)
                     {
                         currentIndex = pendingCount - 1;
diff --git a/src/controls/dev/Repeater/StackLayout.cpp b/src/controls/dev/Repeater/StackLayout.cpp
index 06d6d313c6..7798a9e84e 100644
--- a/src/controls/dev/Repeater/StackLayout.cpp
+++ b/src/controls/dev/Repeater/StackLayout.cpp
@@ -76,7 +76,7 @@ winrt::Size StackLayout::MeasureOverride(
         m_itemSpacing,
         MAXUINT /* maxItemsPerLine */,
         GetScrollOrientation(),
-        DisableVirtualization(),
+        IsVirtualizationEnabled(),
         LayoutId());
     return { desiredSize.Width, desiredSize.Height };
 }
@@ -136,7 +136,7 @@ winrt::FlowLayoutAnchorInfo StackLayout::GetAnchorForRealizationRect(
         const auto lastExtent = state->FlowAlgorithm().LastExtent();
 
         const double averageElementSize = GetAverageElementSize(availableSize, context, state) + m_itemSpacing;
-        const double realizationWindowOffsetInExtent = MajorStart(realizationRect) - MajorStart(lastExtent);
+        const double realizationWindowOffsetInExtent = static_cast<double>(MajorStart(realizationRect)) - static_cast<double>(MajorStart(lastExtent));
         const double majorSize = MajorSize(lastExtent) == 0 ? std::max(0.0, averageElementSize * itemsCount - m_itemSpacing) : MajorSize(lastExtent);
         if (itemsCount > 0 &&
             MajorSize(realizationRect) >= 0 &&
diff --git a/src/controls/dev/Repeater/TestUI/RepeaterTestUIPage.xaml b/src/controls/dev/Repeater/TestUI/RepeaterTestUIPage.xaml
index c1aada7d9d..aa36ad9253 100644
--- a/src/controls/dev/Repeater/TestUI/RepeaterTestUIPage.xaml
+++ b/src/controls/dev/Repeater/TestUI/RepeaterTestUIPage.xaml
@@ -2,24 +2,24 @@
 <Page
     x:Class="MUXControlsTestApp.RepeaterTestUIPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.UI.Xaml.Controls">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <controls:LayoutPanel  Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" HorizontalAlignment="Center" VerticalAlignment="Center">
-        <controls:LayoutPanel.Layout>
-            <controls:FlowLayout Orientation="Vertical" MinColumnSpacing="5" MinRowSpacing="5"/>
-        </controls:LayoutPanel.Layout>
+    <LayoutPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" HorizontalAlignment="Center" VerticalAlignment="Center">
+        <LayoutPanel.Layout>
+            <FlowLayout Orientation="Vertical" MinColumnSpacing="5" MinRowSpacing="5"/>
+        </LayoutPanel.Layout>
 
-        <controls:LayoutPanel.Resources>
-            <controls:FlowLayout x:Key="flow" MinRowSpacing="5" MinColumnSpacing="5" />
-            <controls:StackLayout x:Key="stack"  Spacing="5" />
-        </controls:LayoutPanel.Resources>
+        <LayoutPanel.Resources>
+            <FlowLayout x:Key="flow" MinRowSpacing="5" MinColumnSpacing="5"/>
+            <StackLayout x:Key="stack" Spacing="5"/>
+        </LayoutPanel.Resources>
 
         <StackPanel>
             <TextBlock Text="ItemsSource Samples" Style="{ThemeResource HeaderTextBlockStyle}"/>
             <Button x:Name="itemsSourceDemo" AutomationProperties.Name="ItemsSource Demo">ItemsSource Demo</Button>
             <Button x:Name="collectionChangeDemo" AutomationProperties.Name="Collection Changes Demo" >Collection Changes Demo</Button>
             <Button x:Name="sortingAndFilteringDemo" AutomationProperties.Name="Sorting and Filtering Demo">Sorting and Filtering</Button>
+            <Button x:Name="variableSizedItemsDemo" AutomationProperties.Name="Variable Sized Items Demo">Variable Sized Items Demo</Button>
         </StackPanel>
 
         <StackPanel>
@@ -40,15 +40,15 @@
         </StackPanel>
 
         <StackPanel>
-            <TextBlock Text="Built in layouts" Style="{StaticResource SubheaderTextBlockStyle}" />
+            <TextBlock Text="Built in layouts" Style="{StaticResource SubheaderTextBlockStyle}"/>
             <StackPanel>
                 <TextBlock>ItemSpacing</TextBlock>
-                <TextBox x:Name="itemSpacing" Text="10"></TextBox>
+                <TextBox x:Name="itemSpacing" Text="10"/>
                 <TextBlock>MinColumnSpacing</TextBlock>
-                <TextBox x:Name="lineSpacing" Text="10"></TextBox>
+                <TextBox x:Name="lineSpacing" Text="10"/>
                 <TextBlock>LineAlignment</TextBlock>
                 <TextBlock>(Start/Center/End/SpaceEvenly/SpaceAround/SpaceBetween)</TextBlock>
-                <TextBox x:Name="lineAlignment" Text="Start"></TextBox>
+                <TextBox x:Name="lineAlignment" Text="Start"/>
                 <ToggleSwitch x:Name="orientation" OnContent="Horizontal" OffContent="Vertical">Scroll Orientation</ToggleSwitch>
             </StackPanel>
             <StackPanel Orientation="Horizontal">
@@ -83,7 +83,7 @@
 
         <StackPanel>
             <TextBlock Text="Other Samples" Style="{ThemeResource HeaderTextBlockStyle}"/>
-            <Button x:Name="defaultDemo" AutomationProperties.Name="Default Demo" >Default Demo</Button>
+            <Button x:Name="defaultDemo" AutomationProperties.Name="Default Demo">Default Demo</Button>
             <Button x:Name="basicDemo" AutomationProperties.Name="Basic Demo">Basic Demo</Button>
             <Button x:Name="uniformGridLayoutDemo" AutomationProperties.Name="UniformGridLayoutDemo">UniformGridLayout testing</Button>
             <Button x:Name="keyboardNavigationSample" AutomationProperties.Name="keyboardNavigationSample">Keyboard navigation testing</Button>
@@ -105,5 +105,5 @@
             </StackPanel>
         </StackPanel>
 
-    </controls:LayoutPanel>
+    </LayoutPanel>
 </Page>
diff --git a/src/controls/dev/Repeater/TestUI/RepeaterTestUIPage.xaml.cs b/src/controls/dev/Repeater/TestUI/RepeaterTestUIPage.xaml.cs
index 9db1e31e42..74a2257367 100644
--- a/src/controls/dev/Repeater/TestUI/RepeaterTestUIPage.xaml.cs
+++ b/src/controls/dev/Repeater/TestUI/RepeaterTestUIPage.xaml.cs
@@ -63,6 +63,10 @@ public RepeaterTestUIPage()
                 Frame.NavigateWithoutAnimation(typeof(SortingAndFilteringPage));
             };
 
+            variableSizedItemsDemo.Click += delegate {
+                Frame.NavigateWithoutAnimation(typeof(VariableSizedItemsPage));
+            };
+
             animationsDemo.Click += delegate
             {
                 Frame.NavigateWithoutAnimation(typeof(AnimationsDemoPage));
diff --git a/src/controls/dev/Repeater/TestUI/Repeater_TestUI.projitems b/src/controls/dev/Repeater/TestUI/Repeater_TestUI.projitems
index 1d9b0ba19f..460919a505 100644
--- a/src/controls/dev/Repeater/TestUI/Repeater_TestUI.projitems
+++ b/src/controls/dev/Repeater/TestUI/Repeater_TestUI.projitems
@@ -19,6 +19,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Samples\ItemsSourceSamples\VariableSizedItemsPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Samples\ItemTemplateSamples\DisposableUserControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -128,6 +132,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)Samples\ItemsSourceSamples\SortingAndFilteringPage.xaml.cs">
       <DependentUpon>SortingAndFilteringPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Samples\ItemsSourceSamples\VariableSizedItemsPage.xaml.cs">
+      <DependentUpon>VariableSizedItemsPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Samples\ItemTemplateSamples\DisposableUserControl.xaml.cs">
       <DependentUpon>DisposableUserControl.xaml</DependentUpon>
     </Compile>
diff --git a/src/controls/dev/Repeater/TestUI/Samples/BasicDemo.xaml b/src/controls/dev/Repeater/TestUI/Samples/BasicDemo.xaml
index bb845f7707..8116ab2a1c 100644
--- a/src/controls/dev/Repeater/TestUI/Samples/BasicDemo.xaml
+++ b/src/controls/dev/Repeater/TestUI/Samples/BasicDemo.xaml
@@ -40,7 +40,7 @@
             <ScrollViewer x:Name="scrollViewer">
                 <controls:ItemsRepeater x:Name="repeater" VerticalCacheLength="0" Background="LightBlue">
                     <controls:ItemsRepeater.Layout>
-                        <controls:StackLayout  DisableVirtualization="True"/>
+                        <controls:StackLayout  IsVirtualizationEnabled="False"/>
                     </controls:ItemsRepeater.Layout>
                 </controls:ItemsRepeater>
             </ScrollViewer>
diff --git a/src/controls/dev/Repeater/TestUI/Samples/BasicDemo.xaml.cs b/src/controls/dev/Repeater/TestUI/Samples/BasicDemo.xaml.cs
index 0301167786..64b26d6a94 100644
--- a/src/controls/dev/Repeater/TestUI/Samples/BasicDemo.xaml.cs
+++ b/src/controls/dev/Repeater/TestUI/Samples/BasicDemo.xaml.cs
@@ -18,7 +18,7 @@ public BasicDemo()
             this.InitializeComponent();
             repeater.ItemTemplate = elementFactory;
             var stack = repeater.Layout as StackLayout;
-            int numItems = (stack != null && stack.DisableVirtualization) ? 10 : 10000;
+            int numItems = (stack != null && !stack.IsVirtualizationEnabled) ? 10 : 10000;
             repeater.ItemsSource = Enumerable.Range(0, numItems).Select(x => x.ToString());
         }
 
diff --git a/src/controls/dev/Repeater/TestUI/Samples/ItemsSourceSamples/VariableSizedItemsPage.xaml b/src/controls/dev/Repeater/TestUI/Samples/ItemsSourceSamples/VariableSizedItemsPage.xaml
new file mode 100644
index 0000000000..327ce1cb80
--- /dev/null
+++ b/src/controls/dev/Repeater/TestUI/Samples/ItemsSourceSamples/VariableSizedItemsPage.xaml
@@ -0,0 +1,165 @@
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<Page
+    x:Class="MUXControlsTestApp.Samples.VariableSizedItemsPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:MUXControlsTestApp.Samples">
+
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+        RowDefinitions="Auto, *"
+        ColumnDefinitions="Auto, Auto, Auto, *">
+
+        <StackPanel Orientation="Horizontal" Margin="5" Grid.ColumnSpan="4">
+            <Button x:Name="goBackButton" Content="Back" Width="150" Margin="5"/>
+            <Button x:Name="btnSwitchScroller" Content="Use ScrollView" Width="150" Margin="5" Click="BtnSwitchScroller_Click"/>
+            <Button x:Name="btnSwitchVariability" Content="Use fixed heights" Width="150" Margin="5" Click="BtnSwitchVariability_Click"/>
+        </StackPanel>
+            
+        <Grid Background="{ThemeResource SystemListLowColor}" Margin="4,0,4,0" Padding="6"
+            BorderBrush="{ThemeResource SystemChromeGrayColor}" BorderThickness="1"
+            RowDefinitions="Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto"
+            ColumnDefinitions="Auto, Auto, Auto, Auto"
+            Grid.Row="1" Grid.Column="1">
+
+            <TextBlock Text="Scroller Properties" Grid.ColumnSpan="4" Foreground="Red"/>
+
+            <TextBlock Text="VerticalAnchorRatio:" Grid.Row="1" VerticalAlignment="Center"/>
+            <TextBox x:Name="txtScrollerVerticalAnchorRatio" Width="115" Margin="1" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"/>
+            <Button x:Name="btnGetScrollerVerticalAnchorRatio" Content="G" Margin="1" Grid.Row="1" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Center" Click="BtnGetScrollerVerticalAnchorRatio_Click"/>
+            <Button x:Name="btnSetScrollerVerticalAnchorRatio" Content="S" Margin="1" Grid.Row="1" Grid.Column="3" HorizontalAlignment="Stretch" VerticalAlignment="Center" Click="BtnSetScrollerVerticalAnchorRatio_Click"/>
+
+            <TextBlock Text="VerticalOffset:" Grid.Row="2" VerticalAlignment="Center"/>
+            <TextBox x:Name="txtScrollerVerticalOffset" Width="115" Margin="1" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center"/>
+            <Button x:Name="btnGetScrollerVerticalOffset" Content="G" Margin="1" Grid.Row="2" Grid.Column="2" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Center" Click="BtnGetScrollerVerticalOffset_Click"/>
+
+            <TextBlock Text="VerticalScrollPercentage:" Grid.Row="3" VerticalAlignment="Center"/>
+            <TextBox x:Name="txtScrollerVerticalScrollPercentage" Width="115" Margin="1" Grid.Row="3" Grid.Column="1" VerticalAlignment="Center"/>
+            <Button x:Name="btnGetScrollerVerticalScrollPercentage" Content="G" Margin="1" Grid.Row="3" Grid.Column="2" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Center" Click="BtnGetScrollerVerticalScrollPercentage_Click"/>
+
+            <TextBlock Text="ZoomFactor:" Grid.Row="4" VerticalAlignment="Center"/>
+            <TextBox x:Name="txtScrollerZoomFactor" Width="115" Margin="1" Grid.Row="4" Grid.Column="1" VerticalAlignment="Center"/>
+            <Button x:Name="btnGetScrollerZoomFactor" Content="G" Margin="1" Grid.Row="4" Grid.Column="2" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Center" Click="BtnGetScrollerZoomFactor_Click"/>
+
+            <TextBlock Text="ScrollableHeight:" Grid.Row="5" VerticalAlignment="Center"/>
+            <TextBox x:Name="txtScrollerScrollableHeight" Width="115" Margin="1" Grid.Row="5" Grid.Column="1" VerticalAlignment="Center"/>
+            <Button x:Name="btnGetScrollerScrollableHeight" Content="G" Margin="1" Grid.Row="5" Grid.Column="2" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Center" Click="BtnGetScrollerScrollableHeight_Click"/>
+
+            <TextBlock Text="ExtentHeight:" Grid.Row="6" VerticalAlignment="Center"/>
+            <TextBox x:Name="txtScrollerExtentHeight" Width="115" Margin="1" Grid.Row="6" Grid.Column="1" VerticalAlignment="Center"/>
+            <Button x:Name="btnGetScrollerExtentHeight" Content="G" Margin="1" Grid.Row="6" Grid.Column="2" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Center" Click="BtnGetScrollerExtentHeight_Click"/>
+
+            <TextBlock Text="Scroller Methods" Grid.Row="7" Grid.ColumnSpan="4" Foreground="Red" Margin="0,4,0,0"/>
+
+            <TextBlock Text="VerticalOffset:" Grid.Row="8" VerticalAlignment="Center"/>
+            <TextBox x:Name="txtScrollerChangeViewVerticalOffset" Text="100000" Width="115" Margin="1" Grid.Row="8" Grid.Column="1" VerticalAlignment="Center"/>
+            <Button x:Name="btnGetScrollerChangeViewVerticalOffset" Content="G" Margin="1" Grid.Row="8" Grid.Column="2" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Center" Click="BtnGetScrollerChangeViewVerticalOffset_Click"/>
+
+            <TextBlock Text="VerticalScrollPercentage:" Grid.Row="9" VerticalAlignment="Center"/>
+            <TextBox x:Name="txtScrollerChangeViewVerticalScrollPercentage" Width="115" Margin="1" Grid.Row="9" Grid.Column="1" VerticalAlignment="Center"/>
+            <Button x:Name="btnGetScrollerChangeViewVerticalScrollPercentage" Content="G" Margin="1" Grid.Row="9" Grid.Column="2" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Center" Click="BtnGetScrollerChangeViewVerticalScrollPercentage_Click"/>
+
+            <Grid Grid.Row="10" Grid.ColumnSpan="4" ColumnDefinitions="*, *">
+                <Button x:Name="btnScrollerChangeViewToVerticalOffset" Content="Jump to VerticalOffset" Margin="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Click="BtnScrollerChangeViewToVerticalOffset_Click"/>
+                <Button x:Name="btnScrollerChangeViewToVerticalOffsetWithAnimation" Margin="1" Grid.Column="1" HorizontalAlignment="Stretch" Click="BtnScrollerChangeViewToVerticalOffsetWithAnimation_Click">
+                    <Button.Content>
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock Text="Animate to VerticalOffset" VerticalAlignment="Center"/>
+                            <TextBox x:Name="txtScrollerChangeViewToVerticalOffsetWithAnimationDuration" Text="N/A" Width="50" Margin="4,0,0,0" IsEnabled="False"/>
+                        </StackPanel>
+                    </Button.Content>
+                </Button>
+            </Grid>
+
+            <Grid Grid.Row="11" Grid.ColumnSpan="4" ColumnDefinitions="*, *">
+                <Button x:Name="btnScrollerChangeViewToVerticalScrollPercentage" Content="Jump to VerticalScrollPercentage" Margin="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Click="BtnScrollerChangeViewToVerticalScrollPercentage_Click"/>
+                <Button x:Name="btnScrollerChangeViewToVerticalScrollPercentageWithAnimation" Margin="1" Grid.Column="1" HorizontalAlignment="Stretch" Click="BtnScrollerChangeViewToVerticalScrollPercentageWithAnimation_Click">
+                    <Button.Content>
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock Text="Animate to VerticalScrollPercentage" VerticalAlignment="Center"/>
+                            <TextBox x:Name="txtScrollerChangeViewToVerticalScrollPercentageWithAnimationDuration" Text="N/A" Width="50" Margin="4,0,0,0" IsEnabled="False"/>
+                        </StackPanel>
+                    </Button.Content>
+                </Button>
+            </Grid>
+
+            <TextBlock Text="ZoomFactor:" Grid.Row="12" VerticalAlignment="Center"/>
+            <TextBox x:Name="txtScrollerChangeViewZoomZoomFactor" Text="1" Width="115" Margin="1" Grid.Row="12" Grid.Column="1" VerticalAlignment="Center"/>
+            <TextBlock Text="CenterPoint:" Grid.Row="13" VerticalAlignment="Center"/>
+            <TextBox x:Name="txtScrollerChangeViewZoomCenterPoint" IsEnabled="False" Text="0, 0" Width="115" Margin="1" Grid.Row="13" Grid.Column="1" VerticalAlignment="Center"/>
+
+            <Grid Grid.Row="14" Grid.ColumnSpan="4" ColumnDefinitions="*, *">
+                <Button x:Name="btnScrollerChangeViewToZoomFactor" Content="Jump to VerticalOffset/ZoomFactor" Margin="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Click="BtnScrollerChangeViewToZoomFactor_Click"/>
+                <Button x:Name="btnScrollerChangeViewToZoomFactorWithAnimation" Content="Animate to VerticalOffset/ZoomFactor" Margin="1" Grid.Column="1" HorizontalAlignment="Stretch" Click="BtnScrollerChangeViewToZoomFactorWithAnimation_Click"/>
+            </Grid>
+        </Grid>
+
+        <Grid Margin="4,0,4,0" Padding="6"
+            BorderBrush="{ThemeResource SystemChromeGrayColor}" BorderThickness="1"
+            RowDefinitions="Auto, Auto, Auto, Auto"
+            ColumnDefinitions="Auto, Auto, Auto, Auto"
+            Grid.Row="1" Grid.Column="2">
+
+            <TextBlock Text="ItemsRepeater Properties" Grid.ColumnSpan="4" Foreground="Red"/>
+
+            <TextBlock Text="VerticalCacheLength:" Grid.Row="1" VerticalAlignment="Center"/>
+            <TextBox x:Name="txtItemsRepeaterVerticalCacheLength" Width="115" Margin="1" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"/>
+            <Button x:Name="btnGetItemsRepeaterVerticalCacheLength" Content="G" Margin="1" Grid.Row="1" Grid.Column="2" VerticalAlignment="Center" Click="BtnGetItemsRepeaterVerticalCacheLength_Click"/>
+            <Button x:Name="btnSetItemsRepeaterVerticalCacheLength" Content="S" Margin="1" Grid.Row="1" Grid.Column="3" VerticalAlignment="Center" Click="BtnSetItemsRepeaterVerticalCacheLength_Click"/>
+
+            <TextBlock Text="HorizontalAlignment:" Grid.Row="2" VerticalAlignment="Center"/>
+            <ComboBox x:Name="cmbItemsRepeaterHorizontalAlignment" Margin="1" Grid.Row="2" Grid.Column="1"
+                HorizontalAlignment="Stretch" VerticalAlignment="Center" SelectionChanged="CmbItemsRepeaterHorizontalAlignment_SelectionChanged">
+                <ComboBoxItem>Left</ComboBoxItem>
+                <ComboBoxItem>Center</ComboBoxItem>
+                <ComboBoxItem>Right</ComboBoxItem>
+                <ComboBoxItem>Stretch</ComboBoxItem>
+            </ComboBox>
+
+            <TextBlock Text="VerticalAlignment:" Grid.Row="3" VerticalAlignment="Center"/>
+            <ComboBox x:Name="cmbItemsRepeaterVerticalAlignment" Margin="1" Grid.Row="3" Grid.Column="1"
+                HorizontalAlignment="Stretch" VerticalAlignment="Center" SelectionChanged="CmbItemsRepeaterVerticalAlignment_SelectionChanged">
+                <ComboBoxItem>Top</ComboBoxItem>
+                <ComboBoxItem>Center</ComboBoxItem>
+                <ComboBoxItem>Bottom</ComboBoxItem>
+                <ComboBoxItem>Stretch</ComboBoxItem>
+            </ComboBox>
+        </Grid>
+
+        <Grid Background="{ThemeResource SystemListLowColor}" Margin="4,0,4,0" Padding="6"
+            BorderBrush="{ThemeResource SystemChromeGrayColor}" BorderThickness="1"
+            Grid.Row="1" Grid.Column="3" Visibility="Collapsed">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="*"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Text="Events" Foreground="Red"/>
+
+            <Button x:Name="btnClearEvents" Grid.Row="1" Content="Clear" Click="BtnClearEvents_Click" Margin="1"/>
+            <ListBox x:Name="lstEvents" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.HorizontalScrollMode="Auto" Margin="1" Grid.Row="2"/>
+        </Grid>
+
+        <ScrollViewer x:Name="scrollViewer" Background="Gray" Margin="10" Width="200" HorizontalAlignment="Left" Grid.Row="1"
+            HorizontalScrollMode="Enabled" HorizontalScrollBarVisibility="Auto" ZoomMode="Enabled">
+            <ItemsRepeater x:Name="itemsRepeater" HorizontalCacheLength="0" VerticalCacheLength="0" Background="LightGray">
+                <ItemsRepeater.ItemTemplate>
+                    <DataTemplate>
+                        <Border Margin="2" BorderThickness="6" BorderBrush="DarkGray">
+                            <TextBlock Margin="4" Text="{Binding Text}" Height="{Binding Size}"/>
+                        </Border>
+                    </DataTemplate>
+                </ItemsRepeater.ItemTemplate>
+                <ItemsRepeater.Layout>
+                    <StackLayout/>
+                </ItemsRepeater.Layout>
+            </ItemsRepeater>
+        </ScrollViewer>
+
+        <ScrollView x:Name="scrollView" Background="Gray" Margin="10" Width="200" HorizontalAlignment="Left" Grid.Row="1" Visibility="Collapsed"
+            HorizontalScrollMode="Enabled" HorizontalScrollBarVisibility="Auto" ZoomMode="Enabled"/>
+    </Grid>
+</Page>
diff --git a/src/controls/dev/Repeater/TestUI/Samples/ItemsSourceSamples/VariableSizedItemsPage.xaml.cs b/src/controls/dev/Repeater/TestUI/Samples/ItemsSourceSamples/VariableSizedItemsPage.xaml.cs
new file mode 100644
index 0000000000..2e96192baf
--- /dev/null
+++ b/src/controls/dev/Repeater/TestUI/Samples/ItemsSourceSamples/VariableSizedItemsPage.xaml.cs
@@ -0,0 +1,796 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using System;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Linq;
+using System.Numerics;
+using Microsoft.UI.Composition;
+using Microsoft.UI.Private.Controls;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Navigation;
+
+namespace MUXControlsTestApp.Samples
+{
+    public sealed partial class VariableSizedItemsPage : Page
+    {
+        private double m_extentHeight = 0;
+        private int m_changeViewToVerticalOffsetWithAnimationCorrelationId = -1;
+        private int m_changeViewToVerticalScrollPercentageWithAnimationCorrelationId = -1;
+
+        public VariableSizedItemsPage()
+        {
+            this.InitializeComponent();
+            goBackButton.Click += delegate { Frame.GoBack(); };
+
+            itemsRepeater.ItemsSource = Enumerable.Range(0, 10000).Select(x => new VariableSizeItem(x)
+            {
+                Text = "Item " + x
+            });
+
+            Loaded += VariableSizedItemsPage_Loaded;
+        }
+
+        ~VariableSizedItemsPage()
+        {
+        }
+
+        protected override void OnNavigatedFrom(NavigationEventArgs e)
+        {
+            UnhookScrollersEvents();
+
+            base.OnNavigatedFrom(e);
+        }
+
+        private void AppendEventMessage(string message)
+        {
+            if (lstEvents != null)
+            {
+                lstEvents.Items.Add(message);
+            }
+        }
+
+        private void HookScrollersEvents()
+        {
+            if (scrollViewer != null)
+            {
+                scrollViewer.ViewChanging += ScrollViewer_ViewChanging;
+                scrollViewer.ViewChanged += ScrollViewer_ViewChanged;
+            }
+            if (scrollView != null)
+            {
+                scrollView.ViewChanged += ScrollView_ViewChanged;
+                scrollView.ScrollAnimationStarting += ScrollView_ScrollAnimationStarting;
+            }
+        }
+
+        private void UnhookScrollersEvents()
+        {
+            if (scrollViewer != null)
+            {
+                scrollViewer.ViewChanging -= ScrollViewer_ViewChanging;
+                scrollViewer.ViewChanged -= ScrollViewer_ViewChanged;
+            }
+            if (scrollView != null)
+            {
+                scrollView.ViewChanged -= ScrollView_ViewChanged;
+                scrollView.ScrollAnimationStarting -= ScrollView_ScrollAnimationStarting;
+            }
+        }
+
+        private void UpdateItemsRepeaterVerticalCacheLength()
+        {
+            try
+            {
+                if (itemsRepeater != null)
+                {
+                    txtItemsRepeaterVerticalCacheLength.Text = itemsRepeater.VerticalCacheLength.ToString();
+                }
+            }
+            catch (Exception ex)
+            {
+                string message = "UpdateItemsRepeaterVerticalCacheLength. Exception:" + ex.ToString();
+
+                Debug.WriteLine(message);
+                AppendEventMessage(message);
+            }
+        }
+
+        private void UpdateScrollerVerticalAnchorRatio()
+        {
+            try
+            {
+                if (scrollViewer != null && scrollViewer.Content != null)
+                {
+                    txtScrollerVerticalAnchorRatio.Text = scrollViewer.VerticalAnchorRatio.ToString();
+                }
+                else if (scrollView != null)
+                {
+                    txtScrollerVerticalAnchorRatio.Text = scrollView.VerticalAnchorRatio.ToString();
+                }
+            }
+            catch (Exception ex)
+            {
+                string message = "UpdateScrollerVerticalAnchorRatio. Exception:" + ex.ToString();
+
+                Debug.WriteLine(message);
+                AppendEventMessage(message);
+            }
+        }
+
+        private void UpdateScrollerVerticalOffset()
+        {
+            try
+            {
+                if (scrollViewer != null && scrollViewer.Content != null)
+                {
+                    txtScrollerVerticalOffset.Text = scrollViewer.VerticalOffset.ToString();
+                }
+                else if (scrollView != null)
+                {
+                    txtScrollerVerticalOffset.Text = scrollView.VerticalOffset.ToString();
+                }
+            }
+            catch (Exception ex)
+            {
+                string message = "UpdateScrollerVerticalOffset. Exception:" + ex.ToString();
+
+                Debug.WriteLine(message);
+                AppendEventMessage(message);
+            }
+        }
+
+        private void UpdateScrollerZoomFactor()
+        {
+            try
+            {
+                if (scrollViewer != null && scrollViewer.Content != null)
+                {
+                    txtScrollerZoomFactor.Text = scrollViewer.ZoomFactor.ToString();
+                }
+                else if (scrollView != null)
+                {
+                    txtScrollerZoomFactor.Text = scrollView.ZoomFactor.ToString();
+                }
+            }
+            catch (Exception ex)
+            {
+                string message = "UpdateScrollerZoomFactor. Exception:" + ex.ToString();
+
+                Debug.WriteLine(message);
+                AppendEventMessage(message);
+            }
+        }
+
+        private void UpdateScrollerVerticalScrollPercentage()
+        {
+            try
+            {
+                if (scrollViewer != null && scrollViewer.Content != null)
+                {
+                    if (scrollViewer.ScrollableHeight == 0)
+                    {
+                        txtScrollerVerticalScrollPercentage.Text = "N/A";
+                    }
+                    else
+                    {
+                        txtScrollerVerticalScrollPercentage.Text = (scrollViewer.VerticalOffset / scrollViewer.ScrollableHeight * 100.0).ToString();
+                    }
+                }
+                else if (scrollView != null)
+                {
+                    if (scrollView.ScrollableHeight == 0)
+                    {
+                        txtScrollerVerticalScrollPercentage.Text = "N/A";
+                    }
+                    else
+                    {
+                        txtScrollerVerticalScrollPercentage.Text = (scrollView.VerticalOffset / scrollView.ScrollableHeight * 100.0).ToString();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                string message = "UpdateScrollerVerticalScrollPercentage. Exception:" + ex.ToString();
+
+                Debug.WriteLine(message);
+                AppendEventMessage(message);
+            }
+        }
+
+        private void UpdateScrollerScrollableHeight()
+        {
+            try
+            {
+                if (scrollViewer != null && scrollViewer.Content != null)
+                {
+                    txtScrollerScrollableHeight.Text = scrollViewer.ScrollableHeight.ToString();
+                }
+                else if (scrollView != null)
+                {
+                    txtScrollerScrollableHeight.Text = scrollView.ScrollableHeight.ToString();
+                }
+            }
+            catch (Exception ex)
+            {
+                string message = "UpdateScrollerScrollableHeight. Exception:" + ex.ToString();
+
+                Debug.WriteLine(message);
+                AppendEventMessage(message);
+            }
+        }
+
+        private void UpdateScrollerExtentHeight()
+        {
+            try
+            {
+                if (scrollViewer != null && scrollViewer.Content != null)
+                {
+                    txtScrollerExtentHeight.Text = scrollViewer.ExtentHeight.ToString();
+                }
+                else if (scrollView != null)
+                {
+                    txtScrollerExtentHeight.Text = scrollView.ExtentHeight.ToString();
+                }
+
+                UpdateExtentHeight();
+            }
+            catch (Exception ex)
+            {
+                string message = "UpdateScrollerExtentHeight. Exception:" + ex.ToString();
+
+                Debug.WriteLine(message);
+                AppendEventMessage(message);
+            }
+        }
+
+        private void UpdateExtentHeight()
+        {
+            double extentHeight = 0;
+
+            if (scrollViewer != null && scrollViewer.Content != null)
+            {
+                extentHeight = scrollViewer.ExtentHeight;
+            }
+            else if (scrollView != null)
+            {
+                extentHeight = scrollView.ExtentHeight;
+            }
+
+            if (m_extentHeight != extentHeight)
+            {
+                AppendEventMessage("ExtentHeight changed. Old=" + m_extentHeight + ", New=" + extentHeight);
+
+                m_extentHeight = extentHeight;
+            }
+        }
+
+        private void UpdateScrollerChangeViewVerticalScrollPercentage()
+        {
+            try
+            {
+                double verticalOffset = Convert.ToDouble(txtScrollerChangeViewVerticalOffset.Text);
+
+                if (scrollViewer != null && scrollViewer.Content != null)
+                {
+                    if (scrollViewer.ScrollableHeight == 0)
+                    {
+                        txtScrollerChangeViewVerticalScrollPercentage.Text = "N/A";
+                    }
+                    else
+                    {
+                        txtScrollerChangeViewVerticalScrollPercentage.Text = (verticalOffset / scrollViewer.ScrollableHeight * 100.0).ToString();
+                    }
+                }
+                else if (scrollView != null)
+                {
+                    if (scrollView.ScrollableHeight == 0)
+                    {
+                        txtScrollerChangeViewVerticalScrollPercentage.Text = "N/A";
+                    }
+                    else
+                    {
+                        txtScrollerChangeViewVerticalScrollPercentage.Text = (verticalOffset / scrollView.ScrollableHeight * 100.0).ToString();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                string message = "UpdateScrollerChangeViewVerticalScrollPercentage. Exception:" + ex.ToString();
+
+                Debug.WriteLine(message);
+                AppendEventMessage(message);
+            }
+        }
+
+        private void VariableSizedItemsPage_Loaded(object sender, RoutedEventArgs e)
+        {
+            HookScrollersEvents();
+            UpdateItemsRepeaterVerticalCacheLength();
+            UpdateCmbItemsRepeaterHorizontalAlignment();
+            UpdateCmbItemsRepeaterVerticalAlignment();
+            UpdateScrollerVerticalAnchorRatio();
+            UpdateScrollerVerticalOffset();
+            UpdateScrollerZoomFactor();
+            UpdateScrollerVerticalScrollPercentage();
+            UpdateScrollerScrollableHeight();
+            UpdateScrollerExtentHeight();
+            UpdateScrollerChangeViewVerticalScrollPercentage();
+        }
+
+        private string ScrollViewerViewToString(ScrollViewerView scrollViewerView)
+        {
+            return "H=" + scrollViewerView.HorizontalOffset.ToString() + ", V=" + scrollViewerView.VerticalOffset + ", ZF=" + scrollViewerView.ZoomFactor;
+        }
+
+        private void ScrollViewer_ViewChanging(object sender, ScrollViewerViewChangingEventArgs args)
+        {
+            AppendEventMessage("ViewChanging IsInertial=" + args.IsInertial + ", NextView=(" + ScrollViewerViewToString(args.NextView) + "), FinalView=(" + ScrollViewerViewToString(args.FinalView) + ")");
+        }
+
+        private void ScrollViewer_ViewChanged(object sender, ScrollViewerViewChangedEventArgs args)
+        {
+            AppendEventMessage("ViewChanged IsIntermediate=" + args.IsIntermediate + ", H=" + scrollViewer.HorizontalOffset.ToString() + ", V=" + scrollViewer.VerticalOffset + ", ZF=" + scrollViewer.ZoomFactor);
+
+            UpdateExtentHeight();
+        }
+
+        private void ScrollView_ViewChanged(ScrollView sender, object args)
+        {
+            AppendEventMessage("ViewChanged H=" + scrollView.HorizontalOffset.ToString() + ", V=" + scrollView.VerticalOffset + ", ZF=" + scrollView.ZoomFactor);
+
+            UpdateExtentHeight();
+        }
+
+        private void ScrollView_ScrollAnimationStarting(ScrollView sender, ScrollingScrollAnimationStartingEventArgs args)
+        {
+            AppendEventMessage($"ScrollAnimationStarting CorrelationId={args.CorrelationId}, SP=({args.StartPosition.X}, {args.StartPosition.Y}), EP=({args.EndPosition.X}, {args.EndPosition.Y})");
+
+            try
+            {
+                Vector3KeyFrameAnimation stockKeyFrameAnimation = args.Animation as Vector3KeyFrameAnimation;
+
+                if (stockKeyFrameAnimation != null)
+                {
+                    TextBox txtChangeViewWithAnimationDuration = null;
+
+                    if (m_changeViewToVerticalOffsetWithAnimationCorrelationId == args.CorrelationId)
+                    {
+                        txtChangeViewWithAnimationDuration = txtScrollerChangeViewToVerticalOffsetWithAnimationDuration;
+                    }
+                    else if (m_changeViewToVerticalScrollPercentageWithAnimationCorrelationId == args.CorrelationId)
+                    {
+                        txtChangeViewWithAnimationDuration = txtScrollerChangeViewToVerticalScrollPercentageWithAnimationDuration;
+                    }
+
+                    if (txtChangeViewWithAnimationDuration != null && 
+                        txtChangeViewWithAnimationDuration.Text != "N/A" && 
+                        !string.IsNullOrWhiteSpace(txtChangeViewWithAnimationDuration.Text))
+                    {
+                        double durationOverride = Convert.ToDouble(txtChangeViewWithAnimationDuration.Text);
+
+                        stockKeyFrameAnimation.Duration = TimeSpan.FromMilliseconds(durationOverride);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                string message = "ScrollView_ScrollAnimationStarting. Exception:" + ex.ToString();
+
+                Debug.WriteLine(message);
+                AppendEventMessage(message);
+            }
+        }
+
+        private void BtnSwitchScroller_Click(object sender, RoutedEventArgs e)
+        {
+            if (btnSwitchScroller.Content as string == "Use ScrollView")
+            {
+                btnSwitchScroller.Content = "Use ScrollViewer";
+                btnScrollerChangeViewToZoomFactor.Content = "Jump to ZoomFactor";
+                btnScrollerChangeViewToZoomFactorWithAnimation.Content = "Animate to ZoomFactor";
+                txtScrollerChangeViewToVerticalOffsetWithAnimationDuration.IsEnabled = true;
+                txtScrollerChangeViewToVerticalScrollPercentageWithAnimationDuration.IsEnabled = true;
+                txtScrollerChangeViewZoomCenterPoint.IsEnabled = true;
+                scrollViewer.Visibility = Visibility.Collapsed;
+                scrollView.Visibility = Visibility.Visible;
+                scrollViewer.Content = null;
+                scrollView.Content = itemsRepeater;
+            }
+            else
+            {
+                btnSwitchScroller.Content = "Use ScrollView";
+                btnScrollerChangeViewToZoomFactor.Content = "Jump to VerticalOffset/ZoomFactor";
+                btnScrollerChangeViewToZoomFactorWithAnimation.Content = "Animate to VerticalOffset/ZoomFactor";
+                txtScrollerChangeViewToVerticalOffsetWithAnimationDuration.IsEnabled = false;
+                txtScrollerChangeViewToVerticalScrollPercentageWithAnimationDuration.IsEnabled = false;
+                txtScrollerChangeViewZoomCenterPoint.IsEnabled = false;
+                scrollView.Visibility = Visibility.Collapsed;
+                scrollViewer.Visibility = Visibility.Visible;
+                scrollView.Content = null;
+                scrollViewer.Content = itemsRepeater;
+            }
+        }
+
+        private void BtnSwitchVariability_Click(object sender, RoutedEventArgs e)
+        {
+            if (btnSwitchVariability.Content as string == "Use fixed heights")
+            {
+                btnSwitchVariability.Content = "Use variable heights";
+                itemsRepeater.ItemsSource = Enumerable.Range(0, 10000).Select(x => new FixedSizeItem()
+                {
+                    Text = "Item " + x
+                });
+            }
+            else
+            {
+                btnSwitchVariability.Content = "Use fixed heights";
+                itemsRepeater.ItemsSource = Enumerable.Range(0, 10000).Select(x => new VariableSizeItem(x)
+                {
+                    Text = "Item " + x
+                });
+            }
+        }
+
+        private void BtnGetScrollerVerticalAnchorRatio_Click(object sender, RoutedEventArgs e)
+        {
+            UpdateScrollerVerticalAnchorRatio();
+        }
+
+        private void BtnGetScrollerVerticalOffset_Click(object sender, RoutedEventArgs e)
+        {
+            UpdateScrollerVerticalOffset();
+        }
+
+        private void BtnGetScrollerZoomFactor_Click(object sender, RoutedEventArgs e)
+        {
+            UpdateScrollerZoomFactor();
+        }
+
+        private void BtnGetScrollerVerticalScrollPercentage_Click(object sender, RoutedEventArgs e)
+        {
+            UpdateScrollerVerticalScrollPercentage();
+        }
+
+        private void BtnGetScrollerScrollableHeight_Click(object sender, RoutedEventArgs e)
+        {
+            UpdateScrollerScrollableHeight();
+        }
+
+        private void BtnGetScrollerExtentHeight_Click(object sender, RoutedEventArgs e)
+        {
+            UpdateScrollerExtentHeight();
+        }
+
+        private void BtnSetScrollerVerticalAnchorRatio_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                double verticalAnchorRatio = Convert.ToDouble(txtScrollerVerticalAnchorRatio.Text);
+
+                if (scrollViewer != null)
+                {
+                    scrollViewer.VerticalAnchorRatio = verticalAnchorRatio;
+                }
+                if (scrollView != null)
+                {
+                    scrollView.VerticalAnchorRatio = verticalAnchorRatio;
+                }
+            }
+            catch (Exception ex)
+            {
+                string message = "BtnSetScrollerVerticalAnchorRatio_Click. Exception:" + ex.ToString();
+
+                Debug.WriteLine(message);
+                AppendEventMessage(message);
+            }
+        }
+
+        private void BtnScrollerChangeViewToVerticalOffset_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                double verticalOffset = Convert.ToDouble(txtScrollerChangeViewVerticalOffset.Text);
+
+                if (scrollViewer != null && scrollViewer.Content != null)
+                {
+                    scrollViewer.ChangeView(null, verticalOffset, null, true);
+                }
+                else if (scrollView != null)
+                {
+                    scrollView.ScrollTo(scrollView.HorizontalOffset, verticalOffset, new ScrollingScrollOptions(ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Ignore));
+                }
+            }
+            catch (Exception ex)
+            {
+                string message = "BtnScrollerChangeView_Click. Exception:" + ex.ToString();
+
+                Debug.WriteLine(message);
+                AppendEventMessage(message);
+            }
+        }
+
+        private void BtnScrollerChangeViewToVerticalScrollPercentage_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                double verticalScrollPercentage = Convert.ToDouble(txtScrollerChangeViewVerticalScrollPercentage.Text);
+
+                if (scrollViewer != null && scrollViewer.Content != null)
+                {
+                    double verticalOffset = scrollViewer.ScrollableHeight * verticalScrollPercentage / 100.0;
+
+                    scrollViewer.ChangeView(null, verticalOffset, null, true);
+                }
+                else if (scrollView != null)
+                {
+                    double verticalOffset = scrollView.ScrollableHeight * verticalScrollPercentage / 100.0;
+
+                    scrollView.ScrollTo(scrollView.HorizontalOffset, verticalOffset, new ScrollingScrollOptions(ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Ignore));
+                }
+            }
+            catch (Exception ex)
+            {
+                string message = "BtnScrollerChangeViewToVerticalScrollPercentage_Click. Exception:" + ex.ToString();
+
+                Debug.WriteLine(message);
+                AppendEventMessage(message);
+            }
+        }
+
+        private void BtnScrollerChangeViewToVerticalOffsetWithAnimation_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                double verticalOffset = Convert.ToDouble(txtScrollerChangeViewVerticalOffset.Text);
+
+                if (scrollViewer != null && scrollViewer.Content != null)
+                {
+                    scrollViewer.ChangeView(null, verticalOffset, null, false);
+                }
+                else if (scrollView != null)
+                {
+                    m_changeViewToVerticalOffsetWithAnimationCorrelationId = scrollView.ScrollTo(scrollView.HorizontalOffset, verticalOffset);
+                }
+            }
+            catch (Exception ex)
+            {
+                string message = "BtnScrollerChangeViewWithAnimation_Click. Exception:" + ex.ToString();
+
+                Debug.WriteLine(message);
+                AppendEventMessage(message);
+            }
+        }
+
+        private void BtnScrollerChangeViewToVerticalScrollPercentageWithAnimation_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                double verticalScrollPercentage = Convert.ToDouble(txtScrollerChangeViewVerticalScrollPercentage.Text);
+
+                if (scrollViewer != null && scrollViewer.Content != null)
+                {
+                    double verticalOffset = scrollViewer.ScrollableHeight * verticalScrollPercentage / 100.0;
+
+                    scrollViewer.ChangeView(null, verticalOffset, null, false);
+                }
+                else if (scrollView != null)
+                {
+                    double verticalOffset = scrollView.ScrollableHeight * verticalScrollPercentage / 100.0;
+
+                    m_changeViewToVerticalScrollPercentageWithAnimationCorrelationId = scrollView.ScrollTo(scrollView.HorizontalOffset, verticalOffset);
+                }
+            }
+            catch (Exception ex)
+            {
+                string message = "BtnScrollerChangeViewToVerticalScrollPercentageWithAnimation_Click. Exception:" + ex.ToString();
+
+                Debug.WriteLine(message);
+                AppendEventMessage(message);
+            }
+        }
+
+        private void BtnScrollerChangeViewToZoomFactor_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                double verticalOffset = Convert.ToDouble(txtScrollerChangeViewVerticalOffset.Text);
+                float zoomFactor = Convert.ToSingle(txtScrollerChangeViewZoomZoomFactor.Text);
+
+                if (scrollViewer != null && scrollViewer.Content != null)
+                {
+                    scrollViewer.ChangeView(
+                        null, 
+                        verticalOffset, 
+                        zoomFactor, 
+                        true);
+                }
+                else if (scrollView != null)
+                {
+                    scrollView.ZoomTo(
+                        zoomFactor, 
+                        (txtScrollerChangeViewZoomCenterPoint.Text == "null") ? (Vector2?)null : ConvertFromStringToVector2(txtScrollerChangeViewZoomCenterPoint.Text),
+                        new ScrollingZoomOptions(ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Ignore));
+                }
+            }
+            catch (Exception ex)
+            {
+                string message = "BtnScrollerChangeViewToZoomFactor_Click. Exception:" + ex.ToString();
+
+                Debug.WriteLine(message);
+                AppendEventMessage(message);
+            }
+        }
+
+        private void BtnScrollerChangeViewToZoomFactorWithAnimation_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                double verticalOffset = Convert.ToDouble(txtScrollerChangeViewVerticalOffset.Text);
+                float zoomFactor = Convert.ToSingle(txtScrollerChangeViewZoomZoomFactor.Text);
+
+                if (scrollViewer != null && scrollViewer.Content != null)
+                {
+                    scrollViewer.ChangeView(
+                        null,
+                        verticalOffset,
+                        zoomFactor,
+                        false);
+                }
+                else if (scrollView != null)
+                {
+                    scrollView.ZoomTo(
+                        zoomFactor,
+                        (txtScrollerChangeViewZoomCenterPoint.Text == "null") ? (Vector2?)null : ConvertFromStringToVector2(txtScrollerChangeViewZoomCenterPoint.Text));
+                }
+            }
+            catch (Exception ex)
+            {
+                string message = "BtnScrollerChangeViewToZoomFactorWithAnimation_Click. Exception:" + ex.ToString();
+
+                Debug.WriteLine(message);
+                AppendEventMessage(message);
+            }
+        }
+
+        private void BtnGetScrollerChangeViewVerticalOffset_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (txtScrollerChangeViewVerticalScrollPercentage.Text == "N/A")
+                {
+                    txtScrollerChangeViewVerticalOffset.Text = "N/A";
+                    return;
+                }
+
+                double verticalScrollPercentage = Convert.ToDouble(txtScrollerChangeViewVerticalScrollPercentage.Text);
+
+                if (scrollViewer != null && scrollViewer.Content != null)
+                {
+                    txtScrollerChangeViewVerticalOffset.Text = (scrollViewer.ScrollableHeight * verticalScrollPercentage / 100.0).ToString();
+                }
+                else if (scrollView != null)
+                {
+                    txtScrollerChangeViewVerticalOffset.Text = (scrollView.ScrollableHeight * verticalScrollPercentage / 100.0).ToString();
+                }
+            }
+            catch (Exception ex)
+            {
+                string message = "BtnGetScrollerChangeViewVerticalOffset_Click. Exception:" + ex.ToString();
+
+                Debug.WriteLine(message);
+                AppendEventMessage(message);
+            }
+        }
+
+        private void BtnGetScrollerChangeViewVerticalScrollPercentage_Click(object sender, RoutedEventArgs e)
+        {
+            UpdateScrollerChangeViewVerticalScrollPercentage();
+        }
+
+        private void BtnGetItemsRepeaterVerticalCacheLength_Click(object sender, RoutedEventArgs e)
+        {
+            UpdateItemsRepeaterVerticalCacheLength();
+        }
+
+        private void BtnSetItemsRepeaterVerticalCacheLength_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (itemsRepeater != null)
+                {
+                    itemsRepeater.VerticalCacheLength = Convert.ToDouble(txtItemsRepeaterVerticalCacheLength.Text);
+                }
+            }
+            catch (Exception ex)
+            {
+                string message = "BtnSetItemsRepeaterVerticalCacheLength_Click. Exception:" + ex.ToString();
+
+                Debug.WriteLine(message);
+                AppendEventMessage(message);
+            }
+        }
+
+        private void CmbItemsRepeaterHorizontalAlignment_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (itemsRepeater != null)
+            {
+                itemsRepeater.HorizontalAlignment = (HorizontalAlignment)cmbItemsRepeaterHorizontalAlignment.SelectedIndex;
+            }
+        }
+
+        private void UpdateCmbItemsRepeaterHorizontalAlignment()
+        {
+            if (itemsRepeater != null)
+            {
+                cmbItemsRepeaterHorizontalAlignment.SelectedIndex = (int)itemsRepeater.HorizontalAlignment;
+            }
+        }
+
+        private void CmbItemsRepeaterVerticalAlignment_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (itemsRepeater != null)
+            {
+                itemsRepeater.VerticalAlignment = (VerticalAlignment)cmbItemsRepeaterVerticalAlignment.SelectedIndex;
+            }
+        }
+
+        private void UpdateCmbItemsRepeaterVerticalAlignment()
+        {
+            if (itemsRepeater != null)
+            {
+                cmbItemsRepeaterVerticalAlignment.SelectedIndex = (int)itemsRepeater.VerticalAlignment;
+            }
+        }
+
+        private void BtnClearEvents_Click(object sender, RoutedEventArgs e)
+        {
+            if (lstEvents != null)
+            {
+                lstEvents.Items.Clear();
+            }
+        }
+
+        private Vector2 ConvertFromStringToVector2(string value)
+        {
+            float x = 0, y = 0;
+
+            int commaIndex = value.IndexOf(',');
+            if (commaIndex != -1)
+            {
+                x = Convert.ToSingle(value.Substring(0, commaIndex));
+                y = Convert.ToSingle(value.Substring(commaIndex + 1));
+            }
+
+            return new Vector2(x, y);
+        }
+    }
+
+    public class FixedSizeItem
+    {
+        public FixedSizeItem()
+        {
+            Size = 50;
+        }
+
+        public string Text { get; set; }
+        public int Size { get; set; }
+    }
+
+    public class VariableSizeItem
+    {
+        public VariableSizeItem(int sizeSeed)
+        {
+            long size = (sizeSeed + 9) * (sizeSeed + 10) * (sizeSeed + 11);
+            string sizeStr = size.ToString();
+            sizeStr = sizeStr.Substring(sizeStr.Length - 2);
+            size = long.Parse(sizeStr) * 2;
+            Size = Math.Max((int)size, 24);
+        }
+
+        public string Text { get; set; }
+        public int Size { get; set; }
+    }
+}
diff --git a/src/controls/dev/Repeater/TestUI/Samples/LayoutSamples/NonVirtualLayoutPages/NonVirtualStackLayoutSamplePage.xaml b/src/controls/dev/Repeater/TestUI/Samples/LayoutSamples/NonVirtualLayoutPages/NonVirtualStackLayoutSamplePage.xaml
index 058c3f1c86..294a9e0270 100644
--- a/src/controls/dev/Repeater/TestUI/Samples/LayoutSamples/NonVirtualLayoutPages/NonVirtualStackLayoutSamplePage.xaml
+++ b/src/controls/dev/Repeater/TestUI/Samples/LayoutSamples/NonVirtualLayoutPages/NonVirtualStackLayoutSamplePage.xaml
@@ -5,13 +5,55 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:Microsoft.UI.Xaml.Controls"
     xmlns:local="using:MUXControlsTestApp.Samples">
-    <Grid>
-        <ScrollViewer>
-            <controls:ItemsRepeater x:Name="repeater">
-                <controls:ItemsRepeater.Layout>
-                    <local:NonVirtualStackLayout />
-                </controls:ItemsRepeater.Layout>
-            </controls:ItemsRepeater>
-        </ScrollViewer>
+    <Grid ColumnDefinitions="Auto, Auto, Auto, Auto">
+        <StackPanel>
+            <TextBlock Text="itemsRepeater1.ItemsSource is ObservableCollection&lt;int&gt;" Foreground="Red" Margin="4"/>
+
+            <ScrollViewer Margin="4" Width="64">
+                <controls:ItemsRepeater x:Name="itemsRepeater1">
+                    <controls:ItemsRepeater.Layout>
+                        <local:NonVirtualStackLayout/>
+                    </controls:ItemsRepeater.Layout>
+                </controls:ItemsRepeater>
+            </ScrollViewer>
+        </StackPanel>
+        
+        <Grid Margin="4, 4, 12, 4" Grid.Column="1" ColumnDefinitions="Auto, Auto" RowDefinitions="Auto, Auto, Auto, Auto, Auto, Auto">
+            <TextBlock Text="itemsRepeater1.ItemsSource operations" Grid.ColumnSpan="2" Foreground="Red" Margin="0, 4, 0, 4"/>
+
+            <Button x:Name="btnClear1" Content="Clear" Margin="1" Grid.Row="1" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Center" Click="BtnClear1_Click"/>
+
+            <TextBlock Text="Child Index:" Grid.Row="2" VerticalAlignment="Center" Margin="0, 4, 0, 0"/>
+            <TextBox x:Name="txtChildIndex1" Text="0" VerticalAlignment="Center" Grid.Row="2" Grid.Column="1" Margin="1"/>
+
+            <Button x:Name="btnReplace1" Content="Replace" Margin="1" Grid.Row="3" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Center" Click="BtnReplace1_Click"/>
+            <Button x:Name="btnInsert1" Content="Insert" Margin="1" Grid.Row="4" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Center" Click="BtnInsert1_Click"/>
+            <Button x:Name="btnRemoveAt1" Content="RemoveAt" Margin="1" Grid.Row="5" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Center" Click="BtnRemoveAt1_Click"/>
+        </Grid>
+
+        <StackPanel Grid.Column="2">
+            <TextBlock Text="itemsRepeater2.ItemsSource is ObservableCollection&lt;UIElement&gt;" Foreground="Red" Margin="4"/>
+
+            <ScrollViewer Margin="4" Width="64">
+                <controls:ItemsRepeater x:Name="itemsRepeater2">
+                    <controls:ItemsRepeater.Layout>
+                        <local:NonVirtualStackLayout/>
+                    </controls:ItemsRepeater.Layout>
+                </controls:ItemsRepeater>
+            </ScrollViewer>
+        </StackPanel>
+
+        <Grid Margin="4" Grid.Column="3" ColumnDefinitions="Auto, Auto" RowDefinitions="Auto, Auto, Auto, Auto, Auto, Auto">
+            <TextBlock Text="itemsRepeater2.ItemsSource operations" Grid.ColumnSpan="2" Foreground="Red" Margin="0, 4, 0, 4"/>
+
+            <Button x:Name="btnClear2" Content="Clear" Margin="1" Grid.Row="1" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Center" Click="BtnClear2_Click"/>
+
+            <TextBlock Text="Child Index:" Grid.Row="2" VerticalAlignment="Center" Margin="0, 4, 0, 0"/>
+            <TextBox x:Name="txtChildIndex2" Text="0" VerticalAlignment="Center" Grid.Row="2" Grid.Column="1" Margin="1"/>
+
+            <Button x:Name="btnReplace2" Content="Replace" Margin="1" Grid.Row="3" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Center" Click="BtnReplace2_Click"/>
+            <Button x:Name="btnInsert2" Content="Insert" Margin="1" Grid.Row="4" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Center" Click="BtnInsert2_Click"/>
+            <Button x:Name="btnRemoveAt2" Content="RemoveAt" Margin="1" Grid.Row="5" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Center" Click="BtnRemoveAt2_Click"/>
+        </Grid>
     </Grid>
 </Page>
diff --git a/src/controls/dev/Repeater/TestUI/Samples/LayoutSamples/NonVirtualLayoutPages/NonVirtualStackLayoutSamplePage.xaml.cs b/src/controls/dev/Repeater/TestUI/Samples/LayoutSamples/NonVirtualLayoutPages/NonVirtualStackLayoutSamplePage.xaml.cs
index 322e3426ad..e62814080d 100644
--- a/src/controls/dev/Repeater/TestUI/Samples/LayoutSamples/NonVirtualLayoutPages/NonVirtualStackLayoutSamplePage.xaml.cs
+++ b/src/controls/dev/Repeater/TestUI/Samples/LayoutSamples/NonVirtualLayoutPages/NonVirtualStackLayoutSamplePage.xaml.cs
@@ -1,17 +1,79 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
+using Microsoft.UI;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using System.Linq;
+using Microsoft.UI.Xaml.Media;
+using System.Collections.ObjectModel;
 
 namespace MUXControlsTestApp.Samples
 {
     public sealed partial class NonVirtualStackLayoutSamplePage : Page
     {
+        private ObservableCollection<int> _numbers = new ObservableCollection<int>();
+        private ObservableCollection<UIElement> _uiElements = new ObservableCollection<UIElement>();
+        private SolidColorBrush _solidColorBrushRed = new SolidColorBrush(Colors.Red);
+        private SolidColorBrush _solidColorBrushGreen = new SolidColorBrush(Colors.Green);
+
         public NonVirtualStackLayoutSamplePage()
         {
             this.InitializeComponent();
-            repeater.ItemsSource = Enumerable.Range(0, 10);
+
+            for (int i = 0; i < 10; i++)
+            {
+                _numbers.Add(i);
+                _uiElements.Add(new TextBlock() { Text = i.ToString(), Foreground = _solidColorBrushRed });
+            }
+
+            itemsRepeater1.ItemsSource = _numbers;
+            itemsRepeater2.ItemsSource = _uiElements;
+        }
+
+        private void BtnClear1_Click(object sender, RoutedEventArgs e)
+        {
+            _numbers.Clear();
+        }
+
+        private void BtnReplace1_Click(object sender, RoutedEventArgs e)
+        {
+            int childIndex = int.Parse(txtChildIndex1.Text);
+            _numbers[childIndex] = _numbers.Count;
+        }
+
+        private void BtnInsert1_Click(object sender, RoutedEventArgs e)
+        {
+            int childIndex = int.Parse(txtChildIndex1.Text);
+            _numbers.Insert(childIndex, _numbers.Count);
+        }
+
+        private void BtnRemoveAt1_Click(object sender, RoutedEventArgs e)
+        {
+            int childIndex = int.Parse(txtChildIndex1.Text);
+            _numbers.RemoveAt(childIndex);
+        }
+
+        private void BtnClear2_Click(object sender, RoutedEventArgs e)
+        {
+            _uiElements.Clear();
+        }
+
+        private void BtnReplace2_Click(object sender, RoutedEventArgs e)
+        {
+            int childIndex = int.Parse(txtChildIndex2.Text);
+            _uiElements[childIndex] = new TextBlock() { Text = _uiElements.Count.ToString(), Foreground = _solidColorBrushGreen };
+        }
+
+        private void BtnInsert2_Click(object sender, RoutedEventArgs e)
+        {
+            int childIndex = int.Parse(txtChildIndex2.Text);
+            _uiElements.Insert(childIndex, new TextBlock() { Text = _uiElements.Count.ToString(), Foreground = _solidColorBrushGreen });
+        }
+
+        private void BtnRemoveAt2_Click(object sender, RoutedEventArgs e)
+        {
+            int childIndex = int.Parse(txtChildIndex2.Text);
+            _uiElements.RemoveAt(childIndex);
         }
     }
 }
diff --git a/src/controls/dev/Repeater/TestUI/Samples/UniformGridLayoutDemo.cs b/src/controls/dev/Repeater/TestUI/Samples/UniformGridLayoutDemo.cs
index 3aadca6cbd..a99e663e10 100644
--- a/src/controls/dev/Repeater/TestUI/Samples/UniformGridLayoutDemo.cs
+++ b/src/controls/dev/Repeater/TestUI/Samples/UniformGridLayoutDemo.cs
@@ -17,6 +17,17 @@ public UniformGridLayoutDemo()
             collection = Enumerable.Range(0, 40);
             this.InitializeComponent();
             imageAspectRatioTestRepeater.ItemsSource = Enumerable.Range(0, 30);
+
+            Loaded += UniformGridLayoutDemo_Loaded;
+        }
+
+        ~UniformGridLayoutDemo()
+        {
+        }
+
+        private void UniformGridLayoutDemo_Loaded(object sender, RoutedEventArgs e)
+        {
+            GetUniformGridLayoutMaximumRowsOrColumnsButtonClick(null, null);
         }
 
         public void GetRepeaterActualHeightButtonClick(object sender, RoutedEventArgs e)
@@ -24,6 +35,16 @@ public void GetRepeaterActualHeightButtonClick(object sender, RoutedEventArgs e)
             RepeaterActualHeightLabel.Text = UniformGridRepeater.ActualHeight.ToString();
         }
 
+        private void GetUniformGridLayoutMaximumRowsOrColumnsButtonClick(object sender, RoutedEventArgs e)
+        {
+            UniformGridLayoutMaximumRowsOrColumns.Text = (UniformGridRepeater.Layout as UniformGridLayout).MaximumRowsOrColumns.ToString();
+        }
+
+        private void SetUniformGridLayoutMaximumRowsOrColumnsButtonClick(object sender, RoutedEventArgs e)
+        {
+            LayoutHelper.SetMaxRowsOrColumns(UniformGridRepeater.Layout, int.Parse(UniformGridLayoutMaximumRowsOrColumns.Text));
+        }
+
         private void GetUniformGridLayoutMinColumnSpacingButtonClick(object sender, RoutedEventArgs e)
         {
             UniformGridLayoutMinColumnSpacing.Text = (UniformGridRepeater.Layout as UniformGridLayout).MinColumnSpacing.ToString();
diff --git a/src/controls/dev/Repeater/TestUI/Samples/UniformGridLayoutDemo.xaml b/src/controls/dev/Repeater/TestUI/Samples/UniformGridLayoutDemo.xaml
index 543590ceaf..327f350a87 100644
--- a/src/controls/dev/Repeater/TestUI/Samples/UniformGridLayoutDemo.xaml
+++ b/src/controls/dev/Repeater/TestUI/Samples/UniformGridLayoutDemo.xaml
@@ -3,21 +3,19 @@
     x:Class="MUXControlsTestApp.Samples.UniformGridLayoutDemo"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:MUXControlsTestApp"
-    xmlns:controls="using:Microsoft.UI.Xaml.Controls">
+    xmlns:local="using:MUXControlsTestApp">
 
     <local:TestPage.Resources>
         <!-- The Layout specifications used: -->
-        <controls:UniformGridLayout x:Name="UniformGridLayout"
-                                MinRowSpacing="8" MinColumnSpacing="8"
-                                MaximumRowsOrColumns="4"/>
+        <UniformGridLayout x:Name="UniformGridLayout"
+            MinRowSpacing="8" MinColumnSpacing="8"
+            MaximumRowsOrColumns="4"/>
 
         <DataTemplate x:Key="SimpleElementTemplate" x:DataType="x:String">
             <Grid Background="{ThemeResource SystemControlForegroundBaseMediumLowBrush}"
                 Width="100"
                 Height="100">
-                <TextBlock Text="{Binding}" 
-                    FontSize="20"/>
+                <TextBlock Text="{Binding}" FontSize="20"/>
             </Grid>
         </DataTemplate>
     </local:TestPage.Resources>
@@ -26,49 +24,59 @@
         <StackPanel>
             <StackPanel Orientation="Horizontal">
                 <Button AutomationProperties.Name="GetRepeaterActualHeightButton"
-                        Click="GetRepeaterActualHeightButtonClick" Margin="2">Get actual ItemsRepeater height</Button>
+                    Click="GetRepeaterActualHeightButtonClick" Margin="2">Get actual ItemsRepeater height</Button>
                 <TextBlock x:Name="RepeaterActualHeightLabel" AutomationProperties.Name="RepeaterActualHeightLabel" VerticalAlignment="Center" Margin="2"/>
             </StackPanel>
 
+            <StackPanel Orientation="Horizontal">
+                <TextBlock Text="UniformGridLayout.MaximumRowsOrColumns:" VerticalAlignment="Center" Margin="2"/>
+                <TextBox x:Name="UniformGridLayoutMaximumRowsOrColumns" AutomationProperties.Name="UniformGridLayoutMaximumRowsOrColumns" Margin="2"/>
+                <Button AutomationProperties.Name="GetUniformGridLayoutMaximumRowsOrColumns"
+                    Click="GetUniformGridLayoutMaximumRowsOrColumnsButtonClick" Margin="2">Get</Button>
+                <Button AutomationProperties.Name="SetUniformGridLayoutMaximumRowsOrColumns"
+                    Click="SetUniformGridLayoutMaximumRowsOrColumnsButtonClick" Margin="2">Set</Button>
+            </StackPanel>
+
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="UniformGridLayout.MinColumnSpacing:" VerticalAlignment="Center" Margin="2"/>
                 <TextBox x:Name="UniformGridLayoutMinColumnSpacing" Text="8" AutomationProperties.Name="UniformGridLayoutMinColumnSpacing" Margin="2"/>
                 <Button AutomationProperties.Name="GetUniformGridLayoutMinColumnSpacing"
-                        Click="GetUniformGridLayoutMinColumnSpacingButtonClick" Margin="2">Get</Button>
+                    Click="GetUniformGridLayoutMinColumnSpacingButtonClick" Margin="2">Get</Button>
                 <Button AutomationProperties.Name="SetUniformGridLayoutMinColumnSpacing"
-                        Click="SetUniformGridLayoutMinColumnSpacingButtonClick" Margin="2">Set</Button>
+                    Click="SetUniformGridLayoutMinColumnSpacingButtonClick" Margin="2">Set</Button>
             </StackPanel>
 
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="UniformGridLayout.MinRowSpacing:" VerticalAlignment="Center" Margin="2"/>
                 <TextBox x:Name="UniformGridLayoutMinRowSpacing" Text="8" AutomationProperties.Name="UniformGridLayoutMinRowSpacing" Margin="2"/>
                 <Button AutomationProperties.Name="GetUniformGridLayoutMinRowSpacing"
-                        Click="GetUniformGridLayoutMinRowSpacingButtonClick" Margin="2">Get</Button>
+                    Click="GetUniformGridLayoutMinRowSpacingButtonClick" Margin="2">Get</Button>
                 <Button AutomationProperties.Name="SetUniformGridLayoutMinRowSpacing"
-                        Click="SetUniformGridLayoutMinRowSpacingButtonClick" Margin="2">Set</Button>
+                    Click="SetUniformGridLayoutMinRowSpacingButtonClick" Margin="2">Set</Button>
             </StackPanel>
 
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="UniformGridLayout.MinItemWidth:" VerticalAlignment="Center" Margin="2"/>
                 <TextBox x:Name="UniformGridLayoutMinItemWidth" Text="0" AutomationProperties.Name="UniformGridLayoutMinItemWidth" Margin="2"/>
                 <Button AutomationProperties.Name="GetUniformGridLayoutMinItemWidth"
-                        Click="GetUniformGridLayoutMinItemWidthButtonClick" Margin="2">Get</Button>
+                    Click="GetUniformGridLayoutMinItemWidthButtonClick" Margin="2">Get</Button>
                 <Button AutomationProperties.Name="SetUniformGridLayoutMinItemWidth"
-                        Click="SetUniformGridLayoutMinItemWidthButtonClick" Margin="2">Set</Button>
+                    Click="SetUniformGridLayoutMinItemWidthButtonClick" Margin="2">Set</Button>
             </StackPanel>
 
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="UniformGridLayout.MinItemHeight:" VerticalAlignment="Center" Margin="2"/>
                 <TextBox x:Name="UniformGridLayoutMinItemHeight" Text="0" AutomationProperties.Name="UniformGridLayoutMinItemHeight" Margin="2"/>
                 <Button AutomationProperties.Name="GetUniformGridLayoutMinItemHeight"
-                        Click="GetUniformGridLayoutMinItemHeightButtonClick" Margin="2">Get</Button>
+                    Click="GetUniformGridLayoutMinItemHeightButtonClick" Margin="2">Get</Button>
                 <Button AutomationProperties.Name="SetUniformGridLayoutMinItemHeight"
-                        Click="SetUniformGridLayoutMinItemHeightButtonClick" Margin="2">Set</Button>
+                    Click="SetUniformGridLayoutMinItemHeightButtonClick" Margin="2">Set</Button>
             </StackPanel>
 
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="UniformGridLayout.ItemsStretch:" VerticalAlignment="Center" Margin="2"/>
-                <ComboBox x:Name="CmbUniformGridLayoutItemsStretch" AutomationProperties.Name="CmbUniformGridLayoutItemsStretch" SelectedIndex="0" SelectionChanged="CmbUniformGridLayoutItemsStretch_SelectionChanged" Margin="2">
+                <ComboBox x:Name="CmbUniformGridLayoutItemsStretch" AutomationProperties.Name="CmbUniformGridLayoutItemsStretch" SelectedIndex="0"
+                    SelectionChanged="CmbUniformGridLayoutItemsStretch_SelectionChanged" Margin="2">
                     <ComboBoxItem>None</ComboBoxItem>
                     <ComboBoxItem>Fill</ComboBoxItem>
                     <ComboBoxItem>Uniform</ComboBoxItem>
@@ -77,7 +85,8 @@
 
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="UniformGridLayout.ItemsJustification:" VerticalAlignment="Center" Margin="2"/>
-                <ComboBox x:Name="CmbUniformGridLayoutItemsJustification" AutomationProperties.Name="CmbUniformGridLayoutItemsJustification" SelectedIndex="0" SelectionChanged="CmbUniformGridLayoutItemsJustification_SelectionChanged" Margin="2">
+                <ComboBox x:Name="CmbUniformGridLayoutItemsJustification" AutomationProperties.Name="CmbUniformGridLayoutItemsJustification"
+                    SelectedIndex="0" SelectionChanged="CmbUniformGridLayoutItemsJustification_SelectionChanged" Margin="2">
                     <ComboBoxItem>Start</ComboBoxItem>
                     <ComboBoxItem>Center</ComboBoxItem>
                     <ComboBoxItem>End</ComboBoxItem>
@@ -89,7 +98,8 @@
 
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="UniformGridLayout.Orientation:" VerticalAlignment="Center" Margin="2"/>
-                <ComboBox x:Name="CmbUniformGridLayoutOrientation" AutomationProperties.Name="CmbUniformGridLayoutOrientation" SelectedIndex="1" SelectionChanged="CmbUniformGridLayoutOrientation_SelectionChanged" Margin="2">
+                <ComboBox x:Name="CmbUniformGridLayoutOrientation" AutomationProperties.Name="CmbUniformGridLayoutOrientation"
+                    SelectedIndex="1" SelectionChanged="CmbUniformGridLayoutOrientation_SelectionChanged" Margin="2">
                     <ComboBoxItem>Vertical</ComboBoxItem>
                     <ComboBoxItem>Horizontal</ComboBoxItem>
                 </ComboBox>
@@ -99,41 +109,42 @@
                 <TextBlock Text="ScrollViewer.MaxWidth:" VerticalAlignment="Center" Margin="2"/>
                 <TextBox x:Name="ScrollViewerMaxWidth" Text="0" AutomationProperties.Name="ScrollViewerMaxWidth" Margin="2"/>
                 <Button AutomationProperties.Name="GetScrollViewerMaxWidth"
-                        Click="GetScrollViewerMaxWidthButtonClick" Margin="2">Get</Button>
+                    Click="GetScrollViewerMaxWidthButtonClick" Margin="2">Get</Button>
                 <Button AutomationProperties.Name="SetScrollViewerMaxWidth"
-                        Click="SetScrollViewerMaxWidthButtonClick" Margin="2">Set</Button>
+                    Click="SetScrollViewerMaxWidthButtonClick" Margin="2">Set</Button>
             </StackPanel>
 
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="ScrollViewer.MaxHeight:" VerticalAlignment="Center" Margin="2"/>
                 <TextBox x:Name="ScrollViewerMaxHeight" Text="0" AutomationProperties.Name="ScrollViewerMaxHeight" Margin="2"/>
                 <Button AutomationProperties.Name="GetScrollViewerMaxHeight"
-                        Click="GetScrollViewerMaxHeightButtonClick" Margin="2">Get</Button>
+                    Click="GetScrollViewerMaxHeightButtonClick" Margin="2">Get</Button>
                 <Button AutomationProperties.Name="SetScrollViewerMaxHeight"
-                        Click="SetScrollViewerMaxHeightButtonClick" Margin="2">Set</Button>
+                    Click="SetScrollViewerMaxHeightButtonClick" Margin="2">Set</Button>
             </StackPanel>
 
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="ScrollViewer.HorizontalOffset:" VerticalAlignment="Center" Margin="2"/>
                 <TextBox x:Name="ScrollViewerHorizontalOffset" Text="0" AutomationProperties.Name="ScrollViewerHorizontalOffset" Margin="2"/>
                 <Button AutomationProperties.Name="GetScrollViewerHorizontalOffset"
-                        Click="GetScrollViewerHorizontalOffsetButtonClick" Margin="2">Get</Button>
+                    Click="GetScrollViewerHorizontalOffsetButtonClick" Margin="2">Get</Button>
                 <Button AutomationProperties.Name="SetScrollViewerHorizontalOffset"
-                        Click="SetScrollViewerHorizontalOffsetButtonClick" Margin="2">Set</Button>
+                    Click="SetScrollViewerHorizontalOffsetButtonClick" Margin="2">Set</Button>
             </StackPanel>
 
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="ScrollViewer.VerticalOffset:" VerticalAlignment="Center" Margin="2"/>
                 <TextBox x:Name="ScrollViewerVerticalOffset" Text="0" AutomationProperties.Name="ScrollViewerVerticalOffset" Margin="2"/>
                 <Button AutomationProperties.Name="GetScrollViewerVerticalOffset"
-                        Click="GetScrollViewerVerticalOffsetButtonClick" Margin="2">Get</Button>
+                    Click="GetScrollViewerVerticalOffsetButtonClick" Margin="2">Get</Button>
                 <Button AutomationProperties.Name="SetScrollViewerVerticalOffset"
-                        Click="SetScrollViewerVerticalOffsetButtonClick" Margin="2">Set</Button>
+                    Click="SetScrollViewerVerticalOffsetButtonClick" Margin="2">Set</Button>
             </StackPanel>
 
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="ScrollViewer.HorizontalScrollBarVisibility:" VerticalAlignment="Center" Margin="2"/>
-                <ComboBox x:Name="CmbScrollViewerHorizontalScrollBarVisibility" AutomationProperties.Name="CmbScrollViewerHorizontalScrollBarVisibility" SelectedIndex="1" SelectionChanged="CmbScrollViewerHorizontalScrollBarVisibility_SelectionChanged" Margin="2">
+                <ComboBox x:Name="CmbScrollViewerHorizontalScrollBarVisibility" AutomationProperties.Name="CmbScrollViewerHorizontalScrollBarVisibility"
+                    SelectedIndex="1" SelectionChanged="CmbScrollViewerHorizontalScrollBarVisibility_SelectionChanged" Margin="2">
                     <ComboBoxItem>Disabled</ComboBoxItem>
                     <ComboBoxItem>Auto</ComboBoxItem>
                     <ComboBoxItem>Hidden</ComboBoxItem>
@@ -149,7 +160,7 @@
             IsVerticalScrollChainingEnabled="False"
             AutomationProperties.Name="RepeaterScrollViewer"
             MaxHeight="500">
-            <controls:ItemsRepeater x:Name="UniformGridRepeater"
+            <ItemsRepeater x:Name="UniformGridRepeater"
                 ItemsSource="{x:Bind collection}"
                 Layout="{StaticResource UniformGridLayout}"
                 ItemTemplate="{StaticResource SimpleElementTemplate}"/>
@@ -162,19 +173,20 @@
                     VerticalAlignment="Top"
                     Opacity="0.2"
                     Source="/Images/recipe1.png" />
-                <controls:ItemsRepeater HorizontalAlignment="Left" VerticalAlignment="Stretch"
+                <ItemsRepeater HorizontalAlignment="Left" VerticalAlignment="Stretch"
                     x:Name="imageAspectRatioTestRepeater">
-                    <controls:ItemsRepeater.Layout>
-                        <controls:UniformGridLayout MaximumRowsOrColumns="4"
+                    <ItemsRepeater.Layout>
+                        <UniformGridLayout
+                            MaximumRowsOrColumns="4"
                             Orientation="Horizontal"
                             MinItemWidth="56" />
-                    </controls:ItemsRepeater.Layout>
-                    <controls:ItemsRepeater.ItemTemplate>
+                    </ItemsRepeater.Layout>
+                    <ItemsRepeater.ItemTemplate>
                         <DataTemplate>
-                            <Image VerticalAlignment="Top" Source="/Images/recipe1.png" />
+                            <Image VerticalAlignment="Top" Source="/Images/recipe1.png"/>
                         </DataTemplate>
-                    </controls:ItemsRepeater.ItemTemplate>
-                </controls:ItemsRepeater>
+                    </ItemsRepeater.ItemTemplate>
+                </ItemsRepeater>
             </Grid>
         </ScrollViewer>
     </StackPanel>
diff --git a/src/controls/dev/Repeater/UniformGridLayout.cpp b/src/controls/dev/Repeater/UniformGridLayout.cpp
index c5c838eeaa..a74761f760 100644
--- a/src/controls/dev/Repeater/UniformGridLayout.cpp
+++ b/src/controls/dev/Repeater/UniformGridLayout.cpp
@@ -71,7 +71,7 @@ winrt::Size UniformGridLayout::MeasureOverride(
         LineSpacing(),
         m_maximumRowsOrColumns /* maxItemsPerLine */,
         OrientationBasedMeasures::GetScrollOrientation(),
-        false /* disableVirtualization */,
+        true /* isVirtualizationEnabled */,
         LayoutId());
 
     return { desiredSize.Width, desiredSize.Height };
@@ -139,7 +139,7 @@ winrt::FlowLayoutAnchorInfo UniformGridLayout::Algorithm_GetAnchorForRealization
         const auto lastExtent = gridState->FlowAlgorithm().LastExtent();
         const int itemsPerLine = GetItemsPerLine(availableSize, context);
         const double majorSize = (itemsCount / itemsPerLine) * (double)(GetMajorSizeWithSpacing(context));
-        const double realizationWindowStartWithinExtent = (double)(MajorStart(realizationRect) - MajorStart(lastExtent));
+        const double realizationWindowStartWithinExtent = static_cast<double>(MajorStart(realizationRect)) - static_cast<double>(MajorStart(lastExtent));
         if ((realizationWindowStartWithinExtent + MajorSize(realizationRect)) >= 0 && realizationWindowStartWithinExtent <= majorSize)
         {
             const double offset = std::max(0.0f, MajorStart(realizationRect) - MajorStart(lastExtent));
diff --git a/src/controls/dev/Repeater/UniformGridLayoutState.cpp b/src/controls/dev/Repeater/UniformGridLayoutState.cpp
index 11220ab63b..7e8ac4943b 100644
--- a/src/controls/dev/Repeater/UniformGridLayoutState.cpp
+++ b/src/controls/dev/Repeater/UniformGridLayoutState.cpp
@@ -30,8 +30,8 @@ void UniformGridLayoutState::EnsureElementSize(
     const double layoutItemHeight,
     const winrt::UniformGridLayoutItemsStretch& stretch,
     const winrt::Orientation& orientation,
-    double minRowSpacing,
-    double minColumnSpacing,
+    const double minRowSpacing,
+    const double minColumnSpacing,
     unsigned int maxItemsPerLine)
 {
     if (maxItemsPerLine == 0)
@@ -72,14 +72,15 @@ void UniformGridLayoutState::InvalidateElementSize()
     m_isEffectiveSizeValid = false;
 }
 
-winrt::Size UniformGridLayoutState::CalculateAvailableSize(const winrt::Size availableSize,
+winrt::Size UniformGridLayoutState::CalculateAvailableSize(
+    const winrt::Size availableSize,
     const winrt::Orientation orientation,
     const winrt::UniformGridLayoutItemsStretch& stretch,
     const unsigned int maxItemsPerLine,
     const double itemWidth,
     const double itemHeight,
-    double minRowSpacing,
-    double minColumnSpacing)
+    const double minRowSpacing,
+    const double minColumnSpacing) const
 {
     // Since some controls might have certain requirements when rendering (e.g. maintaining an aspect ratio),
     // we will let elements know the actual size they will get within our layout and let them measure based on that assumption.
@@ -87,49 +88,53 @@ winrt::Size UniformGridLayoutState::CalculateAvailableSize(const winrt::Size ava
     // for the column width (or row height) being provided.
     if (orientation == winrt::Orientation::Horizontal)
     {
-        if (!isnan(itemWidth))
+        if (!isnan(itemWidth) && std::isfinite(availableSize.Width))
         {
             double allowedColumnWidth = itemWidth;
             if (stretch != winrt::UniformGridLayoutItemsStretch::None)
             {
                 allowedColumnWidth += CalculateExtraPixelsInLine(maxItemsPerLine, availableSize.Width, itemWidth, minColumnSpacing);
             }
-            return winrt::Size{ (float)allowedColumnWidth, availableSize.Height};
+            return winrt::Size{ static_cast<float>(allowedColumnWidth), availableSize.Height };
         }
     }
-    else {
-        if (!isnan(itemHeight))
+    else
+    {
+        if (!isnan(itemHeight) && std::isfinite(availableSize.Height))
         {
             double allowedRowHeight = itemHeight;
             if (stretch != winrt::UniformGridLayoutItemsStretch::None)
             {
                 allowedRowHeight += CalculateExtraPixelsInLine(maxItemsPerLine, availableSize.Height, itemHeight, minRowSpacing);
             }
-            return winrt::Size{availableSize.Width, (float)itemHeight};
+            return winrt::Size{ availableSize.Width, static_cast<float>(allowedRowHeight) };
         }
     }
     return availableSize;
 }
 
-double UniformGridLayoutState::CalculateExtraPixelsInLine(unsigned int maxItemsPerLine,
+double UniformGridLayoutState::CalculateExtraPixelsInLine(
+    const unsigned int maxItemsPerLine,
     const float availableSizeMinor,
     const double itemSizeMinor,
-    const double minorItemSpacing)
+    const double minorItemSpacing) const
 {
-    const auto numItemsPerColumn = [](unsigned int maxItemsPerLine, const float availableSizeMinor, const double itemSizeMinor, const double minorItemSpacing){
+    const auto numItemsPerColumn = [](const unsigned int maxItemsPerLine, const float availableSizeMinor, const double itemSizeMinor, const double minorItemSpacing)
+    {
         const unsigned int numItemsBasedOnSize = static_cast<unsigned int>(std::max(1.0, availableSizeMinor / (itemSizeMinor + minorItemSpacing)));
-        if (numItemsBasedOnSize == 0) {
+        if (numItemsBasedOnSize == 0)
+        {
             return maxItemsPerLine;
         }
-        else {
-            return std::min(
-                maxItemsPerLine,
-                numItemsBasedOnSize);
+        else
+        {
+            return std::min(maxItemsPerLine, numItemsBasedOnSize);
         }
     }(maxItemsPerLine,availableSizeMinor,itemSizeMinor,minorItemSpacing);
+
     const auto usedSpace = (numItemsPerColumn * (itemSizeMinor + minorItemSpacing)) - minorItemSpacing;
-    const auto remainingSpace = ((int)(availableSizeMinor - usedSpace));
-    return remainingSpace / ((int)numItemsPerColumn);
+    const auto remainingSpace = static_cast<int>(availableSizeMinor - usedSpace);
+    return remainingSpace / static_cast<int>(numItemsPerColumn);
 }
 
 void UniformGridLayoutState::SetSize(
@@ -139,8 +144,8 @@ void UniformGridLayoutState::SetSize(
     const winrt::Size availableSize,
     const winrt::UniformGridLayoutItemsStretch& stretch,
     const winrt::Orientation& orientation,
-    double minRowSpacing,
-    double minColumnSpacing,
+    const double minRowSpacing,
+    const double minColumnSpacing,
     unsigned int maxItemsPerLine)
 {
     if (maxItemsPerLine == 0)
@@ -153,7 +158,6 @@ void UniformGridLayoutState::SetSize(
 
     const auto availableSizeMinor = orientation == winrt::Orientation::Horizontal ? availableSize.Width : availableSize.Height;
     const auto minorItemSpacing = orientation == winrt::Orientation::Vertical ? minRowSpacing : minColumnSpacing;
-
     const auto itemSizeMinor = orientation == winrt::Orientation::Horizontal ? m_effectiveItemWidth : m_effectiveItemHeight;
 
     double extraMinorPixelsForEachItem = 0.0;
@@ -177,6 +181,7 @@ void UniformGridLayoutState::SetSize(
     {
         const auto itemSizeMajor = orientation == winrt::Orientation::Horizontal ? m_effectiveItemHeight : m_effectiveItemWidth;
         const auto extraMajorPixelsForEachItem = itemSizeMajor * (extraMinorPixelsForEachItem / itemSizeMinor);
+
         if (orientation == winrt::Orientation::Horizontal)
         {
             m_effectiveItemWidth += extraMinorPixelsForEachItem;
diff --git a/src/controls/dev/Repeater/UniformGridLayoutState.h b/src/controls/dev/Repeater/UniformGridLayoutState.h
index 9259275c87..a0013d992b 100644
--- a/src/controls/dev/Repeater/UniformGridLayoutState.h
+++ b/src/controls/dev/Repeater/UniformGridLayoutState.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include "ElementManager.h"
-
 #include "UniformGridLayoutState.g.h"
 #include "FlowLayoutAlgorithm.h"
 
@@ -18,8 +17,8 @@ class UniformGridLayoutState :
     void UninitializeForContext(const winrt::VirtualizingLayoutContext& context);
 
     ::FlowLayoutAlgorithm& FlowAlgorithm() { return m_flowAlgorithm; }
-    double EffectiveItemWidth() { return m_effectiveItemWidth; }
-    double EffectiveItemHeight() { return m_effectiveItemHeight; }
+    double EffectiveItemWidth() const { return m_effectiveItemWidth; }
+    double EffectiveItemHeight() const { return m_effectiveItemHeight; }
 
     void EnsureElementSize(
         const winrt::Size availableSize,
@@ -28,31 +27,32 @@ class UniformGridLayoutState :
         const double itemHeight,
         const winrt::UniformGridLayoutItemsStretch& stretch,
         const winrt::Orientation& orientation,
-        double minRowSpacing,
-        double minColumnSpacing,
+        const double minRowSpacing,
+        const double minColumnSpacing,
         unsigned int maxItemsPerLine);
     void InvalidateElementSize();
 
 private:
     ::FlowLayoutAlgorithm m_flowAlgorithm{ this };
-    bool m_isEffectiveSizeValid = false;
+    bool m_isEffectiveSizeValid{ false };
     double m_effectiveItemWidth{ 0.0 };
     double m_effectiveItemHeight{ 0.0 };
 
-    winrt::Size CalculateAvailableSize(const winrt::Size availableSize,
+    winrt::Size CalculateAvailableSize(
+        const winrt::Size availableSize,
         const winrt::Orientation orientation,
         const winrt::UniformGridLayoutItemsStretch& stretch,
         const unsigned int maxItemsPerLine,
         const double itemWidth,
         const double itemHeight,
-        double minRowSpacing,
-        double minColumnSpacing);
+        const double minRowSpacing,
+        const double minColumnSpacing) const;
 
-    double CalculateExtraPixelsInLine(unsigned int maxItemsPerLine,
+    double CalculateExtraPixelsInLine(
+        const unsigned int maxItemsPerLine,
         const float availableSizeMinor,
         const double itemSizeMinor,
-        const double minorItemSpacing);
-
+        const double minorItemSpacing) const;
 
     void SetSize(const winrt::Size& desiredItemSize,
         const double itemWidth,
@@ -60,7 +60,7 @@ class UniformGridLayoutState :
         const winrt::Size availableSize,
         const winrt::UniformGridLayoutItemsStretch& stretch,
         const winrt::Orientation& orientation,
-        double minRowSpacing,
-        double minColumnSpacing,
+        const double minRowSpacing,
+        const double minColumnSpacing,
         unsigned int maxItemsPerLine);
 };
diff --git a/src/controls/dev/Repeater/ViewManager.cpp b/src/controls/dev/Repeater/ViewManager.cpp
index de862b30da..7f437dfd34 100644
--- a/src/controls/dev/Repeater/ViewManager.cpp
+++ b/src/controls/dev/Repeater/ViewManager.cpp
@@ -7,10 +7,6 @@
 #include "ViewManager.h"
 #include "ItemsRepeater.h"
 #include "RepeaterTestHooks.h"
-#include <FrameworkUdk/Containment.h>
-
-// Bug 50344748: [1.5 Servicing][WASDK] 1-up viewer opens behind Collections (looks like nothing's happened, but the viewer is actually hidden behind the Collections window)
-#define WINAPPSDK_CHANGEID_50344748 50344748
 
 ViewManager::ViewManager(ItemsRepeater* owner) :
     m_owner(owner),
@@ -226,15 +222,8 @@ void ViewManager::MoveFocusFromClearedIndex(int clearedIndex)
         // If the last focused element has focus, use its focus state, if not use programmatic.
         focusState = focusState == winrt::FocusState::Unfocused ? winrt::FocusState::Programmatic : focusState;
 
-        if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_50344748>())
-        {
-            // Since this focus change is due to the focused element getting recycled, don't activate the window.
-            focusCandidate.as<winrt::IUIElementPrivate>().FocusNoActivate(focusState);
-        }
-        else
-        {
-            focusCandidate.Focus(focusState);
-        }
+        // Since this focus change is due to the focused element getting recycled, don't activate the window.
+        focusCandidate.as<winrt::IUIElementPrivate>().FocusNoActivate(focusState);
 
         m_lastFocusedElement.set(focusedChild);
         // Add pin to hold the focused element.
@@ -924,8 +913,9 @@ bool ViewManager::ClearElementToAnimator(const winrt::UIElement& element, const
 
 bool ViewManager::ClearElementToPinnedPool(const winrt::UIElement& element, const winrt::com_ptr<VirtualizationInfo>& virtInfo, bool isClearedDueToCollectionChange)
 {
+    const bool isInPinnedPool = virtInfo->IsInPinnedPool(); 
     const bool moveToPinnedPool =
-        !isClearedDueToCollectionChange && virtInfo->IsPinned();
+        !isClearedDueToCollectionChange && virtInfo->IsPinned() && !isInPinnedPool;
 
     if (moveToPinnedPool)
     {
@@ -946,7 +936,8 @@ bool ViewManager::ClearElementToPinnedPool(const winrt::UIElement& element, cons
         virtInfo->MoveOwnershipToPinnedPool();
     }
 
-    return moveToPinnedPool;
+    // Element is already in pinnedPool or is moved to pinnedPool. Both mean element is cleared.
+    return isInPinnedPool || moveToPinnedPool;
 }
 
 #pragma endregion
diff --git a/src/controls/dev/Repeater/ViewportManager.h b/src/controls/dev/Repeater/ViewportManager.h
index 17f07bce43..15f059f02d 100644
--- a/src/controls/dev/Repeater/ViewportManager.h
+++ b/src/controls/dev/Repeater/ViewportManager.h
@@ -14,7 +14,7 @@ class ViewportManager
     virtual winrt::Rect GetLayoutVisibleWindow() const = 0;
     virtual winrt::Rect GetLayoutRealizationWindow() const = 0;
 
-    virtual void SetLayoutExtent(winrt::Rect extent) = 0;
+    virtual void SetLayoutExtent(const winrt::Rect& layoutExtent) = 0;
     virtual winrt::Rect GetLayoutExtent() const = 0;
     virtual winrt::Point GetOrigin() const = 0;
 
@@ -24,8 +24,9 @@ class ViewportManager
     virtual void OnOwnerMeasuring() = 0;
     virtual void OnOwnerArranged() = 0;
     virtual void OnMakeAnchor(const winrt::UIElement& anchor, const bool isAnchorOutsideRealizedRange) = 0;
-    virtual void OnBringIntoViewRequested(const winrt::BringIntoViewRequestedEventArgs args) = 0;
+    virtual void OnBringIntoViewRequested(const winrt::BringIntoViewRequestedEventArgs& args) = 0;
 
+    virtual void ResetLayoutRealizationWindowCacheBuffer() = 0;
     virtual void ResetScrollers() = 0;
 
     virtual winrt::UIElement MadeAnchor() const = 0;
diff --git a/src/controls/dev/Repeater/ViewportManagerDownlevel.cpp b/src/controls/dev/Repeater/ViewportManagerDownlevel.cpp
index 37c07273df..8c81982c7a 100644
--- a/src/controls/dev/Repeater/ViewportManagerDownlevel.cpp
+++ b/src/controls/dev/Repeater/ViewportManagerDownlevel.cpp
@@ -127,7 +127,7 @@ winrt::Rect ViewportManagerDownLevel::GetLayoutRealizationWindow() const
     return realizationWindow;
 }
 
-void ViewportManagerDownLevel::SetLayoutExtent(winrt::Rect extent)
+void ViewportManagerDownLevel::SetLayoutExtent(const winrt::Rect& extent)
 {
     m_expectedViewportShift.X += m_layoutExtent.X - extent.X;
     m_expectedViewportShift.Y += m_layoutExtent.Y - extent.Y;
@@ -170,6 +170,23 @@ void ViewportManagerDownLevel::OnElementCleared(const winrt::UIElement& element)
     }
 }
 
+void ViewportManagerDownLevel::OnOwnerMeasuring()
+{
+    winrt::Rect currentLayoutRealizationWindow = GetLayoutRealizationWindow();
+
+    if ((m_horizontalCacheBufferPerSide != 0.0 || m_verticalCacheBufferPerSide != 0.0) &&
+        (m_lastLayoutRealizationWindow.Width <= 0.0f || m_lastLayoutRealizationWindow.Height <= 0.0f ||
+            currentLayoutRealizationWindow.Width <= 0.0f || currentLayoutRealizationWindow.Height <= 0.0f ||
+            !SharedHelpers::DoRectsIntersect(m_lastLayoutRealizationWindow, currentLayoutRealizationWindow)))
+    {
+        // Two consecutive measure passes use disconnected realization windows.
+        // Reset the potential cache buffer so that it regrows from scratch.
+        ResetLayoutRealizationWindowCacheBuffer();
+    }
+
+    m_lastLayoutRealizationWindow = currentLayoutRealizationWindow;
+}
+
 void ViewportManagerDownLevel::OnOwnerArranged()
 {
     if (m_managingViewportDisabled)
@@ -211,7 +228,7 @@ void ViewportManagerDownLevel::OnMakeAnchor(const winrt::UIElement& anchor, cons
     m_isAnchorOutsideRealizedRange = isAnchorOutsideRealizedRange;
 }
 
-void ViewportManagerDownLevel::OnBringIntoViewRequested(const winrt::BringIntoViewRequestedEventArgs args)
+void ViewportManagerDownLevel::OnBringIntoViewRequested(const winrt::BringIntoViewRequestedEventArgs& args)
 {
     if (!m_managingViewportDisabled)
     {
@@ -417,12 +434,17 @@ void ViewportManagerDownLevel::UpdateViewport()
     }
 }
 
-void ViewportManagerDownLevel::ResetCacheBuffer()
+void ViewportManagerDownLevel::ResetLayoutRealizationWindowCacheBuffer()
+{
+    ResetCacheBuffer(false /*registerCacheBuildWork*/);
+}
+
+void ViewportManagerDownLevel::ResetCacheBuffer(bool registerCacheBuildWork)
 {
     m_horizontalCacheBufferPerSide = 0.0;
     m_verticalCacheBufferPerSide = 0.0;
 
-    if (!m_managingViewportDisabled)
+    if (!m_managingViewportDisabled && registerCacheBuildWork)
     {
         // We need to start building the realization buffer again.
         RegisterCacheBuildWork();
diff --git a/src/controls/dev/Repeater/ViewportManagerDownlevel.h b/src/controls/dev/Repeater/ViewportManagerDownlevel.h
index a21c9af7c9..6a10264ca7 100644
--- a/src/controls/dev/Repeater/ViewportManagerDownlevel.h
+++ b/src/controls/dev/Repeater/ViewportManagerDownlevel.h
@@ -27,18 +27,19 @@ class ViewportManagerDownLevel : public ViewportManager
     winrt::Rect GetLayoutVisibleWindow() const override;
     winrt::Rect GetLayoutRealizationWindow() const override;
 
-    void SetLayoutExtent(winrt::Rect extent) override;
+    void SetLayoutExtent(const winrt::Rect& extent) override;
     winrt::Rect GetLayoutExtent() const override { return m_layoutExtent; }
     winrt::Point GetOrigin() const override{ return winrt::Point(m_layoutExtent.X, m_layoutExtent.Y); }
 
     void OnLayoutChanged(bool isVirtualizing) override;
     void OnElementPrepared(const winrt::UIElement& element) override {}
     void OnElementCleared(const winrt::UIElement& element) override;
-    void OnOwnerMeasuring() override {};
+    void OnOwnerMeasuring() override;
     void OnOwnerArranged() override;
     void OnMakeAnchor(const winrt::UIElement& anchor, const bool isAnchorOutsideRealizedRange) override;
-    void OnBringIntoViewRequested(const winrt::BringIntoViewRequestedEventArgs args) override;
+    void OnBringIntoViewRequested(const winrt::BringIntoViewRequestedEventArgs& args) override;
 
+    void ResetLayoutRealizationWindowCacheBuffer() override;
     void ResetScrollers() override;
 
     winrt::UIElement MadeAnchor() const override { return m_makeAnchorElement.get(); }
@@ -55,7 +56,7 @@ class ViewportManagerDownLevel : public ViewportManager
     bool HasScrollers() const { return !!m_horizontalScroller || !!m_verticalScroller; }
     bool AddScroller(const winrt::IRepeaterScrollingSurface& scroller);
     void UpdateViewport();
-    void ResetCacheBuffer();
+    void ResetCacheBuffer(bool registerCacheBuildWork = true);
     void ValidateCacheLength(double cacheLength);
     void RegisterCacheBuildWork();
     void TryInvalidateMeasure();
@@ -85,6 +86,7 @@ class ViewportManagerDownLevel : public ViewportManager
 
     tracker_ref<winrt::IAsyncAction> m_cacheBuildAction;
 
+    winrt::Rect m_lastLayoutRealizationWindow{};
     winrt::Rect m_visibleWindow{};
     winrt::Rect m_layoutExtent{};
     winrt::Point m_expectedViewportShift{};
diff --git a/src/controls/dev/Repeater/ViewportManagerWithPlatformFeatures.cpp b/src/controls/dev/Repeater/ViewportManagerWithPlatformFeatures.cpp
index bf950fe842..c58946ec41 100644
--- a/src/controls/dev/Repeater/ViewportManagerWithPlatformFeatures.cpp
+++ b/src/controls/dev/Repeater/ViewportManagerWithPlatformFeatures.cpp
@@ -6,7 +6,7 @@
 #include "ItemsRepeater.common.h"
 #include "ViewportManagerWithPlatformFeatures.h"
 #include "ItemsRepeater.h"
-#include "layout.h"
+#include "Layout.h"
 
 // Pixel delta by which to inflate the cache buffer on each side.  Rather than fill the entire
 // cache buffer all at once, we chunk the work to make the UI thread more responsive.  We inflate
@@ -36,9 +36,7 @@ winrt::UIElement ViewportManagerWithPlatformFeatures::SuggestedAnchor() const
 
         if (anchorElement)
         {
-            ITEMSREPEATER_TRACE_INFO_DBG(nullptr, TRACE_MSG_METH_STR_STR, METH_NAME, this, GetLayoutId().data(), L"SuggestedAnchor returns IScrollAnchorProvider.CurrentAnchor.");
-
-            // We can't simply return anchorElement because, in case of nested Repeaters, it may not
+            // We can't simply return anchorElement because, in case of nested ItemsRepeaters, it may not
             // be a direct child of ours, or even an indirect child. We need to walk up the tree starting
             // from anchorElement to figure out what child of ours (if any) to use as the suggested element.
             winrt::UIElement owner = *m_owner;
@@ -55,6 +53,8 @@ winrt::UIElement ViewportManagerWithPlatformFeatures::SuggestedAnchor() const
                 child = parent;
                 parent = CachedVisualTreeHelpers::GetParent(parent).as<winrt::UIElement>();
             }
+
+            ITEMSREPEATER_TRACE_INFO_DBG(nullptr, TRACE_MSG_METH_STR_STR_PTR, METH_NAME, this, GetLayoutId().data(), L"SuggestedAnchor returns IScrollAnchorProvider.CurrentAnchor.", suggestedAnchor);
         }
 #ifdef DBG
         else
@@ -66,7 +66,8 @@ winrt::UIElement ViewportManagerWithPlatformFeatures::SuggestedAnchor() const
 #ifdef DBG
     else
     {
-        ITEMSREPEATER_TRACE_INFO(nullptr, TRACE_MSG_METH_STR_STR, METH_NAME, this, GetLayoutId().data(), L"SuggestedAnchor returns non-null m_makeAnchorElement.");
+        // Since we have an anchor element, we do not want the scroll anchor provider to start anchoring some other element.
+        ITEMSREPEATER_TRACE_INFO(nullptr, TRACE_MSG_METH_STR_STR_PTR, METH_NAME, this, GetLayoutId().data(), L"SuggestedAnchor returns non-null m_makeAnchorElement.", m_makeAnchorElement);
     }
 #endif
     return suggestedAnchor;
@@ -147,23 +148,69 @@ winrt::Rect ViewportManagerWithPlatformFeatures::GetLayoutRealizationWindow() co
     return realizationWindow;
 }
 
-void ViewportManagerWithPlatformFeatures::SetLayoutExtent(winrt::Rect extent)
+void ViewportManagerWithPlatformFeatures::SetVisibleWindow(const winrt::Rect& visibleWindow)
 {
-    m_expectedViewportShift.X += m_layoutExtent.X - extent.X;
-    m_expectedViewportShift.Y += m_layoutExtent.Y - extent.Y;
+    if (visibleWindow.X != m_visibleWindow.X || visibleWindow.Y != m_visibleWindow.Y ||
+        visibleWindow.Width != m_visibleWindow.Width || visibleWindow.Height != m_visibleWindow.Height)
+    {
+        ITEMSREPEATER_TRACE_INFO_DBG(nullptr, TRACE_MSG_METH_STR_STR_FLT_FLT_FLT_FLT, METH_NAME, this,
+            GetLayoutId().data(), L"m_visibleWindow set:",
+            visibleWindow.X, visibleWindow.Y, visibleWindow.Width, visibleWindow.Height);
 
-    // We tolerate viewport imprecisions up to 1 pixel to avoid invaliding layout too much.
-    if (std::abs(m_expectedViewportShift.X) > 1.f || std::abs(m_expectedViewportShift.Y) > 1.f)
+        m_visibleWindow = visibleWindow;
+    }
+}
+
+void ViewportManagerWithPlatformFeatures::SetPendingViewportShift(const winrt::Point& pendingViewportShift)
+{
+    if (pendingViewportShift.X != m_pendingViewportShift.X || pendingViewportShift.Y != m_pendingViewportShift.Y)
     {
         ITEMSREPEATER_TRACE_INFO_DBG(nullptr, TRACE_MSG_METH_STR_STR_FLT_FLT, METH_NAME, this,
-            GetLayoutId().data(), L"Expecting viewport shift:", 
-            m_expectedViewportShift.X, m_expectedViewportShift.Y);
+            GetLayoutId().data(), L"m_pendingViewportShift set:",
+            pendingViewportShift.X, pendingViewportShift.Y);
+
+        m_pendingViewportShift = pendingViewportShift;
+    }
+}
+
+void ViewportManagerWithPlatformFeatures::SetExpectedViewportShift(float expectedViewportShiftX, float expectedViewportShiftY)
+{
+    if (expectedViewportShiftX != m_expectedViewportShift.X || expectedViewportShiftY != m_expectedViewportShift.Y)
+    {
+        ITEMSREPEATER_TRACE_INFO_DBG(nullptr, TRACE_MSG_METH_STR_STR_FLT_FLT, METH_NAME, this,
+            GetLayoutId().data(), L"m_expectedViewportShift set:",
+            expectedViewportShiftX, expectedViewportShiftY);
+
+        m_expectedViewportShift.X = expectedViewportShiftX;
+        m_expectedViewportShift.Y = expectedViewportShiftY;
+    }
+}
+
+void ViewportManagerWithPlatformFeatures::SetUnshiftableShift(float unshiftableShiftX, float unshiftableShiftY)
+{
+    if (unshiftableShiftX != m_unshiftableShift.X || unshiftableShiftY != m_unshiftableShift.Y)
+    {
+        ITEMSREPEATER_TRACE_INFO_DBG(nullptr, TRACE_MSG_METH_STR_STR_FLT_FLT, METH_NAME, this,
+            GetLayoutId().data(), L"m_unshiftableShift set:",
+            unshiftableShiftX, unshiftableShiftY);
 
+        m_unshiftableShift.X = unshiftableShiftX;
+        m_unshiftableShift.Y = unshiftableShiftY;
+    }
+}
+
+void ViewportManagerWithPlatformFeatures::SetLayoutExtent(const winrt::Rect& layoutExtent)
+{
+    SetExpectedViewportShift(m_expectedViewportShift.X + m_layoutExtent.X - layoutExtent.X, m_expectedViewportShift.Y + m_layoutExtent.Y - layoutExtent.Y);
+
+    // We tolerate viewport imprecisions up to 1 pixel to avoid invaliding layout too much.
+    if (std::abs(m_expectedViewportShift.X) > 1.f || std::abs(m_expectedViewportShift.Y) > 1.f)
+    {
         // There are cases where we might be expecting a shift but not get it. We will
-        // be waiting for the effective viewport event but if the scroll viewer is not able
+        // be waiting for the effective viewport event but if the scroller is not able
         // to perform the shift (perhaps because it cannot scroll in negative offset),
-        // then we will end up not realizing elements in the visible 
-        // window. To avoid this, we register to layout updated for this layout pass. If we 
+        // then we will end up not realizing elements in the visible window.
+        // To avoid this, we register to layout updated for this layout pass. If we 
         // get an effective viewport, we know we have a new viewport and we unregister from
         // layout updated. If we get the layout updated handler, then we know that the 
         // scroller was unable to perform the shift and we invalidate measure and unregister
@@ -174,24 +221,98 @@ void ViewportManagerWithPlatformFeatures::SetLayoutExtent(winrt::Rect extent)
         }
     }
 
-    m_layoutExtent = extent;
-    m_pendingViewportShift = m_expectedViewportShift;
+    if (layoutExtent.X != m_layoutExtent.X || layoutExtent.Y != m_layoutExtent.Y ||
+        layoutExtent.Width != m_layoutExtent.Width || layoutExtent.Height != m_layoutExtent.Height)
+    {
+        ITEMSREPEATER_TRACE_INFO_DBG(nullptr, TRACE_MSG_METH_STR_STR_FLT_FLT, METH_NAME, this,
+            GetLayoutId().data(), L"m_layoutExtent set:",
+            layoutExtent.X, layoutExtent.Y);
+
+        m_layoutExtent = layoutExtent;
+    }
+
+    SetPendingViewportShift(m_expectedViewportShift);
 
     // We just finished a measure pass and have a new extent.
-    // Let's make sure the scrollers will run its arrange so that they track the anchor.
+    // Let's make sure the scroller will run its arrange so that it tracks the anchor.
     if (m_scroller)
     { 
         m_scroller.as<winrt::UIElement>().InvalidateArrange(); 
     }
 }
 
+void ViewportManagerWithPlatformFeatures::ResetLayoutExtent()
+{
+    if (m_layoutExtent.X != 0.0f || m_layoutExtent.Y != 0.0f ||
+        m_layoutExtent.Width != 0.0f || m_layoutExtent.Height != 0.0f)
+    {
+        ITEMSREPEATER_TRACE_INFO_DBG(nullptr, TRACE_MSG_METH_STR_STR_FLT_FLT_FLT_FLT, METH_NAME, this,
+            GetLayoutId().data(), L"m_layoutExtent reset:",
+            m_layoutExtent.X, m_layoutExtent.Y, m_layoutExtent.Width, m_layoutExtent.Height);
+
+        m_layoutExtent = {};
+    }
+}
+
+void ViewportManagerWithPlatformFeatures::ResetVisibleWindow()
+{
+    if (m_visibleWindow.X != 0.0f || m_visibleWindow.Y != 0.0f ||
+        m_visibleWindow.Width != 0.0f || m_visibleWindow.Height != 0.0f)
+    {
+        ITEMSREPEATER_TRACE_INFO_DBG(nullptr, TRACE_MSG_METH_STR_STR_FLT_FLT_FLT_FLT, METH_NAME, this,
+            GetLayoutId().data(), L"m_visibleWindow reset:",
+            m_visibleWindow.X, m_visibleWindow.Y, m_visibleWindow.Width, m_visibleWindow.Height);
+
+        m_visibleWindow = {};
+    }
+}
+
+void ViewportManagerWithPlatformFeatures::ResetExpectedViewportShift()
+{
+    if (m_expectedViewportShift.X != 0.0f || m_expectedViewportShift.Y != 0.0f)
+    {
+        ITEMSREPEATER_TRACE_INFO_DBG(nullptr, TRACE_MSG_METH_STR_STR_FLT_FLT, METH_NAME, this,
+            GetLayoutId().data(), L"m_expectedViewportShift reset:",
+            m_expectedViewportShift.X, m_expectedViewportShift.Y);
+
+        m_expectedViewportShift = {};
+    }
+}
+
+void ViewportManagerWithPlatformFeatures::ResetPendingViewportShift()
+{
+    if (m_pendingViewportShift.X != 0.0f || m_pendingViewportShift.Y != 0.0f)
+    {
+        ITEMSREPEATER_TRACE_INFO_DBG(nullptr, TRACE_MSG_METH_STR_STR_FLT_FLT, METH_NAME, this,
+            GetLayoutId().data(), L"m_pendingViewportShift reset:",
+            m_pendingViewportShift.X, m_pendingViewportShift.Y);
+
+        m_pendingViewportShift = {};
+    }
+}
+
+void ViewportManagerWithPlatformFeatures::ResetUnshiftableShift()
+{
+    if (m_unshiftableShift.X != 0.0f || m_unshiftableShift.Y != 0.0f)
+    {
+        ITEMSREPEATER_TRACE_INFO_DBG(nullptr, TRACE_MSG_METH_STR_STR_FLT_FLT, METH_NAME, this,
+            GetLayoutId().data(), L"m_unshiftableShift reset:",
+            m_unshiftableShift.X, m_unshiftableShift.Y);
+
+        m_unshiftableShift = {};
+    }
+}
+
 void ViewportManagerWithPlatformFeatures::OnLayoutChanged(bool isVirtualizing)
 {
+    ITEMSREPEATER_TRACE_VERBOSE_DBG(nullptr, TRACE_MSG_METH_STR_INT, METH_NAME, this,
+        GetLayoutId().data(), isVirtualizing);
+
     m_managingViewportDisabled = !isVirtualizing;
 
-    m_layoutExtent = {};
-    m_expectedViewportShift = {};
-    m_pendingViewportShift = {};
+    ResetLayoutExtent();
+    ResetExpectedViewportShift();
+    ResetPendingViewportShift();
 
     if (m_managingViewportDisabled)
     {
@@ -202,20 +323,55 @@ void ViewportManagerWithPlatformFeatures::OnLayoutChanged(bool isVirtualizing)
         m_effectiveViewportChangedRevoker = m_owner->EffectiveViewportChanged(winrt::auto_revoke, { this, &ViewportManagerWithPlatformFeatures::OnEffectiveViewportChanged });
     }
 
-    m_unshiftableShift = {};
+    ResetUnshiftableShift();
     ResetCacheBuffer();
 }
 
 void ViewportManagerWithPlatformFeatures::OnElementPrepared(const winrt::UIElement& element)
 {
-    // If we have an anchor element, we do not want the
-    // scroll anchor provider to start anchoring some other element.
-    element.CanBeScrollAnchor(true);
+    ITEMSREPEATER_TRACE_VERBOSE_DBG(nullptr, TRACE_MSG_METH_PTR, METH_NAME, this, element);
+
+    // The newly prepared element is not registered as an anchor candidate right away. It first needs to be arranged at least once so its position
+    // tracked by the scroller is valid.
+    // The element is first put into a list of prepared elements. Then once arranged it is put into a list of prepared+arranged elements. Then finally
+    // at the beginning of the following measure pass, it is registered as an anchor candidate.
+
+    const auto itPreparedElement = std::find_if(m_preparedElements.cbegin(), m_preparedElements.cend(), [&element](const tracker_ref<winrt::UIElement>& preparedElement) { return preparedElement.get() == element; });
+
+    if (itPreparedElement == m_preparedElements.cend())
+    {
+        m_preparedElements.push_back(tracker_ref<winrt::UIElement>{ m_owner, element });
+    }
 }
 
 void ViewportManagerWithPlatformFeatures::OnElementCleared(const winrt::UIElement& element)
 {
-    element.CanBeScrollAnchor(false);
+    ITEMSREPEATER_TRACE_VERBOSE_DBG(nullptr, TRACE_MSG_METH_PTR, METH_NAME, this, element);
+
+    // Remove the element from the prepared and prepared+arranged lists so it no longer gets registered as an anchor candidate for the scroller
+    // after the next arrange pass.
+
+    const auto itPreparedElement = std::find_if(m_preparedElements.cbegin(), m_preparedElements.cend(),
+        [&element](const tracker_ref<winrt::UIElement>& preparedElement) { return preparedElement.get() == element; });
+
+    if (itPreparedElement != m_preparedElements.cend())
+    {
+        m_preparedElements.erase(itPreparedElement);
+    }
+
+    const auto itPreparedAndArrangedElement = std::find_if(m_preparedAndArrangedElements.cbegin(), m_preparedAndArrangedElements.cend(),
+        [&element](const tracker_ref<winrt::UIElement>& preparedAndArrangedElement) { return preparedAndArrangedElement.get() == element; });
+
+    if (itPreparedAndArrangedElement != m_preparedAndArrangedElements.cend())
+    {
+        m_preparedAndArrangedElements.erase(itPreparedAndArrangedElement);
+    }
+
+    if (element.CanBeScrollAnchor())
+    {
+        // Unregister the element as an anchor candidate since it was already declared as such.
+        element.CanBeScrollAnchor(false);
+    }
 }
 
 void ViewportManagerWithPlatformFeatures::OnOwnerMeasuring()
@@ -224,11 +380,64 @@ void ViewportManagerWithPlatformFeatures::OnOwnerMeasuring()
     // fire if you register during arrange.
     // Bug 17411076: EffectiveViewport: registering for effective viewport in arrange should invalidate viewport
     EnsureScroller();
+
+    winrt::Rect currentLayoutRealizationWindow = GetLayoutRealizationWindow();
+
+    if ((m_horizontalCacheBufferPerSide != 0.0 || m_verticalCacheBufferPerSide != 0.0) &&
+        (m_lastLayoutRealizationWindow.Width <= 0.0f || m_lastLayoutRealizationWindow.Height <= 0.0f ||
+         currentLayoutRealizationWindow.Width <= 0.0f || currentLayoutRealizationWindow.Height <= 0.0f ||
+         !SharedHelpers::DoRectsIntersect(m_lastLayoutRealizationWindow, currentLayoutRealizationWindow)))
+    {
+        // Two consecutive measure passes use disconnected realization windows.
+        // Reset the potential cache buffer so that it regrows from scratch.
+        ResetLayoutRealizationWindowCacheBuffer();
+    }
+
+    m_lastLayoutRealizationWindow = currentLayoutRealizationWindow;
+
+    if (m_skipScrollAnchorRegistrationsDuringNextMeasurePass)
+    {
+        ITEMSREPEATER_TRACE_VERBOSE_DBG(nullptr, TRACE_MSG_METH_STR, METH_NAME, this, L"m_skipScrollAnchorRegistrationsDuringNextMeasurePass reset.");
+
+        m_skipScrollAnchorRegistrationsDuringNextMeasurePass = false;
+    }
+    else if (!m_skipScrollAnchorRegistrationsDuringNextArrangePass)
+    {
+        // Now that a new measure pass is starting, register the previously arranged elements as anchor candidates for the scroller.
+        RegisterPreparedAndArrangedElementsAsScrollAnchorCandidates();
+    }
+
+#ifdef DBG
+    TraceScrollerDbg();
+#endif // DBG
 }
 
 void ViewportManagerWithPlatformFeatures::OnOwnerArranged()
 {
-    m_expectedViewportShift = {};
+#ifdef DBG
+    ITEMSREPEATER_TRACE_VERBOSE(nullptr, TRACE_MSG_METH_STR, METH_NAME, this, GetLayoutId().data());
+
+    TraceScrollerDbg();
+    TraceFieldsDbg();
+#endif // DBG
+
+    if (!m_skipScrollAnchorRegistrationsDuringNextMeasurePass)
+    {
+        if (m_skipScrollAnchorRegistrationsDuringNextArrangePass)
+        {
+            ITEMSREPEATER_TRACE_VERBOSE_DBG(nullptr, TRACE_MSG_METH_STR, METH_NAME, this, L"m_skipScrollAnchorRegistrationsDuringNextArrangePass reset.");
+
+            m_skipScrollAnchorRegistrationsDuringNextArrangePass = false;
+        }
+        else
+        {
+            // Now that an arrange pass completed, register the prepared elements as arranged. They will be registered as anchor candidates
+            // during the next measure pass.
+            RegisterPreparedElementsAsArranged();
+        }
+    }
+
+    ResetExpectedViewportShift();
 
     if (!m_managingViewportDisabled)
     {
@@ -264,6 +473,8 @@ void ViewportManagerWithPlatformFeatures::OnOwnerArranged()
 
 void ViewportManagerWithPlatformFeatures::OnLayoutUpdated(winrt::IInspectable const& sender, winrt::IInspectable const& args)
 {
+    ITEMSREPEATER_TRACE_VERBOSE_DBG(nullptr, TRACE_MSG_METH_STR, METH_NAME, this, GetLayoutId().data());
+
     m_layoutUpdatedRevoker.revoke();
     if (m_managingViewportDisabled)
     {
@@ -272,9 +483,9 @@ void ViewportManagerWithPlatformFeatures::OnLayoutUpdated(winrt::IInspectable co
 
     // We were expecting a viewport shift but we never got one and we are not going to in this
     // layout pass. We likely will never get this shift, so lets assume that we are never going to get it and
-    // adjust our expected shift to track that. One case where this can happen is when there is no scrollviewer
+    // adjust our expected shift to track that. One case where this can happen is when there is no scroller
     // that can scroll in the direction where the shift is expected.
-    if (m_pendingViewportShift.X != 0 || m_pendingViewportShift.Y != 0)
+    if (m_pendingViewportShift.X != 0.0f || m_pendingViewportShift.Y != 0.0f)
     {
         ITEMSREPEATER_TRACE_INFO_DBG(nullptr, TRACE_MSG_METH_STR_STR_FLT_FLT, METH_NAME, this,
             GetLayoutId().data(), L"Layout Updated with pending shift - invalidating measure",
@@ -282,10 +493,9 @@ void ViewportManagerWithPlatformFeatures::OnLayoutUpdated(winrt::IInspectable co
             m_pendingViewportShift.Y);
 
         // Assume this is never going to come.
-        m_unshiftableShift.X += m_pendingViewportShift.X;
-        m_unshiftableShift.Y += m_pendingViewportShift.Y;
-        m_pendingViewportShift = {};
-        m_expectedViewportShift = {};
+        SetUnshiftableShift(m_unshiftableShift.X + m_pendingViewportShift.X, m_unshiftableShift.Y + m_pendingViewportShift.Y);
+        ResetPendingViewportShift();
+        ResetExpectedViewportShift();
 
         TryInvalidateMeasure();
     }
@@ -296,11 +506,11 @@ void ViewportManagerWithPlatformFeatures::OnMakeAnchor(const winrt::UIElement& a
 #ifdef DBG
     if (anchor == nullptr)
     {
-        ITEMSREPEATER_TRACE_INFO(nullptr, TRACE_MSG_METH_STR_STR, METH_NAME, this, GetLayoutId().data(), L"Resets m_makeAnchorElement.");
+        ITEMSREPEATER_TRACE_INFO(nullptr, TRACE_MSG_METH_STR_STR_PTR, METH_NAME, this, GetLayoutId().data(), L"Resets m_makeAnchorElement.", m_makeAnchorElement);
     }
     else
     {
-        ITEMSREPEATER_TRACE_INFO(nullptr, TRACE_MSG_METH_STR_STR, METH_NAME, this, GetLayoutId().data(), L"%Sets m_makeAnchorElement.");
+        ITEMSREPEATER_TRACE_INFO(nullptr, TRACE_MSG_METH_STR_STR_PTR, METH_NAME, this, GetLayoutId().data(), L"%Sets m_makeAnchorElement.", anchor);
     }
 #endif // DBG
 
@@ -308,8 +518,10 @@ void ViewportManagerWithPlatformFeatures::OnMakeAnchor(const winrt::UIElement& a
     m_isAnchorOutsideRealizedRange = isAnchorOutsideRealizedRange;
 }
 
-void ViewportManagerWithPlatformFeatures::OnBringIntoViewRequested(const winrt::BringIntoViewRequestedEventArgs args)
+void ViewportManagerWithPlatformFeatures::OnBringIntoViewRequested(const winrt::BringIntoViewRequestedEventArgs& args)
 {
+    ITEMSREPEATER_TRACE_VERBOSE_DBG(nullptr, TRACE_MSG_METH_STR, METH_NAME, this, GetLayoutId().data());
+
     if (!m_managingViewportDisabled)
     {
         // We do not animate bring-into-view operations where the anchor is disconnected because
@@ -332,13 +544,7 @@ void ViewportManagerWithPlatformFeatures::OnBringIntoViewRequested(const winrt::
         const auto targetChild = GetImmediateChildOfRepeater(args.TargetElement());
 
         // Make sure that only the target child can be the anchor during the bring into view operation.
-        for (const auto& child : m_owner->Children())
-        {
-            if (child.CanBeScrollAnchor() && child != targetChild)
-            {
-                child.CanBeScrollAnchor(false);
-            }
-        }
+        UnregisterScrollAnchorCandidates(targetChild /*exceptionElement*/, false /*registerAsPreparedAndArrangedElements*/);
 
         // Register to rendering event to go back to how things were before where any child can be the anchor.
         m_isBringIntoViewInProgress = true;
@@ -370,9 +576,9 @@ winrt::UIElement ViewportManagerWithPlatformFeatures::GetImmediateChildOfRepeate
 
 void ViewportManagerWithPlatformFeatures::OnCompositionTargetRendering(const winrt::IInspectable& /*sender*/, const winrt::IInspectable& /*args*/)
 {
-    ITEMSREPEATER_TRACE_INFO_DBG(nullptr, TRACE_MSG_METH_STR_STR, METH_NAME, this, GetLayoutId().data(), L"Resets m_makeAnchorElement.");
+    ITEMSREPEATER_TRACE_INFO_DBG(nullptr, TRACE_MSG_METH_STR_STR_PTR, METH_NAME, this, GetLayoutId().data(), L"Resets m_makeAnchorElement.", m_makeAnchorElement);
 
-    assert(!m_managingViewportDisabled);
+    MUX_ASSERT(!m_managingViewportDisabled);
 
     m_renderingToken.revoke();
 
@@ -396,7 +602,10 @@ void ViewportManagerWithPlatformFeatures::OnCompositionTargetRendering(const win
 void ViewportManagerWithPlatformFeatures::ResetScrollers()
 {
     m_scroller.set(nullptr);
+    m_scrollPresenterViewChangingRevoker.revoke();
     m_effectiveViewportChangedRevoker.revoke();
+    m_skipScrollAnchorRegistrationsDuringNextMeasurePass = false;
+    m_skipScrollAnchorRegistrationsDuringNextArrangePass = false;
     m_ensuredScroller = false;
 }
 
@@ -409,21 +618,139 @@ void ViewportManagerWithPlatformFeatures::OnCacheBuildActionCompleted()
     }
 }
 
+// Detect an imminent ScrollPresenter view change triggered by a ScrollTo, ScrollBy, ZoomTo, or ZoomBy call (which is likely originated from a ScrollBar interaction)
+// in order to generate items around the destination area. This is to avoid the ScrollPresenter showing blank content because the Compositor thread moved the ScrollPresenter.Content
+// visual before the ItemsRepeater was measured and arranged for the destination view.
+// This event handler checks if that anticipated view, without UI re-generation, would create a blank region in the ScrollPresenter. In the interest of performance, less than
+// 5% blank is tolerated and will not trigger a re-generation. Beyond that, UpdateViewport is called with the anticipated realization window. This is trigger an ItemsRepeater
+// measure/arrange pass based on the anticipated view.
+void ViewportManagerWithPlatformFeatures::OnScrollPresenterViewChanging(winrt::ScrollPresenter const& scrollPresenter, winrt::ScrollingViewChangingEventArgs const& args)
+{
+    const float blankViewportRatioTolerated = 0.05f;
+    const float anticipatedHorizontalOffset = static_cast<float>(args.HorizontalOffset());
+    const float anticipatedVerticalOffset = static_cast<float>(args.VerticalOffset());
+    const float anticipatedZoomFactor = args.ZoomFactor();
+    const float anticipatedExtentWidth = static_cast<float>(scrollPresenter.ExtentWidth() * anticipatedZoomFactor);
+    const float anticipatedExtentHeight = static_cast<float>(scrollPresenter.ExtentHeight() * anticipatedZoomFactor);
+    const float viewportWidth = static_cast<float>(scrollPresenter.ViewportWidth());
+    const float viewportHeight = static_cast<float>(scrollPresenter.ViewportHeight());
+    const float unzoomedAnticipatedHorizontalOffset = anticipatedHorizontalOffset / anticipatedZoomFactor;
+    const float unzoomedAnticipatedVerticalOffset = anticipatedVerticalOffset / anticipatedZoomFactor;
+    const float scaledViewportWidth = viewportWidth / anticipatedZoomFactor;
+    const float scaledViewportHeight = viewportHeight / anticipatedZoomFactor;
+    const winrt::UIElement owner = *m_owner;
+    const winrt::FrameworkElement ownerAsFE = owner.as<winrt::FrameworkElement>();
+
+#ifdef DBG
+    ITEMSREPEATER_TRACE_INFO(nullptr, TRACE_MSG_METH_STR_STR_FLT_FLT, METH_NAME, this, GetLayoutId().data(),
+        L"Anticipated HorizontalOffset, VerticalOffset:", anticipatedHorizontalOffset, anticipatedVerticalOffset);
+    ITEMSREPEATER_TRACE_INFO(nullptr, TRACE_MSG_METH_STR_STR_FLT, METH_NAME, this, GetLayoutId().data(),
+        L"Anticipated ZoomFactor:", anticipatedZoomFactor);
+
+    TraceFieldsDbg();
+#endif // DBG
+
+    winrt::Rect anticipatedLayoutRealizationWindow = {
+        unzoomedAnticipatedHorizontalOffset,
+        unzoomedAnticipatedVerticalOffset,
+        scaledViewportWidth,
+        scaledViewportHeight };
+
+    if (anticipatedExtentWidth < viewportWidth)
+    {
+        const winrt::HorizontalAlignment horizontalAlignment = ownerAsFE.HorizontalAlignment();
+
+        if (horizontalAlignment == winrt::HorizontalAlignment::Center || horizontalAlignment == winrt::HorizontalAlignment::Stretch)
+        {
+            anticipatedLayoutRealizationWindow.X -= (viewportWidth - anticipatedExtentWidth) / 2.0f / anticipatedZoomFactor;
+        }
+        else if (horizontalAlignment == winrt::HorizontalAlignment::Right)
+        {
+            anticipatedLayoutRealizationWindow.X -= (viewportWidth - anticipatedExtentWidth) / anticipatedZoomFactor;
+        }
+    }
+
+    if (anticipatedExtentHeight < viewportHeight)
+    {
+        const winrt::VerticalAlignment verticalAlignment = ownerAsFE.VerticalAlignment();
+
+        if (verticalAlignment == winrt::VerticalAlignment::Center || verticalAlignment == winrt::VerticalAlignment::Stretch)
+        {
+            anticipatedLayoutRealizationWindow.Y -= (viewportHeight - anticipatedExtentHeight) / 2.0f / anticipatedZoomFactor;
+        }
+        else if (verticalAlignment == winrt::VerticalAlignment::Bottom)
+        {
+            anticipatedLayoutRealizationWindow.Y -= (viewportHeight - anticipatedExtentHeight) / anticipatedZoomFactor;
+        }
+    }
+
+    // No UI re-generation is performed if the last recorded realization window, m_lastLayoutRealizationWindow, is empty. This avoids UI generation when the actual effective viewport is empty.
+    if (m_lastLayoutRealizationWindow.Width > 0.0f && m_lastLayoutRealizationWindow.Height > 0.0f &&
+        m_unshiftableShift == winrt::Point() && // Do not affect start of a bring-into-view operation when the target layout anchor is realized and arranged, which results in m_unshiftableShift being set.
+        (anticipatedLayoutRealizationWindow.X < m_lastLayoutRealizationWindow.X - blankViewportRatioTolerated * scaledViewportWidth ||
+         anticipatedLayoutRealizationWindow.X > m_lastLayoutRealizationWindow.X + m_lastLayoutRealizationWindow.Width - (1.0f - blankViewportRatioTolerated) * scaledViewportWidth ||
+         anticipatedLayoutRealizationWindow.Y < m_lastLayoutRealizationWindow.Y - blankViewportRatioTolerated * scaledViewportHeight ||
+         anticipatedLayoutRealizationWindow.Y > m_lastLayoutRealizationWindow.Y + m_lastLayoutRealizationWindow.Height - (1.0f - blankViewportRatioTolerated) * scaledViewportHeight))
+    {
+        // Using the smallest effective viewport, viewportWidth x viewportHeight, to cover the ScrollPresenter's viewport. It may still be too large if a part of the scroller is not displayed on screen.
+        const bool invalidatedMeasure = UpdateViewport(anticipatedLayoutRealizationWindow);
+
+        if (invalidatedMeasure)
+        {
+            UnregisterScrollAnchorCandidates(nullptr /*exceptionElement*/, true /*registerAsPreparedAndArrangedElements*/);
+
+            ITEMSREPEATER_TRACE_VERBOSE_DBG(nullptr, TRACE_MSG_METH_STR, METH_NAME, this, L"m_skipScrollAnchorRegistrationsDuringNextMeasurePass/m_skipScrollAnchorRegistrationsDuringNextArrangePass set.");
+
+            // During such a UI re-generation, scroll anchoring is momentarily turned off to avoid unwanted anchoring-driven scrolls.
+            m_skipScrollAnchorRegistrationsDuringNextMeasurePass = true;
+            m_skipScrollAnchorRegistrationsDuringNextArrangePass = true;
+        }
+    }
+}
+
 void ViewportManagerWithPlatformFeatures::OnEffectiveViewportChanged(winrt::FrameworkElement const& sender, winrt::EffectiveViewportChangedEventArgs const& args)
 {
-    assert(!m_managingViewportDisabled);
-    ITEMSREPEATER_TRACE_INFO(nullptr, TRACE_MSG_METH_STR, METH_NAME, this, GetLayoutId().data());
-    UpdateViewport(args.EffectiveViewport());
+    winrt::Rect effectiveViewport = args.EffectiveViewport();
 
-    m_pendingViewportShift = {};
-    m_unshiftableShift = {};
-    if (m_visibleWindow == winrt::Rect())
+#ifdef DBG
+    MUX_ASSERT(!m_managingViewportDisabled);
+
+    ITEMSREPEATER_TRACE_INFO(nullptr, TRACE_MSG_METH_STR_STR_FLT_FLT_FLT_FLT, METH_NAME, this, GetLayoutId().data(),
+        L"EffectiveViewport:", effectiveViewport.X, effectiveViewport.Y, effectiveViewport.Width, effectiveViewport.Height);
+
+    TraceScrollerDbg();
+#endif // DBG
+
+    bool invalidateMeasure = false;
+    const bool invalidatedMeasure = UpdateViewport(args.EffectiveViewport());
+    const winrt::Point emptyPoint = {};
+    const winrt::Rect emptyRect = {};
+
+    if (m_pendingViewportShift != emptyPoint)
+    {
+        ResetPendingViewportShift();
+        invalidateMeasure = true;
+    }
+
+    if (m_unshiftableShift != emptyPoint)
+    {
+        ResetUnshiftableShift();
+        invalidateMeasure = true;
+    }
+
+    if (m_visibleWindow == emptyRect && m_layoutExtent != emptyRect)
     {
         // We got cleared.
-        m_layoutExtent = {};
+        ResetLayoutExtent();
+        invalidateMeasure = true;
+    }
+
+    if (invalidateMeasure && !invalidatedMeasure)
+    {
+        TryInvalidateMeasure();
     }
 
-    // We got a new viewport, we dont need to wait for layout updated anymore to 
+    // We got a new viewport, we don't need to wait for layout updated anymore to 
     // see if our request for a pending shift was handled.
     m_layoutUpdatedRevoker.revoke();
 }
@@ -452,53 +779,82 @@ void ViewportManagerWithPlatformFeatures::EnsureScroller()
             m_effectiveViewportChangedRevoker = m_owner->EffectiveViewportChanged(winrt::auto_revoke, { this, &ViewportManagerWithPlatformFeatures::OnEffectiveViewportChanged });
         }
 
+        if (const auto scrollPresenter2 = m_scroller.try_as<winrt::IScrollPresenter2>())
+        {
+            m_scrollPresenterViewChangingRevoker = scrollPresenter2.ViewChanging(winrt::auto_revoke, { this, &ViewportManagerWithPlatformFeatures::OnScrollPresenterViewChanging });
+        }
+
         m_ensuredScroller = true;
     }
 }
 
-void ViewportManagerWithPlatformFeatures::UpdateViewport(winrt::Rect const& viewport)
+// Returns True when m_visibleWindow changes and TryInvalidateMeasure is invoked.
+bool ViewportManagerWithPlatformFeatures::UpdateViewport(winrt::Rect const& effectiveViewport)
 {
-    assert(!m_managingViewportDisabled);
-    const auto previousVisibleWindow = m_visibleWindow;
+#ifdef DBG
+    MUX_ASSERT(!m_managingViewportDisabled);
 
-    ITEMSREPEATER_TRACE_INFO_DBG(nullptr, TRACE_MSG_METH_STR_STR_FLT_FLT_FLT_FLT, METH_NAME, this,
-        GetLayoutId().data(),
-        L"Previous Effective Viewport:",
-        previousVisibleWindow.X, previousVisibleWindow.Y, previousVisibleWindow.Width, previousVisibleWindow.Height);
-    ITEMSREPEATER_TRACE_INFO_DBG(nullptr, TRACE_MSG_METH_STR_STR_FLT_FLT_FLT_FLT, METH_NAME, this,
-        GetLayoutId().data(),
-        L"Current Effective Viewport:",
-        viewport.X, viewport.Y, viewport.Width, viewport.Height);
+    const auto previousVisibleWindowDbg = m_visibleWindow;
 
-    const auto& currentVisibleWindow = viewport;
+    ITEMSREPEATER_TRACE_INFO_DBG(nullptr, TRACE_MSG_METH_STR_STR_FLT_FLT_FLT_FLT, METH_NAME, this, GetLayoutId().data(),
+        L"Previous Effective Viewport:", previousVisibleWindowDbg.X, previousVisibleWindowDbg.Y, previousVisibleWindowDbg.Width, previousVisibleWindowDbg.Height);
+    ITEMSREPEATER_TRACE_INFO_DBG(nullptr, TRACE_MSG_METH_STR_STR_FLT_FLT_FLT_FLT, METH_NAME, this, GetLayoutId().data(),
+        L"Current Effective Viewport:", effectiveViewport.X, effectiveViewport.Y, effectiveViewport.Width, effectiveViewport.Height);
+    ITEMSREPEATER_TRACE_INFO_DBG(nullptr, TRACE_MSG_METH_STR_STR_FLT_FLT_FLT_FLT, METH_NAME, this, GetLayoutId().data(),
+        L"Effective Viewport shift:", effectiveViewport.X - previousVisibleWindowDbg.X, effectiveViewport.Y - previousVisibleWindowDbg.Y, effectiveViewport.Width - previousVisibleWindowDbg.Width, effectiveViewport.Height - previousVisibleWindowDbg.Height);
+#endif // DBG
 
-    if (-currentVisibleWindow.X <= ItemsRepeater::ClearedElementsArrangePosition.X &&
-        -currentVisibleWindow.Y <= ItemsRepeater::ClearedElementsArrangePosition.Y)
+    if (-effectiveViewport.X <= ItemsRepeater::ClearedElementsArrangePosition.X &&
+        -effectiveViewport.Y <= ItemsRepeater::ClearedElementsArrangePosition.Y)
     {
-        ITEMSREPEATER_TRACE_INFO_DBG(nullptr, TRACE_MSG_METH_STR_STR, METH_NAME, this, GetLayoutId().data(), L"Viewport is invalid. visible window cleared.");
+        ITEMSREPEATER_TRACE_INFO_DBG(nullptr, TRACE_MSG_METH_STR_STR, METH_NAME, this, GetLayoutId().data(), L"Viewport is invalid. Visible window cleared.");
 
         // We got cleared.
-        m_visibleWindow = {};
+        ResetVisibleWindow();
     }
     else
     {
-        ITEMSREPEATER_TRACE_INFO_DBG(nullptr, TRACE_MSG_METH_STR_STR_FLT_FLT_FLT_FLT, METH_NAME, this, GetLayoutId().data(), L"Previous Viewport:",
-            previousVisibleWindow.X, previousVisibleWindow.Y, previousVisibleWindow.Width, previousVisibleWindow.Height);
-        ITEMSREPEATER_TRACE_INFO_DBG(nullptr, TRACE_MSG_METH_STR_STR_FLT_FLT_FLT_FLT, METH_NAME, this, GetLayoutId().data(), L"Current Viewport:",
-            currentVisibleWindow.X, currentVisibleWindow.Y, currentVisibleWindow.Width, currentVisibleWindow.Height);
+        const float roundingTolerance = 0.01f;
+
+        if (std::abs(m_visibleWindow.X - effectiveViewport.X) > roundingTolerance ||
+            std::abs(m_visibleWindow.Y - effectiveViewport.Y) > roundingTolerance ||
+            std::abs(m_visibleWindow.Width - effectiveViewport.Width) > roundingTolerance ||
+            std::abs(m_visibleWindow.Height - effectiveViewport.Height) > roundingTolerance)
+        {
+            SetVisibleWindow(effectiveViewport);
 
-        m_visibleWindow = currentVisibleWindow;
+            TryInvalidateMeasure();
+            return true;
+        }
     }
 
-    TryInvalidateMeasure();
+    return false;
+}
+
+void ViewportManagerWithPlatformFeatures::ResetLayoutRealizationWindowCacheBuffer()
+{
+    ResetCacheBuffer(false /*registerCacheBuildWork*/);
 }
 
-void ViewportManagerWithPlatformFeatures::ResetCacheBuffer()
+void ViewportManagerWithPlatformFeatures::ResetCacheBuffer(bool registerCacheBuildWork)
 {
+#ifdef DBG
+    if (m_horizontalCacheBufferPerSide != 0.0)
+    {
+        ITEMSREPEATER_TRACE_INFO(nullptr, TRACE_MSG_METH_STR_STR_DBL, METH_NAME, this,
+            GetLayoutId().data(), L"m_horizontalCacheBufferPerSide reset:", m_horizontalCacheBufferPerSide);
+    }
+    if (m_verticalCacheBufferPerSide != 0.0)
+    {
+        ITEMSREPEATER_TRACE_INFO(nullptr, TRACE_MSG_METH_STR_STR_DBL, METH_NAME, this,
+            GetLayoutId().data(), L"m_verticalCacheBufferPerSide reset:", m_verticalCacheBufferPerSide);
+    }
+#endif // DBG
+
     m_horizontalCacheBufferPerSide = 0.0;
     m_verticalCacheBufferPerSide = 0.0;
 
-    if (!m_managingViewportDisabled)
+    if (!m_managingViewportDisabled && registerCacheBuildWork)
     {
         // We need to start building the realization buffer again.
         RegisterCacheBuildWork();
@@ -513,13 +869,65 @@ void ViewportManagerWithPlatformFeatures::ValidateCacheLength(double cacheLength
     }
 }
 
+void ViewportManagerWithPlatformFeatures::RegisterPreparedElementsAsArranged()
+{
+    ITEMSREPEATER_TRACE_VERBOSE_DBG(nullptr, TRACE_MSG_METH_STR_INT, METH_NAME, this, L"m_preparedElements.size:", m_preparedElements.size());
+
+    if (m_preparedElements.size() == 0)
+    {
+        return;
+    }
+
+    for (tracker_ref<winrt::UIElement> preparedElementTracker : m_preparedElements)
+    {
+        const winrt::UIElement preparedElement = preparedElementTracker.get();
+
+        const auto it = std::find_if(m_preparedAndArrangedElements.cbegin(), m_preparedAndArrangedElements.cend(),
+            [&preparedElement](const tracker_ref<winrt::UIElement>& preparedAndArrangedElement) { return preparedAndArrangedElement.get() == preparedElement; });
+
+        if (it == m_preparedAndArrangedElements.cend())
+        {
+            m_preparedAndArrangedElements.push_back(tracker_ref<winrt::UIElement>{ m_owner, preparedElement });
+        }
+    }
+
+    m_preparedElements.clear();
+}
+
+void ViewportManagerWithPlatformFeatures::RegisterPreparedAndArrangedElementsAsScrollAnchorCandidates()
+{
+    ITEMSREPEATER_TRACE_VERBOSE_DBG(nullptr, TRACE_MSG_METH_STR_INT, METH_NAME, this, L"m_preparedAndArrangedElements.size:", m_preparedAndArrangedElements.size());
+
+    if (m_preparedAndArrangedElements.size() == 0)
+    {
+        return;
+    }
+
+    for (tracker_ref<winrt::UIElement> anchorCandidateTracker : m_preparedAndArrangedElements)
+    {
+        const winrt::UIElement anchorCandidate = anchorCandidateTracker.get();
+
+        if (!anchorCandidate.CanBeScrollAnchor())
+        {
+            const auto info = ItemsRepeater::GetVirtualizationInfo(anchorCandidate);
+
+            if (info->IsRealized() && info->IsHeldByLayout())
+            {
+                anchorCandidate.CanBeScrollAnchor(true);
+            }
+        }
+    }
+
+    m_preparedAndArrangedElements.clear();
+}
+
 void ViewportManagerWithPlatformFeatures::RegisterCacheBuildWork()
 {
-    assert(!m_managingViewportDisabled);
+    MUX_ASSERT(!m_managingViewportDisabled);
     if (m_owner->Layout() &&
         !m_cacheBuildActionOutstanding)
     {
-        // We capture 'owner' (a strong refernce on ItemsRepeater) to make sure ItemsRepeater is still around
+        // We capture 'owner' (a strong reference on ItemsRepeater) to make sure ItemsRepeater is still around
         // when the async action completes. By protecting ItemsRepeater, we also ensure that this instance
         // of ViewportManager (referenced by 'this' pointer) is valid because the lifetime of ItemsRepeater
         // and ViewportManager is the same (see ItemsRepeater::m_viewportManager).
@@ -547,6 +955,24 @@ void ViewportManagerWithPlatformFeatures::TryInvalidateMeasure()
     }
 }
 
+void ViewportManagerWithPlatformFeatures::UnregisterScrollAnchorCandidates(winrt::UIElement const& exceptionElement, bool registerAsPreparedAndArrangedElements)
+{
+    ITEMSREPEATER_TRACE_VERBOSE_DBG(nullptr, TRACE_MSG_METH_STR_INT, METH_NAME, this, L"registerAsPreparedAndArrangedElements:", registerAsPreparedAndArrangedElements);
+
+    for (const winrt::UIElement& child : m_owner->Children())
+    {
+        if (child.CanBeScrollAnchor() && child != exceptionElement)
+        {
+            child.CanBeScrollAnchor(false);
+
+            if (registerAsPreparedAndArrangedElements)
+            {
+                m_preparedAndArrangedElements.push_back(tracker_ref<winrt::UIElement>{ m_owner, child });
+            }
+        }
+    }
+}
+
 winrt::hstring ViewportManagerWithPlatformFeatures::GetLayoutId() const
 {
     if (auto layout = m_owner->Layout())
@@ -556,3 +982,41 @@ winrt::hstring ViewportManagerWithPlatformFeatures::GetLayoutId() const
 
     return winrt::hstring{};
 }
+
+#ifdef DBG
+void ViewportManagerWithPlatformFeatures::TraceFieldsDbg()
+{
+    ITEMSREPEATER_TRACE_INFO(nullptr, TRACE_MSG_METH_STR_STR_FLT_FLT, METH_NAME, this,
+        GetLayoutId().data(), L"m_expectedViewportShift:", m_expectedViewportShift.X, m_expectedViewportShift.Y);
+    ITEMSREPEATER_TRACE_INFO(nullptr, TRACE_MSG_METH_STR_STR_FLT_FLT, METH_NAME, this,
+        GetLayoutId().data(), L"m_pendingViewportShift:", m_pendingViewportShift.X, m_pendingViewportShift.Y);
+    ITEMSREPEATER_TRACE_INFO(nullptr, TRACE_MSG_METH_STR_STR_FLT_FLT, METH_NAME, this,
+        GetLayoutId().data(), L"m_unshiftableShift:", m_unshiftableShift.X, m_unshiftableShift.Y);
+    ITEMSREPEATER_TRACE_INFO(nullptr, TRACE_MSG_METH_STR_STR_FLT_FLT_FLT_FLT, METH_NAME, this,
+        GetLayoutId().data(), L"m_visibleWindow:", m_visibleWindow.X, m_visibleWindow.Y, m_visibleWindow.Width, m_visibleWindow.Height);
+    ITEMSREPEATER_TRACE_INFO(nullptr, TRACE_MSG_METH_STR_STR_FLT_FLT_FLT_FLT, METH_NAME, this,
+        GetLayoutId().data(), L"m_lastLayoutRealizationWindow:", m_lastLayoutRealizationWindow.X, m_lastLayoutRealizationWindow.Y, m_lastLayoutRealizationWindow.Width, m_lastLayoutRealizationWindow.Height);
+    ITEMSREPEATER_TRACE_INFO(nullptr, TRACE_MSG_METH_STR_STR_FLT_FLT_FLT_FLT, METH_NAME, this,
+        GetLayoutId().data(), L"m_layoutExtent:", m_layoutExtent.X, m_layoutExtent.Y, m_layoutExtent.Width, m_layoutExtent.Height);    
+}
+
+void ViewportManagerWithPlatformFeatures::TraceScrollerDbg()
+{
+    if (const auto scrollViewerDbg = m_scroller.try_as<winrt::Controls::IScrollViewer>())
+    {
+        ITEMSREPEATER_TRACE_INFO(nullptr, TRACE_MSG_METH_STR_STR_DBL_DBL, METH_NAME, this,
+            GetLayoutId().data(), L"ScrollViewer Offsets:", scrollViewerDbg.HorizontalOffset(), scrollViewerDbg.VerticalOffset());
+
+        ITEMSREPEATER_TRACE_INFO(nullptr, TRACE_MSG_METH_STR_STR_DBL_DBL, METH_NAME, this,
+            GetLayoutId().data(), L"ScrollViewer Scrollable Sizes:", scrollViewerDbg.ScrollableWidth(), scrollViewerDbg.ScrollableHeight());
+    }
+    else if (const auto scrollPresenterDbg = m_scroller.try_as<winrt::Controls::Primitives::IScrollPresenter>())
+    {
+        ITEMSREPEATER_TRACE_INFO(nullptr, TRACE_MSG_METH_STR_STR_DBL_DBL, METH_NAME, this,
+            GetLayoutId().data(), L"ScrollPresenter Offsets:", scrollPresenterDbg.HorizontalOffset(), scrollPresenterDbg.VerticalOffset());
+
+        ITEMSREPEATER_TRACE_INFO(nullptr, TRACE_MSG_METH_STR_STR_DBL_DBL, METH_NAME, this,
+            GetLayoutId().data(), L"ScrollPresenter Scrollable Sizes:", scrollPresenterDbg.ScrollableWidth(), scrollPresenterDbg.ScrollableHeight());
+    }
+}
+#endif // DBG
diff --git a/src/controls/dev/Repeater/ViewportManagerWithPlatformFeatures.h b/src/controls/dev/Repeater/ViewportManagerWithPlatformFeatures.h
index 4a36ae2653..2f7b95c755 100644
--- a/src/controls/dev/Repeater/ViewportManagerWithPlatformFeatures.h
+++ b/src/controls/dev/Repeater/ViewportManagerWithPlatformFeatures.h
@@ -4,15 +4,14 @@
 #pragma once
 
 #include "ViewportManager.h"
+#include "ScrollingViewChangingEventArgs.h"
 
 class ItemsRepeater;
 
-// Manages the virtualization windows (visible/realization). This class essentially is 
-// does the equivalent behavior as ViewportManager class except that here we use 
+// Manages the virtualization windows (visible/realization). This class essentially 
+// does the equivalent behavior of ViewportManager class except that here we use 
 // EffectiveViewport and ScrollAnchoring features added to the framework in RS5. 
 // We also do not use the IRepeaterScrollingSurface internal API used by ViewManager.
-// Not that this class is used when built in the OS build (under wuxc) and ViewManager
-// is used when building in MUX to keep down level support.
 class ViewportManagerWithPlatformFeatures : public ViewportManager
 {
 public:
@@ -29,7 +28,7 @@ class ViewportManagerWithPlatformFeatures : public ViewportManager
     winrt::Rect GetLayoutVisibleWindow() const override;
     winrt::Rect GetLayoutRealizationWindow() const override;
 
-    void SetLayoutExtent(winrt::Rect extent) override;
+    void SetLayoutExtent(const winrt::Rect& layoutExtent) override;
     winrt::Rect GetLayoutExtent() const override { return m_layoutExtent; }
     winrt::Point GetOrigin() const override { return winrt::Point(m_layoutExtent.X, m_layoutExtent.Y); }
 
@@ -39,8 +38,9 @@ class ViewportManagerWithPlatformFeatures : public ViewportManager
     void OnOwnerMeasuring() override;
     void OnOwnerArranged() override;
     void OnMakeAnchor(const winrt::UIElement& anchor, const bool isAnchorOutsideRealizedRange) override;
-    void OnBringIntoViewRequested(const winrt::BringIntoViewRequestedEventArgs args) override;
+    void OnBringIntoViewRequested(const winrt::BringIntoViewRequestedEventArgs& args) override;
 
+    void ResetLayoutRealizationWindowCacheBuffer() override;
     void ResetScrollers() override;
 
     winrt::UIElement MadeAnchor() const override { return m_makeAnchorElement.get(); }
@@ -48,33 +48,60 @@ class ViewportManagerWithPlatformFeatures : public ViewportManager
 private:
     struct ScrollerInfo;
 
+    void SetVisibleWindow(const winrt::Rect& visibleWindow);
+    void SetPendingViewportShift(const winrt::Point& pendingViewportShift);
+    void SetExpectedViewportShift(float expectedViewportShiftX, float expectedViewportShiftY);
+    void SetUnshiftableShift(float unshiftableShiftX, float unshiftableShiftY);
+
+    void ResetLayoutExtent();
+    void ResetVisibleWindow();
+    void ResetExpectedViewportShift();
+    void ResetPendingViewportShift();
+    void ResetUnshiftableShift();
+
     void OnCacheBuildActionCompleted();
     void OnEffectiveViewportChanged(winrt::FrameworkElement const& sender, winrt::EffectiveViewportChangedEventArgs const& args);
     void OnLayoutUpdated(winrt::IInspectable const& sender, winrt::IInspectable const& args);
+    void OnScrollPresenterViewChanging(winrt::ScrollPresenter const& scrollPresenter, winrt::ScrollingViewChangingEventArgs const& args);
 
     void EnsureScroller();
     bool HasScroller() const { return m_scroller != nullptr; }
-    void UpdateViewport(winrt::Rect const& args);
-    void ResetCacheBuffer();
+    bool UpdateViewport(winrt::Rect const& effectiveViewport);
+    void ResetCacheBuffer(bool registerCacheBuildWork = true);
     void ValidateCacheLength(double cacheLength);
+    void RegisterPreparedElementsAsArranged();
+    void RegisterPreparedAndArrangedElementsAsScrollAnchorCandidates();
     void RegisterCacheBuildWork();
     void TryInvalidateMeasure();
+    void UnregisterScrollAnchorCandidates(winrt::UIElement const& exceptionElement, bool registerAsPreparedAndArrangedElements);
     winrt::Rect GetLayoutVisibleWindowDiscardAnchor() const;
 
     winrt::hstring GetLayoutId() const;
     void OnCompositionTargetRendering(winrt::IInspectable const& sender, winrt::IInspectable const& args);
     winrt::UIElement GetImmediateChildOfRepeater(winrt::UIElement const& descendant);
 
+#ifdef DBG
+    void TraceFieldsDbg();
+    void TraceScrollerDbg();
+#endif // DBG
+
     ItemsRepeater* m_owner{ nullptr };
 
     bool m_ensuredScroller{ false };
     tracker_ref<winrt::Controls::IScrollAnchorProvider> m_scroller;
 
+    std::vector<tracker_ref<winrt::UIElement>> m_preparedElements;
+    std::vector<tracker_ref<winrt::UIElement>> m_preparedAndArrangedElements;
+
     tracker_ref<winrt::UIElement> m_makeAnchorElement;
     bool m_isAnchorOutsideRealizedRange{};  // Value is only valid when m_makeAnchorElement is set.
 
+    bool m_skipScrollAnchorRegistrationsDuringNextMeasurePass{};
+    bool m_skipScrollAnchorRegistrationsDuringNextArrangePass{};
+
     bool m_cacheBuildActionOutstanding{};
 
+    winrt::Rect m_lastLayoutRealizationWindow{};
     winrt::Rect m_visibleWindow{};
     winrt::Rect m_layoutExtent{};
     // This is the expected shift by the layout.
@@ -85,11 +112,10 @@ class ViewportManagerWithPlatformFeatures : public ViewportManager
     winrt::Point m_pendingViewportShift{};
     // Unshiftable shift amount that this view manager can
     // handle on its own to fake it to the layout as if the shift
-    // actually happened. This can happen in cases where no scrollviewer
+    // actually happened. This can happen in cases where no scroller
     // in the parent chain can scroll in the shift direction.
     winrt::Point m_unshiftableShift{};
 
-
     // Realization window cache fields
     double m_maximumHorizontalCacheLength{ 2.0 };
     double m_maximumVerticalCacheLength{ 2.0 };
@@ -103,8 +129,8 @@ class ViewportManagerWithPlatformFeatures : public ViewportManager
     bool m_managingViewportDisabled{ false };
 
     // Event tokens
+    winrt::ScrollPresenter::ViewChanging_revoker m_scrollPresenterViewChangingRevoker{};
     winrt::FrameworkElement::EffectiveViewportChanged_revoker m_effectiveViewportChangedRevoker{};
-
     winrt::FrameworkElement::LayoutUpdated_revoker m_layoutUpdatedRevoker{};
     winrt::Microsoft::UI::Xaml::Media::CompositionTarget::Rendering_revoker m_renderingToken{};
 };
diff --git a/src/controls/dev/Repeater/VirtualizationInfo.cpp b/src/controls/dev/Repeater/VirtualizationInfo.cpp
index a992528147..67686ee45d 100644
--- a/src/controls/dev/Repeater/VirtualizationInfo.cpp
+++ b/src/controls/dev/Repeater/VirtualizationInfo.cpp
@@ -25,9 +25,9 @@ bool VirtualizationInfo::IsHeldByLayout() const
     return m_owner == ElementOwner::Layout;
 }
 
-bool VirtualizationInfo::IsRealized() const
+bool VirtualizationInfo::IsInPinnedPool() const
 {
-    return IsHeldByLayout() || m_owner == ElementOwner::PinnedPool;
+    return m_owner == ElementOwner::PinnedPool;
 }
 
 bool VirtualizationInfo::IsInUniqueIdResetPool() const
@@ -35,6 +35,11 @@ bool VirtualizationInfo::IsInUniqueIdResetPool() const
     return m_owner == ElementOwner::UniqueIdResetPool;
 }
 
+bool VirtualizationInfo::IsRealized() const
+{
+    return IsHeldByLayout() || IsInPinnedPool();
+}
+
 void VirtualizationInfo::UpdatePhasingInfo(int phase, const winrt::IInspectable& data, const winrt::IDataTemplateComponent& component)
 {
     m_phase = phase;
@@ -98,7 +103,7 @@ void VirtualizationInfo::MoveOwnershipToLayoutFromPinnedPool()
 void VirtualizationInfo::MoveOwnershipToElementFactory()
 {
 #ifdef DBG
-    if (m_index == s_logItemIndexDbg)
+    if (m_index == s_logItemIndexDbg && !(m_owner == ElementOwner::Animator && m_index == -1))
     {
         ITEMSREPEATER_TRACE_INFO(nullptr, TRACE_MSG_METH_INT, METH_NAME, this, s_logItemIndexDbg);
         MUX_ASSERT(s_logItemIndexDbg != -1);
diff --git a/src/controls/dev/Repeater/VirtualizationInfo.h b/src/controls/dev/Repeater/VirtualizationInfo.h
index 93100672d7..bca18f23a3 100644
--- a/src/controls/dev/Repeater/VirtualizationInfo.h
+++ b/src/controls/dev/Repeater/VirtualizationInfo.h
@@ -38,8 +38,9 @@ class VirtualizationInfo : public winrt::implements<VirtualizationInfo, winrt::I
     // PinnedPool if it gets cleared by layout.
     bool IsPinned() const;
     bool IsHeldByLayout() const;
-    bool IsRealized() const;
+    bool IsInPinnedPool() const;
     bool IsInUniqueIdResetPool() const;
+    bool IsRealized() const;
 
     // Info for phasing
     void UpdatePhasingInfo(int phase, const winrt::IInspectable& data, const winrt::IDataTemplateComponent& component);
diff --git a/src/controls/dev/ResourceHelper/ResourceAccessor.cpp b/src/controls/dev/ResourceHelper/ResourceAccessor.cpp
index b18acf2947..438dd56b23 100644
--- a/src/controls/dev/ResourceHelper/ResourceAccessor.cpp
+++ b/src/controls/dev/ResourceHelper/ResourceAccessor.cpp
@@ -5,12 +5,7 @@
 #include "common.h"
 #include "ResourceAccessor.h"
 
-#ifdef MUX_EXPERIMENTAL
-#define LOC_PREFIX L"Microsoft.Experimental.UI.Xaml"
-#else
 #define LOC_PREFIX L"Microsoft.UI.Xaml"
-#endif
-
 #define LOC_PREFIX_WINUI L"Microsoft.UI.Xaml"
 
 PCWSTR ResourceAccessor::c_resourceLoc{ LOC_PREFIX L"/Resources" };
@@ -66,33 +61,6 @@ winrt::hstring ResourceAccessor::GetLocalizedStringResource(const wstring_view&
     return mrt_lifted_resourceMap.GetValue(resourceName, mrt_lifted_resourceContext).ValueAsString();
 }
 
-#ifdef MUX_EXPERIMENTAL
-winrt::hstring ResourceAccessor::GetLocalizedStringResourceFromWinUI(const wstring_view& resourceName)
-{
-    static winrt::ResourceMap s_resourceMapWinUI = []() {
-
-        constexpr wchar_t c_winUIPackageNamePrefix[] = L"Microsoft.UI.Xaml.";
-        constexpr size_t c_winUIPackageNamePrefixLength = ARRAYSIZE(c_winUIPackageNamePrefix) - 1;
-
-        for (auto resourceMapKvp : winrt::ResourceManager::Current().AllResourceMaps())
-        {
-            auto resourceMapName = resourceMapKvp.Key();
-            if (std::wstring_view(resourceMapName.c_str(), c_winUIPackageNamePrefixLength) == std::wstring_view(c_winUIPackageNamePrefix))
-            {
-                return resourceMapKvp.Value().GetSubtree(ResourceAccessor::c_resourceLocWinUI);
-            }
-        }
-
-        // If we don't find a matching framework package, use the app's resources:
-        return winrt::ResourceManager::Current().MainResourceMap().GetSubtree(ResourceAccessor::c_resourceLocWinUI);
-    }();
-
-    static winrt::ResourceContext s_resourceContext = winrt::ResourceContext::GetForViewIndependentUse();
-
-    return s_resourceMapWinUI.GetValue(resourceName, s_resourceContext).ValueAsString();
-}
-#endif
-
 winrt::LoadedImageSurface ResourceAccessor::GetImageSurface(const wstring_view& assetName, winrt::Size imageSize)
 {
     auto imageUri = winrt::Uri{ std::wstring(L"ms-resource:///Files/Microsoft.UI.Xaml/Assets/") + std::wstring(assetName.data()) + std::wstring(L".png") };
diff --git a/src/controls/dev/ResourceHelper/ResourceAccessor.h b/src/controls/dev/ResourceHelper/ResourceAccessor.h
index b7855e553d..7533819a87 100644
--- a/src/controls/dev/ResourceHelper/ResourceAccessor.h
+++ b/src/controls/dev/ResourceHelper/ResourceAccessor.h
@@ -31,11 +31,6 @@ class ResourceAccessor sealed
     static winrt::Microsoft::Windows::ApplicationModel::Resources::ResourceManager m_resourceManagerWinRT;
 public:
     static winrt::hstring GetLocalizedStringResource(const wstring_view &resourceName);
-
-#ifdef MUX_EXPERIMENTAL
-    static winrt::hstring GetLocalizedStringResourceFromWinUI(const wstring_view& resourceName);
-#endif
-
     static winrt::LoadedImageSurface GetImageSurface(const wstring_view &assetName, winrt::Size imageSize);
     static winrt::Windows::Foundation::IAsyncOperation<winrt::hstring> GetFileContents(const wstring_view& assetFileName);
     static winrt::IInspectable ResourceLookup(const winrt::Control& control, const winrt::IInspectable& key);
diff --git a/src/controls/dev/SampleControl/InteractionTests/SampleControlTests.cs b/src/controls/dev/SampleControl/InteractionTests/SampleControlTests.cs
deleted file mode 100644
index 9601d6d126..0000000000
--- a/src/controls/dev/SampleControl/InteractionTests/SampleControlTests.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-using System;
-using Common;
-using Microsoft.UI.Xaml.Tests.MUXControls.InteractionTests.Infra;
-using Microsoft.UI.Xaml.Tests.MUXControls.InteractionTests.Common;
-using System.Collections.Generic;
-
-using WEX.TestExecution;
-using WEX.TestExecution.Markup;
-using WEX.Logging.Interop;
-
-using Microsoft.Windows.Apps.Test.Automation;
-using Microsoft.Windows.Apps.Test.Foundation;
-using Microsoft.Windows.Apps.Test.Foundation.Controls;
-using Microsoft.Windows.Apps.Test.Foundation.Patterns;
-using Microsoft.Windows.Apps.Test.Foundation.Waiters;
-
-namespace Microsoft.UI.Xaml.Tests.MUXControls.InteractionTests
-{
-    [TestClass]
-    public class SampleControlTests
-    {
-        [ClassInitialize]
-        [TestProperty("RunAs", "User")]
-        [TestProperty("Classification", "Integration")]
-        [TestProperty("Platform", "Any")]
-        public static void ClassInitialize(TestContext testContext)
-        {
-            TestEnvironment.Initialize(testContext, TestApplicationInfo.MUXExperimentalTestApp);
-        }
-
-        [TestCleanup]
-        public void TestCleanup()
-        {
-            TestEnvironment.AssemblyCleanupWorker(TestApplicationInfo.MUXExperimentalTestApp);
-        }
-
-        [TestMethod]
-        public void BasicTest()
-        {
-            Log.Comment("SampleControl Basic Test");
-            using (var setup = new TestSetupHelper("SampleControl Tests"))
-            {
-                Log.Comment("Retrieve SampleControl as generic UIElement");
-                UIObject sampleControl = FindElement.ByName("TestSampleControl");
-                Verify.IsNotNull(sampleControl, "Verifying that we found a UIElement called TestSampleControl");
-            }
-        }
-    }
-}
diff --git a/src/controls/dev/SampleControl/InteractionTests/SampleControl_InteractionTests.projitems b/src/controls/dev/SampleControl/InteractionTests/SampleControl_InteractionTests.projitems
deleted file mode 100644
index a761e81ad9..0000000000
--- a/src/controls/dev/SampleControl/InteractionTests/SampleControl_InteractionTests.projitems
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <HasSharedItems>true</HasSharedItems>
-    <SharedGUID>A1553559-5786-4B44-AB9E-94AB95C86D4D</SharedGUID>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <Import_RootNamespace>SampleControl_InteractionTests</Import_RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)SampleControlTests.cs" />
-  </ItemGroup>
-</Project>
diff --git a/src/controls/dev/SampleControl/InteractionTests/SampleControl_InteractionTests.shproj b/src/controls/dev/SampleControl/InteractionTests/SampleControl_InteractionTests.shproj
deleted file mode 100644
index f83ede1359..0000000000
--- a/src/controls/dev/SampleControl/InteractionTests/SampleControl_InteractionTests.shproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{30120040-3EB8-404D-9344-5E99E34B6090}</ProjectGuid>
-    <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
-  <PropertyGroup />
-  <Import Project="SampleControl_InteractionTests.projitems" Label="Shared" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
-</Project>
\ No newline at end of file
diff --git a/src/controls/dev/SampleControl/SampleControl.cpp b/src/controls/dev/SampleControl/SampleControl.cpp
deleted file mode 100644
index d86d50bdba..0000000000
--- a/src/controls/dev/SampleControl/SampleControl.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-#include "pch.h"
-#include "common.h"
-#include "SampleControl.h"
-#include "ResourceAccessor.h"
-
-SampleControl::SampleControl()
-{
-    SetDefaultStyleKey(this);
-}
-
-void SampleControl::OnApplyTemplate()
-{
-    winrt::IControlProtected controlProtected{ *this };
-}
-
-void  SampleControl::OnPropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args)
-{
-    winrt::IDependencyProperty property = args.Property();
-}
diff --git a/src/controls/dev/SampleControl/SampleControl.h b/src/controls/dev/SampleControl/SampleControl.h
deleted file mode 100644
index 4eac194ced..0000000000
--- a/src/controls/dev/SampleControl/SampleControl.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-#pragma once
-
-#include "pch.h"
-#include "common.h"
-
-#include "SampleControl.g.h"
-#include "SampleControl.properties.h"
-
-class SampleControl :
-    public ReferenceTracker<SampleControl, winrt::implementation::SampleControlT>,
-    public SampleControlProperties
-{
-
-public:
-    SampleControl();
-    ~SampleControl() {}
-
-    // IFrameworkElement
-    void OnApplyTemplate();
-
-    void OnPropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args);
-};
diff --git a/src/controls/dev/SampleControl/SampleControl.idl b/src/controls/dev/SampleControl/SampleControl.idl
deleted file mode 100644
index a39c6071f2..0000000000
--- a/src/controls/dev/SampleControl/SampleControl.idl
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace MEU_XC_NAMESPACE
-{
-
-[MUX_EXPERIMENTAL]
-[webhosthidden]
-[MUX_PROPERTY_CHANGED_CALLBACK(TRUE)]
-[MUX_PROPERTY_CHANGED_CALLBACK_METHODNAME("OnPropertyChanged")]
-unsealed runtimeclass SampleControl : Microsoft.UI.Xaml.Controls.Control
-{
-    SampleControl();
-
-    Object Placeholder{ get; set; };
-
-    static Microsoft.UI.Xaml.DependencyProperty PlaceholderProperty{ get; };
-}
-
-}
diff --git a/src/controls/dev/SampleControl/SampleControl.vcxitems b/src/controls/dev/SampleControl/SampleControl.vcxitems
deleted file mode 100644
index 58b0f40922..0000000000
--- a/src/controls/dev/SampleControl/SampleControl.vcxitems
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <HasSharedItems>true</HasSharedItems>
-    <ItemsProjectGuid>{A329FB8A-3093-4050-83D3-4D9F5847F3B8}</ItemsProjectGuid>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);SAMPLECONTROL_INCLUDED</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectCapability Include="SourceItemsFromImports" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(MSBuildThisFileDirectory)SampleControl.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\GeneratedExperimental\SampleControl.properties.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)SampleControl.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="$(MSBuildThisFileDirectory)SampleControl.xaml">
-      <ControlsResourcesVersion>Any</ControlsResourcesVersion>
-      <Version>RS1</Version>
-      <Type>DefaultStyle</Type>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)SampleControl_themeresources.xaml">
-      <ControlsResourcesVersion>Any</ControlsResourcesVersion>
-      <Version>RS1</Version>
-      <Type>ThemeResources</Type>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <Midl Include="$(MSBuildThisFileDirectory)SampleControl.idl" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/controls/dev/SampleControl/SampleControl.xaml b/src/controls/dev/SampleControl/SampleControl.xaml
deleted file mode 100644
index acc1dfde6c..0000000000
--- a/src/controls/dev/SampleControl/SampleControl.xaml
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
-<ResourceDictionary xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="using:Microsoft.Experimental.UI.Xaml.Controls" xmlns:controls="using:Microsoft.UI.Xaml.Controls" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-  <Style TargetType="local:SampleControl">
-    <Setter Property="Width" Value="123" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="local:SampleControl">
-          <Border Background="Yellow" BorderBrush="Green" BorderThickness="5">
-            <StackPanel>
-              <TextBlock Text="I am a SampleControl" />
-              <controls:SplitButton Content="SplitButton" />
-            </StackPanel>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/controls/dev/SampleControl/SampleControl_themeresources.xaml b/src/controls/dev/SampleControl/SampleControl_themeresources.xaml
deleted file mode 100644
index b7c10c05d9..0000000000
--- a/src/controls/dev/SampleControl/SampleControl_themeresources.xaml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
-<ResourceDictionary xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="using:Microsoft.Experimental.UI.Xaml.Controls" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" />
\ No newline at end of file
diff --git a/src/controls/dev/SampleControl/TestUI/SampleControlPage.xaml b/src/controls/dev/SampleControl/TestUI/SampleControlPage.xaml
deleted file mode 100644
index 88fd2a3e4c..0000000000
--- a/src/controls/dev/SampleControl/TestUI/SampleControlPage.xaml
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
-<local:TestPage
-    x:Class="MUXControlsTestApp.SampleControlPage"
-    x:Name="SampleControlTestPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:MUXControlsTestApp"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:exp="using:Microsoft.Experimental.UI.Xaml.Controls"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d">
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Margin="12">
-        <StackPanel Orientation="Vertical">
-            <exp:SampleControl AutomationProperties.Name="TestSampleControl"/>
-        </StackPanel>
-    </Grid>
-</local:TestPage>
diff --git a/src/controls/dev/SampleControl/TestUI/SampleControl_TestUI.projitems b/src/controls/dev/SampleControl/TestUI/SampleControl_TestUI.projitems
deleted file mode 100644
index 950b9cd7c5..0000000000
--- a/src/controls/dev/SampleControl/TestUI/SampleControl_TestUI.projitems
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <HasSharedItems>true</HasSharedItems>
-    <SharedGUID>280C91F4-96B5-4BDE-9E02-E573E1DEF583</SharedGUID>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <Import_RootNamespace>SampleControl_TestUI</Import_RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <Page Include="$(MSBuildThisFileDirectory)SampleControlPage.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)SampleControlPage.xaml.cs">
-      <DependentUpon>SampleControlPage.xaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
-</Project>
diff --git a/src/controls/dev/SampleControl/TestUI/SampleControl_TestUI.shproj b/src/controls/dev/SampleControl/TestUI/SampleControl_TestUI.shproj
deleted file mode 100644
index 915f617982..0000000000
--- a/src/controls/dev/SampleControl/TestUI/SampleControl_TestUI.shproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{05361409-7FBB-4296-996F-2E591857D84A}</ProjectGuid>
-    <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
-  <PropertyGroup />
-  <Import Project="SampleControl_TestUI.projitems" Label="Shared" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
-</Project>
\ No newline at end of file
diff --git a/src/controls/dev/ScrollPresenter/APITests/ScrollControllerTests.cs b/src/controls/dev/ScrollPresenter/APITests/ScrollControllerTests.cs
index a82d40dcbe..afb4cedf36 100644
--- a/src/controls/dev/ScrollPresenter/APITests/ScrollControllerTests.cs
+++ b/src/controls/dev/ScrollPresenter/APITests/ScrollControllerTests.cs
@@ -126,7 +126,7 @@ public void ChangeOffsetsWhileScrollControllersAreAttached()
                 (c_defaultUIScrollPresenterContentHeight - c_defaultUIScrollPresenterHeight) / 2.0,
                 ScrollingAnimationMode.Disabled,
                 ScrollingSnapPointsMode.Ignore,
-                hookViewChanged: true,
+                hookViewChangingAndChanged: true,
                 isAnimationsEnabledOverride: null, 
                 expectedFinalHorizontalOffset: (c_defaultUIScrollPresenterContentWidth - c_defaultUIScrollPresenterWidth) / 2.0, 
                 expectedFinalVerticalOffset: (c_defaultUIScrollPresenterContentHeight - c_defaultUIScrollPresenterHeight) / 2.0);
@@ -138,7 +138,7 @@ public void ChangeOffsetsWhileScrollControllersAreAttached()
                 (c_defaultUIScrollPresenterContentHeight - c_defaultUIScrollPresenterHeight) / 4.0,
                 ScrollingAnimationMode.Enabled,
                 ScrollingSnapPointsMode.Ignore,
-                hookViewChanged: false,
+                hookViewChangingAndChanged: false,
                 isAnimationsEnabledOverride: null,
                 expectedFinalHorizontalOffset: (c_defaultUIScrollPresenterContentWidth - c_defaultUIScrollPresenterWidth) / 4.0,
                 expectedFinalVerticalOffset: (c_defaultUIScrollPresenterContentHeight - c_defaultUIScrollPresenterHeight) / 4.0);
@@ -151,7 +151,7 @@ public void ChangeOffsetsWhileScrollControllersAreAttached()
                 0.0f,
                 ScrollingAnimationMode.Disabled,
                 ScrollingSnapPointsMode.Ignore,
-                hookViewChanged: false);
+                hookViewChangingAndChanged: false);
 
             Log.Comment("Animate to zoomFactor 1.5");
             ZoomTo(
@@ -161,7 +161,7 @@ public void ChangeOffsetsWhileScrollControllersAreAttached()
                 0.0f,
                 ScrollingAnimationMode.Enabled,
                 ScrollingSnapPointsMode.Ignore,
-                hookViewChanged: false);
+                hookViewChangingAndChanged: false);
         }
 
         [TestMethod]
@@ -477,7 +477,7 @@ public void ChangeOffsetsWhileBiDirectionalScrollControllerIsAttached()
                 (c_defaultUIScrollPresenterContentHeight - c_defaultUIScrollPresenterHeight) / 2.0,
                 ScrollingAnimationMode.Disabled,
                 ScrollingSnapPointsMode.Ignore,
-                hookViewChanged: true,
+                hookViewChangingAndChanged: true,
                 isAnimationsEnabledOverride: null,
                 expectedFinalHorizontalOffset: (c_defaultUIScrollPresenterContentWidth - c_defaultUIScrollPresenterWidth) / 2.0,
                 expectedFinalVerticalOffset: (c_defaultUIScrollPresenterContentHeight - c_defaultUIScrollPresenterHeight) / 2.0);
@@ -489,7 +489,7 @@ public void ChangeOffsetsWhileBiDirectionalScrollControllerIsAttached()
                 (c_defaultUIScrollPresenterContentHeight - c_defaultUIScrollPresenterHeight) / 4.0,
                 ScrollingAnimationMode.Enabled,
                 ScrollingSnapPointsMode.Ignore,
-                hookViewChanged: false,
+                hookViewChangingAndChanged: false,
                 isAnimationsEnabledOverride: null,
                 expectedFinalHorizontalOffset: (c_defaultUIScrollPresenterContentWidth - c_defaultUIScrollPresenterWidth) / 4.0,
                 expectedFinalVerticalOffset: (c_defaultUIScrollPresenterContentHeight - c_defaultUIScrollPresenterHeight) / 4.0);
@@ -502,7 +502,7 @@ public void ChangeOffsetsWhileBiDirectionalScrollControllerIsAttached()
                 0.0f,
                 ScrollingAnimationMode.Disabled,
                 ScrollingSnapPointsMode.Ignore,
-                hookViewChanged: false);
+                hookViewChangingAndChanged: false);
 
             Log.Comment("Animate to zoomFactor 1.5");
             ZoomTo(
@@ -512,7 +512,7 @@ public void ChangeOffsetsWhileBiDirectionalScrollControllerIsAttached()
                 0.0f,
                 ScrollingAnimationMode.Enabled,
                 ScrollingSnapPointsMode.Ignore,
-                hookViewChanged: false);
+                hookViewChangingAndChanged: false);
         }
 
         [TestMethod]
diff --git a/src/controls/dev/ScrollPresenter/APITests/ScrollPresenterAnchoringTests.cs b/src/controls/dev/ScrollPresenter/APITests/ScrollPresenterAnchoringTests.cs
index a3ea8c97a0..a1066ab169 100644
--- a/src/controls/dev/ScrollPresenter/APITests/ScrollPresenterAnchoringTests.cs
+++ b/src/controls/dev/ScrollPresenter/APITests/ScrollPresenterAnchoringTests.cs
@@ -166,7 +166,7 @@ private void AnchoringAtFarEdgeWhileIncreasingContent(Orientation orientation, d
                     }
                 });
 
-                ScrollTo(scrollPresenter, horizontalOffset, verticalOffset, ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Ignore, false /*hookViewChanged*/);
+                ScrollTo(scrollPresenter, horizontalOffset, verticalOffset, ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Ignore, false /*hookViewChangingAndChanged*/);
 
                 RunOnUIThread.Execute(() =>
                 {
@@ -282,7 +282,7 @@ private void AnchoringAtFarEdgeWhileDecreasingViewport(Orientation orientation)
                     }
                 });
 
-                ScrollTo(scrollPresenter, horizontalOffset, verticalOffset, ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Ignore, false /*hookViewChanged*/);
+                ScrollTo(scrollPresenter, horizontalOffset, verticalOffset, ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Ignore, false /*hookViewChangingAndChanged*/);
 
                 RunOnUIThread.Execute(() =>
                 {
@@ -461,7 +461,7 @@ private void AnchoringAtAlmostFarEdge(Orientation orientation)
                     }
                 });
 
-                ScrollTo(scrollPresenter, horizontalOffset, verticalOffset, ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Ignore, false /*hookViewChanged*/);
+                ScrollTo(scrollPresenter, horizontalOffset, verticalOffset, ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Ignore, false /*hookViewChangingAndChanged*/);
 
                 RunOnUIThread.Execute(() =>
                 {
@@ -542,7 +542,7 @@ private void AnchoringElementWithResizedViewport(Orientation orientation, double
                     }
                 });
 
-                ScrollTo(scrollPresenter, horizontalOffset, verticalOffset, ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Ignore, false /*hookViewChanged*/);
+                ScrollTo(scrollPresenter, horizontalOffset, verticalOffset, ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Ignore, false /*hookViewChangingAndChanged*/);
 
                 RunOnUIThread.Execute(() =>
                 {
@@ -834,7 +834,7 @@ public void AnchoringAtRepeaterMiddle()
                     WaitForEvent("Waiting for Loaded event", scrollPresenterLoadedEvent);
 
                     ZoomTo(scrollPresenter, 2.0f, 0.0f, 0.0f, ScrollingAnimationMode.Enabled, ScrollingSnapPointsMode.Ignore);
-                    ScrollTo(scrollPresenter, 0.0, 250.0, ScrollingAnimationMode.Enabled, ScrollingSnapPointsMode.Ignore, false /*hookViewChanged*/);
+                    ScrollTo(scrollPresenter, 0.0, 250.0, ScrollingAnimationMode.Enabled, ScrollingSnapPointsMode.Ignore, false /*hookViewChangingAndChanged*/);
 
                     ItemsRepeater repeater = null;
                     TestDataSource dataSource = null;
diff --git a/src/controls/dev/ScrollPresenter/APITests/ScrollPresenterBringIntoViewTests.cs b/src/controls/dev/ScrollPresenter/APITests/ScrollPresenterBringIntoViewTests.cs
index 400702a29d..b57ded51ec 100644
--- a/src/controls/dev/ScrollPresenter/APITests/ScrollPresenterBringIntoViewTests.cs
+++ b/src/controls/dev/ScrollPresenter/APITests/ScrollPresenterBringIntoViewTests.cs
@@ -655,7 +655,7 @@ private void BringElementIntoView(
 
             if (originalHorizontalOffset != 0 || originalVerticalOffset != 0)
             {
-                ScrollTo(scrollPresenter, originalHorizontalOffset, originalVerticalOffset, ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Ignore, originalZoomFactor == 1.0f /*hookViewChanged*/);
+                ScrollTo(scrollPresenter, originalHorizontalOffset, originalVerticalOffset, ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Ignore, originalZoomFactor == 1.0f /*hookViewChangingAndChanged*/);
             }
 
             RunOnUIThread.Execute(() =>
@@ -782,7 +782,7 @@ private void BringElementInNestedScrollPresentersIntoView(
 
             if (originalOuterHorizontalOffset != 0 || originalOuterVerticalOffset != 0)
             {
-                ScrollTo(outerScrollPresenter, originalOuterHorizontalOffset, originalOuterVerticalOffset, ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Ignore, originalOuterZoomFactor == 1.0f /*hookViewChanged*/);
+                ScrollTo(outerScrollPresenter, originalOuterHorizontalOffset, originalOuterVerticalOffset, ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Ignore, originalOuterZoomFactor == 1.0f /*hookViewChangingAndChanged*/);
             }
 
             if (originalInnerZoomFactor != 1.0f)
@@ -792,7 +792,7 @@ private void BringElementInNestedScrollPresentersIntoView(
 
             if (originalInnerHorizontalOffset != 0 || originalInnerVerticalOffset != 0)
             {
-                ScrollTo(innerScrollPresenter, originalInnerHorizontalOffset, originalInnerVerticalOffset, ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Ignore, originalInnerZoomFactor == 1.0f /*hookViewChanged*/);
+                ScrollTo(innerScrollPresenter, originalInnerHorizontalOffset, originalInnerVerticalOffset, ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Ignore, originalInnerZoomFactor == 1.0f /*hookViewChangingAndChanged*/);
             }
 
             RunOnUIThread.Execute(() =>
diff --git a/src/controls/dev/ScrollPresenter/APITests/ScrollPresenterLayoutTests.cs b/src/controls/dev/ScrollPresenter/APITests/ScrollPresenterLayoutTests.cs
index f21be57eb2..3409a5d078 100644
--- a/src/controls/dev/ScrollPresenter/APITests/ScrollPresenterLayoutTests.cs
+++ b/src/controls/dev/ScrollPresenter/APITests/ScrollPresenterLayoutTests.cs
@@ -63,7 +63,7 @@ public void BasicMargin()
                 c_defaultUIScrollPresenterContentHeight + 2 * c_Margin - c_defaultUIScrollPresenterHeight + 10.0,
                 ScrollingAnimationMode.Disabled,
                 ScrollingSnapPointsMode.Ignore,
-                hookViewChanged: true,
+                hookViewChangingAndChanged: true,
                 isAnimationsEnabledOverride: null,
                 expectedFinalHorizontalOffset: c_defaultUIScrollPresenterContentWidth + 2 * c_Margin - c_defaultUIScrollPresenterWidth,
                 expectedFinalVerticalOffset: c_defaultUIScrollPresenterContentHeight + 2 * c_Margin - c_defaultUIScrollPresenterHeight);
@@ -83,7 +83,7 @@ public void BasicMargin()
                 c_defaultUIScrollPresenterContentHeight - 2 * c_Margin - c_defaultUIScrollPresenterHeight + 10.0,
                 ScrollingAnimationMode.Disabled,
                 ScrollingSnapPointsMode.Ignore,
-                hookViewChanged: false,
+                hookViewChangingAndChanged: false,
                 isAnimationsEnabledOverride: null,
                 expectedFinalHorizontalOffset: c_defaultUIScrollPresenterContentWidth - 2 * c_Margin - c_defaultUIScrollPresenterWidth,
                 expectedFinalVerticalOffset: c_defaultUIScrollPresenterContentHeight - 2 * c_Margin - c_defaultUIScrollPresenterHeight);
@@ -128,7 +128,7 @@ public void BasicPadding()
                 c_defaultUIScrollPresenterContentHeight - c_defaultUIScrollPresenterHeight + 10.0,
                 ScrollingAnimationMode.Disabled,
                 ScrollingSnapPointsMode.Ignore,
-                hookViewChanged: true,
+                hookViewChangingAndChanged: true,
                 isAnimationsEnabledOverride: null,
                 expectedFinalHorizontalOffset: c_defaultUIScrollPresenterContentWidth - c_defaultUIScrollPresenterWidth,
                 expectedFinalVerticalOffset: c_defaultUIScrollPresenterContentHeight - c_defaultUIScrollPresenterHeight);
@@ -592,7 +592,7 @@ public void ImageWithUnnaturalSize()
                 c_UnnaturalImageHeight - c_defaultUIScrollPresenterHeight + 10.0,
                 ScrollingAnimationMode.Disabled,
                 ScrollingSnapPointsMode.Ignore,
-                hookViewChanged: true,
+                hookViewChangingAndChanged: true,
                 isAnimationsEnabledOverride: null,
                 expectedFinalHorizontalOffset: c_UnnaturalImageWidth - c_defaultUIScrollPresenterWidth,
                 expectedFinalVerticalOffset: c_UnnaturalImageHeight - c_defaultUIScrollPresenterHeight);
@@ -739,7 +739,7 @@ public void ImageWithConstrainedWidth()
                 expectedZoomFactor: c_smallZoomFactor);
 
             // Jump to absolute large zoomFactor to make the content larger than the viewport.
-            ZoomTo(scrollPresenter, c_largeZoomFactor, 0.0f, 0.0f, ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Ignore, hookViewChanged: false);
+            ZoomTo(scrollPresenter, c_largeZoomFactor, 0.0f, 0.0f, ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Ignore, hookViewChangingAndChanged: false);
 
             ValidateContentWithConstrainedWidth(
                 compositor,
@@ -933,7 +933,7 @@ public void ImageWithConstrainedHeight()
                 expectedZoomFactor: c_smallZoomFactor);
 
             // Jump to absolute large zoomFactor to make the content larger than the viewport.
-            ZoomTo(scrollPresenter, c_largeZoomFactor, 0.0f, 0.0f, ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Ignore, hookViewChanged: false);
+            ZoomTo(scrollPresenter, c_largeZoomFactor, 0.0f, 0.0f, ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Ignore, hookViewChangingAndChanged: false);
 
             ValidateContentWithConstrainedHeight(
                 compositor,
@@ -1045,7 +1045,7 @@ public void ImageWithConstrainedSize()
                     expectedZoomFactor: c_smallZoomFactor);
 
                 // Jump to absolute large zoomFactor to make the content larger than the viewport.
-                ZoomTo(scrollPresenter, c_largeZoomFactor, 0.0f, 0.0f, ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Ignore, hookViewChanged: false);
+                ZoomTo(scrollPresenter, c_largeZoomFactor, 0.0f, 0.0f, ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Ignore, hookViewChangingAndChanged: false);
 
                 ValidateContentWithConstrainedSize(
                     compositor,
@@ -1086,7 +1086,7 @@ public void RightToLeftFlowDirection()
                 17.0,
                 ScrollingAnimationMode.Disabled,
                 ScrollingSnapPointsMode.Ignore,
-                hookViewChanged: true,
+                hookViewChangingAndChanged: true,
                 isAnimationsEnabledOverride: null,
                 expectedFinalHorizontalOffset: 11.0,
                 expectedFinalVerticalOffset: 17.0);
@@ -1099,7 +1099,7 @@ public void RightToLeftFlowDirection()
                 0.0f,
                 ScrollingAnimationMode.Disabled,
                 ScrollingSnapPointsMode.Ignore,
-                hookViewChanged: false);
+                hookViewChangingAndChanged: false);
 
             IdleSynchronizer.Wait();
 
@@ -1133,7 +1133,7 @@ public void RightToLeftFlowDirection()
                 13.0,
                 ScrollingAnimationMode.Disabled,
                 ScrollingSnapPointsMode.Ignore,
-                hookViewChanged: false,
+                hookViewChangingAndChanged: false,
                 isAnimationsEnabledOverride: null,
                 expectedFinalHorizontalOffset: 7.0,
                 expectedFinalVerticalOffset: 13.0);
@@ -1146,7 +1146,7 @@ public void RightToLeftFlowDirection()
                 0.0f,
                 ScrollingAnimationMode.Disabled,
                 ScrollingSnapPointsMode.Ignore,
-                hookViewChanged: false);
+                hookViewChangingAndChanged: false);
 
             IdleSynchronizer.Wait();
 
diff --git a/src/controls/dev/ScrollPresenter/APITests/ScrollPresenterSnapPointTests.cs b/src/controls/dev/ScrollPresenter/APITests/ScrollPresenterSnapPointTests.cs
index 3c334e7f00..396068e9aa 100644
--- a/src/controls/dev/ScrollPresenter/APITests/ScrollPresenterSnapPointTests.cs
+++ b/src/controls/dev/ScrollPresenter/APITests/ScrollPresenterSnapPointTests.cs
@@ -310,7 +310,7 @@ public void SnapToFirstRepeatedScrollSnapPoint()
             });
 
             // Flick with horizontal offset velocity to naturally land around offset 15.
-            AddScrollVelocity(scrollPresenter, horizontalVelocity: -165.0f, verticalVelocity: 0.0f, horizontalInertiaDecayRate: null, verticalInertiaDecayRate: null, hookViewChanged: false);
+            AddScrollVelocity(scrollPresenter, horizontalVelocity: -165.0f, verticalVelocity: 0.0f, horizontalInertiaDecayRate: null, verticalInertiaDecayRate: null, hookViewChangingAndChanged: false);
 
             RunOnUIThread.Execute(() =>
             {
@@ -365,7 +365,7 @@ public void SnapToFirstRepeatedZoomSnapPoint()
                 inertiaDecayRate: 0.6675f,
                 centerPointX: 150.0f,
                 centerPointY: 100.0f,
-                hookViewChanged: false);
+                hookViewChangingAndChanged: false);
 
             RunOnUIThread.Execute(() =>
             {
diff --git a/src/controls/dev/ScrollPresenter/APITests/ScrollPresenterTests.cs b/src/controls/dev/ScrollPresenter/APITests/ScrollPresenterTests.cs
index 301e86ded3..4dcdf283d1 100644
--- a/src/controls/dev/ScrollPresenter/APITests/ScrollPresenterTests.cs
+++ b/src/controls/dev/ScrollPresenter/APITests/ScrollPresenterTests.cs
@@ -707,7 +707,7 @@ public void ListenToContentEffectiveViewportChanged()
                 verticalOffset: 150,
                 animationMode: ScrollingAnimationMode.Enabled,
                 snapPointsMode: ScrollingSnapPointsMode.Ignore,
-                hookViewChanged: false);
+                hookViewChangingAndChanged: false);
 
             RunOnUIThread.Execute(() =>
             {
diff --git a/src/controls/dev/ScrollPresenter/APITests/ScrollPresenterViewChangeTests.cs b/src/controls/dev/ScrollPresenter/APITests/ScrollPresenterViewChangeTests.cs
index c5ace6c501..c7f60e037f 100644
--- a/src/controls/dev/ScrollPresenter/APITests/ScrollPresenterViewChangeTests.cs
+++ b/src/controls/dev/ScrollPresenter/APITests/ScrollPresenterViewChangeTests.cs
@@ -38,6 +38,7 @@ private enum ViewChangeInterruptionKind
         private const int c_MaxStockOffsetsChangeDuration = 1000;
         private const int c_MaxStockZoomFactorChangeDuration = 1000;
 
+        private uint viewChangingCount = 0u;
         private uint viewChangedCount = 0u;
 
         [TestMethod]
@@ -60,37 +61,37 @@ public void BasicOffsetChanges()
 
             // Jump to absolute offsets
             ScrollTo(scrollPresenter, 11.0, 22.0, ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Ignore);
-            ScrollTo(scrollPresenter, 22.0, 11.0, ScrollingAnimationMode.Auto, ScrollingSnapPointsMode.Ignore, hookViewChanged: false, isAnimationsEnabledOverride: false);
+            ScrollTo(scrollPresenter, 22.0, 11.0, ScrollingAnimationMode.Auto, ScrollingSnapPointsMode.Ignore, hookViewChangingAndChanged: false, isAnimationsEnabledOverride: false);
 
             // Jump to relative offsets
-            ScrollBy(scrollPresenter, -4.0, 15.0, ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Ignore, hookViewChanged: false);
-            ScrollBy(scrollPresenter, 15.0, 4.0, ScrollingAnimationMode.Auto, ScrollingSnapPointsMode.Ignore, hookViewChanged: false, isAnimationsEnabledOverride: false);
+            ScrollBy(scrollPresenter, -4.0, 15.0, ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Ignore, hookViewChangingAndChanged: false);
+            ScrollBy(scrollPresenter, 15.0, 4.0, ScrollingAnimationMode.Auto, ScrollingSnapPointsMode.Ignore, hookViewChangingAndChanged: false, isAnimationsEnabledOverride: false);
 
             // Animate to absolute offsets
-            ScrollTo(scrollPresenter, 55.0, 25.0, ScrollingAnimationMode.Enabled, ScrollingSnapPointsMode.Ignore, hookViewChanged: false);
-            ScrollTo(scrollPresenter, 5.0, 75.0, ScrollingAnimationMode.Auto, ScrollingSnapPointsMode.Ignore, hookViewChanged: false, isAnimationsEnabledOverride: true);
+            ScrollTo(scrollPresenter, 55.0, 25.0, ScrollingAnimationMode.Enabled, ScrollingSnapPointsMode.Ignore, hookViewChangingAndChanged: false);
+            ScrollTo(scrollPresenter, 5.0, 75.0, ScrollingAnimationMode.Auto, ScrollingSnapPointsMode.Ignore, hookViewChangingAndChanged: false, isAnimationsEnabledOverride: true);
 
             // Jump or animate to absolute offsets based on UISettings.AnimationsEnabled
-            ScrollTo(scrollPresenter, 55.0, 25.0, ScrollingAnimationMode.Auto, ScrollingSnapPointsMode.Ignore, hookViewChanged: false);
+            ScrollTo(scrollPresenter, 55.0, 25.0, ScrollingAnimationMode.Auto, ScrollingSnapPointsMode.Ignore, hookViewChangingAndChanged: false);
 
             // Animate to relative offsets
-            ScrollBy(scrollPresenter, 700.0, -8.0, ScrollingAnimationMode.Enabled, ScrollingSnapPointsMode.Ignore, hookViewChanged: false);
-            ScrollBy(scrollPresenter, -80.0, 200.0, ScrollingAnimationMode.Auto, ScrollingSnapPointsMode.Ignore, hookViewChanged: false, isAnimationsEnabledOverride: true);
+            ScrollBy(scrollPresenter, 700.0, -8.0, ScrollingAnimationMode.Enabled, ScrollingSnapPointsMode.Ignore, hookViewChangingAndChanged: false);
+            ScrollBy(scrollPresenter, -80.0, 200.0, ScrollingAnimationMode.Auto, ScrollingSnapPointsMode.Ignore, hookViewChangingAndChanged: false, isAnimationsEnabledOverride: true);
 
             // Jump or animate to relative offsets based on UISettings.AnimationsEnabled
-            ScrollBy(scrollPresenter, 80.0, -200.0, ScrollingAnimationMode.Auto, ScrollingSnapPointsMode.Ignore, hookViewChanged: false);
+            ScrollBy(scrollPresenter, 80.0, -200.0, ScrollingAnimationMode.Auto, ScrollingSnapPointsMode.Ignore, hookViewChangingAndChanged: false);
 
             // Flick with additional offsets velocity
-            AddScrollVelocity(scrollPresenter, horizontalVelocity: -65.0f, verticalVelocity: 80.0f, horizontalInertiaDecayRate: null, verticalInertiaDecayRate: null, hookViewChanged: false);
+            AddScrollVelocity(scrollPresenter, horizontalVelocity: -65.0f, verticalVelocity: 80.0f, horizontalInertiaDecayRate: null, verticalInertiaDecayRate: null, hookViewChangingAndChanged: false);
 
             // Flick with additional offsets velocity and custom scroll inertia decay rate
-            AddScrollVelocity(scrollPresenter, horizontalVelocity: 65.0f, verticalVelocity: -80.0f, horizontalInertiaDecayRate: 0.7f, verticalInertiaDecayRate: 0.8f, hookViewChanged: false);
+            AddScrollVelocity(scrollPresenter, horizontalVelocity: 65.0f, verticalVelocity: -80.0f, horizontalInertiaDecayRate: 0.7f, verticalInertiaDecayRate: 0.8f, hookViewChangingAndChanged: false);
 
             // Do it all again while respecting snap points
-            ScrollTo(scrollPresenter, 11.0, 22.0, ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Default, hookViewChanged: false);
-            ScrollBy(scrollPresenter, -4.0, 15.0, ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Default, hookViewChanged: false);
-            ScrollTo(scrollPresenter, 55.0, 25.0, ScrollingAnimationMode.Enabled, ScrollingSnapPointsMode.Default, hookViewChanged: false);
-            ScrollBy(scrollPresenter, 700.0, -8.0, ScrollingAnimationMode.Enabled, ScrollingSnapPointsMode.Default, hookViewChanged: false);
+            ScrollTo(scrollPresenter, 11.0, 22.0, ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Default, hookViewChangingAndChanged: false);
+            ScrollBy(scrollPresenter, -4.0, 15.0, ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Default, hookViewChangingAndChanged: false);
+            ScrollTo(scrollPresenter, 55.0, 25.0, ScrollingAnimationMode.Enabled, ScrollingSnapPointsMode.Default, hookViewChangingAndChanged: false);
+            ScrollBy(scrollPresenter, 700.0, -8.0, ScrollingAnimationMode.Enabled, ScrollingSnapPointsMode.Default, hookViewChangingAndChanged: false);
         }
 
         [TestMethod]
@@ -113,31 +114,31 @@ public void BasicZoomFactorChanges()
 
             // Jump to absolute zoomFactor
             ZoomTo(scrollPresenter, 2.0f, 22.0f, 33.0f, ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Ignore);
-            ZoomTo(scrollPresenter, 5.0f, 33.0f, 22.0f, ScrollingAnimationMode.Auto, ScrollingSnapPointsMode.Ignore, hookViewChanged: false, isAnimationsEnabledOverride: false);
+            ZoomTo(scrollPresenter, 5.0f, 33.0f, 22.0f, ScrollingAnimationMode.Auto, ScrollingSnapPointsMode.Ignore, hookViewChangingAndChanged: false, isAnimationsEnabledOverride: false);
 
             // Jump to relative zoomFactor
-            ZoomBy(scrollPresenter, 1.0f, 55.0f, 66.0f, ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Ignore, hookViewChanged: false);
-            ZoomBy(scrollPresenter, 1.0f, 66.0f, 55.0f, ScrollingAnimationMode.Auto, ScrollingSnapPointsMode.Ignore, hookViewChanged: false, isAnimationsEnabledOverride: false);
+            ZoomBy(scrollPresenter, 1.0f, 55.0f, 66.0f, ScrollingAnimationMode.Disabled, ScrollingSnapPointsMode.Ignore, hookViewChangingAndChanged: false);
+            ZoomBy(scrollPresenter, 1.0f, 66.0f, 55.0f, ScrollingAnimationMode.Auto, ScrollingSnapPointsMode.Ignore, hookViewChangingAndChanged: false, isAnimationsEnabledOverride: false);
 
             // Animate to absolute zoomFactor
-            ZoomTo(scrollPresenter, 4.0f, -40.0f, -25.0f, ScrollingAnimationMode.Enabled, ScrollingSnapPointsMode.Ignore, hookViewChanged: false);
-            ZoomTo(scrollPresenter, 6.0f, 25.0f, 40.0f, ScrollingAnimationMode.Auto, ScrollingSnapPointsMode.Ignore, hookViewChanged: false, isAnimationsEnabledOverride: true);
+            ZoomTo(scrollPresenter, 4.0f, -40.0f, -25.0f, ScrollingAnimationMode.Enabled, ScrollingSnapPointsMode.Ignore, hookViewChangingAndChanged: false);
+            ZoomTo(scrollPresenter, 6.0f, 25.0f, 40.0f, ScrollingAnimationMode.Auto, ScrollingSnapPointsMode.Ignore, hookViewChangingAndChanged: false, isAnimationsEnabledOverride: true);
 
             // Jump or animate to absolute zoomFactor based on UISettings.AnimationsEnabled
-            ZoomTo(scrollPresenter, 3.0f, 10.0f, 20.0f, ScrollingAnimationMode.Auto, ScrollingSnapPointsMode.Ignore, hookViewChanged: false);
+            ZoomTo(scrollPresenter, 3.0f, 10.0f, 20.0f, ScrollingAnimationMode.Auto, ScrollingSnapPointsMode.Ignore, hookViewChangingAndChanged: false);
 
             // Animate to relative zoomFactor
-            ZoomBy(scrollPresenter, -2.0f, 100.0f, 200.0f, ScrollingAnimationMode.Enabled, ScrollingSnapPointsMode.Ignore, hookViewChanged: false);
-            ZoomBy(scrollPresenter, 1.0f, 100.0f, 200.0f, ScrollingAnimationMode.Auto, ScrollingSnapPointsMode.Ignore, hookViewChanged: false, isAnimationsEnabledOverride: true);
+            ZoomBy(scrollPresenter, -2.0f, 100.0f, 200.0f, ScrollingAnimationMode.Enabled, ScrollingSnapPointsMode.Ignore, hookViewChangingAndChanged: false);
+            ZoomBy(scrollPresenter, 1.0f, 100.0f, 200.0f, ScrollingAnimationMode.Auto, ScrollingSnapPointsMode.Ignore, hookViewChangingAndChanged: false, isAnimationsEnabledOverride: true);
 
             // Jump or animate to relative zoomFactor based on UISettings.AnimationsEnabled
-            ZoomBy(scrollPresenter, 2.0f, 200.0f, 100.0f, ScrollingAnimationMode.Auto, ScrollingSnapPointsMode.Ignore, hookViewChanged: false);
+            ZoomBy(scrollPresenter, 2.0f, 200.0f, 100.0f, ScrollingAnimationMode.Auto, ScrollingSnapPointsMode.Ignore, hookViewChangingAndChanged: false);
 
             // Flick with additional zoomFactor velocity
-            AddZoomVelocity(scrollPresenter, zoomFactorVelocity: 2.0f, inertiaDecayRate: null, centerPointX: -50.0f, centerPointY: 800.0f, waitForViewChangeCompletion: true, hookViewChanged: false);
+            AddZoomVelocity(scrollPresenter, zoomFactorVelocity: 2.0f, inertiaDecayRate: null, centerPointX: -50.0f, centerPointY: 800.0f, waitForViewChangeCompletion: true, hookViewChangingAndChanged: false);
 
             // Flick with additional zoomFactor velocity and custom zoomFactor inertia decay rate
-            AddZoomVelocity(scrollPresenter, zoomFactorVelocity: -2.0f, inertiaDecayRate: 0.75f, centerPointX: -50.0f, centerPointY: 800.0f, waitForViewChangeCompletion: true, hookViewChanged: false);
+            AddZoomVelocity(scrollPresenter, zoomFactorVelocity: -2.0f, inertiaDecayRate: 0.75f, centerPointX: -50.0f, centerPointY: 800.0f, waitForViewChangeCompletion: true, hookViewChangingAndChanged: false);
         }
 
         [TestMethod]
@@ -194,13 +195,13 @@ public void SuccessiveAdditionalScrollVelocities()
             WaitForEvent("Waiting for Loaded event", scrollPresenterLoadedEvent);
 
             // Add scroll velocity with very small inertia decay rate
-            AddScrollVelocity(scrollPresenter, horizontalVelocity: 50.0f, verticalVelocity: 60.0f, horizontalInertiaDecayRate: 0.0007f, verticalInertiaDecayRate: 0.0008f, waitForViewChangeCompletion: false, hookViewChanged: false);
+            AddScrollVelocity(scrollPresenter, horizontalVelocity: 50.0f, verticalVelocity: 60.0f, horizontalInertiaDecayRate: 0.0007f, verticalInertiaDecayRate: 0.0008f, waitForViewChangeCompletion: false, hookViewChangingAndChanged: false);
 
             // Waiting for first view changed event
             WaitForEvent("Waiting for first ViewChanged event", scrollPresenterViewChangedEvent);
 
             // Add scroll velocity with default inertia decay rate
-            AddScrollVelocity(scrollPresenter, horizontalVelocity: 170.0f, verticalVelocity: 180.0f, horizontalInertiaDecayRate: null, verticalInertiaDecayRate: null, waitForViewChangeCompletion: false, hookViewChanged: false);
+            AddScrollVelocity(scrollPresenter, horizontalVelocity: 170.0f, verticalVelocity: 180.0f, horizontalInertiaDecayRate: null, verticalInertiaDecayRate: null, waitForViewChangeCompletion: false, hookViewChangingAndChanged: false);
 
             // Waiting for first view change completion
             WaitForEvent("Waiting for first view change completion", scrollPresenterViewChangeOperationEvent1);
@@ -272,13 +273,13 @@ public void SuccessiveAdditionalZoomVelocities()
             WaitForEvent("Waiting for Loaded event", scrollPresenterLoadedEvent);
 
             // Add zoomFactor velocity with very small inertia decay rate
-            AddZoomVelocity(scrollPresenter, zoomFactorVelocity: 0.4f, inertiaDecayRate: 0.0001f, centerPointX: 0.0f, centerPointY: 0.0f, waitForViewChangeCompletion: false, hookViewChanged: false);
+            AddZoomVelocity(scrollPresenter, zoomFactorVelocity: 0.4f, inertiaDecayRate: 0.0001f, centerPointX: 0.0f, centerPointY: 0.0f, waitForViewChangeCompletion: false, hookViewChangingAndChanged: false);
 
             // Waiting for first view changed event
             WaitForEvent("Waiting for first ViewChanged event", scrollPresenterViewChangedEvent);
 
             // Add zoomFactor velocity with default inertia decay rate
-            AddZoomVelocity(scrollPresenter, zoomFactorVelocity: 0.6f, inertiaDecayRate: null, centerPointX: 0.0f, centerPointY: 0.0f, waitForViewChangeCompletion: false, hookViewChanged: false);
+            AddZoomVelocity(scrollPresenter, zoomFactorVelocity: 0.6f, inertiaDecayRate: null, centerPointX: 0.0f, centerPointY: 0.0f, waitForViewChangeCompletion: false, hookViewChangingAndChanged: false);
 
             // Waiting for first view change completion
             WaitForEvent("Waiting for first view change completion", scrollPresenterViewChangeOperationEvent1);
@@ -525,6 +526,11 @@ public void OffsetsChangeWithCustomDuration()
 
                 RunOnUIThread.Execute(() =>
                 {
+                    scrollPresenter.ViewChanging += (sender, args) =>
+                    {
+                        Log.Comment($"ViewChanging viewChangingCount={++viewChangingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                    };
+
                     scrollPresenter.ViewChanged += (sender, args) =>
                     {
                         Log.Comment($"ViewChanged viewChangedCount={++viewChangedCount} - HorizontalOffset={sender.HorizontalOffset}, VerticalOffset={sender.VerticalOffset}, ZoomFactor={sender.ZoomFactor}");
@@ -555,12 +561,14 @@ public void OffsetsChangeWithCustomDuration()
                 RunOnUIThread.Execute(() =>
                 {
                     Log.Comment($"Final HorizontalOffset={scrollPresenter.HorizontalOffset}, VerticalOffset={scrollPresenter.VerticalOffset}, ZoomFactor={scrollPresenter.ZoomFactor}");
+                    Log.Comment($"Final viewChangingCount={viewChangingCount}");
                     Log.Comment($"Final viewChangedCount={viewChangedCount}");
 
                     Verify.AreEqual(600.0, scrollPresenter.HorizontalOffset);
                     Verify.AreEqual(400.0, scrollPresenter.VerticalOffset);
                     Verify.AreEqual(1.0f, scrollPresenter.ZoomFactor);
 
+                    Verify.AreEqual(0u, viewChangingCount);
                     Verify.IsLessThanOrEqual(viewChangedCount, 2u);
 
                     Verify.AreEqual(ScrollPresenterViewChangeResult.Completed, operation.Result);
@@ -592,6 +600,11 @@ public void ZoomFactorChangeWithCustomDuration()
 
                 RunOnUIThread.Execute(() =>
                 {
+                    scrollPresenter.ViewChanging += (sender, args) =>
+                    {
+                        Log.Comment($"ViewChanging viewChangingCount={++viewChangingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                    };
+
                     scrollPresenter.ViewChanged += (sender, args) =>
                     {
                         Log.Comment($"ViewChanged viewChangedCount={++viewChangedCount} - HorizontalOffset={sender.HorizontalOffset}, VerticalOffset={sender.VerticalOffset}, ZoomFactor={sender.ZoomFactor}");
@@ -623,13 +636,16 @@ public void ZoomFactorChangeWithCustomDuration()
                 RunOnUIThread.Execute(() =>
                 {
                     Log.Comment($"Final HorizontalOffset={scrollPresenter.HorizontalOffset}, VerticalOffset={scrollPresenter.VerticalOffset}, ZoomFactor={scrollPresenter.ZoomFactor}");
+                    Log.Comment($"Final viewChangingCount={viewChangingCount}");
                     Log.Comment($"Final viewChangedCount={viewChangedCount}");
 
                     Verify.IsLessThan(Math.Abs(scrollPresenter.HorizontalOffset - 700.0), 0.01);
                     Verify.IsLessThan(Math.Abs(scrollPresenter.VerticalOffset - 1050.0), 0.01);
                     Verify.AreEqual(8.0f, scrollPresenter.ZoomFactor);
 
+                    Verify.AreEqual(0u, viewChangingCount);
                     Verify.IsLessThanOrEqual(viewChangedCount, 2u);
+
                     Verify.AreEqual(ScrollPresenterViewChangeResult.Completed, operation.Result);
                 });
             }
@@ -657,6 +673,11 @@ public void InterruptViewChangeWithUnloading()
 
             RunOnUIThread.Execute(() =>
             {
+                scrollPresenter.ViewChanging += (sender, args) =>
+                {
+                    Log.Comment($"ViewChanging viewChangingCount={++viewChangingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                };
+
                 scrollPresenter.ViewChanged += (sender, args) =>
                 {
                     Log.Comment($"ViewChanged viewChangedCount={++viewChangedCount} - HorizontalOffset={sender.HorizontalOffset}, VerticalOffset={sender.VerticalOffset}, ZoomFactor={sender.ZoomFactor}");
@@ -838,6 +859,11 @@ private void ConsecutiveOffsetJumps(bool waitForFirstCompletion)
 
                 operations = new ScrollPresenterOperation[3];
 
+                scrollPresenter.ViewChanging += (sender, args) =>
+                {
+                    Log.Comment($"ViewChanging viewChangingCount={++viewChangingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                };
+
                 scrollPresenter.ViewChanged += (sender, args) =>
                 {
                     Log.Comment($"ViewChanged viewChangedCount={++viewChangedCount} - HorizontalOffset={sender.HorizontalOffset}, VerticalOffset={sender.VerticalOffset}, ZoomFactor={sender.ZoomFactor}");
@@ -957,6 +983,11 @@ private void ConsecutiveZoomFactorJumps(bool isFirstZoomRelative, bool isSecondZ
 
                 operations = new ScrollPresenterOperation[3];
 
+                scrollPresenter.ViewChanging += (sender, args) =>
+                {
+                    Log.Comment($"ViewChanging viewChangingCount={++viewChangingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                };
+
                 scrollPresenter.ViewChanged += (sender, args) =>
                 {
                     Log.Comment($"ViewChanged viewChangedCount={++viewChangedCount} - HorizontalOffset={sender.HorizontalOffset}, VerticalOffset={sender.VerticalOffset}, ZoomFactor={sender.ZoomFactor}");
@@ -1099,6 +1130,11 @@ private void ConsecutiveScrollAndZoomJumps(bool isScrollRelative, bool isZoomRel
 
                 operations = new ScrollPresenterOperation[2];
 
+                scrollPresenter.ViewChanging += (sender, args) =>
+                {
+                    Log.Comment($"ViewChanging viewChangingCount={++viewChangingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                };
+
                 scrollPresenter.ViewChanged += (sender, args) =>
                 {
                     Log.Comment($"ViewChanged viewChangedCount={++viewChangedCount} - HorizontalOffset={sender.HorizontalOffset}, VerticalOffset={sender.VerticalOffset}, ZoomFactor={sender.ZoomFactor}");
@@ -1216,6 +1252,11 @@ private void ConsecutiveZoomAndScrollJumps(bool isZoomRelative, bool isScrollRel
 
                 operations = new ScrollPresenterOperation[2];
 
+                scrollPresenter.ViewChanging += (sender, args) =>
+                {
+                    Log.Comment($"ViewChanging viewChangingCount={++viewChangingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                };
+
                 scrollPresenter.ViewChanged += (sender, args) =>
                 {
                     Log.Comment($"ViewChanged viewChangedCount={++viewChangedCount} - HorizontalOffset={sender.HorizontalOffset}, VerticalOffset={sender.VerticalOffset}, ZoomFactor={sender.ZoomFactor}");
@@ -1376,6 +1417,11 @@ private void ChangeOffsetsBeforeLoading(bool animate)
 
                 SetupDefaultUI(scrollPresenter, rectangleScrollPresenterContent, scrollPresenterLoadedEvent, false /*setAsContentRoot*/);
 
+                scrollPresenter.ViewChanging += (sender, args) =>
+                {
+                    Log.Comment($"ViewChanging viewChangingCount={++viewChangingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                };
+
                 scrollPresenter.ViewChanged += (sender, args) =>
                 {
                     Log.Comment($"ViewChanged viewChangedCount={++viewChangedCount} - HorizontalOffset={sender.HorizontalOffset}, VerticalOffset={sender.VerticalOffset}, ZoomFactor={sender.ZoomFactor}");
@@ -1424,6 +1470,11 @@ private void ChangeZoomFactorBeforeLoading(bool animate)
 
                 SetupDefaultUI(scrollPresenter, rectangleScrollPresenterContent, scrollPresenterLoadedEvent, false /*setAsContentRoot*/);
 
+                scrollPresenter.ViewChanging += (sender, args) =>
+                {
+                    Log.Comment($"ViewChanging viewChangingCount={++viewChangingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                };
+
                 scrollPresenter.ViewChanged += (sender, args) =>
                 {
                     Log.Comment($"ViewChanged viewChangedCount={++viewChangedCount} - HorizontalOffset={sender.HorizontalOffset}, VerticalOffset={sender.VerticalOffset}, ZoomFactor={sender.ZoomFactor}");
@@ -1464,7 +1515,7 @@ private void ScrollTo(
             double verticalOffset,
             ScrollingAnimationMode animationMode,
             ScrollingSnapPointsMode snapPointsMode,
-            bool hookViewChanged = true,
+            bool hookViewChangingAndChanged = true,
             bool? isAnimationsEnabledOverride = null,
             double? expectedFinalHorizontalOffset = null,
             double? expectedFinalVerticalOffset = null)
@@ -1478,6 +1529,9 @@ private void ScrollTo(
                 Log.Comment("Waiting for any pending ExpressionAnimation start/stop notifications to occur");
                 CompositionPropertySpy.SynchronouslyTickUIThread(6);
 
+                double? anticipatedHorizontalOffset = null;
+                double? anticipatedVerticalOffset = null;
+                float? anticipatedZoomFactor = null;
                 float originalZoomFactor = 1.0f;
                 AutoResetEvent scrollPresenterViewChangeOperationEvent = new AutoResetEvent(false);
                 ScrollPresenterOperation operation = null;
@@ -1486,8 +1540,16 @@ private void ScrollTo(
                 {
                     scrollPresenterTestHooksHelper.ResetExpressionAnimationStatusChanges(scrollPresenter);
 
-                    if (hookViewChanged)
+                    if (hookViewChangingAndChanged)
                     {
+                        scrollPresenter.ViewChanging += (sender, args) =>
+                        {
+                            Log.Comment($"ViewChanging viewChangingCount={++viewChangingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                            anticipatedHorizontalOffset = args.HorizontalOffset;
+                            anticipatedVerticalOffset = args.VerticalOffset;
+                            anticipatedZoomFactor = args.ZoomFactor;
+                        };
+
                         scrollPresenter.ViewChanged += (sender, args) =>
                         {
                             Log.Comment($"ViewChanged viewChangedCount={++viewChangedCount} - HorizontalOffset={sender.HorizontalOffset}, VerticalOffset={sender.VerticalOffset}, ZoomFactor={sender.ZoomFactor}");
@@ -1520,6 +1582,7 @@ private void ScrollTo(
                 RunOnUIThread.Execute(() =>
                 {
                     Log.Comment($"Final HorizontalOffset={scrollPresenter.HorizontalOffset}, VerticalOffset={scrollPresenter.VerticalOffset}, ZoomFactor={scrollPresenter.ZoomFactor}");
+                    Log.Comment($"Final viewChangingCount={viewChangingCount}");
                     Log.Comment($"Final viewChangedCount={viewChangedCount}");
 
                     Verify.AreEqual(expectedFinalHorizontalOffset, scrollPresenter.HorizontalOffset);
@@ -1529,11 +1592,19 @@ private void ScrollTo(
 
                     if (GetEffectiveIsAnimationEnabled(animationMode, isAnimationsEnabledOverride))
                     {
+                        Verify.AreEqual(0u, viewChangingCount);
                         Verify.IsFalse(viewChangedCount == 1u);
                     }
                     else
                     {
+                        Verify.IsLessThanOrEqual(viewChangingCount, 1u);
                         Verify.IsLessThanOrEqual(viewChangedCount, 1u);
+                        if (anticipatedHorizontalOffset != null && anticipatedVerticalOffset != null && anticipatedZoomFactor != null)
+                        {
+                            Verify.IsLessThan(Math.Abs((double)anticipatedHorizontalOffset - (double)expectedFinalHorizontalOffset), 0.01);
+                            Verify.IsLessThan(Math.Abs((double)anticipatedVerticalOffset - (double)expectedFinalVerticalOffset), 0.01);
+                            Verify.AreEqual((float)anticipatedZoomFactor, originalZoomFactor);
+                        }
                     }
                 });
 
@@ -1555,7 +1626,7 @@ private void ScrollBy(
             double verticalOffsetDelta,
             ScrollingAnimationMode animationMode,
             ScrollingSnapPointsMode snapPointsMode,
-            bool hookViewChanged = true,
+            bool hookViewChangingAndChanged = true,
             bool? isAnimationsEnabledOverride = null,
             double? expectedFinalHorizontalOffset = null,
             double? expectedFinalVerticalOffset = null)
@@ -1569,6 +1640,9 @@ private void ScrollBy(
                 Log.Comment("Waiting for any pending ExpressionAnimation start/stop notifications to occur");
                 CompositionPropertySpy.SynchronouslyTickUIThread(6);
 
+                double? anticipatedHorizontalOffset = null;
+                double? anticipatedVerticalOffset = null;
+                float? anticipatedZoomFactor = null;
                 double originalHorizontalOffset = 0.0;
                 double originalVerticalOffset = 0.0;
                 float originalZoomFactor = 1.0f;
@@ -1579,8 +1653,16 @@ private void ScrollBy(
                 {
                     scrollPresenterTestHooksHelper.ResetExpressionAnimationStatusChanges(scrollPresenter);
 
-                    if (hookViewChanged)
+                    if (hookViewChangingAndChanged)
                     {
+                        scrollPresenter.ViewChanging += (sender, args) =>
+                        {
+                            Log.Comment($"ViewChanging viewChangingCount={++viewChangingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                            anticipatedHorizontalOffset = args.HorizontalOffset;
+                            anticipatedVerticalOffset = args.VerticalOffset;
+                            anticipatedZoomFactor = args.ZoomFactor;
+                        };
+
                         scrollPresenter.ViewChanged += (sender, args) =>
                         {
                             Log.Comment($"ViewChanged viewChangedCount={++viewChangedCount} - HorizontalOffset={sender.HorizontalOffset}, VerticalOffset={sender.VerticalOffset}, ZoomFactor={sender.ZoomFactor}");
@@ -1617,6 +1699,7 @@ private void ScrollBy(
                 RunOnUIThread.Execute(() =>
                 {
                     Log.Comment($"Final HorizontalOffset={scrollPresenter.HorizontalOffset}, VerticalOffset={scrollPresenter.VerticalOffset}, ZoomFactor={scrollPresenter.ZoomFactor}");
+                    Log.Comment($"Final viewChangingCount={viewChangingCount}");
                     Log.Comment($"Final viewChangedCount={viewChangedCount}");
 
                     Verify.AreEqual(expectedFinalHorizontalOffset, scrollPresenter.HorizontalOffset);
@@ -1626,11 +1709,19 @@ private void ScrollBy(
 
                     if (GetEffectiveIsAnimationEnabled(animationMode, isAnimationsEnabledOverride))
                     {
+                        Verify.AreEqual(0u, viewChangingCount);
                         Verify.IsGreaterThan(viewChangedCount, 1u);
                     }
                     else
                     {
+                        Verify.AreEqual(1u, viewChangingCount);
                         Verify.AreEqual(1u, viewChangedCount);
+                        if (anticipatedHorizontalOffset != null && anticipatedVerticalOffset != null && anticipatedZoomFactor != null)
+                        {
+                            Verify.IsLessThan(Math.Abs((double)anticipatedHorizontalOffset - (double)expectedFinalHorizontalOffset), 0.01);
+                            Verify.IsLessThan(Math.Abs((double)anticipatedVerticalOffset - (double)expectedFinalVerticalOffset), 0.01);
+                            Verify.AreEqual((float)anticipatedZoomFactor, originalZoomFactor);
+                        }
                     }
                 });
 
@@ -1653,7 +1744,7 @@ private void AddScrollVelocity(
             float? horizontalInertiaDecayRate,
             float? verticalInertiaDecayRate,
             bool waitForViewChangeCompletion = true,
-            bool hookViewChanged = true)
+            bool hookViewChangingAndChanged = true)
         {
             using (ScrollPresenterTestHooksHelper scrollPresenterTestHooksHelper = new ScrollPresenterTestHooksHelper(
                 enableAnchorNotifications: false,
@@ -1673,8 +1764,13 @@ private void AddScrollVelocity(
                 {
                     scrollPresenterTestHooksHelper.ResetExpressionAnimationStatusChanges(scrollPresenter);
 
-                    if (hookViewChanged)
+                    if (hookViewChangingAndChanged)
                     {
+                        scrollPresenter.ViewChanging += (sender, args) =>
+                        {
+                            Log.Comment($"ViewChanging viewChangingCount={++viewChangingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                        };
+
                         scrollPresenter.ViewChanged += (sender, args) =>
                         {
                             Log.Comment($"ViewChanged viewChangedCount={++viewChangedCount} - HorizontalOffset={sender.HorizontalOffset}, VerticalOffset={sender.VerticalOffset}, ZoomFactor={sender.ZoomFactor}");
@@ -1745,6 +1841,7 @@ private ScrollPresenterOperation StartScrollTo(
             Log.Comment("ScrollTo - horizontalOffset={0}, verticalOffset={1}, animationMode={2}, snapPointsMode={3}",
                 horizontalOffset, verticalOffset, animationMode, snapPointsMode);
 
+            viewChangingCount = 0u;
             viewChangedCount = 0u;
             ScrollPresenterOperation operation = new ScrollPresenterOperation();
 
@@ -1788,6 +1885,7 @@ private ScrollPresenterOperation StartScrollBy(
             Log.Comment("ScrollBy - horizontalOffsetDelta={0}, verticalOffsetDelta={1}, animationMode={2}, snapPointsMode={3}",
                 horizontalOffsetDelta, verticalOffsetDelta, animationMode, snapPointsMode);
 
+            viewChangingCount = 0u;
             viewChangedCount = 0u;
             ScrollPresenterOperation operation = new ScrollPresenterOperation();
 
@@ -1838,6 +1936,7 @@ private ScrollPresenterOperation StartAddScrollVelocity(
                 inertiaDecayRate = new Vector2((float)horizontalInertiaDecayRate, (float)verticalInertiaDecayRate);
             }
 
+            viewChangingCount = 0u;
             viewChangedCount = 0u;
             ScrollPresenterOperation operation = new ScrollPresenterOperation();
 
@@ -1876,7 +1975,7 @@ private void ZoomTo(
             float centerPointY,
             ScrollingAnimationMode animationMode,
             ScrollingSnapPointsMode snapPointsMode,
-            bool hookViewChanged = true,
+            bool hookViewChangingAndChanged = true,
             bool? isAnimationsEnabledOverride = null)
         {
             using (ScrollPresenterTestHooksHelper scrollPresenterTestHooksHelper = new ScrollPresenterTestHooksHelper(
@@ -1885,13 +1984,24 @@ private void ZoomTo(
                 enableExpressionAnimationStatusNotifications: true,
                 isAnimationsEnabledOverride: isAnimationsEnabledOverride))
             {
+                double? anticipatedHorizontalOffset = null;
+                double? anticipatedVerticalOffset = null;
+                float? anticipatedZoomFactor = null;
                 AutoResetEvent scrollPresenterViewChangeOperationEvent = new AutoResetEvent(false);
                 ScrollPresenterOperation operation = null;
 
                 RunOnUIThread.Execute(() =>
                 {
-                    if (hookViewChanged)
+                    if (hookViewChangingAndChanged)
                     {
+                        scrollPresenter.ViewChanging += (sender, args) =>
+                        {
+                            Log.Comment($"ViewChanging viewChangingCount={++viewChangingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                            anticipatedHorizontalOffset = args.HorizontalOffset;
+                            anticipatedVerticalOffset = args.VerticalOffset;
+                            anticipatedZoomFactor = args.ZoomFactor;
+                        };
+
                         scrollPresenter.ViewChanged += (sender, args) =>
                         {
                             Log.Comment($"ViewChanged viewChangedCount={++viewChangedCount} - HorizontalOffset={sender.HorizontalOffset}, VerticalOffset={sender.VerticalOffset}, ZoomFactor={sender.ZoomFactor}");
@@ -1913,6 +2023,7 @@ private void ZoomTo(
                 RunOnUIThread.Execute(() =>
                 {
                     Log.Comment($"Final HorizontalOffset={scrollPresenter.HorizontalOffset}, VerticalOffset={scrollPresenter.VerticalOffset}, ZoomFactor={scrollPresenter.ZoomFactor}");
+                    Log.Comment($"Final viewChangingCount={viewChangingCount}");
                     Log.Comment($"Final viewChangedCount={viewChangedCount}");
 
                     Verify.AreEqual(zoomFactor, scrollPresenter.ZoomFactor);
@@ -1920,11 +2031,19 @@ private void ZoomTo(
 
                     if (GetEffectiveIsAnimationEnabled(animationMode, isAnimationsEnabledOverride))
                     {
+                        Verify.AreEqual(0u, viewChangingCount);
                         Verify.IsGreaterThan(viewChangedCount, 1u);
                     }
                     else
                     {
+                        Verify.AreEqual(1u, viewChangingCount);
                         Verify.AreEqual(1u, viewChangedCount);
+                        if (anticipatedHorizontalOffset != null && anticipatedVerticalOffset != null && anticipatedZoomFactor != null)
+                        {
+                            Verify.IsLessThan(Math.Abs((double)anticipatedHorizontalOffset - scrollPresenter.HorizontalOffset), 0.01);
+                            Verify.IsLessThan(Math.Abs((double)anticipatedVerticalOffset - scrollPresenter.VerticalOffset), 0.01);
+                            Verify.IsLessThan(Math.Abs((float)anticipatedZoomFactor - scrollPresenter.ZoomFactor), 0.001f);
+                        }
                     }
                 });
 
@@ -1947,7 +2066,7 @@ private void ZoomBy(
             float centerPointY,
             ScrollingAnimationMode animationMode,
             ScrollingSnapPointsMode snapPointsMode,
-            bool hookViewChanged = true,
+            bool hookViewChangingAndChanged = true,
             bool? isAnimationsEnabledOverride = null)
         {
             using (ScrollPresenterTestHooksHelper scrollPresenterTestHooksHelper = new ScrollPresenterTestHooksHelper(
@@ -1956,14 +2075,25 @@ private void ZoomBy(
                 enableExpressionAnimationStatusNotifications: true,
                 isAnimationsEnabledOverride: isAnimationsEnabledOverride))
             {
+                double? anticipatedHorizontalOffset = null;
+                double? anticipatedVerticalOffset = null;
+                float? anticipatedZoomFactor = null;
                 float originalZoomFactor = 1.0f;
                 AutoResetEvent scrollPresenterViewChangeOperationEvent = new AutoResetEvent(false);
                 ScrollPresenterOperation operation = null;
 
                 RunOnUIThread.Execute(() =>
                 {
-                    if (hookViewChanged)
+                    if (hookViewChangingAndChanged)
                     {
+                        scrollPresenter.ViewChanging += (sender, args) =>
+                        {
+                            Log.Comment($"ViewChanging viewChangingCount={++viewChangingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                            anticipatedHorizontalOffset = args.HorizontalOffset;
+                            anticipatedVerticalOffset = args.VerticalOffset;
+                            anticipatedZoomFactor = args.ZoomFactor;
+                        };
+
                         scrollPresenter.ViewChanged += (sender, args) =>
                         {
                             Log.Comment($"ViewChanged viewChangedCount={++viewChangedCount} - HorizontalOffset={sender.HorizontalOffset}, VerticalOffset={sender.VerticalOffset}, ZoomFactor={sender.ZoomFactor}");
@@ -1989,6 +2119,7 @@ private void ZoomBy(
                 RunOnUIThread.Execute(() =>
                 {
                     Log.Comment($"Final HorizontalOffset={scrollPresenter.HorizontalOffset}, VerticalOffset={scrollPresenter.VerticalOffset}, ZoomFactor={scrollPresenter.ZoomFactor}");
+                    Log.Comment($"Final viewChangingCount={viewChangingCount}");
                     Log.Comment($"Final viewChangedCount={viewChangedCount}");
 
                     Verify.AreEqual(zoomFactorDelta + originalZoomFactor, scrollPresenter.ZoomFactor);
@@ -1996,11 +2127,19 @@ private void ZoomBy(
 
                     if (GetEffectiveIsAnimationEnabled(animationMode, isAnimationsEnabledOverride))
                     {
+                        Verify.AreEqual(0u, viewChangingCount);
                         Verify.IsGreaterThan(viewChangedCount, 1u);
                     }
                     else
                     {
+                        Verify.AreEqual(1u, viewChangingCount);
                         Verify.AreEqual(1u, viewChangedCount);
+                        if (anticipatedHorizontalOffset != null && anticipatedVerticalOffset != null && anticipatedZoomFactor != null)
+                        {
+                            Verify.IsLessThan(Math.Abs((double)anticipatedHorizontalOffset - scrollPresenter.HorizontalOffset), 0.01);
+                            Verify.IsLessThan(Math.Abs((double)anticipatedVerticalOffset - scrollPresenter.VerticalOffset), 0.01);
+                            Verify.IsLessThan(Math.Abs((float)anticipatedZoomFactor - scrollPresenter.ZoomFactor), 0.001f);
+                        }
                     }
                 });
 
@@ -2023,7 +2162,7 @@ private void AddZoomVelocity(
             float centerPointX,
             float centerPointY,
             bool waitForViewChangeCompletion = true,
-            bool hookViewChanged = true)
+            bool hookViewChangingAndChanged = true)
         {
             using (ScrollPresenterTestHooksHelper scrollPresenterTestHooksHelper = new ScrollPresenterTestHooksHelper(
                 enableAnchorNotifications: false,
@@ -2036,8 +2175,13 @@ private void AddZoomVelocity(
 
                 RunOnUIThread.Execute(() =>
                 {
-                    if (hookViewChanged)
+                    if (hookViewChangingAndChanged)
                     {
+                        scrollPresenter.ViewChanging += (sender, args) =>
+                        {
+                            Log.Comment($"ViewChanging viewChangingCount={++viewChangingCount} - HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+                        };
+
                         scrollPresenter.ViewChanged += (sender, args) =>
                         {
                             Log.Comment($"ViewChanged viewChangedCount={++viewChangedCount} - HorizontalOffset={sender.HorizontalOffset}, VerticalOffset={sender.VerticalOffset}, ZoomFactor={sender.ZoomFactor}");
@@ -2100,6 +2244,7 @@ private ScrollPresenterOperation StartZoomTo(
             Log.Comment("ZoomTo - zoomFactor={0}, centerPoint=({1},{2}), animationMode={3}, snapPointsMode={4}",
                 zoomFactor, centerPointX, centerPointY, animationMode, snapPointsMode);
 
+            viewChangingCount = 0u;
             viewChangedCount = 0u;
             ScrollPresenterOperation operation = new ScrollPresenterOperation();
 
@@ -2144,6 +2289,7 @@ private ScrollPresenterOperation StartZoomBy(
             Log.Comment("ZoomBy - zoomFactorDelta={0}, centerPoint=({1},{2}), animationMode={3}, snapPointsMode={4}",
                 zoomFactorDelta, centerPointX, centerPointY, animationMode, snapPointsMode);
 
+            viewChangingCount = 0u;
             viewChangedCount = 0u;
             ScrollPresenterOperation operation = new ScrollPresenterOperation();
 
@@ -2187,6 +2333,7 @@ private ScrollPresenterOperation StartAddZoomVelocity(
             Log.Comment("AddZoomVelocity - zoomFactorVelocity={0}, inertiaDecayRate={1}, centerPoint=({2},{3})",
                 zoomFactorVelocity, inertiaDecayRate, centerPointX, centerPointY);
 
+            viewChangingCount = 0u;
             viewChangedCount = 0u;
             ScrollPresenterOperation operation = new ScrollPresenterOperation();
 
diff --git a/src/controls/dev/ScrollPresenter/ScrollPresenter.cpp b/src/controls/dev/ScrollPresenter/ScrollPresenter.cpp
index 710b0cc3a2..bd3e28e39b 100644
--- a/src/controls/dev/ScrollPresenter/ScrollPresenter.cpp
+++ b/src/controls/dev/ScrollPresenter/ScrollPresenter.cpp
@@ -15,6 +15,7 @@
 #include "ScrollPresenterTestHooks.h"
 #include "Vector.h"
 #include "RegUtil.h"
+#include "MuxcTraceLogging.h"
 
 // Change to 'true' to turn on debugging outputs in Output window
 bool ScrollPresenterTrace::s_IsDebugOutputEnabled{ false };
@@ -188,52 +189,81 @@ winrt::CompositionPropertySet ScrollPresenter::ExpressionAnimationSources()
     return m_expressionAnimationSources;
 }
 
-double ScrollPresenter::HorizontalOffset()
+double ScrollPresenter::HorizontalOffset() const
 {
     return m_zoomedHorizontalOffset;
 }
 
-double ScrollPresenter::VerticalOffset()
+double ScrollPresenter::VerticalOffset() const
 {
     return m_zoomedVerticalOffset;
 }
 
-float ScrollPresenter::ZoomFactor()
+float ScrollPresenter::ZoomFactor() const
 {
     return m_zoomFactor;
 }
 
-double ScrollPresenter::ExtentWidth()
+double ScrollPresenter::ExtentWidth() const
 {
     return m_unzoomedExtentWidth;
 }
 
-double ScrollPresenter::ExtentHeight()
+double ScrollPresenter::ExtentHeight() const
 {
     return m_unzoomedExtentHeight;
 }
 
-double ScrollPresenter::ViewportWidth()
+double ScrollPresenter::ViewportWidth() const
 {
     return m_viewportWidth;
 }
 
-double ScrollPresenter::ViewportHeight()
+double ScrollPresenter::ViewportHeight() const
 {
     return m_viewportHeight;
 }
 
-double ScrollPresenter::ScrollableWidth()
+double ScrollPresenter::ScrollableWidth() const
 {
     return std::max(0.0, GetZoomedExtentWidth() - ViewportWidth());
 }
 
-double ScrollPresenter::ScrollableHeight()
+double ScrollPresenter::ScrollableHeight() const
 {
     return std::max(0.0, GetZoomedExtentHeight() - ViewportHeight());
 }
 
-winrt::IScrollController ScrollPresenter::HorizontalScrollController()
+// AnticipatedZoomedHorizontalOffset, AnticipatedZoomedVerticalOffset() and AnticipatedZoomFactor() are
+// used to evaluate the view for the ViewChanging event raised when a ScrollTo, ScrollBy, ZoomTo or ZoomBy
+// request is handed off to the InteractionTracker.
+
+double ScrollPresenter::AnticipatedZoomedHorizontalOffset() const
+{
+    return isnan(m_anticipatedZoomedHorizontalOffset) ? m_zoomedHorizontalOffset : m_anticipatedZoomedHorizontalOffset;
+}
+
+double ScrollPresenter::AnticipatedZoomedVerticalOffset() const
+{
+    return isnan(m_anticipatedZoomedVerticalOffset) ? m_zoomedVerticalOffset : m_anticipatedZoomedVerticalOffset;
+}
+
+float ScrollPresenter::AnticipatedZoomFactor() const
+{
+    return isnan(m_anticipatedZoomFactor) ? m_zoomFactor : m_anticipatedZoomFactor;
+}
+
+double ScrollPresenter::AnticipatedScrollableWidth() const
+{
+    return std::max(0.0, m_unzoomedExtentWidth * AnticipatedZoomFactor() - ViewportWidth());
+}
+
+double ScrollPresenter::AnticipatedScrollableHeight() const
+{
+    return std::max(0.0, m_unzoomedExtentHeight * AnticipatedZoomFactor() - ViewportHeight());
+}
+
+winrt::IScrollController ScrollPresenter::HorizontalScrollController() const
 {
     if (m_horizontalScrollController)
     {
@@ -302,7 +332,7 @@ void ScrollPresenter::HorizontalScrollController(winrt::IScrollController const&
     }
 }
 
-winrt::IScrollController ScrollPresenter::VerticalScrollController()
+winrt::IScrollController ScrollPresenter::VerticalScrollController() const
 {
     if (m_verticalScrollController)
     {
@@ -371,7 +401,7 @@ void ScrollPresenter::VerticalScrollController(winrt::IScrollController const& v
     }
 }
 
-winrt::ScrollingInputKinds ScrollPresenter::IgnoredInputKinds()
+winrt::ScrollingInputKinds ScrollPresenter::IgnoredInputKinds() const
 {
     // Workaround for Bug 17377013: XamlCompiler codegen for Enum CreateFromString always returns boxed int which is wrong for [flags] enums (should be uint)
     // Check if the boxed IgnoredInputKinds is an IReference<int> first in which case we unbox as int.
@@ -389,7 +419,7 @@ void ScrollPresenter::IgnoredInputKinds(winrt::ScrollingInputKinds const& value)
     SetValue(s_IgnoredInputKindsProperty, box_value(value));
 }
 
-winrt::ScrollingInteractionState ScrollPresenter::State()
+winrt::ScrollingInteractionState ScrollPresenter::State() const
 {
     return m_state;
 }
@@ -819,8 +849,8 @@ winrt::Size ScrollPresenter::ArrangeOverride(winrt::Size const& finalSize)
         {
             float unzoomedDelta = 0.0f;
 
-            if (newUnzoomedExtentWidth > m_unzoomedExtentWidth ||                                 // ExtentWidth grew
-                m_zoomedHorizontalOffset + m_viewportWidth > m_zoomFactor* m_unzoomedExtentWidth) // ExtentWidth shrank while overpanning
+            if (newUnzoomedExtentWidth > m_unzoomedExtentWidth ||                                  // ExtentWidth grew
+                m_zoomedHorizontalOffset + m_viewportWidth > m_zoomFactor * m_unzoomedExtentWidth) // ExtentWidth shrank while overpanning
             {
                 // Perform horizontal offset adjustment due to edge anchoring
                 unzoomedDelta = static_cast<float>(newUnzoomedExtentWidth - m_unzoomedExtentWidth);
@@ -843,8 +873,8 @@ winrt::Size ScrollPresenter::ArrangeOverride(winrt::Size const& finalSize)
         {
             float unzoomedDelta = 0.0f;
 
-            if (newUnzoomedExtentHeight > m_unzoomedExtentHeight ||                               // ExtentHeight grew
-                m_zoomedVerticalOffset + m_viewportHeight > m_zoomFactor* m_unzoomedExtentHeight) // ExtentHeight shrank while overpanning
+            if (newUnzoomedExtentHeight > m_unzoomedExtentHeight ||                                // ExtentHeight grew
+                m_zoomedVerticalOffset + m_viewportHeight > m_zoomFactor * m_unzoomedExtentHeight) // ExtentHeight shrank while overpanning
             {
                 // Perform vertical offset adjustment due to edge anchoring
                 unzoomedDelta = static_cast<float>(newUnzoomedExtentHeight - m_unzoomedExtentHeight);
@@ -1143,21 +1173,31 @@ void ScrollPresenter::ValuesChanged(
 
     if (isRightToLeftDirection)
     {
-        UpdateOffset(ScrollPresenterDimension::HorizontalScroll, maxPosition.x - args.Position().x);
+        UpdateOffset(ScrollPresenterDimension::HorizontalScroll, static_cast<double>(maxPosition.x) - args.Position().x);
     }
     else
     {
-        UpdateOffset(ScrollPresenterDimension::HorizontalScroll, args.Position().x - minPosition.x);
+        UpdateOffset(ScrollPresenterDimension::HorizontalScroll, static_cast<double>(args.Position().x) - minPosition.x);
     }
 
-    UpdateOffset(ScrollPresenterDimension::VerticalScroll, args.Position().y - minPosition.y);
+    UpdateOffset(ScrollPresenterDimension::VerticalScroll, static_cast<double>(args.Position().y) - minPosition.y);
 
     if (oldZoomFactor != m_zoomFactor || oldZoomedHorizontalOffset != m_zoomedHorizontalOffset || oldZoomedVerticalOffset != m_zoomedVerticalOffset)
     {
         OnViewChanged(oldZoomedHorizontalOffset != m_zoomedHorizontalOffset /*horizontalOffsetChanged*/,
-            oldZoomedVerticalOffset != m_zoomedVerticalOffset /*verticalOffsetChanged*/);
+                      oldZoomedVerticalOffset != m_zoomedVerticalOffset /*verticalOffsetChanged*/);
     }
 
+    TraceLoggingProviderWrite(
+        XamlTelemetryLogging, "ScrollPresenter_ValuesChanged",
+        TraceLoggingFloat64(m_zoomedHorizontalOffset, "HorizontalOffset"),
+        TraceLoggingFloat64(m_zoomedVerticalOffset, "VerticalOffset"),
+        TraceLoggingFloat32(m_zoomFactor, "ZoomFactor"),
+        TraceLoggingFloat64(oldZoomedHorizontalOffset, "OldHorizontalOffset"),
+        TraceLoggingFloat64(oldZoomedVerticalOffset, "OldVerticalOffset"),
+        TraceLoggingFloat32(oldZoomFactor, "OldZoomFactor"),
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
     if (requestId != 0 && !m_interactionTrackerAsyncOperations.empty())
     {
         CompleteInteractionTrackerOperations(
@@ -2080,7 +2120,7 @@ void ScrollPresenter::SetupSnapPoints(
 //and will only shrink to accommodate other snap points which are positioned such that the midpoint between them is within the specified ApplicableRange.
 //Snap points which have ApplicableRangeType = Mandatory are mandatory snap points and their ActualApplicableRange will expand or shrink to ensure that there is no
 //space between it and its neighbors. If the neighbors are also mandatory, this point will be the midpoint between them. If the neighbors are optional then this
-//point will fall on the midpoint or on the Optional neighbor's edge of ApplicableRange, whichever is furthest. 
+//point will fall on the midpoint or on the Optional neighbor's edge of ApplicableRange, whichever is furthest.
 template <typename T>
 void ScrollPresenter::UpdateSnapPointsRanges(
     std::set<std::shared_ptr<SnapPointWrapper<T>>, SnapPointWrapperComparator<T>>* snapPointsSet,
@@ -4212,10 +4252,15 @@ void ScrollPresenter::OnCompositionTargetRendering(const winrt::IInspectable& /*
                     CompleteViewChange(interactionTrackerAsyncOperation, ScrollPresenterViewChangeResult::Completed);
                     if (m_translationAndZoomFactorAnimationsRestartTicksCountdown > 0)
                     {
-                        // Do not unhook the Rendering event when there is a pending restart of the Translation and Scale animations. 
+                        // Do not unhook the Rendering event when there is a pending restart of the Translation and Scale animations.
                         unhookCompositionTargetRendering = false;
                     }
                     m_interactionTrackerAsyncOperations.remove(interactionTrackerAsyncOperation);
+
+                    if (m_interactionTrackerAsyncOperations.empty())
+                    {
+                        ResetAnticipatedView();
+                    }
                 }
                 else
                 {
@@ -5416,6 +5461,39 @@ void ScrollPresenter::UpdateScrollAutomationPatternProperties()
     }
 }
 
+void ScrollPresenter::UpdateAnticipatedOffset(ScrollPresenterDimension dimension, double zoomedOffset)
+{
+    if (dimension == ScrollPresenterDimension::HorizontalScroll)
+    {
+        if (m_anticipatedZoomedHorizontalOffset != zoomedOffset)
+        {
+            SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_STR_DBL, METH_NAME, this, L"anticipatedZoomedHorizontalOffset", zoomedOffset);
+
+            m_anticipatedZoomedHorizontalOffset = zoomedOffset;
+        }
+    }
+    else
+    {
+        MUX_ASSERT(dimension == ScrollPresenterDimension::VerticalScroll);
+        if (m_anticipatedZoomedVerticalOffset != zoomedOffset)
+        {
+            SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_STR_DBL, METH_NAME, this, L"anticipatedZoomedVerticalOffset", zoomedOffset);
+
+            m_anticipatedZoomedVerticalOffset = zoomedOffset;
+        }
+    }
+}
+
+void ScrollPresenter::UpdateAnticipatedZoomFactor(float zoomFactor)
+{
+    if (m_anticipatedZoomFactor != zoomFactor)
+    {
+        SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_STR_FLT, METH_NAME, this, L"anticipatedZoomFactor", zoomFactor);
+
+        m_anticipatedZoomFactor = zoomFactor;
+    }
+}
+
 void ScrollPresenter::UpdateOffset(ScrollPresenterDimension dimension, double zoomedOffset)
 {
     if (dimension == ScrollPresenterDimension::HorizontalScroll)
@@ -5757,7 +5835,7 @@ void ScrollPresenter::ChangeOffsetsPrivate(
             optionsClone ? static_cast<winrt::IInspectable>(*optionsClone) : static_cast<winrt::IInspectable>(options));
     }
 
-    std::shared_ptr<InteractionTrackerAsyncOperation> interactionTrackerAsyncOperation( 
+    std::shared_ptr<InteractionTrackerAsyncOperation> interactionTrackerAsyncOperation(
         std::make_shared<InteractionTrackerAsyncOperation>(
             operationType,
             operationTrigger,
@@ -6184,6 +6262,9 @@ void ScrollPresenter::ProcessOffsetsChange(
         }
     }
 
+    double anticipatedZoomedHorizontalOffset{ DoubleUtil::NaN };
+    double anticipatedZoomedVerticalOffset{ DoubleUtil::NaN };
+
     switch (offsetsChange->ViewKind())
     {
 #ifdef ScrollPresenterViewKind_RelativeToEndOfInertiaView
@@ -6197,10 +6278,14 @@ void ScrollPresenter::ProcessOffsetsChange(
 #endif
     case ScrollPresenterViewKind::RelativeToCurrentView:
     {
+        anticipatedZoomedHorizontalOffset = AnticipatedZoomedHorizontalOffset();
+        anticipatedZoomedVerticalOffset = AnticipatedZoomedVerticalOffset();
+
         if (snapPointsMode == winrt::ScrollingSnapPointsMode::Default || animationMode == winrt::ScrollingAnimationMode::Enabled)
         {
-            zoomedHorizontalOffset += m_zoomedHorizontalOffset;
-            zoomedVerticalOffset += m_zoomedVerticalOffset;
+            // The new requested deltas are added to the prior deltas that have not been processed yet.
+            zoomedHorizontalOffset += anticipatedZoomedHorizontalOffset;
+            zoomedVerticalOffset += anticipatedZoomedVerticalOffset;
         }
         break;
     }
@@ -6235,9 +6320,31 @@ void ScrollPresenter::ProcessOffsetsChange(
                 L"TryUpdatePositionBy",
                 TypeLogging::Float2ToString(winrt::float2(static_cast<float>(zoomedHorizontalOffset), static_cast<float>(zoomedVerticalOffset))).c_str());
 
+            TraceLoggingProviderWrite(
+                XamlTelemetryLogging, "ScrollPresenter_TryUpdatePositionBy",
+                TraceLoggingFloat64(zoomedHorizontalOffset, "HorizontalOffset"),
+                TraceLoggingFloat64(zoomedVerticalOffset, "VerticalOffset"),
+                TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
             m_latestInteractionTrackerRequest = m_interactionTracker.TryUpdatePositionBy(
                 winrt::float3(static_cast<float>(zoomedHorizontalOffset), static_cast<float>(zoomedVerticalOffset), 0.0f));
             m_lastInteractionTrackerAsyncOperationType = InteractionTrackerAsyncOperationType::TryUpdatePositionBy;
+
+            if (zoomedHorizontalOffset != 0.0)
+            {
+                double newAnticipatedZoomedHorizontalOffset = zoomedHorizontalOffset + anticipatedZoomedHorizontalOffset;
+                newAnticipatedZoomedHorizontalOffset = std::max(0.0, newAnticipatedZoomedHorizontalOffset);
+                newAnticipatedZoomedHorizontalOffset = std::min(AnticipatedScrollableWidth(), newAnticipatedZoomedHorizontalOffset);
+                UpdateAnticipatedOffset(ScrollPresenterDimension::HorizontalScroll, newAnticipatedZoomedHorizontalOffset);
+            }
+
+            if (zoomedVerticalOffset != 0.0)
+            {
+                double newAnticipatedZoomedVerticalOffset = zoomedVerticalOffset + anticipatedZoomedVerticalOffset;
+                newAnticipatedZoomedVerticalOffset = std::max(0.0, newAnticipatedZoomedVerticalOffset);
+                newAnticipatedZoomedVerticalOffset = std::min(AnticipatedScrollableHeight(), newAnticipatedZoomedVerticalOffset);
+                UpdateAnticipatedOffset(ScrollPresenterDimension::VerticalScroll, newAnticipatedZoomedVerticalOffset);
+            }
         }
         else
         {
@@ -6246,11 +6353,33 @@ void ScrollPresenter::ProcessOffsetsChange(
             SCROLLPRESENTER_TRACE_INFO_DBG(*this, TRACE_MSG_METH_METH_STR, METH_NAME, this,
                 L"TryUpdatePosition", TypeLogging::Float2ToString(targetPosition).c_str());
 
+            TraceLoggingProviderWrite(
+                XamlTelemetryLogging, "ScrollPresenter_TryUpdatePosition",
+                TraceLoggingFloat64(zoomedHorizontalOffset, "HorizontalOffset"),
+                TraceLoggingFloat64(zoomedVerticalOffset, "VerticalOffset"),
+                TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
             m_latestInteractionTrackerRequest = m_interactionTracker.TryUpdatePosition(
                 winrt::float3(targetPosition, 0.0f));
             m_lastInteractionTrackerAsyncOperationType = InteractionTrackerAsyncOperationType::TryUpdatePosition;
+
+            double newAnticipatedZoomedHorizontalOffset = std::max(0.0, zoomedHorizontalOffset);
+            newAnticipatedZoomedHorizontalOffset = std::min(AnticipatedScrollableWidth(), newAnticipatedZoomedHorizontalOffset);
+            UpdateAnticipatedOffset(ScrollPresenterDimension::HorizontalScroll, newAnticipatedZoomedHorizontalOffset);
+
+            double newAnticipatedZoomedVerticalOffset = std::max(0.0, zoomedVerticalOffset);
+            newAnticipatedZoomedVerticalOffset = std::min(AnticipatedScrollableHeight(), newAnticipatedZoomedVerticalOffset);
+            UpdateAnticipatedOffset(ScrollPresenterDimension::VerticalScroll, newAnticipatedZoomedVerticalOffset);
         }
 
+        RaiseViewChanging(
+#ifdef DBG
+            offsetsChangeCorrelationId,
+#endif // DBG
+            AnticipatedZoomedHorizontalOffset(),
+            AnticipatedZoomedVerticalOffset(),
+            AnticipatedZoomFactor());
+
         if (isForAsyncOperation)
         {
             HookCompositionTargetRendering();
@@ -6261,6 +6390,12 @@ void ScrollPresenter::ProcessOffsetsChange(
     {
         SCROLLPRESENTER_TRACE_INFO_DBG(*this, TRACE_MSG_METH_METH, METH_NAME, this, L"TryUpdatePositionWithAnimation");
 
+        TraceLoggingProviderWrite(
+            XamlTelemetryLogging, "ScrollPresenter_TryUpdatePositionWithAnimation",
+            TraceLoggingFloat64(zoomedHorizontalOffset, "HorizontalOffset"),
+            TraceLoggingFloat64(zoomedVerticalOffset, "VerticalOffset"),
+            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
         m_latestInteractionTrackerRequest = m_interactionTracker.TryUpdatePositionWithAnimation(
             GetPositionAnimation(
                 zoomedHorizontalOffset,
@@ -6268,6 +6403,8 @@ void ScrollPresenter::ProcessOffsetsChange(
                 operationTrigger,
                 offsetsChangeCorrelationId));
         m_lastInteractionTrackerAsyncOperationType = InteractionTrackerAsyncOperationType::TryUpdatePositionWithAnimation;
+
+        ResetAnticipatedView();
         break;
     }
     }
@@ -6334,9 +6471,17 @@ void ScrollPresenter::ProcessOffsetsChange(
     SCROLLPRESENTER_TRACE_INFO_DBG(*this, TRACE_MSG_METH_METH_STR, METH_NAME, this,
         L"TryUpdatePositionWithAdditionalVelocity", TypeLogging::Float2ToString(winrt::float2(offsetsVelocity)).c_str());
 
+    TraceLoggingProviderWrite(
+        XamlTelemetryLogging, "ScrollPresenter_TryUpdatePositionWithAdditionalVelocity",
+        TraceLoggingFloat32(offsetsVelocity.x, "Velocity.X"),
+        TraceLoggingFloat32(offsetsVelocity.y, "Velocity.Y"),
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
     m_latestInteractionTrackerRequest = m_interactionTracker.TryUpdatePositionWithAdditionalVelocity(
         winrt::float3(offsetsVelocity, 0.0f));
     m_lastInteractionTrackerAsyncOperationType = InteractionTrackerAsyncOperationType::TryUpdatePositionWithAdditionalVelocity;
+
+    ResetAnticipatedView();
 }
 
 // Restores the default scroll inertia decay rate if no offset change with additional velocity operation is in progress.
@@ -6398,7 +6543,8 @@ void ScrollPresenter::ProcessZoomFactorChange(
 #endif
     case ScrollPresenterViewKind::RelativeToCurrentView:
     {
-        zoomFactor += m_zoomFactor;
+        // The new requested delta is added to the prior deltas that have not been processed yet.
+        zoomFactor += AnticipatedZoomFactor();
         break;
     }
     }
@@ -6420,9 +6566,37 @@ void ScrollPresenter::ProcessZoomFactorChange(
         SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_METH_FLT_STR, METH_NAME, this,
             L"TryUpdateScale", zoomFactor, TypeLogging::Float2ToString(winrt::float2(centerPoint.x, centerPoint.y)).c_str());
 
+        TraceLoggingProviderWrite(
+            XamlTelemetryLogging, "TryUpdateScale",
+            TraceLoggingFloat32(zoomFactor, "ZoomFactor"),
+            TraceLoggingFloat32(centerPoint.x, "Center.X"),
+            TraceLoggingFloat32(centerPoint.y, "Center.Y"),
+            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
         m_latestInteractionTrackerRequest = m_interactionTracker.TryUpdateScale(zoomFactor, centerPoint);
         m_lastInteractionTrackerAsyncOperationType = InteractionTrackerAsyncOperationType::TryUpdateScale;
 
+        double newAnticipatedZoomedHorizontalOffset = zoomFactor / AnticipatedZoomFactor() * (AnticipatedZoomedHorizontalOffset() + centerPoint.x) - centerPoint.x;
+        double newAnticipatedZoomedVerticalOffset = zoomFactor / AnticipatedZoomFactor() * (AnticipatedZoomedVerticalOffset() + centerPoint.y) - centerPoint.y;
+
+        UpdateAnticipatedZoomFactor(zoomFactor);
+
+        newAnticipatedZoomedHorizontalOffset = std::max(0.0, newAnticipatedZoomedHorizontalOffset);
+        newAnticipatedZoomedHorizontalOffset = std::min(AnticipatedScrollableWidth(), newAnticipatedZoomedHorizontalOffset);
+        UpdateAnticipatedOffset(ScrollPresenterDimension::HorizontalScroll, newAnticipatedZoomedHorizontalOffset);
+
+        newAnticipatedZoomedVerticalOffset = std::max(0.0, newAnticipatedZoomedVerticalOffset);
+        newAnticipatedZoomedVerticalOffset = std::min(AnticipatedScrollableHeight(), newAnticipatedZoomedVerticalOffset);
+        UpdateAnticipatedOffset(ScrollPresenterDimension::VerticalScroll, newAnticipatedZoomedVerticalOffset);
+
+        RaiseViewChanging(
+#ifdef DBG
+            zoomFactorChangeCorrelationId,
+#endif // DBG
+            newAnticipatedZoomedHorizontalOffset,
+            newAnticipatedZoomedVerticalOffset,
+            zoomFactor);
+
         HookCompositionTargetRendering();
         break;
     }
@@ -6430,10 +6604,19 @@ void ScrollPresenter::ProcessZoomFactorChange(
     {
         SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_METH, METH_NAME, this, L"TryUpdateScaleWithAnimation");
 
+        TraceLoggingProviderWrite(
+            XamlTelemetryLogging, "TryUpdateScaleWithAnimation",
+            TraceLoggingFloat32(zoomFactor, "ZoomFactor"),
+            TraceLoggingFloat32(centerPoint.x, "Center.X"),
+            TraceLoggingFloat32(centerPoint.y, "Center.Y"),
+            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
         m_latestInteractionTrackerRequest = m_interactionTracker.TryUpdateScaleWithAnimation(
             GetZoomFactorAnimation(zoomFactor, centerPoint2D, zoomFactorChangeCorrelationId),
             centerPoint);
         m_lastInteractionTrackerAsyncOperationType = InteractionTrackerAsyncOperationType::TryUpdateScaleWithAnimation;
+
+        ResetAnticipatedView();
         break;
     }
     }
@@ -6477,10 +6660,19 @@ void ScrollPresenter::ProcessZoomFactorChange(
     SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_METH_FLT_STR, METH_NAME, this,
         L"TryUpdateScaleWithAdditionalVelocity", zoomFactorVelocity, TypeLogging::Float2ToString(winrt::float2(centerPoint.x, centerPoint.y)).c_str());
 
+    TraceLoggingProviderWrite(
+        XamlTelemetryLogging, "TryUpdateScaleWithAdditionalVelocity",
+        TraceLoggingFloat32(zoomFactorVelocity, "Velocity"),
+        TraceLoggingFloat32(centerPoint.x, "Center.X"),
+        TraceLoggingFloat32(centerPoint.y, "Center.Y"),
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
     m_latestInteractionTrackerRequest = m_interactionTracker.TryUpdateScaleWithAdditionalVelocity(
         zoomFactorVelocity,
         centerPoint);
     m_lastInteractionTrackerAsyncOperationType = InteractionTrackerAsyncOperationType::TryUpdateScaleWithAdditionalVelocity;
+
+    ResetAnticipatedView();
 }
 
 // Restores the default zoomFactor inertia decay rate if no zoomFactor change with additional velocity operation is in progress.
@@ -6506,6 +6698,17 @@ void ScrollPresenter::PostProcessZoomFactorChange(
     ResetZoomFactorInertiaDecayRate();
 }
 
+// Clears the last recorded anticipated view for the ViewChanging event.
+// Called in two classes of circumstances:
+// - all queued view change requested were completed,
+// - an animated view change request is handed off to the InteractionTracker.
+void ScrollPresenter::ResetAnticipatedView()
+{
+    UpdateAnticipatedOffset(ScrollPresenterDimension::HorizontalScroll, DoubleUtil::NaN);
+    UpdateAnticipatedOffset(ScrollPresenterDimension::VerticalScroll, DoubleUtil::NaN);
+    UpdateAnticipatedZoomFactor(FloatUtil::NaN);
+}
+
 // Restores the default scroll offset inertia decay rate.
 void ScrollPresenter::ResetOffsetsInertiaDecayRate()
 {
@@ -6650,6 +6853,11 @@ void ScrollPresenter::CompleteInteractionTrackerOperations(
 
                 m_interactionTrackerAsyncOperations.remove(interactionTrackerAsyncOperationRemoved);
 
+                if (m_interactionTrackerAsyncOperations.empty())
+                {
+                    ResetAnticipatedView();
+                }
+
                 switch (interactionTrackerAsyncOperationRemoved->GetOperationType())
                 {
                 case InteractionTrackerAsyncOperationType::TryUpdatePositionWithAdditionalVelocity:
@@ -6683,6 +6891,11 @@ void ScrollPresenter::CompleteDelayedOperations()
         {
             CompleteViewChange(interactionTrackerAsyncOperation, ScrollPresenterViewChangeResult::Interrupted);
             m_interactionTrackerAsyncOperations.remove(interactionTrackerAsyncOperation);
+
+            if (m_interactionTrackerAsyncOperations.empty())
+            {
+                ResetAnticipatedView();
+            }
         }
     }
 }
@@ -7279,6 +7492,33 @@ void ScrollPresenter::RaiseStateChanged()
     }
 }
 
+void ScrollPresenter::RaiseViewChanging(
+#ifdef DBG
+    int32_t viewChangeCorrelationIdDbg,
+#endif // DBG
+    double anticipatedHorizontalOffset,
+    double anticipatedVerticalOffset,
+    float anticipatedZoomFactor)
+{
+    if (m_viewChangingEventSource)
+    {
+        auto viewChangingEventArgs = winrt::make_self<ScrollingViewChangingEventArgs>();
+
+#ifdef DBG
+        SCROLLPRESENTER_TRACE_INFO(*this, TRACE_MSG_METH_INT, METH_NAME, this, viewChangeCorrelationIdDbg);
+        SCROLLPRESENTER_TRACE_INFO(*this, TRACE_MSG_METH_DBL_DBL, METH_NAME, this, anticipatedHorizontalOffset, anticipatedVerticalOffset);
+        SCROLLPRESENTER_TRACE_INFO(*this, TRACE_MSG_METH_FLT, METH_NAME, this, anticipatedZoomFactor);
+
+        viewChangingEventArgs->SetCorrelationIdDbg(viewChangeCorrelationIdDbg);
+#endif // DBG
+
+        viewChangingEventArgs->SetHorizontalOffset(anticipatedHorizontalOffset);
+        viewChangingEventArgs->SetVerticalOffset(anticipatedVerticalOffset);
+        viewChangingEventArgs->SetZoomFactor(anticipatedZoomFactor);
+        m_viewChangingEventSource(*this, *viewChangingEventArgs);
+    }
+}
+
 void ScrollPresenter::RaiseViewChanged()
 {
     if (m_viewChangedEventSource)
diff --git a/src/controls/dev/ScrollPresenter/ScrollPresenter.h b/src/controls/dev/ScrollPresenter/ScrollPresenter.h
index a4db561c79..1748450d70 100644
--- a/src/controls/dev/ScrollPresenter/ScrollPresenter.h
+++ b/src/controls/dev/ScrollPresenter/ScrollPresenter.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include "DoubleUtil.h"
 #include "FloatUtil.h"
 #include "InteractionTrackerAsyncOperation.h"
 #include "ScrollingScrollAnimationStartingEventArgs.h"
@@ -11,6 +12,7 @@
 #include "ScrollingZoomCompletedEventArgs.h"
 #include "ScrollingBringingIntoViewEventArgs.h"
 #include "ScrollingAnchorRequestedEventArgs.h"
+#include "ScrollingViewChangingEventArgs.h"
 #include "SnapPointWrapper.h"
 #include "ScrollPresenterTrace.h"
 #include "ViewChange.h"
@@ -24,7 +26,7 @@
 #include "ScrollPresenter.properties.h"
 
 class ScrollPresenter :
-    public ReferenceTracker<ScrollPresenter, DeriveFromPanelHelper_base, winrt::ScrollPresenter, winrt::Controls::IScrollAnchorProvider, winrt::IRepeaterScrollingSurface>,
+    public ReferenceTracker<ScrollPresenter, DeriveFromPanelHelper_base, winrt::ScrollPresenter, winrt::IScrollPresenter2, winrt::Controls::IScrollAnchorProvider, winrt::IRepeaterScrollingSurface>,
     public ScrollPresenterProperties
 {
 public:
@@ -128,26 +130,26 @@ class ScrollPresenter :
 #pragma region IScrollPresenter
     winrt::CompositionPropertySet ExpressionAnimationSources();
 
-    double HorizontalOffset();
-    double VerticalOffset();
-    float ZoomFactor();
-    double ExtentWidth();
-    double ExtentHeight();
-    double ViewportWidth();
-    double ViewportHeight();
-    double ScrollableWidth();
-    double ScrollableHeight();
-
-    winrt::IScrollController HorizontalScrollController();
+    double HorizontalOffset() const;
+    double VerticalOffset() const;
+    float ZoomFactor() const;
+    double ExtentWidth() const;
+    double ExtentHeight() const;
+    double ViewportWidth() const;
+    double ViewportHeight() const;
+    double ScrollableWidth() const;
+    double ScrollableHeight() const;
+
+    winrt::IScrollController HorizontalScrollController() const;
     void HorizontalScrollController(winrt::IScrollController const& value);
 
-    winrt::IScrollController VerticalScrollController();
+    winrt::IScrollController VerticalScrollController() const;
     void VerticalScrollController(winrt::IScrollController const& value);
 
-    winrt::ScrollingInputKinds IgnoredInputKinds();
+    winrt::ScrollingInputKinds IgnoredInputKinds() const;
     void IgnoredInputKinds(winrt::ScrollingInputKinds const& value);
 
-    winrt::ScrollingInteractionState State();
+    winrt::ScrollingInteractionState State() const;
 
     winrt::IVector<winrt::ScrollSnapPointBase> HorizontalSnapPoints();
 
@@ -281,6 +283,12 @@ class ScrollPresenter :
     static winrt::hstring DependencyPropertyToString(const winrt::IDependencyProperty& dependencyProperty);
 #endif
 
+    double AnticipatedZoomedHorizontalOffset() const;
+    double AnticipatedZoomedVerticalOffset() const;
+    float AnticipatedZoomFactor() const;
+    double AnticipatedScrollableWidth() const;
+    double AnticipatedScrollableHeight() const;
+
     winrt::Size ArrangeContent(
         const winrt::UIElement& content,
         const winrt::Thickness& contentMargin,
@@ -425,6 +433,8 @@ class ScrollPresenter :
         double viewportWidth,
         double viewportHeight);
     void UpdateScrollAutomationPatternProperties();
+    void UpdateAnticipatedOffset(ScrollPresenterDimension dimension, double zoomedOffset);
+    void UpdateAnticipatedZoomFactor(float zoomFactor);
     void UpdateOffset(ScrollPresenterDimension dimension, double zoomedOffset);
     void UpdateScrollControllerIsScrollable(ScrollPresenterDimension dimension);
     void UpdateScrollControllerValues(ScrollPresenterDimension dimension);
@@ -485,6 +495,7 @@ class ScrollPresenter :
         std::shared_ptr<ZoomFactorChangeWithAdditionalVelocity> zoomFactorChangeWithAdditionalVelocity);
     void PostProcessZoomFactorChange(
         std::shared_ptr<InteractionTrackerAsyncOperation> interactionTrackerAsyncOperation);
+    void ResetAnticipatedView();
     void ResetOffsetsInertiaDecayRate();
     void ResetZoomFactorInertiaDecayRate();
     void CompleteViewChange(
@@ -604,6 +615,13 @@ class ScrollPresenter :
         wstring_view const& propertyName);
     void RaiseExtentChanged();
     void RaiseStateChanged();
+    void RaiseViewChanging(
+#ifdef DBG
+        int32_t viewChangeCorrelationIdDbg,
+#endif // DBG
+        double anticipatedHorizontalOffset,
+        double anticipatedVerticalOffset,
+        float anticipatedZoomFactor);
     void RaiseViewChanged();
     winrt::CompositionAnimation RaiseScrollAnimationStarting(
         const winrt::Vector3KeyFrameAnimation& positionAnimation,
@@ -786,10 +804,13 @@ class ScrollPresenter :
     float m_animationRestartZoomFactor{ 1.0f };
     float m_endOfInertiaZoomFactor{ 1.0f };
     float m_zoomFactor{ 1.0f };
+    float m_anticipatedZoomFactor{ FloatUtil::NaN };
     float m_contentLayoutOffsetX{ 0.0f };
     float m_contentLayoutOffsetY{ 0.0f };
     double m_zoomedHorizontalOffset{ 0.0 };
     double m_zoomedVerticalOffset{ 0.0 };
+    double m_anticipatedZoomedHorizontalOffset{ DoubleUtil::NaN };
+    double m_anticipatedZoomedVerticalOffset{ DoubleUtil::NaN };
     double m_unzoomedExtentWidth{ 0.0 };
     double m_unzoomedExtentHeight{ 0.0 };
     double m_viewportWidth{ 0.0 };
diff --git a/src/controls/dev/ScrollPresenter/ScrollPresenter.idl b/src/controls/dev/ScrollPresenter/ScrollPresenter.idl
index 444f0f0850..d1986969fc 100644
--- a/src/controls/dev/ScrollPresenter/ScrollPresenter.idl
+++ b/src/controls/dev/ScrollPresenter/ScrollPresenter.idl
@@ -167,4 +167,13 @@ runtimeclass ScrollingAnchorRequestedEventArgs
     Microsoft.UI.Xaml.UIElement AnchorElement { get; set; };
 }
 
+[MUX_PREVIEW]
+[webhosthidden]
+runtimeclass ScrollingViewChangingEventArgs
+{
+    Double HorizontalOffset { get; };
+    Double VerticalOffset { get; };
+    Single ZoomFactor{ get; };
+}
+
 }
diff --git a/src/controls/dev/ScrollPresenter/ScrollPresenter.vcxitems b/src/controls/dev/ScrollPresenter/ScrollPresenter.vcxitems
index e5c4279d9c..115ffd4998 100644
--- a/src/controls/dev/ScrollPresenter/ScrollPresenter.vcxitems
+++ b/src/controls/dev/ScrollPresenter/ScrollPresenter.vcxitems
@@ -38,6 +38,7 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)ScrollPresenterTrace.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ScrollingScrollCompletedEventArgs.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ScrollingScrollAnimationStartingEventArgs.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)ScrollingViewChangingEventArgs.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)SnapPoint.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)SnapPointWrapper.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ScrollingZoomAnimationStartingEventArgs.h" />
@@ -66,6 +67,7 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)ScrollingBringingIntoViewEventArgs.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)ScrollingScrollCompletedEventArgs.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)ScrollingScrollAnimationStartingEventArgs.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)ScrollingViewChangingEventArgs.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)ScrollPresenterTestHooksExpressionAnimationStatusChangedEventArgs.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)ScrollingZoomAnimationStartingEventArgs.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)ScrollingAnchorRequestedEventArgs.cpp" />
diff --git a/src/controls/dev/ScrollPresenter/ScrollPresenterAnchoring.cpp b/src/controls/dev/ScrollPresenter/ScrollPresenterAnchoring.cpp
index 974be422ec..3e35313d7e 100644
--- a/src/controls/dev/ScrollPresenter/ScrollPresenterAnchoring.cpp
+++ b/src/controls/dev/ScrollPresenter/ScrollPresenterAnchoring.cpp
@@ -376,8 +376,8 @@ void ScrollPresenter::EnsureAnchorElementSelection()
             globalTestHooks->NotifyAnchorEvaluated(*this, requestedAnchorElement, viewportAnchorPointHorizontalOffset, viewportAnchorPointVerticalOffset);
         }
 
-        SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_PTR_STR, METH_NAME, this, m_anchorElement.get(), L"m_anchorElement set.");
-        SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_STR_STR, METH_NAME, this, TypeLogging::RectToString(m_anchorElementBounds).c_str(), L"m_anchorElementBounds set.");
+        SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_PTR_STR, METH_NAME, this, m_anchorElement.get(), L"m_anchorElement set from ScrollingAnchorRequestedEventArgs.");
+        SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_STR_STR, METH_NAME, this, TypeLogging::RectToString(m_anchorElementBounds).c_str(), L"m_anchorElementBounds set from ScrollingAnchorRequestedEventArgs.");
 
         return;
     }
@@ -432,8 +432,10 @@ void ScrollPresenter::EnsureAnchorElementSelection()
         m_anchorElement.set(bestAnchorCandidate);
         m_anchorElementBounds = bestAnchorCandidateBounds;
 
-        SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_PTR_STR, METH_NAME, this, m_anchorElement.get(), L"m_anchorElement set.");
-        SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_STR_STR, METH_NAME, this, TypeLogging::RectToString(m_anchorElementBounds).c_str(), L"m_anchorElementBounds set.");
+        SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_PTR_STR, METH_NAME, this, m_anchorElement.get(),
+            anchorCandidates ? L"m_anchorElement set from anchorCandidates." : L"m_anchorElement set from m_anchorCandidates.");
+        SCROLLPRESENTER_TRACE_VERBOSE_DBG(*this, TRACE_MSG_METH_STR_STR, METH_NAME, this, TypeLogging::RectToString(m_anchorElementBounds).c_str(),
+            anchorCandidates ? L"m_anchorElementBounds set from anchorCandidates." : L"m_anchorElementBounds set from m_anchorCandidates.");
     }
 
     if (globalTestHooks && globalTestHooks->AreAnchorNotificationsRaised())
@@ -477,13 +479,13 @@ void ScrollPresenter::ProcessAnchorCandidate(
     if (!isnan(viewportAnchorPointHorizontalOffset))
     {
         anchorCandidateDistance += std::pow(viewportAnchorPointHorizontalOffset - anchorCandidateBounds.X, 2);
-        anchorCandidateDistance += std::pow(viewportAnchorPointHorizontalOffset - (anchorCandidateBounds.X + anchorCandidateBounds.Width), 2);
+        anchorCandidateDistance += std::pow(viewportAnchorPointHorizontalOffset - (static_cast<double>(anchorCandidateBounds.X) + static_cast<double>(anchorCandidateBounds.Width)), 2);
     }
 
     if (!isnan(viewportAnchorPointVerticalOffset))
     {
         anchorCandidateDistance += std::pow(viewportAnchorPointVerticalOffset - anchorCandidateBounds.Y, 2);
-        anchorCandidateDistance += std::pow(viewportAnchorPointVerticalOffset - (anchorCandidateBounds.Y + anchorCandidateBounds.Height), 2);
+        anchorCandidateDistance += std::pow(viewportAnchorPointVerticalOffset - (static_cast<double>(anchorCandidateBounds.Y) + static_cast<double>(anchorCandidateBounds.Height)), 2);
     }
 
     if (anchorCandidateDistance <= *bestAnchorCandidateDistance)
diff --git a/src/controls/dev/ScrollPresenter/ScrollPresenterPrimitives.idl b/src/controls/dev/ScrollPresenter/ScrollPresenterPrimitives.idl
index 807cf01947..01123acadf 100644
--- a/src/controls/dev/ScrollPresenter/ScrollPresenterPrimitives.idl
+++ b/src/controls/dev/ScrollPresenter/ScrollPresenterPrimitives.idl
@@ -345,6 +345,7 @@ unsealed runtimeclass ScrollPresenter :
     event Windows.Foundation.TypedEventHandler<ScrollPresenter, Object> ExtentChanged;
     event Windows.Foundation.TypedEventHandler<ScrollPresenter, Object> StateChanged;
     event Windows.Foundation.TypedEventHandler<ScrollPresenter, Object> ViewChanged;
+
     event Windows.Foundation.TypedEventHandler<ScrollPresenter, MU_XC_NAMESPACE.ScrollingScrollAnimationStartingEventArgs> ScrollAnimationStarting;
     event Windows.Foundation.TypedEventHandler<ScrollPresenter, MU_XC_NAMESPACE.ScrollingZoomAnimationStartingEventArgs> ZoomAnimationStarting;
     event Windows.Foundation.TypedEventHandler<ScrollPresenter, MU_XC_NAMESPACE.ScrollingScrollCompletedEventArgs> ScrollCompleted;
@@ -352,6 +353,9 @@ unsealed runtimeclass ScrollPresenter :
     event Windows.Foundation.TypedEventHandler<ScrollPresenter, MU_XC_NAMESPACE.ScrollingBringingIntoViewEventArgs> BringingIntoView;
     event Windows.Foundation.TypedEventHandler<ScrollPresenter, MU_XC_NAMESPACE.ScrollingAnchorRequestedEventArgs> AnchorRequested;
 
+    [MUX_PREVIEW]
+    event Windows.Foundation.TypedEventHandler<ScrollPresenter, MU_XC_NAMESPACE.ScrollingViewChangingEventArgs> ViewChanging;
+
     static Microsoft.UI.Xaml.DependencyProperty BackgroundProperty { get; };
     static Microsoft.UI.Xaml.DependencyProperty ContentProperty { get; };
     static Microsoft.UI.Xaml.DependencyProperty ContentOrientationProperty { get; };
diff --git a/src/controls/dev/ScrollPresenter/ScrollPresenterPrivate.cpp b/src/controls/dev/ScrollPresenter/ScrollPresenterPrivate.cpp
index e5cc68ab4d..11fa5efb36 100644
--- a/src/controls/dev/ScrollPresenter/ScrollPresenterPrivate.cpp
+++ b/src/controls/dev/ScrollPresenter/ScrollPresenterPrivate.cpp
@@ -104,7 +104,7 @@ winrt::UIElement ScrollPresenter::AnchorElement()
 void ScrollPresenter::RegisterAnchorCandidate(winrt::UIElement const& element)
 {
 #ifdef DBG_VERBOSE
-    SCROLLPRESENTER_TRACE_VERBOSE(*this, TRACE_MSG_METH_PTR_DBL, METH_NAME, this, element, VerticalAnchorRatio());
+    SCROLLPRESENTER_TRACE_VERBOSE(*this, TRACE_MSG_METH_PTR, METH_NAME, this, element);
 #endif
 
     if (!element)
@@ -115,7 +115,7 @@ void ScrollPresenter::RegisterAnchorCandidate(winrt::UIElement const& element)
     if (!isnan(HorizontalAnchorRatio()) || !isnan(VerticalAnchorRatio()))
     {
 #ifdef DBG
-        // We should not be registring the same element twice. Even through it is functionally ok,
+        // We should not be registering the same element twice. Even through it is functionally ok,
         // we will end up spending more time during arrange than we must.
         // However checking if an element is already in the list every time a new element is registered is worse for perf.
         // So, I'm leaving an assert here to catch regression in our code but in release builds we run without the check.
diff --git a/src/controls/dev/ScrollPresenter/ScrollPresenterTypeLogging.cpp b/src/controls/dev/ScrollPresenter/ScrollPresenterTypeLogging.cpp
index 1b1db068d9..701d146f38 100644
--- a/src/controls/dev/ScrollPresenter/ScrollPresenterTypeLogging.cpp
+++ b/src/controls/dev/ScrollPresenter/ScrollPresenterTypeLogging.cpp
@@ -247,16 +247,19 @@ winrt::hstring InteractionTrackerAsyncOperationTypeToString(InteractionTrackerAs
 
 winrt::hstring InteractionTrackerAsyncOperationTriggerToString(InteractionTrackerAsyncOperationTrigger operationTrigger)
 {
-    switch (operationTrigger)
+    switch (static_cast<int>(operationTrigger))
     {
-    case InteractionTrackerAsyncOperationTrigger::DirectViewChange:
+    case static_cast<int>(InteractionTrackerAsyncOperationTrigger::DirectViewChange):
         return L"DirectViewChange";
-    case InteractionTrackerAsyncOperationTrigger::HorizontalScrollControllerRequest:
+    case static_cast<int>(InteractionTrackerAsyncOperationTrigger::HorizontalScrollControllerRequest):
         return L"HorizontalScrollControllerRequest";
-    case InteractionTrackerAsyncOperationTrigger::VerticalScrollControllerRequest:
+    case static_cast<int>(InteractionTrackerAsyncOperationTrigger::VerticalScrollControllerRequest):
         return L"VerticalScrollControllerRequest";
-    case InteractionTrackerAsyncOperationTrigger::BringIntoViewRequest:
+    case static_cast<int>(InteractionTrackerAsyncOperationTrigger::BringIntoViewRequest):
         return L"BringIntoViewRequest";
+    case static_cast<int>(InteractionTrackerAsyncOperationTrigger::HorizontalScrollControllerRequest) |
+         static_cast<int>(InteractionTrackerAsyncOperationTrigger::VerticalScrollControllerRequest):
+        return L"HorizontalScrollControllerRequest | VerticalScrollControllerRequest";
     default:
         MUX_ASSERT(false);
         return L"";
diff --git a/src/controls/dev/ScrollPresenter/ScrollingViewChangingEventArgs.cpp b/src/controls/dev/ScrollPresenter/ScrollingViewChangingEventArgs.cpp
new file mode 100644
index 0000000000..7cc46e22c3
--- /dev/null
+++ b/src/controls/dev/ScrollPresenter/ScrollingViewChangingEventArgs.cpp
@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+#include "pch.h"
+#include "ScrollingViewChangingEventArgs.h"
+
+double ScrollingViewChangingEventArgs::HorizontalOffset() const
+{
+    return m_horizontalOffset;
+}
+
+void ScrollingViewChangingEventArgs::SetHorizontalOffset(double horizontalOffset)
+{
+    m_horizontalOffset = horizontalOffset;
+}
+
+double ScrollingViewChangingEventArgs::VerticalOffset() const
+{
+    return m_verticalOffset;
+}
+
+void ScrollingViewChangingEventArgs::SetVerticalOffset(double verticalOffset)
+{
+    m_verticalOffset = verticalOffset;
+}
+
+float ScrollingViewChangingEventArgs::ZoomFactor() const
+{
+    return m_zoomFactor;
+}
+
+void ScrollingViewChangingEventArgs::SetZoomFactor(float zoomFactor)
+{
+    m_zoomFactor = zoomFactor;
+}
+
+#ifdef DBG
+int32_t ScrollingViewChangingEventArgs::CorrelationIdDbg() const
+{
+    return m_correlationIdDbg;
+}
+
+void ScrollingViewChangingEventArgs::SetCorrelationIdDbg(int32_t correlationIdDbg)
+{
+    m_correlationIdDbg = correlationIdDbg;
+}
+#endif // DBG
diff --git a/src/controls/dev/ScrollPresenter/ScrollingViewChangingEventArgs.h b/src/controls/dev/ScrollPresenter/ScrollingViewChangingEventArgs.h
new file mode 100644
index 0000000000..fc95967326
--- /dev/null
+++ b/src/controls/dev/ScrollPresenter/ScrollingViewChangingEventArgs.h
@@ -0,0 +1,45 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+#pragma once
+
+#include "ScrollPresenter.h"
+#include "ScrollingViewChangingEventArgs.g.h"
+
+class ScrollingViewChangingEventArgs :
+    public winrt::implementation::ScrollingViewChangingEventArgsT<ScrollingViewChangingEventArgs>
+{
+public:
+    ScrollingViewChangingEventArgs()
+    {
+        SCROLLPRESENTER_TRACE_VERBOSE(nullptr, TRACE_MSG_METH, METH_NAME, this);
+    }
+
+    ~ScrollingViewChangingEventArgs()
+    {
+        SCROLLPRESENTER_TRACE_VERBOSE(nullptr, TRACE_MSG_METH, METH_NAME, this);
+    }
+
+    // IScrollingViewChangingEventArgs overrides
+    double HorizontalOffset() const;
+    double VerticalOffset() const;
+    float ZoomFactor() const;
+
+    void SetHorizontalOffset(double horizontalOffset);
+    void SetVerticalOffset(double verticalOffset);
+    void SetZoomFactor(float zoomFactor);
+
+#ifdef DBG
+    int32_t CorrelationIdDbg() const;
+    void SetCorrelationIdDbg(int32_t correlationIdDbg);
+#endif // DBG
+
+private:
+    double m_horizontalOffset{};
+    double m_verticalOffset{};
+    float m_zoomFactor{};
+
+#ifdef DBG
+    int32_t m_correlationIdDbg{ -1 };
+#endif // DBG
+};
diff --git a/src/controls/dev/ScrollPresenter/TestUI/ScrollPresenterDynamicPage.xaml.cs b/src/controls/dev/ScrollPresenter/TestUI/ScrollPresenterDynamicPage.xaml.cs
index 220a975584..b5bdb16bcf 100644
--- a/src/controls/dev/ScrollPresenter/TestUI/ScrollPresenterDynamicPage.xaml.cs
+++ b/src/controls/dev/ScrollPresenter/TestUI/ScrollPresenterDynamicPage.xaml.cs
@@ -114,6 +114,11 @@ private void ScrollPresenter_StateChanged(ScrollPresenter sender, object args)
             AppendAsyncEventMessage("StateChanged " + sender.State.ToString());
         }
 
+        private void ScrollPresenter_ViewChanging(ScrollPresenter sender, ScrollingViewChangingEventArgs args)
+        {
+            AppendAsyncEventMessage("ViewChanging H=" + args.HorizontalOffset.ToString() + ", V=" + args.VerticalOffset + ", ZF=" + args.ZoomFactor);
+        }
+
         private void ScrollPresenter_ViewChanged(ScrollPresenter sender, object args)
         {
             AppendAsyncEventMessage("ViewChanged H=" + sender.HorizontalOffset.ToString() + ", V=" + sender.VerticalOffset + ", ZF=" + sender.ZoomFactor);
@@ -265,6 +270,7 @@ private void ChkLogScrollPresenterEvents_Checked(object sender, RoutedEventArgs
         {
             scrollPresenter.ExtentChanged += ScrollPresenter_ExtentChanged;
             scrollPresenter.StateChanged += ScrollPresenter_StateChanged;
+            scrollPresenter.ViewChanging += ScrollPresenter_ViewChanging;
             scrollPresenter.ViewChanged += ScrollPresenter_ViewChanged;
             scrollPresenter.ScrollCompleted += ScrollPresenter_ScrollCompleted;
             scrollPresenter.ZoomCompleted += ScrollPresenter_ZoomCompleted;
@@ -276,6 +282,7 @@ private void ChkLogScrollPresenterEvents_Unchecked(object sender, RoutedEventArg
         {
             scrollPresenter.ExtentChanged -= ScrollPresenter_ExtentChanged;
             scrollPresenter.StateChanged -= ScrollPresenter_StateChanged;
+            scrollPresenter.ViewChanging -= ScrollPresenter_ViewChanging;
             scrollPresenter.ViewChanged -= ScrollPresenter_ViewChanged;
             scrollPresenter.ScrollCompleted -= ScrollPresenter_ScrollCompleted;
             scrollPresenter.ZoomCompleted -= ScrollPresenter_ZoomCompleted;
@@ -2613,6 +2620,7 @@ private void UseScrollPresenter(ScrollPresenter s)
                     {
                         scrollPresenter.ExtentChanged -= ScrollPresenter_ExtentChanged;
                         scrollPresenter.StateChanged -= ScrollPresenter_StateChanged;
+                        scrollPresenter.ViewChanging -= ScrollPresenter_ViewChanging;
                         scrollPresenter.ViewChanged -= ScrollPresenter_ViewChanged;
                         scrollPresenter.ScrollCompleted -= ScrollPresenter_ScrollCompleted;
                         scrollPresenter.ZoomCompleted -= ScrollPresenter_ZoomCompleted;
@@ -2662,6 +2670,7 @@ private void UseScrollPresenter(ScrollPresenter s)
                     {
                         scrollPresenter.ExtentChanged += ScrollPresenter_ExtentChanged;
                         scrollPresenter.StateChanged += ScrollPresenter_StateChanged;
+                        scrollPresenter.ViewChanging += ScrollPresenter_ViewChanging;
                         scrollPresenter.ViewChanged += ScrollPresenter_ViewChanged;
                         scrollPresenter.ScrollCompleted += ScrollPresenter_ScrollCompleted;
                         scrollPresenter.ZoomCompleted += ScrollPresenter_ZoomCompleted;
diff --git a/src/controls/dev/ScrollView/ScrollView.cpp b/src/controls/dev/ScrollView/ScrollView.cpp
index 4fae470c44..d7201c020a 100644
--- a/src/controls/dev/ScrollView/ScrollView.cpp
+++ b/src/controls/dev/ScrollView/ScrollView.cpp
@@ -39,7 +39,7 @@ ScrollView::~ScrollView()
     UnhookCompositionTargetRendering();
     UnhookScrollPresenterEvents(true /*isForDestructor*/);
     UnhookScrollViewEvents();
-    ResetHideIndicatorsTimer(true /*isForDestructor*/);
+    ResetHideIndicatorsTimer();
 }
 
 #pragma region IScrollView
@@ -909,7 +909,9 @@ void ScrollView::OnHideIndicatorsTimerTick(
 
     if (AreScrollControllersAutoHiding())
     {
-        HideIndicators();
+        // As this control may be in the process of being discarded,
+        // use tracker_ref's safe_get() instead of get() to avoid crashes.
+        HideIndicators(true /*useTransitions*/, true /*useSafeGet*/);
     }
 }
 
@@ -969,6 +971,18 @@ void ScrollView::OnZoomAnimationStarting(
     }
 }
 
+void ScrollView::OnScrollPresenterViewChanging(
+    const winrt::IInspectable& /*sender*/,
+    const winrt::ScrollingViewChangingEventArgs& args)
+{
+    if (m_viewChangingEventSource)
+    {
+        SCROLLVIEW_TRACE_VERBOSE(*this, TRACE_MSG_METH, METH_NAME, this);
+
+        m_viewChangingEventSource(*this, args);
+    }
+}
+
 void ScrollView::OnScrollPresenterViewChanged(
     const winrt::IInspectable& /*sender*/,
     const winrt::IInspectable& args)
@@ -1131,16 +1145,14 @@ void ScrollView::OnScrollPresenterPropertyChanged(
     }
 }
 
-void ScrollView::ResetHideIndicatorsTimer(bool isForDestructor, bool restart)
+void ScrollView::ResetHideIndicatorsTimer(bool restart)
 {
-    auto hideIndicatorsTimer = m_hideIndicatorsTimer.safe_get(isForDestructor /*useSafeGet*/);
-
-    if (hideIndicatorsTimer && hideIndicatorsTimer.IsEnabled())
+    if (m_hideIndicatorsTimer && m_hideIndicatorsTimer.IsEnabled())
     {
-        hideIndicatorsTimer.Stop();
+        m_hideIndicatorsTimer.Stop();
         if (restart)
         {
-            hideIndicatorsTimer.Start();
+            m_hideIndicatorsTimer.Start();
         }
     }
 }
@@ -1259,6 +1271,7 @@ void ScrollView::HookScrollPresenterEvents()
     MUX_ASSERT(m_scrollPresenterStateChangedToken.value == 0);
     MUX_ASSERT(m_scrollPresenterScrollAnimationStartingToken.value == 0);
     MUX_ASSERT(m_scrollPresenterZoomAnimationStartingToken.value == 0);
+    MUX_ASSERT(m_scrollPresenterViewChangingToken.value == 0);
     MUX_ASSERT(m_scrollPresenterViewChangedToken.value == 0);
     MUX_ASSERT(m_scrollPresenterScrollCompletedToken.value == 0);
     MUX_ASSERT(m_scrollPresenterZoomCompletedToken.value == 0);
@@ -1279,6 +1292,13 @@ void ScrollView::HookScrollPresenterEvents()
         m_scrollPresenterBringingIntoViewToken = scrollPresenter.BringingIntoView({ this, &ScrollView::OnScrollPresenterBringingIntoView });
         m_scrollPresenterAnchorRequestedToken = scrollPresenter.AnchorRequested({ this, &ScrollView::OnScrollPresenterAnchorRequested });
 
+        const winrt::IScrollPresenter2 scrollPresenter2 = scrollPresenter.try_as<winrt::IScrollPresenter2>();
+
+        if (scrollPresenter2)
+        {
+            m_scrollPresenterViewChangingToken = scrollPresenter2.ViewChanging({ this, &ScrollView::OnScrollPresenterViewChanging });
+        }
+
         const winrt::DependencyObject scrollPresenterAsDO = scrollPresenter.try_as<winrt::DependencyObject>();
 
         m_scrollPresenterComputedHorizontalScrollModeChangedToken.value = scrollPresenterAsDO.RegisterPropertyChangedCallback(
@@ -1326,6 +1346,18 @@ void ScrollView::UnhookScrollPresenterEvents(bool isForDestructor)
             m_scrollPresenterZoomAnimationStartingToken.value = 0;
         }
 
+        if (m_scrollPresenterViewChangingToken.value != 0)
+        {
+            const winrt::IScrollPresenter2 scrollPresenter2 = scrollPresenter.try_as<winrt::IScrollPresenter2>();
+
+            if (scrollPresenter2)
+            {
+                scrollPresenter2.ViewChanging(m_scrollPresenterViewChangingToken);
+            }
+
+            m_scrollPresenterViewChangingToken.value = 0;
+        }
+
         if (m_scrollPresenterViewChangedToken.value != 0)
         {
             scrollPresenter.ViewChanged(m_scrollPresenterViewChangedToken);
@@ -1650,10 +1682,13 @@ bool ScrollView::IsInputKindIgnored(winrt::ScrollingInputKinds const& inputKind)
     return (IgnoredInputKinds() & inputKind) == inputKind;
 }
 
-bool ScrollView::AreAllScrollControllersCollapsed() const
+bool ScrollView::AreAllScrollControllersCollapsed(bool useSafeGet) const
 {
-    return !SharedHelpers::IsAncestor(m_horizontalScrollControllerElement.try_as<winrt::DependencyObject>() /*child*/, static_cast<winrt::DependencyObject>(*this) /*parent*/, true /*checkVisibility*/) &&
-        !SharedHelpers::IsAncestor(m_verticalScrollControllerElement.try_as<winrt::DependencyObject>() /*child*/, static_cast<winrt::DependencyObject>(*this) /*parent*/, true /*checkVisibility*/);
+    return
+        (m_horizontalScrollControllerElement.safe_get(useSafeGet) == nullptr ||
+         !SharedHelpers::IsAncestor(m_horizontalScrollControllerElement.try_as<winrt::DependencyObject>() /*child*/, static_cast<winrt::DependencyObject>(*this) /*parent*/, true /*checkVisibility*/)) &&
+        (m_verticalScrollControllerElement.safe_get(useSafeGet) == nullptr ||
+         !SharedHelpers::IsAncestor(m_verticalScrollControllerElement.try_as<winrt::DependencyObject>() /*child*/, static_cast<winrt::DependencyObject>(*this) /*parent*/, true /*checkVisibility*/));
 }
 
 bool ScrollView::AreBothScrollControllersVisible() const
@@ -1668,13 +1703,14 @@ bool ScrollView::IsScrollControllersSeparatorVisible() const
 }
 
 void ScrollView::HideIndicators(
-    bool useTransitions)
+    bool useTransitions,
+    bool useSafeGet)
 {
     SCROLLVIEW_TRACE_VERBOSE(*this, TRACE_MSG_METH_INT_INT, METH_NAME, this, useTransitions, m_keepIndicatorsShowing);
 
     MUX_ASSERT(AreScrollControllersAutoHiding());
 
-    if (!AreAllScrollControllersCollapsed() && !m_keepIndicatorsShowing)
+    if (!AreAllScrollControllersCollapsed(useSafeGet) && !m_keepIndicatorsShowing)
     {
         GoToState(s_noIndicatorStateName, useTransitions);
 
@@ -1693,25 +1729,21 @@ void ScrollView::HideIndicatorsAfterDelay()
 
     if (!m_keepIndicatorsShowing && IsLoaded())
     {
-        winrt::DispatcherTimer hideIndicatorsTimer = nullptr;
-
         if (m_hideIndicatorsTimer)
         {
-            hideIndicatorsTimer = m_hideIndicatorsTimer.get();
-            if (hideIndicatorsTimer.IsEnabled())
+            if (m_hideIndicatorsTimer.IsEnabled())
             {
-                hideIndicatorsTimer.Stop();
+                m_hideIndicatorsTimer.Stop();
             }
         }
         else
         {
-            hideIndicatorsTimer = winrt::DispatcherTimer();
-            hideIndicatorsTimer.Interval(winrt::TimeSpan::duration(s_noIndicatorCountdown));
-            hideIndicatorsTimer.Tick({ this, &ScrollView::OnHideIndicatorsTimerTick });
-            m_hideIndicatorsTimer.set(hideIndicatorsTimer);
+            m_hideIndicatorsTimer = winrt::DispatcherTimer();
+            m_hideIndicatorsTimer.Interval(winrt::TimeSpan::duration(s_noIndicatorCountdown));
+            m_hideIndicatorsTimer.Tick({ this, &ScrollView::OnHideIndicatorsTimerTick });
         }
 
-        hideIndicatorsTimer.Start();
+        m_hideIndicatorsTimer.Start();
     }
 }
 
@@ -1759,7 +1791,7 @@ void ScrollView::UpdateScrollControllersVisualState(
             return;
         }
 
-        ResetHideIndicatorsTimer(false /*isForDestructor*/, true /*restart*/);
+        ResetHideIndicatorsTimer(true /*restart*/);
 
         // Mouse indicators dominate if they are already showing or if we have set the flag to prefer them.
         if (m_preferMouseIndicators || m_showingMouseIndicators || !areScrollControllersAutoHiding)
diff --git a/src/controls/dev/ScrollView/ScrollView.h b/src/controls/dev/ScrollView/ScrollView.h
index a0362266f0..d1c13066c6 100644
--- a/src/controls/dev/ScrollView/ScrollView.h
+++ b/src/controls/dev/ScrollView/ScrollView.h
@@ -176,6 +176,9 @@ class ScrollView :
     void OnZoomAnimationStarting(
         const winrt::IInspectable& sender,
         const winrt::ScrollingZoomAnimationStartingEventArgs& args);
+    void OnScrollPresenterViewChanging(
+        const winrt::IInspectable& sender,
+        const winrt::ScrollingViewChangingEventArgs& args);
     void OnScrollPresenterViewChanged(
         const winrt::IInspectable& sender,
         const winrt::IInspectable& args);
@@ -198,7 +201,7 @@ class ScrollView :
         const winrt::IInspectable& sender,
         const winrt::IInspectable& args);
 
-    void ResetHideIndicatorsTimer(bool isForDestructor = false, bool restart = false);
+    void ResetHideIndicatorsTimer(bool restart = false);
 
     void HookUISettingsEvent();
     void HookCompositionTargetRendering();
@@ -226,11 +229,11 @@ class ScrollView :
 
     bool IsInputKindIgnored(winrt::ScrollingInputKinds const& inputKind);
 
-    bool AreAllScrollControllersCollapsed() const;
+    bool AreAllScrollControllersCollapsed(bool useSafeGet = false) const;
     bool AreBothScrollControllersVisible() const;
     bool AreScrollControllersAutoHiding();
     bool IsScrollControllersSeparatorVisible() const;
-    void HideIndicators(bool useTransitions = true);
+    void HideIndicators(bool useTransitions = true, bool useSafeGet = false);
     void HideIndicatorsAfterDelay();
     void UpdateScrollControllersAutoHiding(bool forceUpdate = false);
     void UpdateVisualStates(
@@ -282,7 +285,8 @@ class ScrollView :
     tracker_ref<winrt::IUIElement> m_verticalScrollControllerElement{ this };
     tracker_ref<winrt::IUIElement> m_scrollControllersSeparatorElement{ this };
     tracker_ref<winrt::IScrollPresenter> m_scrollPresenter{ this };
-    tracker_ref<winrt::DispatcherTimer> m_hideIndicatorsTimer{ this };
+
+    winrt::DispatcherTimer m_hideIndicatorsTimer{ nullptr };
 
     // Event Tokens
     winrt::event_token m_gettingFocusToken{};
@@ -293,6 +297,7 @@ class ScrollView :
     winrt::event_token m_scrollPresenterStateChangedToken{};
     winrt::event_token m_scrollPresenterScrollAnimationStartingToken{};
     winrt::event_token m_scrollPresenterZoomAnimationStartingToken{};
+    winrt::event_token m_scrollPresenterViewChangingToken{};
     winrt::event_token m_scrollPresenterViewChangedToken{};
     winrt::event_token m_scrollPresenterScrollCompletedToken{};
     winrt::event_token m_scrollPresenterZoomCompletedToken{};
@@ -365,7 +370,7 @@ class ScrollView :
 
     // Private constants    
     // 2 seconds delay used to hide the indicators for example when OS animations are turned off.
-    static constexpr int64_t s_noIndicatorCountdown = 2000 * 10000; 
+    static constexpr int64_t s_noIndicatorCountdown = 2000 * 10000;
 
     static constexpr std::wstring_view s_noIndicatorStateName{ L"NoIndicator"sv };
     static constexpr std::wstring_view s_touchIndicatorStateName{ L"TouchIndicator"sv };
@@ -380,4 +385,4 @@ class ScrollView :
 };
 
 extern template void std::default_delete<ScrollView::AutoHideScrollBarsState>::operator()(ScrollView::AutoHideScrollBarsState*) const noexcept;
-extern template void std::default_delete<const ScrollView::AutoHideScrollBarsState>::operator()(const ScrollView::AutoHideScrollBarsState*) const noexcept;
\ No newline at end of file
+extern template void std::default_delete<const ScrollView::AutoHideScrollBarsState>::operator()(const ScrollView::AutoHideScrollBarsState*) const noexcept;
diff --git a/src/controls/dev/ScrollView/ScrollView.idl b/src/controls/dev/ScrollView/ScrollView.idl
index 7035bae701..1da02a0b27 100644
--- a/src/controls/dev/ScrollView/ScrollView.idl
+++ b/src/controls/dev/ScrollView/ScrollView.idl
@@ -133,6 +133,9 @@ unsealed runtimeclass ScrollView : Microsoft.UI.Xaml.Controls.Control
     event Windows.Foundation.TypedEventHandler<ScrollView, ScrollingBringingIntoViewEventArgs> BringingIntoView;
     event Windows.Foundation.TypedEventHandler<ScrollView, ScrollingAnchorRequestedEventArgs> AnchorRequested;
 
+    [MUX_PREVIEW]
+    event Windows.Foundation.TypedEventHandler<ScrollView, ScrollingViewChangingEventArgs> ViewChanging;
+
     static Microsoft.UI.Xaml.DependencyProperty ContentProperty { get; };
     static Microsoft.UI.Xaml.DependencyProperty ScrollPresenterProperty { get; };
     static Microsoft.UI.Xaml.DependencyProperty HorizontalScrollBarVisibilityProperty { get; };
diff --git a/src/controls/dev/ScrollView/TestUI/ScrollViewBlankPage.xaml.cs b/src/controls/dev/ScrollView/TestUI/ScrollViewBlankPage.xaml.cs
index 4b63df94d1..680bfb3c4b 100644
--- a/src/controls/dev/ScrollView/TestUI/ScrollViewBlankPage.xaml.cs
+++ b/src/controls/dev/ScrollView/TestUI/ScrollViewBlankPage.xaml.cs
@@ -7,6 +7,10 @@
 
 using ScrollPresenter = Microsoft.UI.Xaml.Controls.Primitives.ScrollPresenter;
 using ScrollView = Microsoft.UI.Xaml.Controls.ScrollView;
+using ScrollingScrollOptions = Microsoft.UI.Xaml.Controls.ScrollingScrollOptions;
+using ScrollingAnimationMode = Microsoft.UI.Xaml.Controls.ScrollingAnimationMode;
+using ScrollingSnapPointsMode = Microsoft.UI.Xaml.Controls.ScrollingSnapPointsMode;
+using ScrollingViewChangingEventArgs = Microsoft.UI.Xaml.Controls.ScrollingViewChangingEventArgs;
 using ScrollingScrollAnimationStartingEventArgs = Microsoft.UI.Xaml.Controls.ScrollingScrollAnimationStartingEventArgs;
 using ScrollingZoomAnimationStartingEventArgs = Microsoft.UI.Xaml.Controls.ScrollingZoomAnimationStartingEventArgs;
 using ScrollingScrollCompletedEventArgs = Microsoft.UI.Xaml.Controls.ScrollingScrollCompletedEventArgs;
@@ -159,9 +163,14 @@ private void ScrollPresenter_StateChanged(ScrollPresenter sender, object args)
             AppendAsyncEventMessage($"ScrollPresenter.StateChanged {sender.State.ToString()}");
         }
 
+        private void ScrollPresenter_ViewChanging(ScrollPresenter sender, ScrollingViewChangingEventArgs args)
+        {
+            AppendAsyncEventMessage($"ScrollPresenter.ViewChanging HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+        }
+
         private void ScrollPresenter_ViewChanged(ScrollPresenter sender, object args)
         {
-            AppendAsyncEventMessage($"ScrollPresenter.ViewChanged HorizontalOffset={sender.HorizontalOffset.ToString()}, VerticalOffset={sender.VerticalOffset}, ZoomFactor={sender.ZoomFactor}");
+            AppendAsyncEventMessage($"ScrollPresenter.ViewChanged HorizontalOffset={sender.HorizontalOffset}, VerticalOffset={sender.VerticalOffset}, ZoomFactor={sender.ZoomFactor}");
         }
 
         private void ScrollPresenter_ScrollAnimationStarting(ScrollPresenter sender, ScrollingScrollAnimationStartingEventArgs args)
@@ -194,9 +203,14 @@ private void ScrollView_StateChanged(ScrollView sender, object args)
             AppendAsyncEventMessage($"ScrollView.StateChanged {sender.State.ToString()}");
         }
 
+        private void ScrollView_ViewChanging(ScrollView sender, ScrollingViewChangingEventArgs args)
+        {
+            AppendAsyncEventMessage($"ScrollView.ViewChanging HorizontalOffset={args.HorizontalOffset}, VerticalOffset={args.VerticalOffset}, ZoomFactor={args.ZoomFactor}");
+        }
+
         private void ScrollView_ViewChanged(ScrollView sender, object args)
         {
-            AppendAsyncEventMessage($"ScrollView.ViewChanged HorizontalOffset={sender.HorizontalOffset.ToString()}, VerticalOffset={sender.VerticalOffset}, ZoomFactor={sender.ZoomFactor}");
+            AppendAsyncEventMessage($"ScrollView.ViewChanged HorizontalOffset={sender.HorizontalOffset}, VerticalOffset={sender.VerticalOffset}, ZoomFactor={sender.ZoomFactor}");
         }
 
         private void ScrollView_ScrollAnimationStarting(ScrollView sender, ScrollingScrollAnimationStartingEventArgs args)
@@ -254,6 +268,7 @@ private void ChkLogScrollPresenterEvents_Checked(object sender, RoutedEventArgs
                     scrollPresenter.SizeChanged += ScrollPresenter_SizeChanged;
                     scrollPresenter.ExtentChanged += ScrollPresenter_ExtentChanged;
                     scrollPresenter.StateChanged += ScrollPresenter_StateChanged;
+                    scrollPresenter.ViewChanging += ScrollPresenter_ViewChanging;
                     scrollPresenter.ViewChanged += ScrollPresenter_ViewChanged;
                     scrollPresenter.ScrollAnimationStarting += ScrollPresenter_ScrollAnimationStarting;
                     scrollPresenter.ZoomAnimationStarting += ScrollPresenter_ZoomAnimationStarting;
@@ -275,6 +290,7 @@ private void ChkLogScrollPresenterEvents_Unchecked(object sender, RoutedEventArg
                     scrollPresenter.SizeChanged -= ScrollPresenter_SizeChanged;
                     scrollPresenter.ExtentChanged -= ScrollPresenter_ExtentChanged;
                     scrollPresenter.StateChanged -= ScrollPresenter_StateChanged;
+                    scrollPresenter.ViewChanging -= ScrollPresenter_ViewChanging;
                     scrollPresenter.ViewChanged -= ScrollPresenter_ViewChanged;
                     scrollPresenter.ScrollAnimationStarting -= ScrollPresenter_ScrollAnimationStarting;
                     scrollPresenter.ZoomAnimationStarting -= ScrollPresenter_ZoomAnimationStarting;
@@ -296,6 +312,7 @@ private void ChkLogScrollViewEvents_Checked(object sender, RoutedEventArgs e)
                 scrollView.SizeChanged += ScrollView_SizeChanged;
                 scrollView.ExtentChanged += ScrollView_ExtentChanged;
                 scrollView.StateChanged += ScrollView_StateChanged;
+                scrollView.ViewChanging += ScrollView_ViewChanging;
                 scrollView.ViewChanged += ScrollView_ViewChanged;
                 scrollView.ScrollAnimationStarting += ScrollView_ScrollAnimationStarting;
                 scrollView.ZoomAnimationStarting += ScrollView_ZoomAnimationStarting;
@@ -316,6 +333,7 @@ private void ChkLogScrollViewEvents_Unchecked(object sender, RoutedEventArgs e)
                 scrollView.SizeChanged -= ScrollView_SizeChanged;
                 scrollView.ExtentChanged -= ScrollView_ExtentChanged;
                 scrollView.StateChanged -= ScrollView_StateChanged;
+                scrollView.ViewChanging -= ScrollView_ViewChanging;
                 scrollView.ViewChanged -= ScrollView_ViewChanged;
                 scrollView.ScrollAnimationStarting -= ScrollView_ScrollAnimationStarting;
                 scrollView.ZoomAnimationStarting -= ScrollView_ZoomAnimationStarting;
diff --git a/src/controls/dev/ScrollView/TestUI/ScrollViewDynamicPage.xaml.cs b/src/controls/dev/ScrollView/TestUI/ScrollViewDynamicPage.xaml.cs
index a6466ad1c6..b114f1b950 100644
--- a/src/controls/dev/ScrollView/TestUI/ScrollViewDynamicPage.xaml.cs
+++ b/src/controls/dev/ScrollView/TestUI/ScrollViewDynamicPage.xaml.cs
@@ -1893,6 +1893,7 @@ private void UseScrollView(ScrollView sv2)
                     {
                         scrollView.ExtentChanged -= ScrollView_ExtentChanged;
                         scrollView.StateChanged -= ScrollView_StateChanged;
+                        scrollView.ViewChanging -= ScrollView_ViewChanging;
                         scrollView.ViewChanged -= ScrollView_ViewChanged;
                         scrollView.ScrollAnimationStarting -= ScrollView_ScrollAnimationStarting;
                         scrollView.ZoomAnimationStarting -= ScrollView_ZoomAnimationStarting;
@@ -1908,6 +1909,7 @@ private void UseScrollView(ScrollView sv2)
                     {
                         scrollPresenter.ExtentChanged -= ScrollPresenter_ExtentChanged;
                         scrollPresenter.StateChanged -= ScrollPresenter_StateChanged;
+                        scrollPresenter.ViewChanging -= ScrollPresenter_ViewChanging;
                         scrollPresenter.ViewChanged -= ScrollPresenter_ViewChanged;
                         scrollPresenter.ScrollAnimationStarting -= ScrollPresenter_ScrollAnimationStarting;
                         scrollPresenter.ZoomAnimationStarting -= ScrollPresenter_ZoomAnimationStarting;
@@ -1970,6 +1972,7 @@ private void UseScrollView(ScrollView sv2)
                     {
                         scrollView.ExtentChanged += ScrollView_ExtentChanged;
                         scrollView.StateChanged += ScrollView_StateChanged;
+                        scrollView.ViewChanging += ScrollView_ViewChanging;
                         scrollView.ViewChanged += ScrollView_ViewChanged;
                         scrollView.ScrollAnimationStarting += ScrollView_ScrollAnimationStarting;
                         scrollView.ZoomAnimationStarting += ScrollView_ZoomAnimationStarting;
@@ -1986,6 +1989,7 @@ private void UseScrollView(ScrollView sv2)
                     {
                         scrollPresenter.ExtentChanged += ScrollPresenter_ExtentChanged;
                         scrollPresenter.StateChanged += ScrollPresenter_StateChanged;
+                        scrollPresenter.ViewChanging += ScrollPresenter_ViewChanging;
                         scrollPresenter.ViewChanged += ScrollPresenter_ViewChanged;
                         scrollPresenter.ScrollAnimationStarting += ScrollPresenter_ScrollAnimationStarting;
                         scrollPresenter.ZoomAnimationStarting += ScrollPresenter_ZoomAnimationStarting;
@@ -2095,6 +2099,11 @@ private void ScrollPresenter_StateChanged(ScrollPresenter sender, object args)
             AppendAsyncEventMessage("ScrollPresenter.StateChanged " + sender.State.ToString());
         }
 
+        private void ScrollPresenter_ViewChanging(ScrollPresenter sender, ScrollingViewChangingEventArgs args)
+        {
+            AppendAsyncEventMessage("ScrollPresenter.ViewChanging H=" + args.HorizontalOffset.ToString() + ", V=" + args.VerticalOffset + ", ZF=" + args.ZoomFactor);
+        }
+
         private void ScrollPresenter_ViewChanged(ScrollPresenter sender, object args)
         {
             AppendAsyncEventMessage("ScrollPresenter.ViewChanged H=" + sender.HorizontalOffset.ToString() + ", V=" + sender.VerticalOffset + ", ZF=" + sender.ZoomFactor);
@@ -2125,6 +2134,11 @@ private void ScrollView_StateChanged(ScrollView sender, object args)
             AppendAsyncEventMessage("ScrollView.StateChanged " + sender.State.ToString());
         }
 
+        private void ScrollView_ViewChanging(ScrollView sender, ScrollingViewChangingEventArgs args)
+        {
+            AppendAsyncEventMessage("ScrollView.ViewChanging H=" + args.HorizontalOffset.ToString() + ", V=" + args.VerticalOffset + ", ZF=" + args.ZoomFactor);
+        }
+
         private void ScrollView_ViewChanged(ScrollView sender, object args)
         {
             AppendAsyncEventMessage("ScrollView.ViewChanged H=" + sender.HorizontalOffset.ToString() + ", V=" + sender.VerticalOffset + ", ZF=" + sender.ZoomFactor);
@@ -2201,6 +2215,7 @@ private void ChkLogScrollPresenterEvents_Checked(object sender, RoutedEventArgs
                 {
                     scrollPresenter.ExtentChanged += ScrollPresenter_ExtentChanged;
                     scrollPresenter.StateChanged += ScrollPresenter_StateChanged;
+                    scrollPresenter.ViewChanging += ScrollPresenter_ViewChanging;
                     scrollPresenter.ViewChanged += ScrollPresenter_ViewChanged;
                     scrollPresenter.ScrollAnimationStarting += ScrollPresenter_ScrollAnimationStarting;
                     scrollPresenter.ZoomAnimationStarting += ScrollPresenter_ZoomAnimationStarting;
@@ -2223,6 +2238,7 @@ private void ChkLogScrollPresenterEvents_Unchecked(object sender, RoutedEventArg
                 {
                     scrollPresenter.ExtentChanged -= ScrollPresenter_ExtentChanged;
                     scrollPresenter.StateChanged -= ScrollPresenter_StateChanged;
+                    scrollPresenter.ViewChanging -= ScrollPresenter_ViewChanging;
                     scrollPresenter.ViewChanged -= ScrollPresenter_ViewChanged;
                     scrollPresenter.ScrollAnimationStarting -= ScrollPresenter_ScrollAnimationStarting;
                     scrollPresenter.ZoomAnimationStarting -= ScrollPresenter_ZoomAnimationStarting;
@@ -2240,6 +2256,7 @@ private void ChkLogScrollViewEvents_Checked(object sender, RoutedEventArgs e)
             {
                 scrollView.ExtentChanged += ScrollView_ExtentChanged;
                 scrollView.StateChanged += ScrollView_StateChanged;
+                scrollView.ViewChanging += ScrollView_ViewChanging;
                 scrollView.ViewChanged += ScrollView_ViewChanged;
                 scrollView.ScrollAnimationStarting += ScrollView_ScrollAnimationStarting;
                 scrollView.ZoomAnimationStarting += ScrollView_ZoomAnimationStarting;
@@ -2257,6 +2274,7 @@ private void ChkLogScrollViewEvents_Unchecked(object sender, RoutedEventArgs e)
             {
                 scrollView.ExtentChanged -= ScrollView_ExtentChanged;
                 scrollView.StateChanged -= ScrollView_StateChanged;
+                scrollView.ViewChanging -= ScrollView_ViewChanging;
                 scrollView.ViewChanged -= ScrollView_ViewChanged;
                 scrollView.ScrollAnimationStarting -= ScrollView_ScrollAnimationStarting;
                 scrollView.ZoomAnimationStarting -= ScrollView_ZoomAnimationStarting;
diff --git a/src/controls/dev/SplitView/SplitView_themeresources.xaml b/src/controls/dev/SplitView/SplitView_themeresources.xaml
index 9fff18bfa1..84cc5a983f 100644
--- a/src/controls/dev/SplitView/SplitView_themeresources.xaml
+++ b/src/controls/dev/SplitView/SplitView_themeresources.xaml
@@ -508,7 +508,8 @@
                               <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="Visible"/>
                           </ObjectAnimationUsingKeyFrames>
                           <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PaneClipRectangleTransform" Storyboard.TargetProperty="TranslateX">
-                              <SplineDoubleKeyFrame KeyTime="{StaticResource SplitViewPaneAnimationCloseDuration}" KeySpline="0.0,0.35 0.15,1.0" Value="{Binding TemplateSettings.CompactPaneGridLength, RelativeSource={RelativeSource Mode=TemplatedParent}}" />
+                            <LinearDoubleKeyFrame KeyTime="0:0:0" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.OpenPaneLengthMinusCompactLength}" />
+                            <SplineDoubleKeyFrame KeySpline="0.0,0.35 0.15,1.0" KeyTime="{StaticResource SplitViewPaneAnimationOpenPreDuration}" Value="0" />
                           </DoubleAnimationUsingKeyFrames>
                       </Storyboard>
                   </VisualTransition>
diff --git a/src/controls/dev/SwipeControl/SwipeControl.cpp b/src/controls/dev/SwipeControl/SwipeControl.cpp
index 7212394b6e..286e9bb608 100644
--- a/src/controls/dev/SwipeControl/SwipeControl.cpp
+++ b/src/controls/dev/SwipeControl/SwipeControl.cpp
@@ -743,8 +743,8 @@ void SwipeControl::DismissSwipeOnAnExternalTap(winrt::Point const& tapPoint)
 
     // If point is not within the item's bounds, close it.
     if (*this && tapPoint.X < transformedElementOrigin.X || tapPoint.Y < transformedElementOrigin.Y ||
-        (tapPoint.X - transformedElementOrigin.X) > ActualWidth() ||
-        (tapPoint.Y - transformedElementOrigin.Y) > ActualHeight())
+        (static_cast<double>(tapPoint.X) - transformedElementOrigin.X) > ActualWidth() ||
+        (static_cast<double>(tapPoint.Y) - transformedElementOrigin.Y) > ActualHeight())
     {
         CloseIfNotRemainOpenExecuteItem();
     }
diff --git a/src/controls/dev/TabView/InteractionTests/TabViewTearOutTests.cs b/src/controls/dev/TabView/InteractionTests/TabViewTearOutTests.cs
new file mode 100644
index 0000000000..2e07636c50
--- /dev/null
+++ b/src/controls/dev/TabView/InteractionTests/TabViewTearOutTests.cs
@@ -0,0 +1,371 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using System.IO;
+using Microsoft.UI.Xaml.Tests.MUXControls.InteractionTests.Infra;
+using Microsoft.UI.Xaml.Tests.MUXControls.InteractionTests.Common;
+
+using WEX.TestExecution;
+using WEX.TestExecution.Markup;
+using WEX.Logging.Interop;
+
+using Microsoft.Windows.Apps.Test.Automation;
+using Microsoft.Windows.Apps.Test.Foundation;
+using Microsoft.Windows.Apps.Test.Foundation.Controls;
+using Microsoft.Windows.Apps.Test.Foundation.Patterns;
+using Microsoft.Windows.Apps.Test.Foundation.Waiters;
+using MUXTestInfra.Shared.Infra;
+using System.Linq;
+using System.Collections.Generic;
+using System;
+
+namespace Microsoft.UI.Xaml.Tests.MUXControls.InteractionTests
+{
+    [TestClass]
+    public class TabViewTearOutTests
+    {
+        private static TestApplicationInfo _tabViewTearOutApp;
+
+        public static TestApplicationInfo TabViewTearOutApp
+        {
+            get
+            {
+                if (_tabViewTearOutApp == null)
+                {
+                    _tabViewTearOutApp = new TestApplicationInfo(
+                        "TabViewTearOutApp_6f07fta6qpts2",
+                        "Tab Tear-Out App",
+                        Path.Combine("TabViewTearOutApp", "TabViewTearOutApp.exe"));
+                }
+
+                return _tabViewTearOutApp;
+            }
+        }
+
+        [ClassInitialize]
+        [TestProperty("RunAs", "User")]
+        [TestProperty("Classification", "Integration")]
+        [TestProperty("Platform", "Any")]
+        [TestProperty("IsolationLevel", "Method")] // These tests create and destroy windows, so we'll isolate each test to ensure we start with a known good state each time.
+        public static void ClassInitialize(TestContext testContext)
+        {
+            // These tests involve multiple windows, so don't bother maximizing the window at the start of tests.
+            testContext.Properties.Add("MaximizeWindowAtStart", false);
+
+            TestEnvironment.Initialize(testContext, TabViewTearOutApp);
+        }
+
+        [ClassCleanup]
+        public static void ClassCleanup()
+        {
+            TestEnvironment.AssemblyCleanupWorker(TabViewTearOutApp);
+        }
+
+        [TestCleanup]
+        public static void TestCleanup()
+        {
+            var testAppProcess = TestEnvironment.Application.Process;
+
+            if (testAppProcess != null && !testAppProcess.HasExited)
+            {
+                testAppProcess.Kill();
+            }
+        }
+
+        [TestMethod]
+        [TestProperty("Description", "Verifies that CanTearOutTabs enables the tearing out of tabs into new windows, and the rejoining of those tabs into existing windows.")]
+        public void CanTearOutAndRejoinTabs()
+        {
+            TabViewTearOutTestHelpers.CanTearOutAndRejoinTabs(GetTabViewTearOutAppWindows, GetTabViewFromWindow, GetTabsFromTabView);
+        }
+
+        [TestMethod]
+        [TestProperty("Description", "Verifies that CanTearOutTabs does not prevent internally reordering tabs.")]
+        [TestProperty("Ignore", "True")] // Task 50591398: Re-enable tests when we ingest the latest Microsoft.UI.Input.dll
+        public void CanReorderTabs()
+        {
+            TabViewTearOutTestHelpers.CanReorderTabs(GetTabViewTearOutAppWindows, GetTabViewFromWindow, GetTabsFromTabView);
+        }
+
+        [TestMethod]
+        [TestProperty("Description", "Verifies that CanTearOutTabs does not prevent selecting tabs.")]
+        public void CanSelectTabs()
+        {
+            TabViewTearOutTestHelpers.CanSelectTabs(GetTabViewTearOutAppWindows, GetTabViewFromWindow, GetTabsFromTabView);
+        }
+
+        private static readonly UICondition _windowCondition =
+            UICondition.CreateFromClassName("WinUIDesktopWin32WindowClass")
+            .AndWith(UICondition.CreateFromName(TabViewTearOutApp.TestAppMainWindowTitle));
+
+        private static readonly UICondition _tabViewCondition =
+            UICondition.CreateFromName("TearOutTabsTabView");
+
+        private static readonly UICondition _tabCondition =
+            UICondition.CreateFromClassName("ListViewItem");
+
+        private static List<Window> GetTabViewTearOutAppWindows()
+        {
+            return UIObject.Root.Children.FindMultiple(_windowCondition).Select(o => new Window(o)).ToList();
+        }
+
+        private static Tab GetTabViewFromWindow(Window window)
+        {
+            return new Tab(window.Descendants.Find(_tabViewCondition));
+        }
+
+        private static List<TabItem> GetTabsFromTabView(Tab tabView)
+        {
+            return tabView.Descendants.FindMultiple(_tabCondition).Select(o => new TabItem(o)).ToList();
+        }
+    }
+
+    public static class TabViewTearOutTestHelpers
+    {
+        public static void CanTearOutAndRejoinTabs(
+            Func<List<Window>> getTabViewTearOutAppWindowsFunc,
+            Func<Window, Tab> getTabViewFromWindowFunc,
+            Func<Tab, List<TabItem>> getTabsFromTabViewFunc)
+        {
+            try
+            {
+                Log.Comment("We should begin with only one window.");
+
+                var windows = getTabViewTearOutAppWindowsFunc();
+
+                Verify.AreEqual(1, windows.Count);
+
+                var window = windows.First();
+
+                var tabView = getTabViewFromWindowFunc(window);
+                var tabs = getTabsFromTabViewFunc(tabView);
+
+                Log.Comment("The window should have three tabs in the order 1, 2, 3.");
+
+                Verify.AreEqual(3, tabs.Count);
+                Verify.AreEqual("Item 1", tabs[0].Name);
+                Verify.AreEqual("Item 2", tabs[1].Name);
+                Verify.AreEqual("Item 3", tabs[2].Name);
+
+                Log.Comment("Let's ensure the window is visible prior to dragging on it.");
+
+                window.SetWindowVisualState(WindowVisualState.Normal);
+
+                Log.Comment("Now we'll tear out the first tab.");
+
+                InputHelper.MouseDragDistance(tabs[0], distance: 300, Direction.South, duration: 1000);
+
+                Log.Comment("We should now have two windows: the first with two tabs in the order 2, 3; and the second with one tab that is 1.");
+
+                windows = getTabViewTearOutAppWindowsFunc();
+                Verify.AreEqual(2, windows.Count);
+
+                // The new window is the one that contains Item 1.
+                var newWindow = windows.Where(w => w.Descendants.TryFind(UICondition.CreateFromName("Item 1"), out _)).First();
+                var newWindowTabView = getTabViewFromWindowFunc(newWindow);
+
+                tabs = getTabsFromTabViewFunc(tabView);
+                var newTabs = getTabsFromTabViewFunc(newWindowTabView);
+
+                Verify.AreEqual(2, tabs.Count);
+                Verify.AreEqual("Item 2", tabs[0].Name);
+                Verify.AreEqual("Item 3", tabs[1].Name);
+                Verify.AreEqual(1, newTabs.Count);
+                Verify.AreEqual("Item 1", newTabs[0].Name);
+
+                Log.Comment("Let's ensure the second window is visible prior to dragging on it.");
+
+                newWindow.SetWindowVisualState(WindowVisualState.Normal);
+
+                using (var closingWaiter = newWindow.GetWindowClosedWaiter())
+                {
+                    Log.Comment("Now we'll drag the torn out tab to the end of the original tab view. This should merge the tab to the end the original tab view and close the second window.");
+
+                    var addNewTabButton = tabView.Descendants.Find(UICondition.CreateFromName("Add New Tab"));
+
+                    InputHelper.MouseDragToTarget(newTabs[0], addNewTabButton);
+                    closingWaiter.Wait();
+                }
+
+                Log.Comment("We should now have one windows with three tabs in the order 2, 3, 1.");
+
+                windows = getTabViewTearOutAppWindowsFunc();
+                tabs = getTabsFromTabViewFunc(tabView);
+
+                Verify.AreEqual(1, windows.Count);
+                Verify.AreEqual(3, tabs.Count);
+                Verify.AreEqual("Item 2", tabs[0].Name);
+                Verify.AreEqual("Item 3", tabs[1].Name);
+                Verify.AreEqual("Item 1", tabs[2].Name);
+            }
+            finally
+            {
+                foreach (Window window in getTabViewTearOutAppWindowsFunc())
+                {
+                    using (var closingWaiter = window.GetWindowClosedWaiter())
+                    {
+                        window.Close();
+                        closingWaiter.Wait();
+                    }
+                }
+            }
+        }
+
+        public static void CanReorderTabs(
+            Func<List<Window>> getTabViewTearOutAppWindowsFunc,
+            Func<Window, Tab> getTabViewFromWindowFunc,
+            Func<Tab, List<TabItem>> getTabsFromTabViewFunc)
+        {
+            try
+            {
+                Log.Comment("We should begin with only one window.");
+
+                var windows = getTabViewTearOutAppWindowsFunc();
+
+                Verify.AreEqual(1, windows.Count);
+
+                var window = windows.First();
+
+                var tabView = getTabViewFromWindowFunc(window);
+                var tabs = getTabsFromTabViewFunc(tabView);
+
+                Log.Comment("The window should have three tabs in the order 1, 2, 3.");
+
+                Verify.AreEqual(3, tabs.Count);
+                Verify.AreEqual("Item 1", tabs[0].Name);
+                Verify.AreEqual("Item 2", tabs[1].Name);
+                Verify.AreEqual("Item 3", tabs[2].Name);
+
+                Log.Comment("Let's ensure the window is visible prior to dragging on it.");
+
+                window.SetWindowVisualState(WindowVisualState.Normal);
+
+                Log.Comment("Now we'll drag tab 1 to the right side of tab 2.");
+
+                InputHelper.MouseDragToTarget(tabs[0], tabs[1], 50);
+
+                Log.Comment("We should still have only one window.");
+
+                windows = getTabViewTearOutAppWindowsFunc();
+
+                Verify.AreEqual(1, windows.Count);
+
+                tabs = getTabsFromTabViewFunc(tabView);
+
+                Log.Comment("The window should now have three tabs in the order 2, 1, 3.");
+
+                Verify.AreEqual(3, tabs.Count);
+                Verify.AreEqual("Item 2", tabs[0].Name);
+                Verify.AreEqual("Item 1", tabs[1].Name);
+                Verify.AreEqual("Item 3", tabs[2].Name);
+
+                window.SetWindowVisualState(WindowVisualState.Normal);
+
+                Log.Comment("Now we'll drag tab 3 to the left side of tab 2.");
+
+                InputHelper.MouseDragToTarget(tabs[2], tabs[0], -50);
+
+                Log.Comment("We should still have only one window.");
+
+                windows = getTabViewTearOutAppWindowsFunc();
+
+                Verify.AreEqual(1, windows.Count);
+
+                tabs = getTabsFromTabViewFunc(tabView);
+
+                Log.Comment("The window should now have three tabs in the order 3, 2, 1.");
+
+                Verify.AreEqual(3, tabs.Count);
+                Verify.AreEqual("Item 3", tabs[0].Name);
+                Verify.AreEqual("Item 2", tabs[1].Name);
+                Verify.AreEqual("Item 1", tabs[2].Name);
+            }
+            finally
+            {
+                foreach (Window window in getTabViewTearOutAppWindowsFunc())
+                {
+                    using (var closingWaiter = window.GetWindowClosedWaiter())
+                    {
+                        window.Close();
+                        closingWaiter.Wait();
+                    }
+                }
+            }
+        }
+        public static void CanSelectTabs(
+            Func<List<Window>> getTabViewTearOutAppWindowsFunc,
+            Func<Window, Tab> getTabViewFromWindowFunc,
+            Func<Tab, List<TabItem>> getTabsFromTabViewFunc)
+        {
+            try
+            {
+                Log.Comment("We should begin with only one window.");
+
+                var windows = getTabViewTearOutAppWindowsFunc();
+
+                Verify.AreEqual(1, windows.Count);
+
+                var window = windows.First();
+
+                var tabView = getTabViewFromWindowFunc(windows[0]);
+                var tabs = getTabsFromTabViewFunc(tabView);
+
+                Log.Comment("The window should have three tabs in the order 1, 2, 3.");
+
+                Verify.AreEqual(3, tabs.Count);
+                Verify.AreEqual("Item 1", tabs[0].Name);
+                Verify.AreEqual("Item 2", tabs[1].Name);
+                Verify.AreEqual("Item 3", tabs[2].Name);
+
+                Log.Comment("The first tab should be selected.");
+
+                Verify.IsTrue(tabs[0].IsSelected);
+                Verify.IsFalse(tabs[1].IsSelected);
+                Verify.IsFalse(tabs[2].IsSelected);
+
+                Log.Comment("Let's ensure the window is visible prior to clicking on it.");
+
+                window.SetWindowVisualState(WindowVisualState.Normal);
+
+                Log.Comment("Now we'll click on tab 2. It should be selected.");
+
+                InputHelper.LeftClick(tabs[1]);
+
+                Verify.IsFalse(tabs[0].IsSelected);
+                Verify.IsTrue(tabs[1].IsSelected);
+                Verify.IsFalse(tabs[2].IsSelected);
+
+                window.SetWindowVisualState(WindowVisualState.Normal);
+
+                Log.Comment("Now we'll click on tab 3. It should be selected.");
+
+                InputHelper.LeftClick(tabs[2]);
+
+                Verify.IsFalse(tabs[0].IsSelected);
+                Verify.IsFalse(tabs[1].IsSelected);
+                Verify.IsTrue(tabs[2].IsSelected);
+
+                window.SetWindowVisualState(WindowVisualState.Normal);
+
+                Log.Comment("Now we'll click on tab 1. It should be selected.");
+
+                InputHelper.LeftClick(tabs[0]);
+
+                Verify.IsTrue(tabs[0].IsSelected);
+                Verify.IsFalse(tabs[1].IsSelected);
+                Verify.IsFalse(tabs[2].IsSelected);
+            }
+            finally
+            {
+                foreach (Window window in getTabViewTearOutAppWindowsFunc())
+                {
+                    using (var closingWaiter = window.GetWindowClosedWaiter())
+                    {
+                        window.Close();
+                        closingWaiter.Wait();
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/controls/dev/TabView/InteractionTests/TabViewTests.cs b/src/controls/dev/TabView/InteractionTests/TabViewTests.cs
index 7b21fc2a24..9735303a5d 100644
--- a/src/controls/dev/TabView/InteractionTests/TabViewTests.cs
+++ b/src/controls/dev/TabView/InteractionTests/TabViewTests.cs
@@ -19,6 +19,7 @@
 using Microsoft.Windows.Apps.Test.Foundation.Waiters;
 using Windows.Devices.Input;
 using MUXTestInfra.Shared.Infra;
+using System.Linq;
 
 namespace Microsoft.UI.Xaml.Tests.MUXControls.InteractionTests
 {
@@ -1144,6 +1145,74 @@ public void VerifyScrollRepeatButtons()
             }
         }
 
+        [TestMethod]
+        [TestProperty("Description", "Verifies that CanTearOutTabs enables the tearing out of tabs created for data items into new windows, and the rejoining of those tabs into existing windows.")]
+        [TestProperty("IsolationLevel", "Method")] // These tests create and destroy windows, so we'll isolate each test to ensure we start with a known good state each time.
+        public void CanTearOutAndRejoinTabsWithDataItems()
+        {
+            using (var setup = new TestSetupHelper(new[] { "TabView Tests", "TabViewTearOutWindowWithDataItemsButton" }))
+            {
+                TabViewTearOutTestHelpers.CanTearOutAndRejoinTabs(GetTabViewTearOutAppWindows, GetTabViewFromWindow, GetTabsFromTabView);
+            }
+        }
+
+        [TestMethod]
+        [TestProperty("Description", "Verifies that CanTearOutTabs does not prevent internally reordering tabs created for items.")]
+        [TestProperty("IsolationLevel", "Method")] // These tests create and destroy windows, so we'll isolate each test to ensure we start with a known good state each time.
+        [TestProperty("Ignore", "True")] // Task 50591398: Re-enable tests  when we ingest the latest Microsoft.UI.Input.dll
+        public void CanReorderTabsWithTabTearOutWithDataItems()
+        {
+            using (var setup = new TestSetupHelper(new[] { "TabView Tests", "TabViewTearOutWindowWithDataItemsButton" }))
+            {
+                TabViewTearOutTestHelpers.CanReorderTabs(GetTabViewTearOutAppWindows, GetTabViewFromWindow, GetTabsFromTabView);
+            }
+        }
+
+        [TestMethod]
+        [TestProperty("Description", "Verifies that CanTearOutTabs does not prevent selecting tabs created for data items.")]
+        [TestProperty("IsolationLevel", "Method")] // These tests create and destroy windows, so we'll isolate each test to ensure we start with a known good state each time.
+        public void CanSelectTabsWithTabTearOutWithDataItems()
+        {
+            using (var setup = new TestSetupHelper(new[] { "TabView Tests", "TabViewTearOutWindowWithDataItemsButton" }))
+            {
+                TabViewTearOutTestHelpers.CanSelectTabs(GetTabViewTearOutAppWindows, GetTabViewFromWindow, GetTabsFromTabView);
+            }
+        }
+
+        [TestMethod]
+        [TestProperty("Description", "Verifies that CanTearOutTabs enables the tearing out of tabs not created for data items into new windows, and the rejoining of those tabs into existing windows.")]
+        [TestProperty("IsolationLevel", "Method")] // These tests create and destroy windows, so we'll isolate each test to ensure we start with a known good state each time.
+        public void CanTearOutAndRejoinTabsWithoutDataItems()
+        {
+            using (var setup = new TestSetupHelper(new[] { "TabView Tests", "TabViewTearOutWindowWithoutDataItemsButton" }))
+            {
+                TabViewTearOutTestHelpers.CanTearOutAndRejoinTabs(GetTabViewTearOutAppWindows, GetTabViewFromWindow, GetTabsFromTabView);
+            }
+        }
+
+        [TestMethod]
+        [TestProperty("Description", "Verifies that CanTearOutTabs does not prevent internally reordering tabs not created for data items.")]
+        [TestProperty("IsolationLevel", "Method")] // These tests create and destroy windows, so we'll isolate each test to ensure we start with a known good state each time.
+        [TestProperty("Ignore", "True")] // Task 50591398: Re-enable tests  when we ingest the latest Microsoft.UI.Input.dll
+        public void CanReorderTabsWithTabTearOutWithoutDataItems()
+        {
+            using (var setup = new TestSetupHelper(new[] { "TabView Tests", "TabViewTearOutWindowWithoutDataItemsButton" }))
+            {
+                TabViewTearOutTestHelpers.CanReorderTabs(GetTabViewTearOutAppWindows, GetTabViewFromWindow, GetTabsFromTabView);
+            }
+        }
+
+        [TestMethod]
+        [TestProperty("Description", "Verifies that CanTearOutTabs does not prevent selecting tabs backed not created for.")]
+        [TestProperty("IsolationLevel", "Method")] // These tests create and destroy windows, so we'll isolate each test to ensure we start with a known good state each time.
+        public void CanSelectTabsWithTabTearOutWithoutDataItems()
+        {
+            using (var setup = new TestSetupHelper(new[] { "TabView Tests", "TabViewTearOutWindowWithoutDataItemsButton" }))
+            {
+                TabViewTearOutTestHelpers.CanSelectTabs(GetTabViewTearOutAppWindows, GetTabViewFromWindow, GetTabsFromTabView);
+            }
+        }
+
         private void PressButtonAndVerifyText(String buttonName, String textBlockName, String expectedText)
         {
             Button button = FindElement.ByName<Button>(buttonName);
@@ -1175,5 +1244,29 @@ private void EnumerateChildren(UIObject root)
                 EnumerateChildren(child);
             }
         }
+
+        private static readonly UICondition _windowCondition =
+            UICondition.CreateFromName("MUXControlsTestApp.Desktop - Secondary TabViewTearOutWindow");
+
+        private static readonly UICondition _tabViewCondition =
+            UICondition.CreateFromName("TearOutTabsTabView");
+
+        private static readonly UICondition _tabCondition =
+            UICondition.CreateFromClassName("ListViewItem");
+
+        private static List<Window> GetTabViewTearOutAppWindows()
+        {
+            return UIObject.Root.Children.FindMultiple(_windowCondition).Select(o => new Window(o)).ToList();
+        }
+
+        private static Tab GetTabViewFromWindow(Window window)
+        {
+            return new Tab(window.Descendants.Find(_tabViewCondition));
+        }
+
+        private static List<TabItem> GetTabsFromTabView(Tab tabView)
+        {
+            return tabView.Descendants.FindMultiple(_tabCondition).Select(o => new TabItem(o)).ToList();
+        }
     }
 }
diff --git a/src/controls/dev/TabView/InteractionTests/TabView_InteractionTests.projitems b/src/controls/dev/TabView/InteractionTests/TabView_InteractionTests.projitems
index b0f02f410e..0d8ee7379d 100644
--- a/src/controls/dev/TabView/InteractionTests/TabView_InteractionTests.projitems
+++ b/src/controls/dev/TabView/InteractionTests/TabView_InteractionTests.projitems
@@ -10,6 +10,7 @@
     <Import_RootNamespace>TabView_InteractionTests</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)TabViewTearOutTests.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)TabViewTests.cs" />
   </ItemGroup>
 </Project>
diff --git a/src/controls/dev/TabView/TabView.cpp b/src/controls/dev/TabView/TabView.cpp
index 69cb55af20..6f9566d572 100644
--- a/src/controls/dev/TabView/TabView.cpp
+++ b/src/controls/dev/TabView/TabView.cpp
@@ -12,6 +12,14 @@
 #include "SharedHelpers.h"
 #include <Vector.h>
 #include "velocity.h"
+#include <algorithm>
+#include <Windowsx.h>
+#include <winuser.h>
+
+// This needs to be here instead of in CppWinRTIncludes.h because it includes Microsoft.UI.h,
+// which contains definitions of a few types like WindowId that conflict with their definitions
+// in Microsoft.UI.Content.h.
+#include <winrt\Microsoft.UI.Interop.h>
 
 static constexpr double c_tabMinimumWidth = 48.0;
 static constexpr double c_tabMaximumWidth = 200.0;
@@ -26,6 +34,35 @@ static constexpr double c_scrollAmount = 50.0;
 bool TabViewTrace::s_IsDebugOutputEnabled{ false };
 bool TabViewTrace::s_IsVerboseDebugOutputEnabled{ false };
 
+std::list<winrt::weak_ref<winrt::TabView>> TabView::s_tabViewWithTearOutList;
+HANDLE TabView::s_tabWithTearOutListMutex = ::CreateMutexW(nullptr, FALSE, nullptr);
+
+TabViewTabTearOutWindowRequestedEventArgs::TabViewTabTearOutWindowRequestedEventArgs(winrt::IInspectable const& item, winrt::UIElement const& tab)
+    : m_items({ item })
+    , m_tabs({ tab })
+{
+}
+
+TabViewTabTearOutRequestedEventArgs::TabViewTabTearOutRequestedEventArgs(winrt::IInspectable const& item, winrt::UIElement const& tab)
+    : m_items({ item })
+    , m_tabs({ tab })
+{
+}
+
+TabViewExternalTornOutTabsDroppingEventArgs::TabViewExternalTornOutTabsDroppingEventArgs(winrt::IInspectable const& item, winrt::UIElement const& tab, int dropIndex)
+    : m_items({ item })
+    , m_tabs({ tab })
+    , m_dropIndex(dropIndex)
+{
+}
+
+TabViewExternalTornOutTabsDroppedEventArgs::TabViewExternalTornOutTabsDroppedEventArgs(winrt::IInspectable const& item, winrt::UIElement const& tab, int dropIndex)
+    : m_items({ item })
+    , m_tabs({ tab })
+    , m_dropIndex(dropIndex)
+{
+}
+
 TabView::TabView()
 {
     __RP_Marker_ClassById(RuntimeProfiler::ProfId_TabView);
@@ -36,6 +73,7 @@ TabView::TabView()
     SetDefaultStyleKey(this);
 
     Loaded({ this, &TabView::OnLoaded });
+    Unloaded({ this, &TabView::OnUnloaded });
 
     winrt::KeyboardAccelerator ctrlf4Accel;
     ctrlf4Accel.Key(winrt::VirtualKey::F4);
@@ -61,6 +99,17 @@ TabView::TabView()
     KeyboardAccelerators().Append(ctrlShiftTabAccel);
 }
 
+TabView::~TabView()
+{
+    if (m_inputNonClientPointerSource)
+    {
+        m_inputNonClientPointerSource.EnteringMoveSize(m_enteringMoveSizeToken);
+        m_inputNonClientPointerSource.EnteredMoveSize(m_enteredMoveSizeToken);
+        m_inputNonClientPointerSource.WindowRectChanging(m_windowRectChangingToken);
+        m_inputNonClientPointerSource.ExitedMoveSize(m_exitedMoveSizeToken);
+    }
+}
+
 void TabView::OnApplyTemplate()
 {
     UnhookEventsAndClearFields();
@@ -92,6 +141,7 @@ void TabView::OnApplyTemplate()
         {
             m_listViewLoadedRevoker = listView.Loaded(winrt::auto_revoke, { this, &TabView::OnListViewLoaded });
             m_listViewSelectionChangedRevoker = listView.SelectionChanged(winrt::auto_revoke, { this, &TabView::OnListViewSelectionChanged });
+            m_listViewSizeChangedRevoker = listView.SizeChanged(winrt::auto_revoke, { this, &TabView::OnListViewSizeChanged });
 
             m_listViewDragItemsStartingRevoker = listView.DragItemsStarting(winrt::auto_revoke, { this, &TabView::OnListViewDragItemsStarting });
             m_listViewDragItemsCompletedRevoker = listView.DragItemsCompleted(winrt::auto_revoke, { this, &TabView::OnListViewDragItemsCompleted });
@@ -376,6 +426,13 @@ void TabView::UpdateListViewItemContainerTransitions()
     }
 }
 
+void TabView::OnCanTearOutTabsPropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args)
+{
+    UpdateTabViewWithTearOutList();
+    AttachMoveSizeLoopEvents();
+    UpdateNonClientRegion();
+}
+
 void TabView::UnhookEventsAndClearFields()
 {
     m_listViewLoadedRevoker.revoke();
@@ -468,6 +525,14 @@ winrt::AutomationPeer TabView::OnCreateAutomationPeer()
 void TabView::OnLoaded(const winrt::IInspectable&, const winrt::RoutedEventArgs&)
 {
     UpdateTabContent();
+    UpdateTabViewWithTearOutList();
+    AttachMoveSizeLoopEvents();
+    UpdateNonClientRegion();
+}
+
+void TabView::OnUnloaded(const winrt::IInspectable&, const winrt::RoutedEventArgs&)
+{
+    UpdateTabViewWithTearOutList();
 }
 
 void TabView::OnListViewLoaded(const winrt::IInspectable&, const winrt::RoutedEventArgs& args)
@@ -541,6 +606,7 @@ void TabView::OnListViewLoaded(const winrt::IInspectable&, const winrt::RoutedEv
     }
 
     UpdateBottomBorderLineVisualStates();
+    UpdateNonClientRegion();
 }
 
 void TabView::OnTabStripPointerExited(const winrt::IInspectable& sender, const winrt::PointerRoutedEventArgs& args)
@@ -770,6 +836,11 @@ void TabView::OnListViewSelectionChanged(const winrt::IInspectable& sender, cons
     m_selectionChangedEventSource(*this, args);
 }
 
+void TabView::OnListViewSizeChanged(const winrt::IInspectable& sender, const winrt::SizeChangedEventArgs& args)
+{
+    UpdateNonClientRegion();
+}
+
 winrt::TabViewItem TabView::FindTabViewItemFromDragItem(const winrt::IInspectable& item)
 {
     auto tab = ContainerFromItem(item).try_as<winrt::TabViewItem>();
@@ -916,10 +987,6 @@ void TabView::UpdateTabContent()
                 tabContentPresenter.ContentTemplate(tvi.ContentTemplate());
                 tabContentPresenter.ContentTemplateSelector(tvi.ContentTemplateSelector());
 
-                // It is not ideal to call UpdateLayout here, but it is necessary to ensure that the ContentPresenter has expanded its content
-                // into the live visual tree.
-                tabContentPresenter.UpdateLayout();
-
                 if (shouldMoveFocusToNewTab)
                 {
                     auto focusable = winrt::FocusManager::FindFirstFocusableElement(tabContentPresenter);
@@ -1309,18 +1376,24 @@ winrt::IInspectable TabView::ItemFromContainer(winrt::DependencyObject const& co
 
 int TabView::GetItemCount()
 {
-    if (auto itemssource = TabItemsSource())
+    if (auto itemsSource = TabItemsSource())
     {
-        if (auto iterable = itemssource.try_as<winrt::IIterable<winrt::IInspectable>>())
+        if (auto vector = itemsSource.try_as<winrt::IVector<winrt::IInspectable>>())
         {
-            int i = 1;
-            auto iter = iterable.First();
-            while (iter.MoveNext())
+            return static_cast<int>(vector.Size());
+        }
+        else if (auto iterable = itemsSource.try_as<winrt::IIterable<winrt::IInspectable>>())
+        {
+            int i = 0;
+
+            for (auto const& o : iterable)
             {
                 i++;
             }
+
             return i;
         }
+
         return 0;
     }
     else
@@ -1524,3 +1597,639 @@ void TabView::UpdateIsItemDraggedOver(bool isItemDraggedOver)
         UpdateTabWidths();
     }
 }
+
+void TabView::UpdateTabViewWithTearOutList()
+{
+    auto tabViewWithTearOutList = GetTabViewWithTearOutList();
+
+    winrt::weak_ref<winrt::TabView> thisAsWeak = *this;
+    auto existingIterator = std::find(tabViewWithTearOutList->begin(), tabViewWithTearOutList->end(), thisAsWeak);
+
+    if (CanTearOutTabs() && IsLoaded() && existingIterator == std::end((*tabViewWithTearOutList)))
+    {
+        tabViewWithTearOutList->push_back(*this);
+    }
+    else if ((!CanTearOutTabs() || !IsLoaded()) && existingIterator != std::end((*tabViewWithTearOutList)))
+    {
+        tabViewWithTearOutList->erase(existingIterator);
+    }
+}
+
+void TabView::AttachMoveSizeLoopEvents()
+{
+    if (CanTearOutTabs())
+    {
+        if (IsLoaded() && m_enteringMoveSizeToken.value == 0)
+        {
+            auto& nonClientPointerSource = GetInputNonClientPointerSource();
+
+            m_enteringMoveSizeToken = nonClientPointerSource.EnteringMoveSize({ this, &TabView::OnEnteringMoveSize });
+            m_enteredMoveSizeToken = nonClientPointerSource.EnteredMoveSize({ this, &TabView::OnEnteredMoveSize });
+            m_windowRectChangingToken = nonClientPointerSource.WindowRectChanging({ this, &TabView::OnWindowRectChanging });
+            m_exitedMoveSizeToken = nonClientPointerSource.ExitedMoveSize({ this, &TabView::OnExitedMoveSize });
+        }
+    }
+    else if (m_inputNonClientPointerSource)
+    {
+        m_inputNonClientPointerSource.EnteringMoveSize(m_enteringMoveSizeToken);
+        m_inputNonClientPointerSource.EnteredMoveSize(m_enteredMoveSizeToken);
+        m_inputNonClientPointerSource.WindowRectChanging(m_windowRectChangingToken);
+        m_inputNonClientPointerSource.ExitedMoveSize(m_exitedMoveSizeToken);
+
+        m_enteringMoveSizeToken.value = 0;
+        m_enteredMoveSizeToken.value = 0;
+        m_windowRectChangingToken.value = 0;
+        m_exitedMoveSizeToken.value = 0;
+    }
+}
+
+//
+// We initialize the tab tear-out state machine when we enter the move-size loop. The state machine has two states it can be in:
+// either we're dragging a tab within a tab view, or we're dragging a tab that has been torn out of a tab view.
+//
+// If we start dragging a tab in a tab view with multiple tabs, then we'll start in the former state.  We'll raise the TabTearOutWindowRequested event,
+// which prompts the app to create a new window to host the tab's data object.
+// 
+// If we start dragging a tab in a tab view where that is its only tab, then we'll start in the latter state.  We will *not* raise the TabTearOutWindowRequested event,
+// because in this case, the window being dragged is the one that owns the tab view with a single tab.
+//
+// We update the state machine in the WindowRectChanging event.  See that method for a description of the state machine's functionality.
+//
+
+void TabView::OnEnteringMoveSize(const winrt::InputNonClientPointerSource& sender, const winrt::EnteringMoveSizeEventArgs& args)
+{
+    // We only perform tab tear-out when a move is being performed.
+    if (args.MoveSizeOperation() != winrt::MoveSizeOperation::Move)
+    {
+        return;
+    }
+
+    auto pointInIslandCoords = XamlRoot().CoordinateConverter().ConvertScreenToLocal(args.PointerScreenPoint());
+    auto tab = GetTabAtPoint(pointInIslandCoords);
+
+    // If there was no tab at the point where the user clicked and dragged, then we have nothing to do.
+    if (!tab)
+    {
+        return;
+    }
+
+    auto dataItem = ItemFromContainer(tab);
+
+    m_isInTabTearOutLoop = true;
+    m_tabBeingDragged = tab;
+    m_dataItemBeingDragged = dataItem;
+    m_tabViewContainingTabBeingDragged = *this;
+    m_originalTabBeingDraggedPoint = m_tabBeingDragged.TransformToVisual(nullptr).TransformPoint({ 0, 0 });
+
+    SelectedItem(m_dataItemBeingDragged);
+
+    // We don't want to create a new window for tearing out if every tab is being torn out -
+    // in that case, we just want to drag the window.
+    if (GetItemCount() > 1)
+    {
+        auto windowRequestedArgs = winrt::make<TabViewTabTearOutWindowRequestedEventArgs>(dataItem, tab);
+        m_tabTearOutWindowRequestedEventSource(*this, windowRequestedArgs);
+
+        args.MoveSizeWindowId(windowRequestedArgs.NewWindowId());
+
+        HWND newWindow = winrt::Microsoft::UI::GetWindowFromWindowId(windowRequestedArgs.NewWindowId());
+        m_tabTearOutNewAppWindow = winrt::AppWindow::GetFromWindowId(windowRequestedArgs.NewWindowId());
+        HWND currentWindow = winrt::Microsoft::UI::GetWindowFromWindowId(XamlRoot().ContentIslandEnvironment().AppWindowId());
+
+        WINDOWPLACEMENT wp{};
+        wp.length = sizeof(wp);
+        GetWindowPlacement(currentWindow, &wp);
+
+        // We'll position the new window to be hidden at the same position as the current window and with the restored size of the current window.
+        RECT windowRect;
+        GetWindowRect(currentWindow, &windowRect);
+        SetWindowPos(
+            newWindow,
+            HWND_TOP,
+            windowRect.left,
+            windowRect.top,
+            wp.rcNormalPosition.right - wp.rcNormalPosition.left,
+            wp.rcNormalPosition.bottom - wp.rcNormalPosition.top,
+            SWP_HIDEWINDOW);
+    }
+    else
+    {
+        m_tabTearOutNewAppWindow = winrt::AppWindow::GetFromWindowId(XamlRoot().ContentIslandEnvironment().AppWindowId());
+    }
+}
+
+void TabView::OnEnteredMoveSize(const winrt::InputNonClientPointerSource& sender, const winrt::EnteredMoveSizeEventArgs& args)
+{
+    if (!m_isInTabTearOutLoop)
+    {
+        return;
+    }
+
+    MUX_ASSERT(CanTearOutTabs() && m_tabTearOutDraggingState == TabTearOutDraggingState::Idle);
+    m_tabTearOutDraggingState = GetItemCount() > 1 ? TabTearOutDraggingState::DraggingTabWithinTabView : TabTearOutDraggingState::DraggingTornOutTab;
+    m_tabTearOutInitialPosition = args.PointerScreenPoint();
+    m_dragPositionOffset = {};
+
+    // If we're starting in the state of dragging a torn out tab, let's populate the list of tab views and their bounds now.
+    if (m_tabTearOutDraggingState == TabTearOutDraggingState::DraggingTornOutTab)
+    {
+        PopulateTabViewList();
+    }
+}
+
+//
+// The tab tear-out state machine proceeds as follows.
+// 
+// When dragging a tab within a tab view:
+//   - If the tab is still within the bounds of the tab view, then we'll update its position in the item list based on where the user has dragged it -
+//     e.g., if the user has dragged it more than 1/2 of the way across the width of the tab to the right, then we'll swap the positions of those two tabs
+//     to keep the dragged tab underneath the user's pointer.
+//   - If the tab is no longer within the bounds of the tab view, then we'll transition to the torn-out tab state.  We'll raise the TabTearOutRequested event,
+//     which prompts the app to remove the tab's data object from the item list of the tab view it's being torn out from.  We'll then show the window created
+//     in response to TabTearOutWindowRequested, which will now display the data object that has been torn out.
+//
+// When dragging a torn-out tab:
+//   - If the tab is not over a tab view with CanTearOutTabs set to true, then we won't do anything, which will allow the window to be dragged as normal.
+//   - If the tab is over a tab view with CanTearOutTabs set to true, then we'll raise the ExternalTornOutTabsDropping event, which allows the app
+//     to decide whether it wants to allow the tab to be dropped into the tab view.  If it does, then we'll raise the ExternalTornOutTabsDropped event,
+//     which prompts the app to move the tab's data object to the item list of the tab view in question, then hide the window being dragged,
+//     and finally transition to the dragging within tab view state.
+//
+// The tab tear-out state concludes when the user releases the pointer.
+//
+
+void TabView::OnWindowRectChanging(const winrt::InputNonClientPointerSource& sender, const winrt::WindowRectChangingEventArgs& args)
+{
+    if (!m_isInTabTearOutLoop)
+    {
+        return;
+    }
+
+    switch (m_tabTearOutDraggingState)
+    {
+    case TabTearOutDraggingState::DraggingTabWithinTabView:
+        DragTabWithinTabView(args);
+        break;
+    case TabTearOutDraggingState::DraggingTornOutTab:
+        DragTornOutTab(args);
+        break;
+    }
+
+    auto newWindowRect = args.NewWindowRect();
+    newWindowRect.X -= static_cast<int32_t>(m_dragPositionOffset.X);
+    newWindowRect.X -= static_cast<int32_t>(m_dragPositionOffset.Y);
+    args.NewWindowRect(newWindowRect);
+}
+
+void TabView::DragTabWithinTabView(const winrt::WindowRectChangingEventArgs& args)
+{
+    auto pointInIslandCoords = m_tabViewContainingTabBeingDragged.XamlRoot().CoordinateConverter().ConvertScreenToLocal(args.PointerScreenPoint());
+    auto tabBeingDragged = m_tabViewContainingTabBeingDragged.ContainerFromItem(m_dataItemBeingDragged).try_as<winrt::TabViewItem>();
+
+    if (tabBeingDragged)
+    {
+        // We'll retrieve the bounds of the tab view in which we're dragging the tab, in order to be able to tell whether the tab has been dragged out of it.
+        auto bounds = m_tabViewContainingTabBeingDragged.TransformToVisual(nullptr).TransformBounds({ 0, 0, static_cast<float>(m_tabViewContainingTabBeingDragged.ActualWidth()), static_cast<float>(m_tabViewContainingTabBeingDragged.ActualHeight()) });
+
+        // We'll add a one-pixel margin to the bounds, since otherwise we could run into the situation where we immediately reattach after dragging out of a tab view,
+        // depending on how sub-pixel rounding works out.
+        bounds.X -= 1;
+        bounds.Y -= 1;
+        bounds.Width += 2;
+        bounds.Height += 2;
+
+        if (SharedHelpers::DoesRectContainPoint(bounds, pointInIslandCoords))
+        {
+            // If the tab view bounds contain the pointer point, then we'll update the index of the tab being dragged within its tab view.
+            UpdateTabIndex(tabBeingDragged, pointInIslandCoords);
+        }
+        else
+        {
+            // Otherwise, we'll tear out the tab and show the window created to host the torn-out tab.
+            TearOutTab(tabBeingDragged, pointInIslandCoords);
+        }
+    }
+}
+
+void TabView::UpdateTabIndex(winrt::TabViewItem const& tabBeingDragged, winrt::Point const& pointerPosition)
+{
+    auto tabViewImpl = winrt::get_self<TabView>(m_tabViewContainingTabBeingDragged);
+
+    // We'll first figure out what tab is located at the position in question.  This may return null if, for example,
+    // the user has dragged over the add-tab button, in which case we'll just early-out.
+    if (auto tabAtPoint = tabViewImpl->GetTabAtPoint(pointerPosition))
+    {
+        // Now we'll retrieve the data item associated with that tab.  If it's the data item of the tab we're dragging,
+        // then we know that the tab doesn't need to move - the pointer is still over the tab in question.
+        // If it's *not* the data item of the tab we're dragging, then we'll swap the tab the pointer is over
+        // with the tab we're dragging.
+        auto dataItemAtPoint = tabViewImpl->ItemFromContainer(tabAtPoint);
+
+        if (dataItemAtPoint != m_dataItemBeingDragged)
+        {
+            int newIndex = tabViewImpl->IndexFromContainer(tabAtPoint);
+
+            // If this tab view has an items source set, we'll swap the items in the items source.
+            // Otherwise, we'll swap the tab items themselves.
+            if (auto tabItemsSource = m_tabViewContainingTabBeingDragged.TabItemsSource())
+            {
+                if (auto tabItemsSourceVector = tabItemsSource.try_as<winrt::IVector<IInspectable>>())
+                {
+                    tabItemsSourceVector.RemoveAt(tabViewImpl->IndexFromContainer(tabBeingDragged));
+                    tabItemsSourceVector.InsertAt(newIndex, m_dataItemBeingDragged);
+                }
+            }
+            else
+            {
+                m_tabViewContainingTabBeingDragged.TabItems().RemoveAt(tabViewImpl->IndexFromContainer(tabBeingDragged));
+                m_tabViewContainingTabBeingDragged.TabItems().InsertAt(newIndex, tabBeingDragged);
+            }
+
+            // Finally, we'll re-select the tab being dragged, since it has changed positions.
+            m_tabViewContainingTabBeingDragged.SelectedIndex(newIndex);
+        }
+    }
+}
+
+void TabView::TearOutTab(winrt::TabViewItem const& tabBeingDragged, winrt::Point const& pointerPosition)
+{
+    auto tabViewImpl = winrt::get_self<TabView>(m_tabViewContainingTabBeingDragged);
+
+    // We'll first raise the TabTearOutRequested event, which prompts the app to move the torn-out tab data item from its current tab view to the one in the new window.
+    tabViewImpl->m_tabTearOutRequestedEventSource(m_tabViewContainingTabBeingDragged, winrt::make<TabViewTabTearOutRequestedEventArgs>(m_dataItemBeingDragged, tabBeingDragged));
+
+    // We're now dragging a torn out tab, so let's populate the list of tab views.
+    m_tabTearOutDraggingState = TabTearOutDraggingState::DraggingTornOutTab;
+    PopulateTabViewList();
+
+    // Now we'll show the window.
+    m_tabTearOutNewAppWindow.Show();
+
+    if (m_tabViewContainingTabBeingDragged)
+    {
+        m_tabViewContainingTabBeingDragged.UpdateLayout();
+
+        // We want to keep the tab under the user's pointer, so we'll subtract off the difference from the XAML position of the tab in the original window,
+        // in order to ensure we position the window such that the tab in the new window is in the same position as the tab in the old window.
+        auto containingTabPosition = m_tabViewContainingTabBeingDragged.ContainerFromIndex(m_tabViewContainingTabBeingDragged.SelectedIndex()).as<winrt::TabViewItem>().TransformToVisual(nullptr).TransformPoint({ 0, 0 });
+        m_dragPositionOffset = { containingTabPosition.X - m_originalTabBeingDraggedPoint.X , containingTabPosition.Y - m_originalTabBeingDraggedPoint.Y };
+    }
+    else
+    {
+        m_dragPositionOffset = {};
+    }
+}
+
+void TabView::DragTornOutTab(const winrt::WindowRectChangingEventArgs& args)
+{
+    // When we're dragging a torn-out tab, we want to check, as the window moves, whether the user has dragged the tab over a tab view that will allow it to be dropped into it.
+    // We'll iterate through the list of tab views and their bounds and check each of their screen positions against the screen position of the pointer.
+    for (auto iterator = m_tabViewBoundsTuples.begin(); iterator != m_tabViewBoundsTuples.end(); iterator++)
+    {
+        auto& otherTabViewScreenBounds = std::get<winrt::RectInt32>(*iterator);
+
+        if (SharedHelpers::DoesRectContainPoint(otherTabViewScreenBounds, args.PointerScreenPoint()))
+        {
+            auto& otherTabView = std::get<winrt::TabView>(*iterator);
+
+            // We'll check which index we need to insert the tab at.
+            int insertionIndex = GetTabInsertionIndex(otherTabView, args.PointerScreenPoint());
+
+            // If we got a valid index, we'll begin attempting to merge the tab into this tab view.
+            if (insertionIndex >= 0)
+            {
+                // First, we'll raise the ExternalTornOutTabsDropping event, which asks the app whether this tab view should accept the tab being dropped into it.
+                auto tabsDroppingArgs = winrt::make<TabViewExternalTornOutTabsDroppingEventArgs>(m_dataItemBeingDragged, m_tabBeingDragged, insertionIndex);
+
+                auto otherTabViewImpl = winrt::get_self<TabView>(otherTabView);
+                otherTabViewImpl->m_externalTornOutTabsDroppingEventSource(otherTabView, tabsDroppingArgs);
+
+                // If the response was yes, then we'll raise the ExternalTornOutTabsDropped event, which prompts the app to actually move the tab's data item
+                // to the new tab view; we'll flag the new tab view as the one containing the tab we're dragging; we'll move to the dragging tab within a tab view state;
+                // and finally we'll then hide the torn-out tab window.
+                if (tabsDroppingArgs.AllowDrop())
+                {
+                    // We're about to merge the tab into the other tab view, so we'll retrieve and save off the tab view that currently holds the tab being dragged.
+                    // We'll need to remove it from the list of tab views with CanTearOutTabs set to true if its window is destroyed.
+                    m_tabViewInNewAppWindow = m_tabViewContainingTabBeingDragged;
+
+                    otherTabViewImpl->m_externalTornOutTabsDroppedEventSource(otherTabView, winrt::make<TabViewExternalTornOutTabsDroppedEventArgs>(m_dataItemBeingDragged, m_tabBeingDragged, insertionIndex));
+                    otherTabView.SelectedItem(m_dataItemBeingDragged);
+
+                    // If the other tab view's app window is a different app window than the one being dragged, bring it to the front beneath the one being dragged.
+                    auto otherTabViewAppWindow = winrt::AppWindow::GetFromWindowId(otherTabView.XamlRoot().ContentIslandEnvironment().AppWindowId());
+                    if (otherTabViewAppWindow.Id() != m_tabTearOutNewAppWindow.Id())
+                    {
+                        otherTabViewAppWindow.MoveInZOrderBelow(m_tabTearOutNewAppWindow.Id());
+                    }
+
+                    m_tabViewContainingTabBeingDragged = otherTabView;
+                    m_dragPositionOffset = {};
+                    m_tabTearOutDraggingState = TabTearOutDraggingState::DraggingTabWithinTabView;
+                    m_tabTearOutNewAppWindow.Hide();
+
+                    break;
+                }
+            }
+        }
+    }
+}
+
+int TabView::GetTabInsertionIndex(winrt::TabView const& otherTabView, winrt::PointInt32 const& screenPosition)
+{
+    int index = -1;
+
+    // To get the insertion index, we'll first check what tab (if any) is beneath the screen position.
+    auto otherTabViewImpl = winrt::get_self<TabView>(otherTabView);
+    auto tab = otherTabViewImpl->GetTabAtPoint(otherTabView.XamlRoot().CoordinateConverter().ConvertScreenToLocal(screenPosition));
+
+    if (tab)
+    {
+        // If there was a tab underneath the position, then we'll check whether the screen position is on its left side or its right side.
+        // If it's on the left side, we'll set the insertion position to be before this tab. Otherwise, we'll set it to be after this tab.
+        auto tabIndex = otherTabViewImpl->IndexFromContainer(tab);
+        auto tabRect = otherTabView.XamlRoot().CoordinateConverter().ConvertLocalToScreen(tab.TransformToVisual(nullptr).TransformBounds(winrt::Rect{ 0, 0, static_cast<float>(tab.ActualWidth()), static_cast<float>(tab.ActualHeight()) }));
+
+        if (screenPosition.X < tabRect.X + tabRect.Width / 2)
+        {
+            index = tabIndex;
+        }
+        else
+        {
+            index = tabIndex + 1;
+        }
+    }
+    else if (otherTabViewImpl->GetItemCount() > 0)
+    {
+        // If there was no tab, under the cursor, then that suggests we want to insert the tab either at the very beginning or at the very end.
+        // We'll first check whether the screen position is to the left of the bounds of the first tab.  If so, we'll set the insertion position
+        // to be the start of the item list.
+        auto firstTab = otherTabViewImpl->ContainerFromIndex(0).as<winrt::TabViewItem>();
+
+        if (firstTab)
+        {
+            auto firstTabRect = otherTabView.XamlRoot().CoordinateConverter().ConvertLocalToScreen(firstTab.TransformToVisual(nullptr).TransformBounds(winrt::Rect{ 0, 0, static_cast<float>(firstTab.ActualWidth()), static_cast<float>(firstTab.ActualHeight()) }));
+
+            if (screenPosition.X < firstTabRect.X)
+            {
+                index = 0;
+            }
+        }
+
+        // If that wasn't the case, then next we'll check whether the screen position is to the right of the bounds of the last tab.
+        // If so, we'll set the insertion position to be the end of the item list.
+        if (index < 0)
+        {
+            auto lastTabIndex = otherTabViewImpl->GetItemCount() - 1;
+            auto lastTab = otherTabViewImpl->ContainerFromIndex(lastTabIndex).as<winrt::TabViewItem>();
+
+            if (lastTab)
+            {
+                auto lastTabRect = otherTabView.XamlRoot().CoordinateConverter().ConvertLocalToScreen(lastTab.TransformToVisual(nullptr).TransformBounds(winrt::Rect{ 0, 0, static_cast<float>(lastTab.ActualWidth()), static_cast<float>(lastTab.ActualHeight()) }));
+                if (screenPosition.X > lastTabRect.X + lastTabRect.Width)
+                {
+                    index = otherTabViewImpl->GetItemCount();
+                }
+            }
+        }
+    }
+
+    return index;
+}
+
+// When we exit the move-size loop, we'll reset the tab tear-out state machine to an idle state, and check the status of the window that was created.
+// If the window is currently hidden, then the user has merged the torn out tab with another tab view, and the window is no longer needed.
+// In that case, we'll queue the window for destruction.
+
+void TabView::OnExitedMoveSize(const winrt::InputNonClientPointerSource& sender, const winrt::ExitedMoveSizeEventArgs& args)
+{
+    if (!m_isInTabTearOutLoop)
+    {
+        return;
+    }
+
+    m_tabTearOutDraggingState = TabTearOutDraggingState::Idle;
+
+    if (!m_tabTearOutNewAppWindow.IsVisible())
+    {
+        // We're about to close the window containing the tab view that had been holding the tab view,
+        // so we'll remove it from the list of tab views with CanTearOutTabs set to true
+        // This will ensure that it's immediately removed from the list rather than waiting for the
+        // WM_CLOSE message to be handled.
+        if (m_tabViewInNewAppWindow)
+        {
+            auto tabViewWithTearOutList = GetTabViewWithTearOutList();
+            winrt::weak_ref<winrt::TabView> windowTabViewAsWeak = m_tabViewInNewAppWindow;
+            auto existingIterator = std::find(tabViewWithTearOutList->begin(), tabViewWithTearOutList->end(), windowTabViewAsWeak);
+
+            if (existingIterator != std::end((*tabViewWithTearOutList)))
+            {
+                tabViewWithTearOutList->erase(existingIterator);
+            }
+        }
+
+        PostMessageW(winrt::Microsoft::UI::GetWindowFromWindowId(m_tabTearOutNewAppWindow.Id()), WM_CLOSE, 0, 0);
+    }
+    else if (m_tabViewContainingTabBeingDragged)
+    {
+        // Otherwise, if the window is still open, let's update its tab view's non-client region.
+        winrt::get_self<TabView>(m_tabViewContainingTabBeingDragged)->UpdateNonClientRegion();
+    }
+
+    // We'll also update this tab view's non-client region, now that it's stabilized.
+    UpdateNonClientRegion();
+    m_isInTabTearOutLoop = false;
+}
+
+winrt::TabViewItem TabView::GetTabAtPoint(const winrt::Point& point)
+{
+    // Convert the point to a point in the TabView's coordinate space
+    // and then detect which TabViewItem is at that point.
+    auto tabViewRect = TransformToVisual(nullptr).TransformBounds(winrt::Rect{ 0, 0, static_cast<float>(ActualWidth()), static_cast<float>(ActualHeight()) });
+
+    if (SharedHelpers::DoesRectContainPoint(tabViewRect, point))
+    {
+        auto tabCount = GetItemCount();
+        for (int i = 0; i < tabCount; i++)
+        {
+            auto tab = ContainerFromIndex(i).try_as<winrt::TabViewItem>();
+            if (tab)
+            {
+                auto tabRect = tab.TransformToVisual(nullptr).TransformBounds(winrt::Rect{ 0, 0, static_cast<float>(tab.ActualWidth()), static_cast<float>(tab.ActualHeight()) });
+                if (SharedHelpers::DoesRectContainPoint(tabRect, point))
+                {
+                    return tab;
+                }
+            }
+        }
+    }
+
+    return nullptr;
+}
+
+void TabView::PopulateTabViewList()
+{
+    // When we're dragging a torn-out tab, we want to check, as the window moves, whether the user has dragged the tab over a tab view that will allow it to be dropped into it.
+    // We'll pre-fill a list of tab views and their screen bounds when we start dragging a torn-out tab, on the basis that they are unlikely to move while we're dragging the tab.
+    m_tabViewBoundsTuples.clear();
+
+    // We'll also track which tab view holds the torn-out tab.
+    m_tabViewContainingTabBeingDragged = nullptr;
+
+    auto tabViewWithTearOutList = TabView::GetTabViewWithTearOutList();
+
+    auto iterator = tabViewWithTearOutList->begin();
+    while (iterator != tabViewWithTearOutList->end())
+    {
+        auto otherTabView = (*iterator).get();
+
+        if (!otherTabView)
+        {
+            iterator = tabViewWithTearOutList->erase(iterator);
+        }
+        else
+        {
+            // We only want to populate the tuple list with tab views that don't currently contain the item being dragged,
+            // since this tuple list is used to detect tab views that the item being dragged can be dragged onto.
+            bool otherTabViewContainsTab = false;
+            uint32_t ignored;
+
+            if (auto otherTabItemsSource = otherTabView.TabItemsSource())
+            {
+                if (auto tabItemsSourceVector = otherTabItemsSource.try_as<winrt::IVector<IInspectable>>())
+                {
+                    otherTabViewContainsTab = tabItemsSourceVector.IndexOf(m_dataItemBeingDragged, ignored);
+                }
+            }
+            else
+            {
+                otherTabViewContainsTab = otherTabView.TabItems().IndexOf(m_tabBeingDragged, ignored);
+            }
+
+            if (otherTabViewContainsTab)
+            {
+                m_tabViewContainingTabBeingDragged = otherTabView;
+            }
+            else
+            {
+                auto otherTabViewXamlBounds = otherTabView.TransformToVisual(nullptr).TransformBounds(winrt::Rect(0, 0, static_cast<float>(otherTabView.ActualWidth()), static_cast<float>(otherTabView.ActualHeight())));
+                auto otherTabViewScreenBounds = otherTabView.XamlRoot().CoordinateConverter().ConvertLocalToScreen(otherTabViewXamlBounds);
+
+                m_tabViewBoundsTuples.push_back(std::make_tuple(otherTabViewScreenBounds, otherTabView));
+            }
+
+            iterator++;
+        }
+    }
+}
+
+// At the moment, all TabViews and windows are on the same thread.
+// However, that won't always be the case, so to handle things
+// when it isn't, we'll lock the accessing of the list of TabViews
+// behind a mutex and require its acquisition to interact with the list.
+MutexLockedResource<std::list<winrt::weak_ref<winrt::TabView>>> TabView::GetTabViewWithTearOutList()
+{
+    return MutexLockedResource(s_tabWithTearOutListMutex, &s_tabViewWithTearOutList);
+}
+
+winrt::InputNonClientPointerSource const& TabView::GetInputNonClientPointerSource()
+{
+    auto windowId = GetAppWindowId();
+
+    if (!m_inputNonClientPointerSource && windowId.Value != 0)
+    {
+        m_inputNonClientPointerSource = winrt::InputNonClientPointerSource::GetForWindowId(windowId);
+    }
+
+    return m_inputNonClientPointerSource;
+}
+
+winrt::ContentCoordinateConverter const& TabView::GetAppWindowCoordinateConverter()
+{
+    auto windowId = GetAppWindowId();
+
+    if (!m_appWindowCoordinateConverter && windowId.Value != 0)
+    {
+        m_appWindowCoordinateConverter = winrt::ContentCoordinateConverter::CreateForWindowId(windowId);
+    }
+
+    return m_appWindowCoordinateConverter;
+}
+
+void TabView::UpdateNonClientRegion()
+{
+    if (auto& nonClientPointerSource = GetInputNonClientPointerSource())
+    {
+        auto captionRects = nonClientPointerSource.GetRegionRects(winrt::NonClientRegionKind::Caption);
+
+        // We need to preserve non-client caption regions set by components other than us,
+        // so we'll keep around all caption regions except the one that we set.
+        std::vector<winrt::RectInt32> captionRegions;
+        std::for_each(captionRects.cbegin(), captionRects.cend(), [&](winrt::RectInt32 const& rect)
+            {
+                if (!m_nonClientRegionSet || rect == m_nonClientRegion)
+                {
+                    captionRegions.push_back(rect);
+                }
+            });
+
+        if (CanTearOutTabs() && IsLoaded())
+        {
+            if (auto& listView = m_listView.get())
+            {
+                if (listView.IsLoaded())
+                {
+                    if (auto& appWindowCoordinateConverter = GetAppWindowCoordinateConverter())
+                    {
+                        auto listViewBounds = listView.TransformToVisual(nullptr).TransformBounds(winrt::Rect(0, 0, static_cast<float>(listView.ActualWidth()), static_cast<float>(listView.ActualHeight())));
+
+                        if (listViewBounds.X < 0 || listViewBounds.Y < 0)
+                        {
+                            return;
+                        }
+
+                        // Non-client region rects need to be in the coordinate system of the owning app window, so we'll take our XAML island coordinates,
+                        // convert them to screen coordinates, and then convert from there to app window coordinates.
+                        auto appWindowListViewBounds = appWindowCoordinateConverter.ConvertScreenToLocal(XamlRoot().CoordinateConverter().ConvertLocalToScreen(listViewBounds));
+
+                        m_nonClientRegion = {
+                            static_cast<int32_t>(appWindowListViewBounds.X),
+                            static_cast<int32_t>(appWindowListViewBounds.Y),
+                            static_cast<int32_t>(appWindowListViewBounds.Width),
+                            static_cast<int32_t>(appWindowListViewBounds.Height),
+                        };
+
+                        m_nonClientRegionSet = true;
+
+                        captionRegions.push_back(m_nonClientRegion);
+                    }
+                }
+            }
+        }
+
+        nonClientPointerSource.SetRegionRects(winrt::NonClientRegionKind::Caption, captionRegions);
+    }
+}
+
+winrt::WindowId TabView::GetAppWindowId()
+{
+    winrt::WindowId appWindowId{};
+
+    if (auto xamlRoot = XamlRoot())
+    {
+        if (auto contentIslandEnvironment = xamlRoot.ContentIslandEnvironment())
+        {
+            appWindowId = contentIslandEnvironment.AppWindowId();
+        }
+    }
+
+    if (appWindowId.Value != m_lastAppWindowId.Value)
+    {
+        m_lastAppWindowId = appWindowId;
+
+        m_inputNonClientPointerSource = nullptr;
+        m_appWindowCoordinateConverter = nullptr;
+    }
+
+    return appWindowId;
+}
diff --git a/src/controls/dev/TabView/TabView.h b/src/controls/dev/TabView/TabView.h
index 79f4a2bf9c..0ca96f28a0 100644
--- a/src/controls/dev/TabView/TabView.h
+++ b/src/controls/dev/TabView/TabView.h
@@ -12,8 +12,14 @@
 #include "TabViewTabDroppedOutsideEventArgs.g.h"
 #include "TabViewTabDragStartingEventArgs.g.h"
 #include "TabViewTabDragCompletedEventArgs.g.h"
+#include "TabViewTabTearOutWindowRequestedEventArgs.g.h"
+#include "TabViewTabTearOutRequestedEventArgs.g.h"
+#include "TabViewExternalTornOutTabsDroppingEventArgs.g.h"
+#include "TabViewExternalTornOutTabsDroppedEventArgs.g.h"
 #include "TabViewTrace.h"
 
+#include <wil/resource.h>
+
 class TabViewTabCloseRequestedEventArgs :
     public winrt::implementation::TabViewTabCloseRequestedEventArgsT<TabViewTabCloseRequestedEventArgs>
 {
@@ -77,6 +83,129 @@ class TabViewTabDragCompletedEventArgs :
     winrt::TabViewItem m_tab{};
 };
 
+// We need to make a copy of our arrays in event arg types because in managed code, they're cleaned up after access.
+// In other words, if we provide a pointer to the arrays stored on the args type, they will be clobbered after being accessed once.
+template <class T>
+winrt::com_array<T> CopyArray(winrt::com_array<T> const& a)
+{
+    return std::move(winrt::com_array<T>{ a.begin(), a.end()});
+}
+
+class TabViewTabTearOutWindowRequestedEventArgs :
+    public winrt::implementation::TabViewTabTearOutWindowRequestedEventArgsT<TabViewTabTearOutWindowRequestedEventArgs>
+{
+public:
+    TabViewTabTearOutWindowRequestedEventArgs(winrt::IInspectable const& item, winrt::UIElement const& tab);
+
+    winrt::com_array<winrt::IInspectable> Items() const { return CopyArray(m_items); }
+    winrt::com_array<winrt::UIElement> Tabs() const { return CopyArray(m_tabs); }
+
+    winrt::Microsoft::UI::WindowId NewWindowId() const { return m_newWindowId; }
+    void NewWindowId(winrt::Microsoft::UI::WindowId const& value) { m_newWindowId = value; }
+
+private:
+    winrt::com_array<winrt::IInspectable> m_items;
+    winrt::com_array<winrt::UIElement> m_tabs;
+
+    winrt::Microsoft::UI::WindowId m_newWindowId{};
+};
+
+class TabViewTabTearOutRequestedEventArgs :
+    public winrt::implementation::TabViewTabTearOutRequestedEventArgsT<TabViewTabTearOutRequestedEventArgs>
+{
+public:
+    TabViewTabTearOutRequestedEventArgs(winrt::IInspectable const& item, winrt::UIElement const& tab);
+
+    winrt::com_array<winrt::IInspectable> Items() const { return CopyArray(m_items); }
+    winrt::com_array<winrt::UIElement> Tabs() const { return CopyArray(m_tabs); }
+
+    winrt::Microsoft::UI::WindowId NewWindowId() const { return m_newWindowId; }
+
+private:
+    winrt::com_array<winrt::IInspectable> m_items;
+    winrt::com_array<winrt::UIElement> m_tabs;
+
+    winrt::Microsoft::UI::WindowId m_newWindowId{};
+};
+
+class TabViewExternalTornOutTabsDroppingEventArgs :
+    public winrt::implementation::TabViewExternalTornOutTabsDroppingEventArgsT<TabViewExternalTornOutTabsDroppingEventArgs>
+{
+public:
+    TabViewExternalTornOutTabsDroppingEventArgs(winrt::IInspectable const& item, winrt::UIElement const& tab, int dropIndex);
+
+    winrt::com_array<winrt::IInspectable> Items() const { return CopyArray(m_items); }
+    winrt::com_array<winrt::UIElement> Tabs() const { return CopyArray(m_tabs); }
+
+    int DropIndex() const { return m_dropIndex; }
+    bool AllowDrop() const { return m_allowDrop; }
+    void AllowDrop(bool value) { m_allowDrop = value; }
+
+private:
+    winrt::com_array<winrt::IInspectable> m_items;
+    winrt::com_array<winrt::UIElement> m_tabs;
+
+    int m_dropIndex{ -1 };
+    bool m_allowDrop{ false };
+};
+
+class TabViewExternalTornOutTabsDroppedEventArgs :
+    public winrt::implementation::TabViewExternalTornOutTabsDroppedEventArgsT<TabViewExternalTornOutTabsDroppedEventArgs>
+{
+public:
+    TabViewExternalTornOutTabsDroppedEventArgs(winrt::IInspectable const& item, winrt::UIElement const& tab, int dropIndex);
+
+    winrt::com_array<winrt::IInspectable> Items() const { return CopyArray(m_items); }
+    winrt::com_array<winrt::UIElement> Tabs() const { return CopyArray(m_tabs); }
+
+    int DropIndex() const { return m_dropIndex; }
+
+private:
+    winrt::com_array<winrt::IInspectable> m_items;
+    winrt::com_array<winrt::UIElement> m_tabs;
+
+    int m_dropIndex{ -1 };
+};
+
+template<class T>
+class MutexLockedResource
+{
+public:
+    MutexLockedResource(HANDLE mutex, T* resource)
+    {
+        m_mutex = mutex;
+        m_resource = resource;
+
+        ::WaitForSingleObject(m_mutex, INFINITE);
+    }
+
+    ~MutexLockedResource()
+    {
+        ::ReleaseMutex(m_mutex);
+    }
+
+    T& operator*()
+    {
+        return *m_resource;
+    }
+
+    T* operator->()
+    {
+        return m_resource;
+    }
+
+private:
+    HANDLE m_mutex;
+    T* m_resource;
+};
+
+enum class TabTearOutDraggingState
+{
+    Idle,
+    DraggingTabWithinTabView,
+    DraggingTornOutTab,
+};
+
 class TabView :
     public ReferenceTracker<TabView, winrt::implementation::TabViewT>,
     public TabViewProperties
@@ -84,6 +213,7 @@ class TabView :
 
 public:
     TabView();
+    ~TabView();
 
     // IFrameworkElement
     void OnApplyTemplate();
@@ -104,6 +234,7 @@ class TabView :
     void OnTabWidthModePropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args);
     void OnSelectedIndexPropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args);
     void OnSelectedItemPropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args);
+    void OnCanTearOutTabsPropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args);
 
     void OnItemsChanged(winrt::IInspectable const& item);
     void UpdateTabContent();
@@ -118,8 +249,19 @@ class TabView :
 
     void UpdateTabWidths(bool shouldUpdateWidths = true, bool fillAllAvailableSpace = true);
 
+    int GetItemCount();
+
+    void UpdateTabViewWithTearOutList();
+    void AttachMoveSizeLoopEvents();
+
+    static MutexLockedResource<std::list<winrt::weak_ref<winrt::TabView>>> GetTabViewWithTearOutList();
+
+    winrt::InputNonClientPointerSource const& GetInputNonClientPointerSource();
+    winrt::ContentCoordinateConverter const& GetAppWindowCoordinateConverter();
+
 private:
     void OnLoaded(const winrt::IInspectable& sender, const winrt::RoutedEventArgs& args);
+    void OnUnloaded(const winrt::IInspectable& sender, const winrt::RoutedEventArgs& args);
     void OnScrollViewerLoaded(const winrt::IInspectable& sender, const winrt::RoutedEventArgs& args);
     void OnAddButtonClick(const winrt::IInspectable& sender, const winrt::RoutedEventArgs& args);
     void OnScrollDecreaseClick(const winrt::IInspectable& sender, const winrt::RoutedEventArgs& args);
@@ -131,6 +273,7 @@ class TabView :
     void OnTabStripPointerExited(const winrt::IInspectable& sender, const winrt::PointerRoutedEventArgs& args);
     void OnTabStripPointerEntered(const winrt::IInspectable& sender, const winrt::PointerRoutedEventArgs& args);
     void OnListViewSelectionChanged(const winrt::IInspectable& sender, const winrt::SelectionChangedEventArgs& args);
+    void OnListViewSizeChanged(const winrt::IInspectable& sender, const winrt::SizeChangedEventArgs& args);
 
     void OnListViewDragItemsStarting(const winrt::IInspectable& sender, const winrt::DragItemsStartingEventArgs& args);
     void OnListViewDragItemsCompleted(const winrt::IInspectable& sender, const winrt::DragItemsCompletedEventArgs& args);
@@ -161,8 +304,6 @@ class TabView :
     void OnListViewDraggingPropertyChanged(const winrt::DependencyObject& sender, const winrt::DependencyProperty& args);
     void OnListViewGettingFocus(const winrt::IInspectable& sender, const winrt::GettingFocusEventArgs& args);
 
-    int GetItemCount();
-
     void UpdateBottomBorderLineVisualStates();
     void UpdateTabBottomBorderLineVisualStates();
 
@@ -172,6 +313,26 @@ class TabView :
 
     void UpdateIsItemDraggedOver(bool isItemDraggedOver);
 
+    void OnEnteringMoveSize(const winrt::InputNonClientPointerSource& sender, const winrt::EnteringMoveSizeEventArgs& args);
+    void OnEnteredMoveSize(const winrt::InputNonClientPointerSource& sender, const winrt::EnteredMoveSizeEventArgs& args);
+    void OnWindowRectChanging(const winrt::InputNonClientPointerSource& sender, const winrt::WindowRectChangingEventArgs& args);
+    void OnExitedMoveSize(const winrt::InputNonClientPointerSource& sender, const winrt::ExitedMoveSizeEventArgs& args);
+
+    winrt::TabViewItem GetTabAtPoint(const winrt::Point& point);
+    void PopulateTabViewList();
+
+    void DragTabWithinTabView(const winrt::WindowRectChangingEventArgs& args);
+    void UpdateTabIndex(winrt::TabViewItem const& tabBeingDragged, winrt::Point const& pointerPosition);
+    void TearOutTab(winrt::TabViewItem const& tabBeingDragged, winrt::Point const& pointerPosition);
+    void DragTornOutTab(const winrt::WindowRectChangingEventArgs& args);
+    int GetTabInsertionIndex(winrt::TabView const& otherTabView, winrt::PointInt32 const& screenPosition);
+
+    void UpdateNonClientRegion();
+    winrt::WindowId GetAppWindowId();
+
+    static std::list<winrt::weak_ref<winrt::TabView>> s_tabViewWithTearOutList;
+    static HANDLE s_tabWithTearOutListMutex;
+
     bool m_updateTabWidthOnPointerLeave{ false };
     bool m_pointerInTabstrip{ false };
 
@@ -195,6 +356,7 @@ class TabView :
     winrt::ListView::PointerEntered_revoker m_tabStripPointerEnteredRevoker{};
     winrt::Selector::SelectionChanged_revoker m_listViewSelectionChangedRevoker{};
     winrt::UIElement::GettingFocus_revoker m_listViewGettingFocusRevoker{};
+    winrt::FrameworkElement::SizeChanged_revoker m_listViewSizeChangedRevoker{};
 
     PropertyChanged_revoker m_listViewCanReorderItemsPropertyChangedRevoker{};
     PropertyChanged_revoker m_listViewAllowDropPropertyChangedRevoker{};
@@ -226,4 +388,29 @@ class TabView :
     bool m_isItemBeingDragged{ false };
     bool m_isItemDraggedOver{ false };
     std::optional<double> m_expandedWidthForDragOver{};
+
+    winrt::event_token m_enteringMoveSizeToken{};
+    winrt::event_token m_enteredMoveSizeToken{};
+    winrt::event_token m_windowRectChangingToken{};
+    winrt::event_token m_exitedMoveSizeToken{};
+
+    bool m_isInTabTearOutLoop{ false };
+    winrt::AppWindow m_tabTearOutNewAppWindow{ nullptr };
+    winrt::IInspectable m_dataItemBeingDragged{ nullptr };
+    winrt::TabViewItem m_tabBeingDragged{ nullptr };
+    winrt::TabView m_tabViewContainingTabBeingDragged{ nullptr };
+    winrt::TabView m_tabViewInNewAppWindow{ nullptr };
+    winrt::Point m_originalTabBeingDraggedPoint{};
+    winrt::Point m_dragPositionOffset{};
+    TabTearOutDraggingState m_tabTearOutDraggingState{ TabTearOutDraggingState::Idle };
+    winrt::PointInt32 m_tabTearOutInitialPosition{};
+
+    winrt::RectInt32 m_nonClientRegion{};
+    bool m_nonClientRegionSet{ false };
+
+    std::vector<std::tuple<winrt::RectInt32, winrt::TabView>> m_tabViewBoundsTuples;
+
+    winrt::WindowId m_lastAppWindowId{};
+    winrt::InputNonClientPointerSource m_inputNonClientPointerSource{ nullptr };
+    winrt::ContentCoordinateConverter m_appWindowCoordinateConverter{ nullptr };
 };
diff --git a/src/controls/dev/TabView/TabView.idl b/src/controls/dev/TabView/TabView.idl
index 4a07051030..b05e9d0855 100644
--- a/src/controls/dev/TabView/TabView.idl
+++ b/src/controls/dev/TabView/TabView.idl
@@ -54,6 +54,47 @@ runtimeclass TabViewTabDragCompletedEventArgs
     TabViewItem Tab { get; };
 }
 
+[MUX_PREVIEW]
+[webhosthidden]
+runtimeclass TabViewTabTearOutWindowRequestedEventArgs
+{
+    Object[] Items { get; };
+    Microsoft.UI.Xaml.UIElement[] Tabs { get; };
+
+    Microsoft.UI.WindowId NewWindowId;
+};
+
+[MUX_PREVIEW]
+[webhosthidden]
+runtimeclass TabViewTabTearOutRequestedEventArgs
+{
+    Object[] Items { get; };
+    Microsoft.UI.Xaml.UIElement[] Tabs { get; };
+
+    Microsoft.UI.WindowId NewWindowId { get; };
+};
+
+[MUX_PREVIEW]
+[webhosthidden]
+runtimeclass TabViewExternalTornOutTabsDroppingEventArgs
+{
+    Object[] Items { get; };
+    Microsoft.UI.Xaml.UIElement[] Tabs { get; };
+
+    Int32 DropIndex { get; };
+    Boolean AllowDrop;
+};
+
+[MUX_PREVIEW]
+[webhosthidden]
+runtimeclass TabViewExternalTornOutTabsDroppedEventArgs
+{
+    Object[] Items { get; };
+    Microsoft.UI.Xaml.UIElement[] Tabs { get; };
+
+    Int32 DropIndex { get; };
+};
+
 [MUX_PUBLIC]
 [webhosthidden]
 [contentproperty("TabItems")]
@@ -103,6 +144,18 @@ unsealed runtimeclass TabView : Microsoft.UI.Xaml.Controls.Control
     [MUX_DEFAULT_VALUE("true")]
     Boolean AllowDropTabs{ get; set; };
 
+    [MUX_PREVIEW]
+    {
+        [MUX_PROPERTY_CHANGED_CALLBACK(TRUE)]
+        [MUX_DEFAULT_VALUE("false")]
+        Boolean CanTearOutTabs{ get; set; };
+
+        event Windows.Foundation.TypedEventHandler<TabView, TabViewTabTearOutWindowRequestedEventArgs> TabTearOutWindowRequested;
+        event Windows.Foundation.TypedEventHandler<TabView, TabViewTabTearOutRequestedEventArgs> TabTearOutRequested;
+        event Windows.Foundation.TypedEventHandler<TabView, TabViewExternalTornOutTabsDroppingEventArgs> ExternalTornOutTabsDropping;
+        event Windows.Foundation.TypedEventHandler<TabView, TabViewExternalTornOutTabsDroppedEventArgs> ExternalTornOutTabsDropped;
+    }
+
     [MUX_DEFAULT_VALUE("0")]
     [MUX_PROPERTY_CHANGED_CALLBACK(TRUE)]
     Int32 SelectedIndex;
@@ -137,6 +190,12 @@ unsealed runtimeclass TabView : Microsoft.UI.Xaml.Controls.Control
     static Microsoft.UI.Xaml.DependencyProperty CanDragTabsProperty{ get; };
     static Microsoft.UI.Xaml.DependencyProperty CanReorderTabsProperty{ get; };
     static Microsoft.UI.Xaml.DependencyProperty AllowDropTabsProperty{ get; };
+
+    [MUX_PREVIEW]
+    {
+        static Microsoft.UI.Xaml.DependencyProperty CanTearOutTabsProperty{ get; };
+    }
+
     static Microsoft.UI.Xaml.DependencyProperty SelectedIndexProperty{ get; };
     static Microsoft.UI.Xaml.DependencyProperty SelectedItemProperty{ get; };
 }
diff --git a/src/controls/dev/TabView/TabViewItem.cpp b/src/controls/dev/TabView/TabViewItem.cpp
index 44f9402de1..4087fd1e51 100644
--- a/src/controls/dev/TabView/TabViewItem.cpp
+++ b/src/controls/dev/TabView/TabViewItem.cpp
@@ -191,7 +191,7 @@ void TabViewItem::UpdateSelectedBackgroundPathTranslateTransform()
             // between the selected TabViewItem and its content.
             winrt::TranslateTransform translateTransform;
 
-            translateTransform.Y(roundedSelectedBackgroundPathActualOffsetY - selectedBackgroundPathActualOffset.y);
+            translateTransform.Y(static_cast<double>(roundedSelectedBackgroundPathActualOffsetY) - static_cast<double>(selectedBackgroundPathActualOffset.y));
 
             selectedBackgroundPath.RenderTransform(translateTransform);
         }
diff --git a/src/controls/dev/TabView/TestUI/TabViewPage.xaml b/src/controls/dev/TabView/TestUI/TabViewPage.xaml
index 49214946ec..6d677cb917 100644
--- a/src/controls/dev/TabView/TestUI/TabViewPage.xaml
+++ b/src/controls/dev/TabView/TestUI/TabViewPage.xaml
@@ -172,23 +172,31 @@
                             <controls:SymbolIconSource Symbol="Home"/>
                         </controls:TabViewItem.IconSource>
 
-                        <StackPanel x:Name="FirstTabContent" AutomationProperties.Name="FirstTabContent" Background="{ThemeResource TabViewItemHeaderBackgroundSelected}">
-                            <Button x:Name="FirstTabButton" AutomationProperties.Name="FirstTabButton" Margin="8" FontSize="20">Home Button</Button>
-                            <StackPanel>
-                                <Button x:Name="TabViewSizingPageButton" AutomationProperties.Name="TabViewSizingPageButton"
+                        <ScrollViewer>
+                            <StackPanel x:Name="FirstTabContent" AutomationProperties.Name="FirstTabContent" Background="{ThemeResource TabViewItemHeaderBackgroundSelected}">
+                                <Button x:Name="FirstTabButton" AutomationProperties.Name="FirstTabButton" Margin="8" FontSize="20">Home Button</Button>
+                                <StackPanel>
+                                    <Button x:Name="TabViewSizingPageButton" AutomationProperties.Name="TabViewSizingPageButton"
                                         Margin="4" Click="TabViewSizingPageButton_Click"
                                         FontSize="20">TabView Sizing Page</Button>
-                                <Button x:Name="TabViewTabClosingBehaviorButton" AutomationProperties.Name="TabViewTabClosingBehaviorButton"
+                                    <Button x:Name="TabViewTabClosingBehaviorButton" AutomationProperties.Name="TabViewTabClosingBehaviorButton"
                                         Margin="4" Click="TabViewTabClosingBehaviorButton_Click"
                                         FontSize="20">TabView Tab Closing behavior Page</Button>
-                                <Button x:Name="TabViewTabItemsSourcePageButton" AutomationProperties.Name="TabViewTabItemsSourcePageButton"
+                                    <Button x:Name="TabViewTabItemsSourcePageButton" AutomationProperties.Name="TabViewTabItemsSourcePageButton"
                                         Margin="4" Click="TabViewTabItemsSourcePageButton_Click"
                                         FontSize="20">TabView TabItemsSource Page</Button>
-                                <Button x:Name="MultipleTabViewPageButton" AutomationProperties.Name="MultipleTabViewPageButton"
+                                    <Button x:Name="MultipleTabViewPageButton" AutomationProperties.Name="MultipleTabViewPageButton"
                                         Margin="4" Click="MultipleTabViewPageButton_Click"
                                         FontSize="20">Multiple TabView Page</Button>
+                                    <Button x:Name="TabViewTearOutWindowWithDataItemsButton" AutomationProperties.Name="TabViewTearOutWindowWithDataItemsButton"
+                                        Margin="4" Click="TabViewTearOutWindowWithDataItemsButton_Click"
+                                        FontSize="20">TabView Tear-Out Window (With Data Items)</Button>
+                                    <Button x:Name="TabViewTearOutWindowWithoutDataItemsButton" AutomationProperties.Name="TabViewTearOutWindowWithoutDataItemsButton"
+                                        Margin="4" Click="TabViewTearOutWindowWithoutDataItemsButton_Click"
+                                        FontSize="20">TabView Tear-Out Window (Without Data Items)</Button>
+                                </StackPanel>
                             </StackPanel>
-                        </StackPanel>
+                        </ScrollViewer>
                     </controls:TabViewItem>
 
                     <controls:TabViewItem x:Name="SecondTab" AutomationProperties.Name="SecondTab" Header="SecondTab" IsClosable="True" DragStarting="OnSecondTabDragStarting">
diff --git a/src/controls/dev/TabView/TestUI/TabViewPage.xaml.cs b/src/controls/dev/TabView/TestUI/TabViewPage.xaml.cs
index 2e100d9e51..bd29c11fa5 100644
--- a/src/controls/dev/TabView/TestUI/TabViewPage.xaml.cs
+++ b/src/controls/dev/TabView/TestUI/TabViewPage.xaml.cs
@@ -421,6 +421,20 @@ private void MultipleTabViewPageButton_Click(object sender, RoutedEventArgs e)
             this.Frame.Navigate(typeof(MultipleTabViewPage));
         }
 
+        private void TabViewTearOutWindowWithDataItemsButton_Click(object sender, RoutedEventArgs e)
+        {
+            TabViewTearOutWindowWithDataItems newWindow = new();
+            newWindow.AppWindow.Resize(new Windows.Graphics.SizeInt32(800, 300));
+            newWindow.Activate();
+        }
+
+        private void TabViewTearOutWindowWithoutDataItemsButton_Click(object sender, RoutedEventArgs e)
+        {
+            TabViewTearOutWindowWithoutDataItems newWindow = new();
+            newWindow.AppWindow.Resize(new Windows.Graphics.SizeInt32(800, 300));
+            newWindow.Activate();
+        }
+
         private void ShortLongTextButton_Click(object sender, RoutedEventArgs e)
         {
             FirstTab.Header = "s";
diff --git a/src/controls/dev/TabView/TestUI/TabViewTearOutWindowWithDataItems.xaml b/src/controls/dev/TabView/TestUI/TabViewTearOutWindowWithDataItems.xaml
new file mode 100644
index 0000000000..3f84c1cbfe
--- /dev/null
+++ b/src/controls/dev/TabView/TestUI/TabViewTearOutWindowWithDataItems.xaml
@@ -0,0 +1,40 @@
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<Window
+    x:Class="MUXControlsTestApp.TabViewTearOutWindowWithDataItems"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:helpers="using:AppTestAutomationHelpers"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:sys="using:System"
+    mc:Ignorable="d">
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition Height="0"/>
+        </Grid.RowDefinitions>
+        
+        <TabView
+            AutomationProperties.Name="TearOutTabsTabView"
+            TabItemsSource="{x:Bind StringList}"
+            CanTearOutTabs="True"
+            CanDragTabs="False"
+            CanReorderTabs="False"
+            TabTearOutWindowRequested="OnTabTearOutWindowRequested"
+            TabTearOutRequested="OnTabTearOutRequested"
+            ExternalTornOutTabsDropping="OnExternalTornOutTabsDropping"
+            ExternalTornOutTabsDropped="OnExternalTornOutTabsDropped">
+            <TabView.TabItemTemplate>
+                <DataTemplate x:DataType="sys:String">
+                    <TabViewItem AutomationProperties.Name="{x:Bind}" Header="{x:Bind}">
+                        <TextBlock Text="{x:Bind}" />
+                    </TabViewItem>
+                </DataTemplate>
+            </TabView.TabItemTemplate>
+        </TabView>
+
+        <helpers:TestAutomationHelpersPanel Grid.Row="1" />
+    </Grid>
+    
+</Window>
diff --git a/src/controls/dev/TabView/TestUI/TabViewTearOutWindowWithDataItems.xaml.cs b/src/controls/dev/TabView/TestUI/TabViewTearOutWindowWithDataItems.xaml.cs
new file mode 100644
index 0000000000..c5540ac1f7
--- /dev/null
+++ b/src/controls/dev/TabView/TestUI/TabViewTearOutWindowWithDataItems.xaml.cs
@@ -0,0 +1,85 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Navigation;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Linq;
+using Windows.Foundation.Collections;
+
+namespace MUXControlsTestApp
+{
+    public sealed partial class TabViewTearOutWindowWithDataItems : Window
+    {
+        public ObservableCollection<object> StringList { get; set; }
+
+        public TabViewTearOutWindowWithDataItems()
+        {
+            this.InitializeComponent();
+
+            StringList = [
+                "Item 1",
+                "Item 2",
+                "Item 3",
+            ];
+
+            Title = "MUXControlsTestApp.Desktop - Secondary TabViewTearOutWindow";
+        }
+
+        // A user has begun interacting with a tab, such that they might want to tear it out into its own window.
+        // We'll create a hidden window with the tab's contents that will be shown if the user tears out the tab.
+        private void OnTabTearOutWindowRequested(TabView _, TabViewTabTearOutWindowRequestedEventArgs args)
+        {
+            TabViewTearOutWindowWithDataItems newWindow = new() { StringList = [.. args.Items] };
+            newWindow.AppWindow.Hide();
+            newWindow.AppWindow.Resize(new Windows.Graphics.SizeInt32(800, 300));
+            args.NewWindowId = newWindow.AppWindow.Id;
+        }
+
+        // A user has torn out a tab, so now is the time we need to remove the torn-out item from our item list.
+        private void OnTabTearOutRequested(TabView _, TabViewTabTearOutRequestedEventArgs args)
+        {
+            for (int i = 0; i < args.Items.Length; i++)
+            {
+                int index = StringList.IndexOf(args.Items[i]);
+
+                if (index >= 0)
+                {
+                    StringList.RemoveAt(index);
+                }
+            }
+        }
+
+        // A tab being dragged from within this process has been dropped on another tab view.  This gives the tab view
+        // the opportunity to check to see whether it actually want to accepts the new tab.  In the case of this test app,
+        // however, we'll just always accept a dropped tab.
+        private void OnExternalTornOutTabsDropping(TabView _, TabViewExternalTornOutTabsDroppingEventArgs args)
+        {
+            args.AllowDrop = true;
+        }
+
+        // The tab being dragged has now been dropped onto another tab view.  We'll add its item to our item list.
+        // The tab view will take care of disposing of the window.
+        private void OnExternalTornOutTabsDropped(TabView _, TabViewExternalTornOutTabsDroppedEventArgs args)
+        {
+            for (int i = 0; i < args.Items.Length; i++)
+            {
+                int index = StringList.IndexOf(args.Items[i]);
+
+                if (index >= 0)
+                {
+                    StringList.RemoveAt(index);
+                }
+            }
+
+            for (int i = 0; i < args.Items.Length; i++)
+            {
+                StringList.Insert(Math.Min(args.DropIndex + i, StringList.Count), args.Items[i]);
+            }
+        }
+    }
+}
diff --git a/src/controls/dev/TabView/TestUI/TabViewTearOutWindowWithoutDataItems.xaml b/src/controls/dev/TabView/TestUI/TabViewTearOutWindowWithoutDataItems.xaml
new file mode 100644
index 0000000000..61a4fc35a2
--- /dev/null
+++ b/src/controls/dev/TabView/TestUI/TabViewTearOutWindowWithoutDataItems.xaml
@@ -0,0 +1,36 @@
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<Window
+    x:Class="MUXControlsTestApp.TabViewTearOutWindowWithoutDataItems"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:helpers="using:AppTestAutomationHelpers"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:sys="using:System"
+    mc:Ignorable="d">
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition Height="0"/>
+        </Grid.RowDefinitions>
+        
+        <TabView
+            x:Name="TearOutTabsTabView"
+            AutomationProperties.Name="TearOutTabsTabView"
+            CanTearOutTabs="True"
+            TabTearOutWindowRequested="OnTabTearOutWindowRequested"
+            TabTearOutRequested="OnTabTearOutRequested"
+            ExternalTornOutTabsDropping="OnExternalTornOutTabsDropping"
+            ExternalTornOutTabsDropped="OnExternalTornOutTabsDropped">
+            <TabView.TabItems>
+                <TabViewItem Header="Item 1" Content="Item 1" />
+                <TabViewItem Header="Item 2" Content="Item 2" />
+                <TabViewItem Header="Item 3" Content="Item 3" />
+            </TabView.TabItems>
+        </TabView>
+
+        <helpers:TestAutomationHelpersPanel Grid.Row="1" />
+    </Grid>
+    
+</Window>
diff --git a/src/controls/dev/TabView/TestUI/TabViewTearOutWindowWithoutDataItems.xaml.cs b/src/controls/dev/TabView/TestUI/TabViewTearOutWindowWithoutDataItems.xaml.cs
new file mode 100644
index 0000000000..b20eb9ceb8
--- /dev/null
+++ b/src/controls/dev/TabView/TestUI/TabViewTearOutWindowWithoutDataItems.xaml.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Reflection;
+using Windows.Foundation.Collections;
+
+namespace MUXControlsTestApp
+{
+    public sealed partial class TabViewTearOutWindowWithoutDataItems : Window
+    {
+        TabViewTearOutWindowWithoutDataItems tearOutWindow;
+
+        public TabViewTearOutWindowWithoutDataItems()
+        {
+            this.InitializeComponent();
+            Title = "MUXControlsTestApp.Desktop - Secondary TabViewTearOutWindow";
+        }
+
+        // A user has begun interacting with a tab, such that they might want to tear it out into its own window.
+        // We'll create a hidden window with the tab's contents that will be shown if the user tears out the tab.
+        private void OnTabTearOutWindowRequested(TabView _, TabViewTabTearOutWindowRequestedEventArgs args)
+        {
+            tearOutWindow = new();
+            tearOutWindow.TearOutTabsTabView.TabItems.Clear();
+            tearOutWindow.AppWindow.Hide();
+            tearOutWindow.AppWindow.Resize(new Windows.Graphics.SizeInt32(800, 300));
+            args.NewWindowId = tearOutWindow.AppWindow.Id;
+        }
+
+        // A user has torn out a tab, so now is the time we need to remove the torn-out item from our item list.
+        private void OnTabTearOutRequested(TabView tabView, TabViewTabTearOutRequestedEventArgs args)
+        {
+            foreach (var tab in args.Tabs.Cast<TabViewItem>())
+            {
+                tabView.TabItems.Remove(tab);
+                tearOutWindow.TearOutTabsTabView.TabItems.Add(tab);
+            }
+        }
+
+        // A tab being dragged from within this process has been dropped on another tab view.  This gives the tab view
+        // the opportunity to check to see whether it actually want to accepts the new tab.  In the case of this test app,
+        // however, we'll just always accept a dropped tab.
+        private void OnExternalTornOutTabsDropping(TabView _, TabViewExternalTornOutTabsDroppingEventArgs args)
+        {
+            args.AllowDrop = true;
+        }
+
+        // The tab being dragged has now been dropped onto another tab view.  We'll add its item to our item list.
+        // The tab view will take care of disposing of the window.
+        private void OnExternalTornOutTabsDropped(TabView tabView, TabViewExternalTornOutTabsDroppedEventArgs args)
+        {
+            int insertionIndex = args.DropIndex;
+
+            foreach (var tab in args.Tabs.Cast<TabViewItem>())
+            {
+                TabView otherTabView = null;
+                DependencyObject current = tab;
+
+                while (otherTabView == null)
+                {
+                    if (current is TabView foundTabView)
+                    {
+                        otherTabView = foundTabView;
+                    }
+
+                    current = VisualTreeHelper.GetParent(current);
+                }
+
+                otherTabView?.TabItems.Remove(tab);
+                tabView.TabItems.Insert(insertionIndex++, tab);
+            }
+        }
+    }
+}
diff --git a/src/controls/dev/TabView/TestUI/TabView_TestUI.projitems b/src/controls/dev/TabView/TestUI/TabView_TestUI.projitems
index 74b4feed3b..212e19e37c 100644
--- a/src/controls/dev/TabView/TestUI/TabView_TestUI.projitems
+++ b/src/controls/dev/TabView/TestUI/TabView_TestUI.projitems
@@ -34,6 +34,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)TabViewTearOutWindowWithDataItems.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)TabViewTearOutWindowWithoutDataItems.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)MultipleTabViewPage.xaml.cs">
@@ -54,5 +62,11 @@
     <Compile Include="$(MSBuildThisFileDirectory)TabViewTabClosingBehaviorPage.xaml.cs">
       <DependentUpon>TabViewTabClosingBehaviorPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)TabViewTearOutWindowWithDataItems.xaml.cs">
+      <DependentUpon>TabViewTearOutWindowWithDataItems.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)TabViewTearOutWindowWithoutDataItems.xaml.cs">
+      <DependentUpon>TabViewTearOutWindowWithoutDataItems.xaml</DependentUpon>
+    </Compile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/controls/dev/TeachingTip/InteractionTests/TeachingTipTestPageElements.cs b/src/controls/dev/TeachingTip/InteractionTests/TeachingTipTestPageElements.cs
index d9226886f8..20ab26bc61 100644
--- a/src/controls/dev/TeachingTip/InteractionTests/TeachingTipTestPageElements.cs
+++ b/src/controls/dev/TeachingTip/InteractionTests/TeachingTipTestPageElements.cs
@@ -206,6 +206,12 @@ public Button GetRemoveTargetButton()
         }
         private Button removeTargetButton;
 
+        public Button GetSwitchTargetButton()
+        {
+            return GetElement(ref SwitchTargetButton, "SwitchTargetButton");
+        }
+        private Button SwitchTargetButton;
+
         public ComboBox GetIsLightDismissEnabledComboBox()
         {
             return GetElement(ref isLightDismissEnabledComboBox, "IsLightDismissEnabledComboBox");
diff --git a/src/controls/dev/TeachingTip/InteractionTests/TeachingTipTests.cs b/src/controls/dev/TeachingTip/InteractionTests/TeachingTipTests.cs
index f7fc9ece60..11a9669455 100644
--- a/src/controls/dev/TeachingTip/InteractionTests/TeachingTipTests.cs
+++ b/src/controls/dev/TeachingTip/InteractionTests/TeachingTipTests.cs
@@ -1194,6 +1194,26 @@ void EnableLightDismiss()
             }
         }
 
+        [TestMethod]
+        [TestProperty("TestSuite", "C")]
+        public void VerifyTeachingTipTargetChange()
+        {
+            using (var setup = new TestSetupHelper(new[] { "TeachingTip Tests", "TeachingTip Test" }))
+            {
+                elements = new TeachingTipTestPageElements();
+
+                OpenTeachingTip();
+
+                double oldYOffset = GetTipVerticalOffset();
+
+                elements.GetSwitchTargetButton().InvokeAndWait();
+
+                double newYOffset = GetTipVerticalOffset();
+
+                Verify.IsFalse(oldYOffset == newYOffset);
+            }
+        }
+
         private void CloseOpenAndCloseWithJustKeyboardViaF6()
         {
             KeyboardHelper.PressKey(Key.F6);
diff --git a/src/controls/dev/TeachingTip/TeachingTip.cpp b/src/controls/dev/TeachingTip/TeachingTip.cpp
index 74b4ba92a0..c7aa0298b3 100644
--- a/src/controls/dev/TeachingTip/TeachingTip.cpp
+++ b/src/controls/dev/TeachingTip/TeachingTip.cpp
@@ -484,67 +484,67 @@ bool TeachingTip::PositionTargetedPopup()
         {
         case winrt::TeachingTipPlacementMode::Top:
             popup.VerticalOffset(m_currentTargetBoundsInCoreWindowSpace.Y - tipHeight - offset.Top);
-            popup.HorizontalOffset((((m_currentTargetBoundsInCoreWindowSpace.X * 2.0f) + m_currentTargetBoundsInCoreWindowSpace.Width - tipWidth) / 2.0f));
+            popup.HorizontalOffset((((m_currentTargetBoundsInCoreWindowSpace.X * 2.0) + m_currentTargetBoundsInCoreWindowSpace.Width - tipWidth) / 2.0));
             break;
 
         case winrt::TeachingTipPlacementMode::Bottom:
-            popup.VerticalOffset(m_currentTargetBoundsInCoreWindowSpace.Y + m_currentTargetBoundsInCoreWindowSpace.Height + static_cast<float>(offset.Bottom));
-            popup.HorizontalOffset((((m_currentTargetBoundsInCoreWindowSpace.X * 2.0f) + m_currentTargetBoundsInCoreWindowSpace.Width - tipWidth) / 2.0f));
+            popup.VerticalOffset(static_cast<double>(m_currentTargetBoundsInCoreWindowSpace.Y) + m_currentTargetBoundsInCoreWindowSpace.Height + offset.Bottom);
+            popup.HorizontalOffset((((m_currentTargetBoundsInCoreWindowSpace.X * 2.0) + m_currentTargetBoundsInCoreWindowSpace.Width - tipWidth) / 2.0));
             break;
 
         case winrt::TeachingTipPlacementMode::Left:
-            popup.VerticalOffset(((m_currentTargetBoundsInCoreWindowSpace.Y * 2.0f) + m_currentTargetBoundsInCoreWindowSpace.Height - tipHeight) / 2.0f);
+            popup.VerticalOffset(((m_currentTargetBoundsInCoreWindowSpace.Y * 2.0) + m_currentTargetBoundsInCoreWindowSpace.Height - tipHeight) / 2.0);
             popup.HorizontalOffset(m_currentTargetBoundsInCoreWindowSpace.X - tipWidth - offset.Left);
             break;
 
         case winrt::TeachingTipPlacementMode::Right:
-            popup.VerticalOffset(((m_currentTargetBoundsInCoreWindowSpace.Y * 2.0f) + m_currentTargetBoundsInCoreWindowSpace.Height - tipHeight) / 2.0f);
-            popup.HorizontalOffset(m_currentTargetBoundsInCoreWindowSpace.X + m_currentTargetBoundsInCoreWindowSpace.Width + static_cast<float>(offset.Right));
+            popup.VerticalOffset(((m_currentTargetBoundsInCoreWindowSpace.Y * 2.0) + m_currentTargetBoundsInCoreWindowSpace.Height - tipHeight) / 2.0);
+            popup.HorizontalOffset(static_cast<double>(m_currentTargetBoundsInCoreWindowSpace.X) + m_currentTargetBoundsInCoreWindowSpace.Width + offset.Right);
             break;
 
         case winrt::TeachingTipPlacementMode::TopRight:
             popup.VerticalOffset(m_currentTargetBoundsInCoreWindowSpace.Y - tipHeight - offset.Top);
-            popup.HorizontalOffset(((((m_currentTargetBoundsInCoreWindowSpace.X * 2.0f) + m_currentTargetBoundsInCoreWindowSpace.Width) / 2.0f) - MinimumTipEdgeToTailCenter()));
+            popup.HorizontalOffset(((((m_currentTargetBoundsInCoreWindowSpace.X * 2.0) + m_currentTargetBoundsInCoreWindowSpace.Width) / 2.0) - MinimumTipEdgeToTailCenter()));
             break;
 
         case winrt::TeachingTipPlacementMode::TopLeft:
             popup.VerticalOffset(m_currentTargetBoundsInCoreWindowSpace.Y - tipHeight - offset.Top);
-            popup.HorizontalOffset(((((m_currentTargetBoundsInCoreWindowSpace.X * 2.0f) + m_currentTargetBoundsInCoreWindowSpace.Width) / 2.0f) - tipWidth + MinimumTipEdgeToTailCenter()));
+            popup.HorizontalOffset(((((m_currentTargetBoundsInCoreWindowSpace.X * 2.0) + m_currentTargetBoundsInCoreWindowSpace.Width) / 2.0) - tipWidth + MinimumTipEdgeToTailCenter()));
             break;
 
         case winrt::TeachingTipPlacementMode::BottomRight:
-            popup.VerticalOffset(m_currentTargetBoundsInCoreWindowSpace.Y + m_currentTargetBoundsInCoreWindowSpace.Height + static_cast<float>(offset.Bottom));
-            popup.HorizontalOffset(((((m_currentTargetBoundsInCoreWindowSpace.X * 2.0f) + m_currentTargetBoundsInCoreWindowSpace.Width) / 2.0f) - MinimumTipEdgeToTailCenter()));
+            popup.VerticalOffset(static_cast<double>(m_currentTargetBoundsInCoreWindowSpace.Y) + m_currentTargetBoundsInCoreWindowSpace.Height + offset.Bottom);
+            popup.HorizontalOffset(((((m_currentTargetBoundsInCoreWindowSpace.X * 2.0) + m_currentTargetBoundsInCoreWindowSpace.Width) / 2.0) - MinimumTipEdgeToTailCenter()));
             break;
 
         case winrt::TeachingTipPlacementMode::BottomLeft:
-            popup.VerticalOffset(m_currentTargetBoundsInCoreWindowSpace.Y + m_currentTargetBoundsInCoreWindowSpace.Height + static_cast<float>(offset.Bottom));
-            popup.HorizontalOffset(((((m_currentTargetBoundsInCoreWindowSpace.X * 2.0f) + m_currentTargetBoundsInCoreWindowSpace.Width) / 2.0f) - tipWidth + MinimumTipEdgeToTailCenter()));
+            popup.VerticalOffset(static_cast<double>(m_currentTargetBoundsInCoreWindowSpace.Y) + m_currentTargetBoundsInCoreWindowSpace.Height + offset.Bottom);
+            popup.HorizontalOffset(((((m_currentTargetBoundsInCoreWindowSpace.X * 2.0) + m_currentTargetBoundsInCoreWindowSpace.Width) / 2.0) - tipWidth + MinimumTipEdgeToTailCenter()));
             break;
 
         case winrt::TeachingTipPlacementMode::LeftTop:
-            popup.VerticalOffset((((m_currentTargetBoundsInCoreWindowSpace.Y * 2.0f) + m_currentTargetBoundsInCoreWindowSpace.Height) / 2.0f) - tipHeight + MinimumTipEdgeToTailCenter());
+            popup.VerticalOffset((((m_currentTargetBoundsInCoreWindowSpace.Y * 2.0) + m_currentTargetBoundsInCoreWindowSpace.Height) / 2.0) - tipHeight + MinimumTipEdgeToTailCenter());
             popup.HorizontalOffset(m_currentTargetBoundsInCoreWindowSpace.X - tipWidth - offset.Left);
             break;
 
         case winrt::TeachingTipPlacementMode::LeftBottom:
-            popup.VerticalOffset((((m_currentTargetBoundsInCoreWindowSpace.Y * 2.0f) + m_currentTargetBoundsInCoreWindowSpace.Height) / 2.0f) - MinimumTipEdgeToTailCenter());
+            popup.VerticalOffset((((m_currentTargetBoundsInCoreWindowSpace.Y * 2.0) + m_currentTargetBoundsInCoreWindowSpace.Height) / 2.0) - MinimumTipEdgeToTailCenter());
             popup.HorizontalOffset(m_currentTargetBoundsInCoreWindowSpace.X - tipWidth - offset.Left);
             break;
 
         case winrt::TeachingTipPlacementMode::RightTop:
-            popup.VerticalOffset((((m_currentTargetBoundsInCoreWindowSpace.Y * 2.0f) + m_currentTargetBoundsInCoreWindowSpace.Height) / 2.0f) - tipHeight + MinimumTipEdgeToTailCenter());
-            popup.HorizontalOffset(m_currentTargetBoundsInCoreWindowSpace.X + m_currentTargetBoundsInCoreWindowSpace.Width + static_cast<float>(offset.Right));
+            popup.VerticalOffset((((m_currentTargetBoundsInCoreWindowSpace.Y * 2.0) + m_currentTargetBoundsInCoreWindowSpace.Height) / 2.0) - tipHeight + MinimumTipEdgeToTailCenter());
+            popup.HorizontalOffset(static_cast<double>(m_currentTargetBoundsInCoreWindowSpace.X) + m_currentTargetBoundsInCoreWindowSpace.Width + offset.Right);
             break;
 
         case winrt::TeachingTipPlacementMode::RightBottom:
-            popup.VerticalOffset((((m_currentTargetBoundsInCoreWindowSpace.Y * 2.0f) + m_currentTargetBoundsInCoreWindowSpace.Height) / 2.0f) - MinimumTipEdgeToTailCenter());
-            popup.HorizontalOffset(m_currentTargetBoundsInCoreWindowSpace.X + m_currentTargetBoundsInCoreWindowSpace.Width + static_cast<float>(offset.Right));
+            popup.VerticalOffset((((m_currentTargetBoundsInCoreWindowSpace.Y * 2.0) + m_currentTargetBoundsInCoreWindowSpace.Height) / 2.0) - MinimumTipEdgeToTailCenter());
+            popup.HorizontalOffset(static_cast<double>(m_currentTargetBoundsInCoreWindowSpace.X) + m_currentTargetBoundsInCoreWindowSpace.Width + offset.Right);
             break;
 
         case winrt::TeachingTipPlacementMode::Center:
-            popup.VerticalOffset(m_currentTargetBoundsInCoreWindowSpace.Y + (m_currentTargetBoundsInCoreWindowSpace.Height / 2.0f) - tipHeight - offset.Top);
-            popup.HorizontalOffset((((m_currentTargetBoundsInCoreWindowSpace.X * 2.0f) + m_currentTargetBoundsInCoreWindowSpace.Width - tipWidth) / 2.0f));
+            popup.VerticalOffset(m_currentTargetBoundsInCoreWindowSpace.Y + (m_currentTargetBoundsInCoreWindowSpace.Height / 2.0) - tipHeight - offset.Top);
+            popup.HorizontalOffset((((m_currentTargetBoundsInCoreWindowSpace.X * 2.0) + m_currentTargetBoundsInCoreWindowSpace.Width - tipWidth) / 2.0));
             break;
 
         default:
@@ -1487,14 +1487,20 @@ void TeachingTip::OnTargetChanged()
     auto const target = Target();
     m_target.set(target);
 
+    bool isTargetLoaded = false;
+
     if (target)
     {
+        // We need to check if the target is loaded before registering for its 
+        // loaded event. This is because the act of registering for the loaded event
+        // will cause the target to report that it is not loaded.
+        isTargetLoaded = target.IsLoaded();
         m_targetLoadedRevoker = target.Loaded(winrt::auto_revoke, { this, &TeachingTip::OnTargetLoaded });
     }
 
     if (IsOpen())
     {
-        if (target && target.IsLoaded())
+        if (target && isTargetLoaded)
         {
             m_currentTargetBoundsInCoreWindowSpace = target.TransformToVisual(nullptr).TransformBounds({
                 0.0,
@@ -1506,7 +1512,7 @@ void TeachingTip::OnTargetChanged()
         }
 
         // if we have a target that is not yet loaded, skip positioning the flayout for now, that will happen once the target loads.
-        if (!target || (target && target.IsLoaded()))
+        if (!target || (target && isTargetLoaded))
         {
             PositionPopup();
         }
@@ -2068,13 +2074,13 @@ std::tuple<winrt::Thickness, winrt::Thickness> TeachingTip::DetermineSpaceAround
 
     const winrt::Thickness windowSpaceAroundTarget{
         // Target.Left - Window.Left
-        m_currentTargetBoundsInCoreWindowSpace.X - /* 0 except with test window bounds */ windowBoundsInCoreWindowSpace.X,
+        static_cast<double>(m_currentTargetBoundsInCoreWindowSpace.X) - /* 0 except with test window bounds */ windowBoundsInCoreWindowSpace.X,
         // Target.Top - Window.Top
-        m_currentTargetBoundsInCoreWindowSpace.Y - /* 0 except with test window bounds */ windowBoundsInCoreWindowSpace.Y,
+        static_cast<double>(m_currentTargetBoundsInCoreWindowSpace.Y) - /* 0 except with test window bounds */ windowBoundsInCoreWindowSpace.Y,
         // Window.Right - Target.Right
-        (windowBoundsInCoreWindowSpace.X + windowBoundsInCoreWindowSpace.Width) - (m_currentTargetBoundsInCoreWindowSpace.X + m_currentTargetBoundsInCoreWindowSpace.Width),
+        (static_cast<double>(windowBoundsInCoreWindowSpace.X) + windowBoundsInCoreWindowSpace.Width) - (static_cast<double>(m_currentTargetBoundsInCoreWindowSpace.X) + m_currentTargetBoundsInCoreWindowSpace.Width),
         // Screen.Right - Target.Right
-        (windowBoundsInCoreWindowSpace.Y + windowBoundsInCoreWindowSpace.Height) - (m_currentTargetBoundsInCoreWindowSpace.Y + m_currentTargetBoundsInCoreWindowSpace.Height) };
+        (static_cast<double>(windowBoundsInCoreWindowSpace.Y) + windowBoundsInCoreWindowSpace.Height) - (static_cast<double>(m_currentTargetBoundsInCoreWindowSpace.Y) + m_currentTargetBoundsInCoreWindowSpace.Height) };
 
 
     const winrt::Thickness screenSpaceAroundTarget = [this, screenBoundsInCoreWindowSpace, windowSpaceAroundTarget]()
@@ -2083,13 +2089,13 @@ std::tuple<winrt::Thickness, winrt::Thickness> TeachingTip::DetermineSpaceAround
         {
             return winrt::Thickness{
                 // Target.Left - Screen.Left
-                m_currentTargetBoundsInCoreWindowSpace.X - screenBoundsInCoreWindowSpace.X,
+                static_cast<double>(m_currentTargetBoundsInCoreWindowSpace.X) - screenBoundsInCoreWindowSpace.X,
                 // Target.Top - Screen.Top
-                m_currentTargetBoundsInCoreWindowSpace.Y - screenBoundsInCoreWindowSpace.Y,
+                static_cast<double>(m_currentTargetBoundsInCoreWindowSpace.Y) - screenBoundsInCoreWindowSpace.Y,
                 // Screen.Right - Target.Right
-                (screenBoundsInCoreWindowSpace.X + screenBoundsInCoreWindowSpace.Width) - (m_currentTargetBoundsInCoreWindowSpace.X + m_currentTargetBoundsInCoreWindowSpace.Width),
+                (static_cast<double>(screenBoundsInCoreWindowSpace.X) + screenBoundsInCoreWindowSpace.Width) - (static_cast<double>(m_currentTargetBoundsInCoreWindowSpace.X) + m_currentTargetBoundsInCoreWindowSpace.Width),
                 // Screen.Bottom - Target.Bottom
-                (screenBoundsInCoreWindowSpace.Y + screenBoundsInCoreWindowSpace.Height) - (m_currentTargetBoundsInCoreWindowSpace.Y + m_currentTargetBoundsInCoreWindowSpace.Height) };
+                (static_cast<double>(screenBoundsInCoreWindowSpace.Y) + screenBoundsInCoreWindowSpace.Height) - (static_cast<double>(m_currentTargetBoundsInCoreWindowSpace.Y) + m_currentTargetBoundsInCoreWindowSpace.Height) };
         }
         return windowSpaceAroundTarget;
     }();
@@ -2255,51 +2261,51 @@ void TeachingTip::OnPropertyChanged(
     winrt::get_self<TeachingTip>(sender.as<winrt::TeachingTip>())->OnPropertyChanged(args);
 }
 
-float TeachingTip::TailLongSideActualLength()
+double TeachingTip::TailLongSideActualLength()
 {
     if (auto&& tailPolygon = m_tailPolygon.get())
     {
-        return static_cast<float>(std::max(tailPolygon.ActualHeight(), tailPolygon.ActualWidth()));
+        return std::max(tailPolygon.ActualHeight(), tailPolygon.ActualWidth());
     }
     return 0;
 }
 
-float TeachingTip::TailLongSideLength()
+double TeachingTip::TailLongSideLength()
 {
-    return static_cast<float>(TailLongSideActualLength() - (2 * s_tailOcclusionAmount));
+    return TailLongSideActualLength() - (2 * static_cast<double>(s_tailOcclusionAmount));
 }
 
-float TeachingTip::TailShortSideLength()
+double TeachingTip::TailShortSideLength()
 {
     if (auto&& tailPolygon = m_tailPolygon.get())
     {
-        return static_cast<float>(std::min(tailPolygon.ActualHeight(), tailPolygon.ActualWidth()) - s_tailOcclusionAmount);
+        return std::min(tailPolygon.ActualHeight(), tailPolygon.ActualWidth()) - s_tailOcclusionAmount;
     }
     return 0;
 }
 
-float TeachingTip::MinimumTipEdgeToTailEdgeMargin()
+double TeachingTip::MinimumTipEdgeToTailEdgeMargin()
 {
     if (auto&& tailOcclusionGrid = m_tailOcclusionGrid.get())
     {
         return tailOcclusionGrid.ColumnDefinitions().Size() > 1 ?
-            static_cast<float>(tailOcclusionGrid.ColumnDefinitions().GetAt(1).ActualWidth() + s_tailOcclusionAmount)
-            : 0.0f;
+            tailOcclusionGrid.ColumnDefinitions().GetAt(1).ActualWidth() + s_tailOcclusionAmount
+            : 0.0;
     }
     return 0;
 }
 
-float TeachingTip::MinimumTipEdgeToTailCenter()
+double TeachingTip::MinimumTipEdgeToTailCenter()
 {
     if (auto&& tailOcclusionGrid = m_tailOcclusionGrid.get())
     {
         if (auto&& tailPolygon = m_tailPolygon.get())
         {
             return tailOcclusionGrid.ColumnDefinitions().Size() > 1 ?
-                static_cast<float>(tailOcclusionGrid.ColumnDefinitions().GetAt(0).ActualWidth() +
-                    tailOcclusionGrid.ColumnDefinitions().GetAt(1).ActualWidth() +
-                    (std::max(tailPolygon.ActualHeight(), tailPolygon.ActualWidth()) / 2))
-                : 0.0f;
+                tailOcclusionGrid.ColumnDefinitions().GetAt(0).ActualWidth() +
+                tailOcclusionGrid.ColumnDefinitions().GetAt(1).ActualWidth() +
+                (std::max(tailPolygon.ActualHeight(), tailPolygon.ActualWidth()) / 2)
+                : 0.0;
         }
     }
     return 0;
diff --git a/src/controls/dev/TeachingTip/TeachingTip.h b/src/controls/dev/TeachingTip/TeachingTip.h
index 6403589498..b499a6436b 100644
--- a/src/controls/dev/TeachingTip/TeachingTip.h
+++ b/src/controls/dev/TeachingTip/TeachingTip.h
@@ -161,15 +161,15 @@ class TeachingTip :
 
     // The tail is designed as an 8x16 pixel shape, however it is actually a 10x20 shape which is partially occluded by the tip content.
     // This is done to get the border of the tip to follow the tail shape without drawing the border on the tip edge of the tail.
-    float TailLongSideActualLength();
-    float TailLongSideLength();
-    float TailShortSideLength();
-    float MinimumTipEdgeToTailEdgeMargin();
-    float MinimumTipEdgeToTailCenter();
+    double TailLongSideActualLength();
+    double TailLongSideLength();
+    double TailShortSideLength();
+    double MinimumTipEdgeToTailEdgeMargin();
+    double MinimumTipEdgeToTailCenter();
 
     winrt::CornerRadius GetTeachingTipCornerRadius();
-    float TopLeftCornerRadius() { return static_cast<float>(GetTeachingTipCornerRadius().TopLeft); }
-    float TopRightCornerRadius() { return static_cast<float>(GetTeachingTipCornerRadius().TopRight); }
+    double TopLeftCornerRadius() { return GetTeachingTipCornerRadius().TopLeft; }
+    double TopRightCornerRadius() { return GetTeachingTipCornerRadius().TopRight; }
 
     tracker_ref<winrt::Border> m_container{ this };
 
@@ -258,22 +258,22 @@ class TeachingTip :
     }
 
     // These values are shifted by one because this is the 1px highlight that sits adjacent to the tip border.
-    inline winrt::Thickness BottomPlacementTopRightHighlightMargin(double width, double height) { return { (width / 2) + (TailShortSideLength() - 1.0f), 0, (TopRightCornerRadius() - 1.0f), 0 }; }
-    inline winrt::Thickness BottomRightPlacementTopRightHighlightMargin(double width, double height) { return { MinimumTipEdgeToTailEdgeMargin() + TailLongSideLength() - 1.0f, 0, (TopRightCornerRadius() - 1.0f), 0 }; }
-    inline winrt::Thickness BottomLeftPlacementTopRightHighlightMargin(double width, double height) { return { width - (MinimumTipEdgeToTailEdgeMargin() + 1.0f), 0, (TopRightCornerRadius() - 1.0f), 0 }; }
+    inline winrt::Thickness BottomPlacementTopRightHighlightMargin(double width, double height) { return { (width / 2) + (TailShortSideLength() - 1.0), 0, (TopRightCornerRadius() - 1.0), 0 }; }
+    inline winrt::Thickness BottomRightPlacementTopRightHighlightMargin(double width, double height) { return { MinimumTipEdgeToTailEdgeMargin() + TailLongSideLength() - 1.0, 0, (TopRightCornerRadius() - 1.0), 0 }; }
+    inline winrt::Thickness BottomLeftPlacementTopRightHighlightMargin(double width, double height) { return { width - (MinimumTipEdgeToTailEdgeMargin() + 1.0), 0, (TopRightCornerRadius() - 1.0), 0 }; }
     static inline winrt::Thickness constexpr OtherPlacementTopRightHighlightMargin(double width, double height) { return { 0, 0, 0, 0 }; }
 
-    inline winrt::Thickness BottomPlacementTopLeftHighlightMargin(double width, double height) { return { (TopLeftCornerRadius() - 1.0f), 0, (width / 2) + (TailShortSideLength() - 1.0f), 0 }; }
-    inline winrt::Thickness BottomRightPlacementTopLeftHighlightMargin(double width, double height) { return { (TopLeftCornerRadius() - 1.0f), 0, width - (MinimumTipEdgeToTailEdgeMargin() + 1.0f), 0 }; }
-    inline winrt::Thickness BottomLeftPlacementTopLeftHighlightMargin(double width, double height) { return { (TopLeftCornerRadius() - 1.0f), 0, MinimumTipEdgeToTailEdgeMargin() + TailLongSideLength() - 1.0f, 0 }; }
-    inline winrt::Thickness TopEdgePlacementTopLeftHighlightMargin(double width, double height) { return { (TopLeftCornerRadius() - 1.0f), 1, (TopRightCornerRadius() - 1.0f), 0 }; }
+    inline winrt::Thickness BottomPlacementTopLeftHighlightMargin(double width, double height) { return { (TopLeftCornerRadius() - 1.0), 0, (width / 2) + (TailShortSideLength() - 1.0), 0 }; }
+    inline winrt::Thickness BottomRightPlacementTopLeftHighlightMargin(double width, double height) { return { (TopLeftCornerRadius() - 1.0), 0, width - (MinimumTipEdgeToTailEdgeMargin() + 1.0), 0 }; }
+    inline winrt::Thickness BottomLeftPlacementTopLeftHighlightMargin(double width, double height) { return { (TopLeftCornerRadius() - 1.0), 0, MinimumTipEdgeToTailEdgeMargin() + TailLongSideLength() - 1.0, 0 }; }
+    inline winrt::Thickness TopEdgePlacementTopLeftHighlightMargin(double width, double height) { return { (TopLeftCornerRadius() - 1.0), 1, (TopRightCornerRadius() - 1.0), 0 }; }
     // Shifted by one since the tail edge's border is not accounted for automatically.
-    inline winrt::Thickness LeftEdgePlacementTopLeftHighlightMargin(double width, double height) { return { (TopLeftCornerRadius() - 1.0f), 1, (TopRightCornerRadius() - 2.0f), 0 }; }
-    inline winrt::Thickness RightEdgePlacementTopLeftHighlightMargin(double width, double height) { return { (TopLeftCornerRadius() - 2.0f), 1, (TopRightCornerRadius() - 1.0f), 0 }; }
+    inline winrt::Thickness LeftEdgePlacementTopLeftHighlightMargin(double width, double height) { return { (TopLeftCornerRadius() - 1.0), 1, (TopRightCornerRadius() - 2.0), 0 }; }
+    inline winrt::Thickness RightEdgePlacementTopLeftHighlightMargin(double width, double height) { return { (TopLeftCornerRadius() - 2.0), 1, (TopRightCornerRadius() - 1.0), 0 }; }
 
     static inline double constexpr UntargetedTipFarPlacementOffset(float farWindowCoordinateInCoreWindowSpace, double tipSize, double offset) { return farWindowCoordinateInCoreWindowSpace - (tipSize + s_untargetedTipWindowEdgeMargin + offset); }
-    static inline double constexpr UntargetedTipCenterPlacementOffset(float nearWindowCoordinateInCoreWindowSpace, float farWindowCoordinateInCoreWindowSpace, double tipSize, double nearOffset, double farOffset) { return ((nearWindowCoordinateInCoreWindowSpace + farWindowCoordinateInCoreWindowSpace) / 2)  - (tipSize / 2) + nearOffset - farOffset; }
-    static inline double constexpr UntargetedTipNearPlacementOffset(float nearWindowCoordinateInCoreWindowSpace, double offset) { return s_untargetedTipWindowEdgeMargin + nearWindowCoordinateInCoreWindowSpace + offset; }
+    static inline double constexpr UntargetedTipCenterPlacementOffset(float nearWindowCoordinateInCoreWindowSpace, float farWindowCoordinateInCoreWindowSpace, double tipSize, double nearOffset, double farOffset) { return ((static_cast<double>(nearWindowCoordinateInCoreWindowSpace) + static_cast<double>(farWindowCoordinateInCoreWindowSpace)) / 2)  - (tipSize / 2) + nearOffset - farOffset; }
+    static inline double constexpr UntargetedTipNearPlacementOffset(float nearWindowCoordinateInCoreWindowSpace, double offset) { return static_cast<double>(s_untargetedTipWindowEdgeMargin) + nearWindowCoordinateInCoreWindowSpace + offset; }
 
     static constexpr wstring_view s_scaleTargetName{ L"Scale"sv };
     static constexpr wstring_view s_translationTargetName{ L"Translation"sv };
diff --git a/src/controls/dev/TeachingTip/TestUI/TeachingTipPage.xaml b/src/controls/dev/TeachingTip/TestUI/TeachingTipPage.xaml
index 05294055bf..96f26df4dd 100644
--- a/src/controls/dev/TeachingTip/TestUI/TeachingTipPage.xaml
+++ b/src/controls/dev/TeachingTip/TestUI/TeachingTipPage.xaml
@@ -70,6 +70,7 @@
                             </muxc:TeachingTip>
                         </Button.Resources>
                     </Button>
+                    <Button x:Name="targetButton2" HorizontalAlignment="Center" VerticalAlignment="Center" Height="300">Second Target</Button>
                     <Grid Background="Green" Width="100" Height="10000"/>
                 </StackPanel>
             </ScrollViewer>
@@ -136,6 +137,8 @@
                             <RowDefinition Height="Auto"/>
                             <RowDefinition Height="Auto"/>
                             <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*"/>
@@ -305,6 +308,9 @@
                            Text="{x:Bind BrushToString(CurrentCancelClosesCheckBox.Foreground),Mode=OneWay}" FontSize="8"/>
                             </StackPanel>
                         </StackPanel>
+
+                        <TextBlock Grid.Row="38" Text="Switch TeachingTip Target" Foreground="Red"/>
+                        <Button Grid.Row="39" AutomationProperties.Name="SwitchTargetButton" Click="OnSwitchTargetButtonClicked">Switch Target</Button>
                     </Grid>
                 </ScrollViewer>
 
diff --git a/src/controls/dev/TeachingTip/TestUI/TeachingTipPage.xaml.cs b/src/controls/dev/TeachingTip/TestUI/TeachingTipPage.xaml.cs
index 9e39fdfbb4..374d2fc625 100644
--- a/src/controls/dev/TeachingTip/TestUI/TeachingTipPage.xaml.cs
+++ b/src/controls/dev/TeachingTip/TestUI/TeachingTipPage.xaml.cs
@@ -946,6 +946,12 @@ private void OnPageThemeComboBoxSelectionChanged(object sender, SelectionChanged
             }
         }
 
+        public void OnSwitchTargetButtonClicked(object sender, RoutedEventArgs args)
+        {
+            var newTarget = getTeachingTip().Target == targetButton ? targetButton2 : targetButton;
+            getTeachingTip().Target = newTarget;
+        }
+
         public Button ActionButton
         {
             get
diff --git a/src/controls/dev/Telemetry/MuxcTraceLogging.h b/src/controls/dev/Telemetry/MuxcTraceLogging.h
index e3d8abbdb8..76baa9e87c 100644
--- a/src/controls/dev/Telemetry/MuxcTraceLogging.h
+++ b/src/controls/dev/Telemetry/MuxcTraceLogging.h
@@ -65,6 +65,8 @@
 #define TRACE_MSG_METH_STR_DBL_DBL L"%s[0x%p](%s, %lf, %lf)\n"
 #define TRACE_MSG_METH_STR_FLT L"%s[0x%p](%s, %f)\n"
 #define TRACE_MSG_METH_STR_INT L"%s[0x%p](%s, %d)\n"
+#define TRACE_MSG_METH_STR_STR_PTR L"%s[0x%p](%s, %s, 0x%p)\n"
+#define TRACE_MSG_METH_STR_STR_DBL L"%s[0x%p](%s, %s, %lf)\n"
 #define TRACE_MSG_METH_STR_STR_INT L"%s[0x%p](%s, %s, %d)\n"
 #define TRACE_MSG_METH_STR_STR_STR L"%s[0x%p](%s, %s, %s)\n"
 #define TRACE_MSG_METH_STR_INT_INT L"%s[0x%p](%s, %d, %d)\n"
@@ -73,6 +75,7 @@
 #define TRACE_MSG_METH_STR_STR_FLT_FLT_FLT_FLT L"%s[0x%p](%s, %s, %f, %f, %f, %f)\n"
 #define TRACE_MSG_METH_STR_STR_FLT L"%s[0x%p](%s, %s, %f)\n"
 #define TRACE_MSG_METH_STR_STR_INT_INT L"%s[0x%p](%s, %s, %d, %d)\n"
+#define TRACE_MSG_METH_STR_STR_DBL_DBL L"%s[0x%p](%s, %s, %lf, %lf)\n"
 
 #define TRACE_MSG_METH_METH L"%s[0x%p] - calls %s()\n"
 #define TRACE_MSG_METH_METH_INT L"%s[0x%p] - calls %s(%d)\n"
diff --git a/src/controls/dev/Telemetry/RuntimeProfiler.cpp b/src/controls/dev/Telemetry/RuntimeProfiler.cpp
index d6ce8376ee..9b14bf8c55 100644
--- a/src/controls/dev/Telemetry/RuntimeProfiler.cpp
+++ b/src/controls/dev/Telemetry/RuntimeProfiler.cpp
@@ -208,7 +208,6 @@ namespace RuntimeProfiler {
 
     bool g_runtimeProfilerInitialized{ false };
     PTP_TIMER g_pTimer{ nullptr };
-    winrt::Application::Suspending_revoker g_applicationSuspendingRevoker{};
 
     void UninitializeRuntimeProfiler()
     {
@@ -225,11 +224,6 @@ namespace RuntimeProfiler {
             g_pTimer = nullptr;
         }
 
-        if (g_applicationSuspendingRevoker)
-        {
-            g_applicationSuspendingRevoker.revoke();
-        }
-
         g_runtimeProfilerInitialized = false;
     }
 
@@ -254,23 +248,7 @@ namespace RuntimeProfiler {
             SetThreadpoolTimer(g_pTimer, &ftdueTime, (DWORD)(std::chrono::milliseconds(EventFrequency).count()), 60 * 1000);
         }
 
-        //  Since MUX doesn't piggyback the WUX Extension suspend handler,
-        //  we sign up for suspension notifications.
-        try
-        {
-            g_applicationSuspendingRevoker = winrt::Application::Current().Suspending(winrt::auto_revoke, [](auto&, auto&)
-                {
-                    FireEvent(true);
-                }
-            );
-        }
-        catch (winrt::hresult_error e)
-        {
-            // We might not have an Application instance object in XamlPresenter scenarios
-            // because we don't need it.
-        }
-
-        g_runtimeProfilerInitialized = g_pTimer != nullptr && g_applicationSuspendingRevoker;
+        g_runtimeProfilerInitialized = g_pTimer != nullptr;
     }
 
     void RegisterMethod(ProfileGroup group, UINT16 uTypeIndex, UINT16 uMethodIndex, volatile LONG *pCount) noexcept
diff --git a/src/controls/dev/Telemetry/RuntimeProfiler.h b/src/controls/dev/Telemetry/RuntimeProfiler.h
index f01551ba79..27f8f0da9f 100644
--- a/src/controls/dev/Telemetry/RuntimeProfiler.h
+++ b/src/controls/dev/Telemetry/RuntimeProfiler.h
@@ -66,6 +66,7 @@ namespace RuntimeProfiler
         ProfId_AnnotatedScrollBar,
         ProfId_MapControl,
         ProfId_SelectorBar,
+        ProfId_TitleBar,
         ProfId_Size // ProfId_Size is the last always. 
     } ProfilerClassId;
 
diff --git a/src/controls/dev/TitleBar/TestUI/TitleBarPage.xaml b/src/controls/dev/TitleBar/TestUI/TitleBarPage.xaml
index cede7e4813..8052da162c 100644
--- a/src/controls/dev/TitleBar/TestUI/TitleBarPage.xaml
+++ b/src/controls/dev/TitleBar/TestUI/TitleBarPage.xaml
@@ -12,12 +12,12 @@
 
     <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Margin="12">
         <StackPanel Orientation="Vertical">
-            <CheckBox x:Name="IsBackButtonVisibleCheckBox" Content="Back Button Visible" Checked="IsBackButtonVisibleCheckBox_CheckedChanged" Unchecked="IsBackButtonVisibleCheckBox_CheckedChanged"/>
-            <CheckBox x:Name="IsBackEnabledCheckBox" Content="Back Button Enabled" Checked="IsBackEnabledCheckBox_CheckedChanged" Unchecked="IsBackEnabledCheckBox_CheckedChanged"/>
-            <TextBlock x:Name="BackRequestedTextBox"/>
-            <CheckBox x:Name="SetIconCheckBox" IsChecked="True" Content="Set Icon" Checked="SetIconCheckBox_CheckedChanged" Unchecked="SetIconCheckBox_CheckedChanged"/>
-            <CheckBox x:Name="SetTitleCheckBox" IsChecked="True" Content="Set Title" Checked="SetTitleCheckBox_CheckedChanged" Unchecked="SetTitleCheckBox_CheckedChanged"/>
-            <CheckBox x:Name="CustomContentCheckBox" Content="CustomContent" Checked="CustomContentCheckBox_CheckedChanged" Unchecked="CustomContentCheckBox_CheckedChanged"/>
+            <TitleBar x:Name="WindowingTitleBar" Title="Windowing TitleBar">
+                <TitleBar.IconSource>
+                    <SymbolIconSource Symbol="Home"/>
+                </TitleBar.IconSource>
+            </TitleBar>
+            <Button Content="New Window with Custom TitleBar" Click="TitleBarWindowingButton_Click"/>
         </StackPanel>
     </Grid>
 </local:TestPage>
diff --git a/src/controls/dev/TitleBar/TestUI/TitleBarPage.xaml.cs b/src/controls/dev/TitleBar/TestUI/TitleBarPage.xaml.cs
index d3d19187b2..8a6840145e 100644
--- a/src/controls/dev/TitleBar/TestUI/TitleBarPage.xaml.cs
+++ b/src/controls/dev/TitleBar/TestUI/TitleBarPage.xaml.cs
@@ -10,103 +10,26 @@
 using Windows.UI;
 using System.Windows.Input;
 
-using Microsoft.Experimental.UI.Xaml.Controls;
 using Windows.UI.ViewManagement;
 using Windows.Foundation;
+using MUXControlsTestApp.Utilities;
+using Microsoft.UI.Windowing;
 
 namespace MUXControlsTestApp
 {
+    [TopLevelTestPage(Name = "TitleBar", Icon = "DefaultIcon.png")]
     public sealed partial class TitleBarPage : TestPage
     {
-        TitleBar _titleBar = null;
-
         public TitleBarPage()
         {
             this.InitializeComponent();
-
-            _titleBar = new TitleBar();
-            _titleBar.Title = "Experimental Controls Test App";
-            var icon = new Microsoft.UI.Xaml.Controls.SymbolIconSource();
-            icon.Symbol = Symbol.Keyboard;
-            _titleBar.IconSource = icon;
-
-            var testFrame = Window.Current.Content as TestFrame;
-            testFrame.CustomElement = _titleBar;
-
-            // Set window min size to the smallest width we support.
-            ApplicationView.GetForCurrentView().SetPreferredMinSize(new Size(320, 500));
-        }
-
-        private void _titleBar_BackRequested(TitleBar sender, object args)
-        {
-            BackRequestedTextBox.Text = "BackRequested";
-        }
-
-        private void IsBackButtonVisibleCheckBox_CheckedChanged(object sender, RoutedEventArgs e)
-        {
-            if (_titleBar != null)
-            {
-                _titleBar.IsBackButtonVisible = IsBackButtonVisibleCheckBox.IsChecked.Value;
-            }
         }
 
-        private void IsBackEnabledCheckBox_CheckedChanged(object sender, RoutedEventArgs e)
+        private void TitleBarWindowingButton_Click(object sender, RoutedEventArgs e)
         {
-            if (_titleBar != null)
-            {
-                _titleBar.IsBackEnabled = IsBackEnabledCheckBox.IsChecked.Value;
-            }
+            var newWindow = new TitleBarPageWindow();
+            newWindow.Activate();
         }
 
-        private void SetIconCheckBox_CheckedChanged(object sender, RoutedEventArgs e)
-        {
-            if (_titleBar != null)
-            {
-                if (SetIconCheckBox.IsChecked.Value)
-                {
-                    var icon = new Microsoft.UI.Xaml.Controls.SymbolIconSource();
-                    icon.Symbol = Symbol.Mail;
-                    _titleBar.IconSource = icon;
-                }
-                else
-                {
-                    _titleBar.IconSource = null;
-                }
-            }
-        }
-
-        private void SetTitleCheckBox_CheckedChanged(object sender, RoutedEventArgs e)
-        {
-            if (_titleBar != null)
-            {
-                _titleBar.Title = SetTitleCheckBox.IsChecked.Value ? "Title" : String.Empty;
-            }
-        }
-        private void CustomContentCheckBox_CheckedChanged(object sender, RoutedEventArgs e)
-        {
-            if (_titleBar != null)
-            {
-                if (CustomContentCheckBox.IsChecked.Value)
-                {
-                    string xaml =
-                    @"<Grid xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation'>
-                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width='Auto'/>
-                            <ColumnDefinition Width='*' />
-                         </Grid.ColumnDefinitions >
-
-                         <Button Content='Left'/>
-                         <Button Grid.Column='1' Content='Right' HorizontalAlignment='Right'/>
-                    </Grid>";
-
-                    var element = XamlReader.Load(xaml);
-                    _titleBar.CustomContent = element;
-                }
-                else
-                {
-                    _titleBar.CustomContent = null;
-                }
-            }
-        }
     }
 }
diff --git a/src/controls/dev/TitleBar/TestUI/TitleBarPageWindow.xaml b/src/controls/dev/TitleBar/TestUI/TitleBarPageWindow.xaml
new file mode 100644
index 0000000000..5c3540b0b0
--- /dev/null
+++ b/src/controls/dev/TitleBar/TestUI/TitleBarPageWindow.xaml
@@ -0,0 +1,111 @@
+<Window
+    x:Class="MUXControlsTestApp.TitleBarPageWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:MUXControlsTestApp"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <Window.SystemBackdrop>
+        <MicaBackdrop />
+    </Window.SystemBackdrop>
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <TitleBar x:Name="WindowingTitleBar"
+                Title="Windowing TitleBar"
+                BackRequested="WindowingTitleBar_BackRequested"
+                PaneToggleRequested="WindowingTitleBar_PaneToggleRequested">
+            <TitleBar.IconSource>
+                <SymbolIconSource Symbol="Home" />
+            </TitleBar.IconSource>
+        </TitleBar>
+
+
+        <StackPanel Grid.Row="1"
+                    Orientation="Vertical"
+                    Background="{ThemeResource LayerFillColorDefaultBrush}"
+                    BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                    BorderThickness="1"
+                    Spacing="8"
+                    Padding="46,20">
+            <CheckBox x:Name="IsBackButtonVisibleCheckBox"
+                    Content="Back Button Visible"
+                    Checked="IsBackButtonVisibleCheckBox_CheckedChanged"
+                    Unchecked="IsBackButtonVisibleCheckBox_CheckedChanged" />
+
+            <CheckBox x:Name="IsBackEnabledCheckBox"
+                    IsChecked="True"
+                    Content="Back Button Enabled"
+                    Checked="IsBackEnabledCheckBox_CheckedChanged"
+                    Unchecked="IsBackEnabledCheckBox_CheckedChanged" />
+
+            <StackPanel Orientation="Horizontal">
+                <TextBlock Text="Back Requested:" />
+                <TextBlock x:Name="BackRequestedCountTextBox"
+                        Margin="8,0,0,0"
+                        Foreground="Red" />
+            </StackPanel>
+
+            <CheckBox x:Name="IsPaneToggleButtonVisibleCheckbox"
+                    Content="PaneToggleButton Visible"
+                    Checked="IsPaneToggleButtonVisibleCheckbox_CheckedChanged"
+                    Unchecked="IsPaneToggleButtonVisibleCheckbox_CheckedChanged" />
+
+            <StackPanel Orientation="Horizontal">
+                <TextBlock Text="PaneToggleButton Requested:" />
+                <TextBlock x:Name="PaneToggleButtonRequestedCountTextBox"
+                        Margin="8,0,0,0"
+                        Foreground="Red" />
+            </StackPanel>
+
+            <CheckBox x:Name="SetIconCheckBox"
+                    IsChecked="True"
+                    Content="Set Icon"
+                    Checked="SetIconCheckBox_CheckedChanged"
+                    Unchecked="SetIconCheckBox_CheckedChanged" />
+
+            <StackPanel Orientation="Horizontal"
+                        Spacing="8">
+                <TextBox x:Name="TitleTextBox"
+                        PlaceholderText="Title Text"
+                        HorizontalAlignment="Left"
+                        Width="120" />
+                <Button x:Name="TitleButton"
+                        Content="Set Title"
+                        Click="TitleButton_Click" />
+            </StackPanel>
+
+            <StackPanel Orientation="Horizontal"
+                        Spacing="8">
+                <TextBox x:Name="SubtitleTextBox"
+                        PlaceholderText="Subtitle Text"
+                        HorizontalAlignment="Left"
+                        Width="120" />
+                <Button x:Name="SetSubtitleButton"
+                        Content="Set Subtitle"
+                        Click="SetSubtitleButton_Click" />
+            </StackPanel>
+
+            <CheckBox x:Name="HeaderContentCheckBox"
+                    Content="HeaderContent"
+                    Checked="HeaderContentCheckBox_CheckedChanged"
+                    Unchecked="HeaderContentCheckBox_CheckedChanged" />
+
+            <CheckBox x:Name="CustomContentCheckBox"
+                    Content="CustomContent"
+                    Checked="CustomContentCheckBox_CheckedChanged"
+                    Unchecked="CustomContentCheckBox_CheckedChanged" />
+
+            <CheckBox x:Name="FooterContentCheckBox"
+                    Content="FooterContent"
+                    Checked="FooterContentCheckBox_CheckedChanged"
+                    Unchecked="FooterContentCheckBox_CheckedChanged" />
+
+        </StackPanel>
+    </Grid>
+</Window>
diff --git a/src/controls/dev/TitleBar/TestUI/TitleBarPageWindow.xaml.cs b/src/controls/dev/TitleBar/TestUI/TitleBarPageWindow.xaml.cs
new file mode 100644
index 0000000000..5bc69d6cfe
--- /dev/null
+++ b/src/controls/dev/TitleBar/TestUI/TitleBarPageWindow.xaml.cs
@@ -0,0 +1,152 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Markup;
+using System;
+
+namespace MUXControlsTestApp
+{
+    public sealed partial class TitleBarPageWindow : Window
+    {
+        private int backRequestedCount = 0;
+        private int paneToggleRequestedCount = 0;
+        public TitleBarPageWindow()
+        {
+            this.InitializeComponent();
+
+            // C# code to set AppTitleBar uielement as titlebar
+            this.ExtendsContentIntoTitleBar = true;
+            this.SetTitleBar(this.WindowingTitleBar);
+
+        }
+
+        private void WindowingTitleBar_BackRequested(TitleBar sender, object args)
+        {
+            BackRequestedCountTextBox.Text = (backRequestedCount++).ToString();
+        }
+
+        private void IsBackButtonVisibleCheckBox_CheckedChanged(object sender, RoutedEventArgs e)
+        {
+            if (WindowingTitleBar != null)
+            {
+                WindowingTitleBar.IsBackButtonVisible = IsBackButtonVisibleCheckBox.IsChecked.Value;
+            }
+        }
+
+        private void IsBackEnabledCheckBox_CheckedChanged(object sender, RoutedEventArgs e)
+        {
+            if (WindowingTitleBar != null)
+            {
+                WindowingTitleBar.IsBackEnabled = IsBackEnabledCheckBox.IsChecked.Value;
+            }
+        }
+
+        private void WindowingTitleBar_PaneToggleRequested(TitleBar sender, object args)
+        {
+            PaneToggleButtonRequestedCountTextBox.Text = (paneToggleRequestedCount++).ToString();
+        }
+
+        private void IsPaneToggleButtonVisibleCheckbox_CheckedChanged(object sender, RoutedEventArgs e)
+        {
+            if (WindowingTitleBar != null)
+            {
+                WindowingTitleBar.IsPaneToggleButtonVisible = IsPaneToggleButtonVisibleCheckbox.IsChecked.Value;
+            }
+        }
+
+        private void SetIconCheckBox_CheckedChanged(object sender, RoutedEventArgs e)
+        {
+            if (WindowingTitleBar != null)
+            {
+                if (SetIconCheckBox.IsChecked.Value)
+                {
+                    var icon = new Microsoft.UI.Xaml.Controls.SymbolIconSource();
+                    icon.Symbol = Symbol.Mail;
+                    WindowingTitleBar.IconSource = icon;
+                }
+                else
+                {
+                    WindowingTitleBar.IconSource = null;
+                }
+            }
+        }
+
+        private void CustomContentCheckBox_CheckedChanged(object sender, RoutedEventArgs e)
+        {
+            if (WindowingTitleBar != null)
+            {
+                if (CustomContentCheckBox.IsChecked.Value)
+                {
+                    string xaml =
+                    @"<Grid xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation'>
+                         <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width='Auto'/>
+                            <ColumnDefinition Width='*' />
+                         </Grid.ColumnDefinitions >
+
+                         <Button Content='Left'/>
+                         <Button Grid.Column='1' Content='Right' HorizontalAlignment='Right'/>
+                    </Grid>";
+
+                    var element = XamlReader.Load(xaml);
+                    WindowingTitleBar.Content = element;
+                }
+                else
+                {
+                    WindowingTitleBar.Content = null;
+                }
+            }
+        }
+
+        private void HeaderContentCheckBox_CheckedChanged(object sender, RoutedEventArgs e)
+        {
+            if (WindowingTitleBar != null)
+            {
+                if (HeaderContentCheckBox.IsChecked.Value)
+                {
+                    var button = new Button();
+                    button.Content = "Header";
+                    WindowingTitleBar.Header = button;
+                }
+                else
+                {
+                    WindowingTitleBar.Header = null;
+                }
+            }
+        }
+
+        private void FooterContentCheckBox_CheckedChanged(object sender, RoutedEventArgs e)
+        {
+            if (WindowingTitleBar != null)
+            {
+                if (FooterContentCheckBox.IsChecked.Value)
+                {
+                    var button = new Button();
+                    button.Content = "Footer";
+                    WindowingTitleBar.Footer = button;
+                }
+                else
+                {
+                    WindowingTitleBar.Footer = null;
+                }
+            }
+        }
+
+        private void SetSubtitleButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (WindowingTitleBar != null)
+            {
+                WindowingTitleBar.Subtitle = SubtitleTextBox.Text;
+            }
+        }
+
+        private void TitleButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (WindowingTitleBar != null)
+            {
+                WindowingTitleBar.Title = TitleTextBox.Text;
+            }
+        }
+
+
+    }
+}
diff --git a/src/controls/dev/TitleBar/TestUI/TitleBar_TestUI.projitems b/src/controls/dev/TitleBar/TestUI/TitleBar_TestUI.projitems
index 071ee352a2..ffd10876eb 100644
--- a/src/controls/dev/TitleBar/TestUI/TitleBar_TestUI.projitems
+++ b/src/controls/dev/TitleBar/TestUI/TitleBar_TestUI.projitems
@@ -14,10 +14,17 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)TitleBarPageWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)TitleBarPage.xaml.cs">
       <DependentUpon>TitleBarPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)TitleBarPageWindow.xaml.cs">
+      <DependentUpon>TitleBarPageWindow.xaml</DependentUpon>
+    </Compile>
   </ItemGroup>
 </Project>
diff --git a/src/controls/dev/TitleBar/TitleBar.cpp b/src/controls/dev/TitleBar/TitleBar.cpp
index 0632c67836..d3cede6cfd 100644
--- a/src/controls/dev/TitleBar/TitleBar.cpp
+++ b/src/controls/dev/TitleBar/TitleBar.cpp
@@ -7,6 +7,7 @@
 #include "TitleBarTemplateSettings.h"
 #include "TitleBarAutomationPeer.h"
 #include "ResourceAccessor.h"
+#include <winrt/Microsoft.UI.Windowing.h>
 
 TitleBar::TitleBar()
 {
@@ -15,28 +16,21 @@ TitleBar::TitleBar()
     SetDefaultStyleKey(this);
 
     SizeChanged({ this, &TitleBar::OnSizeChanged });
+    LayoutUpdated({ this, &TitleBar::OnLayoutUpdated });
 
-    if (winrt::CoreWindow::GetForCurrentThread())
+    if (const winrt::IFrameworkElement frameworkElement = *this)
     {
-        if (const auto currentView = winrt::CoreApplication::GetCurrentView())
-        {
-            if (const auto coreTitleBar = currentView.TitleBar())
-            {
-                m_titleBarMetricsChangedRevoker = coreTitleBar.LayoutMetricsChanged(winrt::auto_revoke, { this, &TitleBar::OnTitleBarMetricsChanged });
-                m_titleBarIsVisibleChangedRevoker = coreTitleBar.IsVisibleChanged(winrt::auto_revoke, { this, &TitleBar::OnTitleBarIsVisibleChanged });
-            }
-        }
-    }
-
-    if (const auto window = winrt::Window::Current())
-    {
-        window.Activated({ this, &TitleBar::OnWindowActivated });
+        m_actualThemeChangedRevoker = frameworkElement.ActualThemeChanged(winrt::auto_revoke,
+                [this](auto&&, auto&&) { UpdateTheme(); });
     }
+}
 
-    if (winrt::IFrameworkElement6 frameworkElement6 = *this)
+TitleBar::~TitleBar()
+{
+    if (m_inputActivationChangedToken.value)
     {
-        m_actualThemeChangedRevoker = frameworkElement6.ActualThemeChanged(winrt::auto_revoke,
-                [this](auto&&, auto&&) { UpdateTheme(); });
+        m_inputActivationListener.InputActivationChanged(m_inputActivationChangedToken);
+        m_inputActivationChangedToken.value = 0;
     }
 }
 
@@ -47,138 +41,148 @@ winrt::AutomationPeer TitleBar::OnCreateAutomationPeer()
 
 void TitleBar::OnApplyTemplate()
 {
-    winrt::IControlProtected controlProtected{ *this };
-
-    if (winrt::CoreWindow::GetForCurrentThread())
-    {
-        if (const auto currentView = winrt::CoreApplication::GetCurrentView())
-        {
-            if (const auto coreTitleBar = currentView.TitleBar())
-            {
-                coreTitleBar.ExtendViewIntoTitleBar(true);
-            }
-        }
-    }
+    __super::OnApplyTemplate();
 
-    m_layoutRoot.set(GetTemplateChildT<winrt::Grid>(L"LayoutRoot", controlProtected));
-    m_leftPaddingColumn.set(GetTemplateChildT<winrt::ColumnDefinition>(L"LeftPaddingColumn", controlProtected));
-    m_rightPaddingColumn.set(GetTemplateChildT<winrt::ColumnDefinition>(L"RightPaddingColumn", controlProtected));
+    winrt::IControlProtected controlProtected{ *this };
 
-    m_titleTextBlock.set(GetTemplateChildT<winrt::TextBlock>(L"TitleText", controlProtected));
-    m_customArea.set(GetTemplateChildT<winrt::FrameworkElement>(L"CustomContentPresenter", controlProtected));
+    m_leftPaddingColumn.set(GetTemplateChildT<winrt::ColumnDefinition>(s_leftPaddingColumnName, controlProtected));
+    m_rightPaddingColumn.set(GetTemplateChildT<winrt::ColumnDefinition>(s_rightPaddingColumnName, controlProtected));
 
-    if (const auto window = winrt::Window::Current())
+    if (const auto xamlRoot = XamlRoot())
     {
-        if (const auto dragRegion = GetTemplateChildT<winrt::Grid>(L"DragRegion", controlProtected))
-        {
-            window.SetTitleBar(dragRegion);
-        }
-        else
+        if (const auto contentIslandEnvironment = xamlRoot.ContentIslandEnvironment())
         {
-            window.SetTitleBar(nullptr);
-        }
-    }
-
-    if (const auto backButton = GetTemplateChildT<winrt::Button>(L"BackButton", controlProtected))
-    {
-        m_backButtonClickRevoker = backButton.Click(winrt::auto_revoke, { this, &TitleBar::OnBackButtonClick });
+            const auto appWindowId = contentIslandEnvironment.AppWindowId();
 
-        // Do localization for the back button
-        if (winrt::AutomationProperties::GetName(backButton).empty())
-        {
-            const auto backButtonName = ResourceAccessor::GetLocalizedStringResourceFromWinUI(SR_NavigationBackButtonName);
-            winrt::AutomationProperties::SetName(backButton, backButtonName);
+            if (appWindowId.Value != 0)
+            {
+                m_inputActivationListener = winrt::Microsoft::UI::Input::InputActivationListener::GetForWindowId(appWindowId);
+                m_inputActivationChangedToken = m_inputActivationListener.InputActivationChanged({ this, &TitleBar::OnInputActivationChanged });
+            }
         }
-
-        // Setup the tooltip for the back button
-        const auto tooltip = winrt::ToolTip();
-        const auto backButtonTooltipText = ResourceAccessor::GetLocalizedStringResourceFromWinUI(SR_NavigationBackButtonToolTip);
-        tooltip.Content(box_value(backButtonTooltipText));
-        winrt::ToolTipService::SetToolTip(backButton, tooltip);
     }
 
-    UpdateVisibility();
     UpdateHeight();
     UpdatePadding();
     UpdateIcon();
     UpdateBackButton();
+    UpdatePaneToggleButton();
     UpdateTheme();
     UpdateTitle();
+    UpdateInteractableElementsList();
 }
 
-void TitleBar::OnBackButtonClick(winrt::IInspectable const& sender, winrt::RoutedEventArgs const& args)
+void TitleBar::OnPropertyChanged(winrt::DependencyPropertyChangedEventArgs const& args)
 {
-    m_backRequestedEventSource(*this, nullptr);
-}
-
-void TitleBar::OnIconSourcePropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args)
-{
-    UpdateIcon();
-}
+    winrt::IDependencyProperty property = args.Property();
 
-void TitleBar::OnIsBackButtonVisiblePropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args)
-{
-    UpdateBackButton();
-}
-
-void TitleBar::OnCustomContentPropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args)
-{
-    UpdateHeight();
-}
-
-void TitleBar::OnTitlePropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args)
-{
-    UpdateTitle();
+    if (property == s_IsBackButtonVisibleProperty)
+    {
+        UpdateBackButton();
+    }
+    else if (property == s_IsBackEnabledProperty)
+    {
+        UpdateInteractableElementsList();
+    }
+    else if (property == s_IsPaneToggleButtonVisibleProperty)
+    {
+        UpdatePaneToggleButton();
+    }
+    if (property == s_IconSourceProperty)
+    {
+        UpdateIcon();
+    }
+    else if (property == s_TitleProperty)
+    {
+        UpdateTitle();
+    }
+    else if (property == s_SubtitleProperty)
+    {
+        UpdateSubtitle();
+    }
+    if (property == s_HeaderProperty)
+    {
+        UpdateHeader();
+    }
+    else if (property == s_ContentProperty)
+    {
+        UpdateContent();
+    }
+    else if (property == s_FooterProperty)
+    {
+        UpdateFooter();
+    }
 }
 
 void TitleBar::OnSizeChanged(const winrt::IInspectable& sender, const winrt::SizeChangedEventArgs& args)
 {
-    const auto titleTextBlock = m_titleTextBlock.get();
-    const auto customArea = m_customArea.get();
-    if (titleTextBlock && customArea)
+    if (Content() != nullptr)
     {
-        auto const templateSettings = winrt::get_self<::TitleBarTemplateSettings>(TemplateSettings());
+        const auto contentArea = m_contentArea.get();
+        const auto contentAreaGrid = m_contentAreaGrid.get();
 
-        if (m_isTitleSquished)
+        if (contentArea && contentAreaGrid)
         {
-            // If the title column has * sizing but it's not trimmed anymore, then give the extra space back to the custom area.
-            if (!titleTextBlock.IsTextTrimmed())
+            if (!m_compactModeThresholdWidth && contentArea.DesiredSize().Width >= contentAreaGrid.ActualWidth())
             {
-                templateSettings->TitleColumnGridLength({ 1, winrt::GridUnitType::Auto });
-                templateSettings->CustomColumnGridLength({ 1, winrt::GridUnitType::Star });
-
-                m_isTitleSquished = false;
+                m_compactModeThresholdWidth = args.NewSize().Width;
+                winrt::VisualStateManager::GoToState(*this, s_compactVisualStateName, false);
             }
-        }
-        else
-        {
-            // If the custom area is at its minimum width, switch the title column to be * sized so it squishes instead.
-            if (!m_isTitleSquished && customArea.DesiredSize().Width >= customArea.ActualWidth())
+            else if (args.NewSize().Width >= m_compactModeThresholdWidth)
             {
-                templateSettings->TitleColumnGridLength({ 1, winrt::GridUnitType::Star });
-                templateSettings->CustomColumnGridLength({ 1, winrt::GridUnitType::Auto });
-
-                m_isTitleSquished = true;
+                m_compactModeThresholdWidth = 0.0;
+                winrt::VisualStateManager::GoToState(*this, s_expandedVisualStateName, false);
+                UpdateTitle();
+                UpdateSubtitle();
             }
         }
     }
+
+    UpdateDragRegion();
 }
 
-void TitleBar::OnWindowActivated(const winrt::IInspectable& sender, const winrt::WindowActivatedEventArgs& args)
+void TitleBar::OnLayoutUpdated(const winrt::IInspectable& sender, const winrt::IInspectable& args)
 {
-    winrt::VisualStateManager::GoToState(*this,
-        (args.WindowActivationState() == winrt::CoreWindowActivationState::Deactivated) ? L"Deactivated" : L"Activated",
-        false);
+    UpdateDragRegion();
 }
 
-void TitleBar::OnTitleBarMetricsChanged(const winrt::IInspectable& /*sender*/, const winrt::IInspectable& /*args*/)
+void TitleBar::OnInputActivationChanged(const winrt::InputActivationListener& sender, const winrt::InputActivationListenerActivationChangedEventArgs& args)
 {
-    UpdatePadding();
+    bool isDeactivated = sender.State() == winrt::InputActivationState::Deactivated;
+
+    if (IsBackButtonVisible() && IsBackEnabled())
+    {
+        winrt::VisualStateManager::GoToState(*this,
+            isDeactivated ? s_backButtonDeactivatedVisualStateName : s_backButtonVisibleVisualStateName, false);
+    }
+
+    if (IsPaneToggleButtonVisible())
+    {
+        winrt::VisualStateManager::GoToState(*this,
+            isDeactivated ? s_paneToggleButtonDeactivatedVisualStateName : s_paneToggleButtonVisibleVisualStateName, false);
+    }
+
+    if (!Title().empty())
+    {
+        winrt::VisualStateManager::GoToState(*this,
+            isDeactivated ? s_titleTextDeactivatedVisualStateName : s_titleTextVisibleVisualStateName, false);
+    }
+
+    if (!Subtitle().empty())
+    {
+        winrt::VisualStateManager::GoToState(*this,
+            isDeactivated ? s_subtitleTextDeactivatedVisualStateName : s_subtitleTextVisibleVisualStateName, false);
+    }
 }
 
-void TitleBar::OnTitleBarIsVisibleChanged(const winrt::CoreApplicationViewTitleBar& sender, const winrt::IInspectable& /*args*/)
+void TitleBar::OnBackButtonClick(winrt::IInspectable const& sender, winrt::RoutedEventArgs const& args)
 {
-    UpdateVisibility();
+    m_backRequestedEventSource(*this, nullptr);
+}
+
+void TitleBar::OnPaneToggleButtonClick(winrt::IInspectable const& sender, winrt::RoutedEventArgs const& args)
+{
+    m_paneToggleRequestedEventSource(*this, nullptr);
 }
 
 void TitleBar::UpdateIcon()
@@ -187,57 +191,82 @@ void TitleBar::UpdateIcon()
     if (auto const source = IconSource())
     {
         templateSettings->IconElement(SharedHelpers::MakeIconElementFrom(source));
-        winrt::VisualStateManager::GoToState(*this, L"IconVisible", false);
+        winrt::VisualStateManager::GoToState(*this, s_iconVisibleVisualStateName, false);
     }
     else
     {
         templateSettings->IconElement(nullptr);
-        winrt::VisualStateManager::GoToState(*this, L"IconCollapsed", false);
+        winrt::VisualStateManager::GoToState(*this, s_iconCollapsedVisualStateName, false);
     }
 }
 
 void TitleBar::UpdateBackButton()
 {
-    winrt::VisualStateManager::GoToState(*this,
-        IsBackButtonVisible() ? L"BackButtonVisible" : L"BackButtonCollapsed",
-        false);
+    if (IsBackButtonVisible())
+    {
+        if (!m_backButton.get())
+        {
+            LoadBackButton();
+        }
+
+        winrt::VisualStateManager::GoToState(*this, s_backButtonVisibleVisualStateName, false);
+    }
+    else
+    {
+        winrt::VisualStateManager::GoToState(*this, s_backButtonCollapsedVisualStateName, false);
+    }
+    
+    UpdateInteractableElementsList();
 }
 
-void TitleBar::UpdateVisibility()
+void TitleBar::UpdatePaneToggleButton()
 {
-
-    if (const auto currentView = winrt::CoreApplication::GetCurrentView())
+    if (IsPaneToggleButtonVisible())
     {
-        if (const auto coreTitleBar = currentView.TitleBar())
+        if (!m_paneToggleButton.get())
         {
-            winrt::VisualStateManager::GoToState(*this,
-                coreTitleBar.IsVisible() ? L"TitleBarVisible" : L"TitleBarCollapsed",
-                false);
+            LoadPaneToggleButton();
         }
+
+        winrt::VisualStateManager::GoToState(*this, s_paneToggleButtonVisibleVisualStateName, false);
+    }
+    else
+    {
+        winrt::VisualStateManager::GoToState(*this, s_paneToggleButtonCollapsedVisualStateName, false);
     }
+
+    UpdateInteractableElementsList();
 }
 
 void TitleBar::UpdateHeight()
 {
     winrt::VisualStateManager::GoToState(*this,
-        (CustomContent() == nullptr) ? L"CompactHeight" : L"ExpandedHeight",
+        (Content() == nullptr && Header() == nullptr && Footer() == nullptr) ?
+        s_compactHeightVisualStateName : s_expandedHeightVisualStateName,
         false);
 }
 
 void TitleBar::UpdatePadding()
 {
-    if (const auto currentView = winrt::CoreApplication::GetCurrentView())
+    if (const auto xamlRoot = XamlRoot())
     {
-        if (const auto coreTitleBar = currentView.TitleBar())
+        if (const auto contentIslandEnvironment = xamlRoot.ContentIslandEnvironment())
         {
-            if (const auto leftColumn = m_leftPaddingColumn.get())
-            {
-                leftColumn.Width(winrt::GridLengthHelper::FromPixels(coreTitleBar.SystemOverlayLeftInset()));
-            }
+            const auto appWindowId = contentIslandEnvironment.AppWindowId();
+            const winrt::Microsoft::UI::Windowing::AppWindow appWindow = winrt::Microsoft::UI::Windowing::AppWindow::GetFromWindowId(appWindowId);
 
-            if (const auto rightColumn = m_rightPaddingColumn.get())
+            if (const auto appTitleBar = appWindow.TitleBar())
             {
-                rightColumn.Width(winrt::GridLengthHelper::FromPixels(coreTitleBar.SystemOverlayRightInset()));
+                // TODO 50724421: Bind to appTitleBar Left and Right inset changed event.
+                if (const auto leftColumn = m_leftPaddingColumn.get())
+                {
+                    leftColumn.Width(winrt::GridLengthHelper::FromPixels(appTitleBar.LeftInset()));
+                }
+
+                if (const auto rightColumn = m_rightPaddingColumn.get())
+                {
+                    rightColumn.Width(winrt::GridLengthHelper::FromPixels(appTitleBar.RightInset()));
+                }
             }
         }
     }
@@ -245,35 +274,43 @@ void TitleBar::UpdatePadding()
 
 void TitleBar::UpdateTheme()
 {
-    if (const auto appView = winrt::ApplicationView::GetForCurrentView())
+    if (const auto xamlRoot = XamlRoot())
     {
-        if (const auto titleBar = appView.TitleBar())
+        if (const auto contentIslandEnvironment = xamlRoot.ContentIslandEnvironment())
         {
-            // rest colors
-            const auto buttonForegroundColor = ResourceAccessor::ResourceLookup(*this, box_value(L"TitleBarButtonForegroundColor")).as<winrt::Color>();
-            titleBar.ButtonForegroundColor(buttonForegroundColor);
+            const auto appWindowId = contentIslandEnvironment.AppWindowId();
+            const winrt::Microsoft::UI::Windowing::AppWindow appWindow = winrt::Microsoft::UI::Windowing::AppWindow::GetFromWindowId(appWindowId);
+
+            // AppWindow TitleBar's caption buttons does not update colors with theme change.
+            // We need to set them here.
+            if (const auto appTitleBar = appWindow.TitleBar())
+            {
+                // Rest colors.
+                const auto buttonForegroundColor = ResourceAccessor::ResourceLookup(*this, box_value(s_titleBarButtonForegroundColorName)).as<winrt::Color>();
+                appTitleBar.ButtonForegroundColor(buttonForegroundColor);
 
-            const auto buttonBackgroundColor = ResourceAccessor::ResourceLookup(*this, box_value(L"TitleBarButtonBackgroundColor")).as<winrt::Color>();
-            titleBar.ButtonBackgroundColor(buttonBackgroundColor);
-            titleBar.ButtonInactiveBackgroundColor(buttonBackgroundColor);
+                const auto buttonBackgroundColor = ResourceAccessor::ResourceLookup(*this, box_value(s_titleBarButtonBackgroundColorName)).as<winrt::Color>();
+                appTitleBar.ButtonBackgroundColor(buttonBackgroundColor);
+                appTitleBar.ButtonInactiveBackgroundColor(buttonBackgroundColor);
 
-            // hover colors
-            const auto buttonHoverForegroundColor = ResourceAccessor::ResourceLookup(*this, box_value(L"TitleBarButtonHoverForegroundColor")).as<winrt::Color>();
-            titleBar.ButtonHoverForegroundColor(buttonHoverForegroundColor);
+                // Hover colors.
+                const auto buttonHoverForegroundColor = ResourceAccessor::ResourceLookup(*this, box_value(s_titleBarButtonHoverForegroundColorName)).as<winrt::Color>();
+                appTitleBar.ButtonHoverForegroundColor(buttonHoverForegroundColor);
 
-            const auto buttonHoverBackgroundColor = ResourceAccessor::ResourceLookup(*this, box_value(L"TitleBarButtonHoverBackgroundColor")).as<winrt::Color>();
-            titleBar.ButtonHoverBackgroundColor(buttonHoverBackgroundColor);
+                const auto buttonHoverBackgroundColor = ResourceAccessor::ResourceLookup(*this, box_value(s_titleBarButtonHoverBackgroundColorName)).as<winrt::Color>();
+                appTitleBar.ButtonHoverBackgroundColor(buttonHoverBackgroundColor);
 
-            // pressed colors
-            const auto buttonPressedForegroundColor = ResourceAccessor::ResourceLookup(*this, box_value(L"TitleBarButtonPressedForegroundColor")).as<winrt::Color>();
-            titleBar.ButtonPressedForegroundColor(buttonPressedForegroundColor);
+                // Pressed colors.
+                const auto buttonPressedForegroundColor = ResourceAccessor::ResourceLookup(*this, box_value(s_titleBarButtonPressedForegroundColorName)).as<winrt::Color>();
+                appTitleBar.ButtonPressedForegroundColor(buttonPressedForegroundColor);
 
-            const auto buttonPressedBackgroundColor = ResourceAccessor::ResourceLookup(*this, box_value(L"TitleBarButtonPressedBackgroundColor")).as<winrt::Color>();
-            titleBar.ButtonPressedBackgroundColor(buttonPressedBackgroundColor);
+                const auto buttonPressedBackgroundColor = ResourceAccessor::ResourceLookup(*this, box_value(s_titleBarButtonPressedBackgroundColorName)).as<winrt::Color>();
+                appTitleBar.ButtonPressedBackgroundColor(buttonPressedBackgroundColor);
 
-            // inactive foreground
-            const auto buttonInactiveForegroundColor = ResourceAccessor::ResourceLookup(*this, box_value(L"TitleBarButtonInactiveForegroundColor")).as<winrt::Color>();
-            titleBar.ButtonInactiveForegroundColor(buttonInactiveForegroundColor);
+                // Inactive foreground.
+                const auto buttonInactiveForegroundColor = ResourceAccessor::ResourceLookup(*this, box_value(s_titleBarButtonInactiveForegroundColorName)).as<winrt::Color>();
+                appTitleBar.ButtonInactiveForegroundColor(buttonInactiveForegroundColor);
+            }
         }
     }
 }
@@ -283,11 +320,229 @@ void TitleBar::UpdateTitle()
     const winrt::hstring titleText = Title();
     if (titleText.empty())
     {
-        winrt::VisualStateManager::GoToState(*this, L"TitleTextCollapsed", false);
+        winrt::VisualStateManager::GoToState(*this, s_titleTextCollapsedVisualStateName, false);
+    }
+    else
+    {
+        winrt::VisualStateManager::GoToState(*this, s_titleTextVisibleVisualStateName, false);
+    }
+}
+
+void TitleBar::UpdateSubtitle()
+{
+    const winrt::hstring titleText = Title();
+    if (titleText.empty())
+    {
+        winrt::VisualStateManager::GoToState(*this, s_subtitleTextCollapsedVisualStateName, false);
+    }
+    else
+    {
+        winrt::VisualStateManager::GoToState(*this, s_subtitleTextVisibleVisualStateName, false);
+    }
+}
+
+void TitleBar::UpdateHeader()
+{
+    if (Header() == nullptr)
+    {
+        winrt::VisualStateManager::GoToState(*this, s_headerCollapsedVisualStateName, false);
     }
     else
     {
-        winrt::VisualStateManager::GoToState(*this, L"TitleTextVisible", false);
+        if (!m_headerArea.get())
+        {
+            m_headerArea.set(GetTemplateChildT<winrt::FrameworkElement>(s_headerContentPresenterPartName, *this));
+        }
+        winrt::VisualStateManager::GoToState(*this, s_headerVisibleVisualStateName, false);
     }
+
+    UpdateHeight();
+    UpdateInteractableElementsList();
 }
 
+void TitleBar::UpdateContent()
+{
+    if (Content() == nullptr)
+    {
+        winrt::VisualStateManager::GoToState(*this, s_contentCollapsedVisualStateName, false);
+    }
+    else
+    {
+        if (!m_contentArea.get())
+        {
+            winrt::IControlProtected controlProtected{ *this };
+
+            m_contentAreaGrid.set(GetTemplateChildT<winrt::Grid>(s_contentPresenterGridPartName, controlProtected));
+            m_contentArea.set(GetTemplateChildT<winrt::FrameworkElement>(s_contentPresenterPartName, controlProtected));
+        }
+
+        winrt::VisualStateManager::GoToState(*this, s_contentVisibleVisualStateName, false);
+    }
+
+    UpdateHeight();
+    UpdateInteractableElementsList();
+}
+
+void TitleBar::UpdateFooter()
+{
+    if (Footer() == nullptr)
+    {
+        winrt::VisualStateManager::GoToState(*this, s_footerCollapsedVisualStateName, false);
+    }
+    else
+    {
+        if (!m_footerArea.get())
+        {
+            m_footerArea.set(GetTemplateChildT<winrt::FrameworkElement>(s_footerPresenterPartName, *this));
+        }
+        winrt::VisualStateManager::GoToState(*this, s_footerVisibleVisualStateName, false);
+    }
+
+    UpdateHeight();
+    UpdateInteractableElementsList();
+}
+
+// Once TitleBar control is set as the Window titlebar in developer codebehind, the entire region's input is marked as non-client
+// and becomes non interactable. We need to punch out a hole for each interactable region in TitleBar. 
+void TitleBar::UpdateDragRegion()
+{
+    if (const auto xamlRoot = XamlRoot())
+    {
+        if (const auto contentIslandEnvironment = xamlRoot.ContentIslandEnvironment())
+        {
+            auto appWindowId = contentIslandEnvironment.AppWindowId();
+            winrt::InputNonClientPointerSource nonClientPointerSource = winrt::InputNonClientPointerSource::GetForWindowId(appWindowId);
+
+            if (!m_interactableElementsList.empty())
+            {
+                std::vector<winrt::Windows::Graphics::RectInt32> passthroughRects;
+
+                // Get rects for each interactable element in TitleBar.
+                for (const auto frameworkElement : m_interactableElementsList)
+                {
+                    const auto transformBounds = frameworkElement.TransformToVisual(nullptr);
+                    const auto width = frameworkElement.ActualWidth();
+                    const auto height = frameworkElement.ActualHeight();
+                    const auto bounds = transformBounds.TransformBounds(winrt::Rect{
+                        0.0f,
+                        0.0f,
+                        static_cast<float>(width),
+                        static_cast<float>(height) });
+
+                    if (bounds.X < 0 || bounds.Y < 0)
+                    {
+                        continue;
+                    }
+
+                    const auto scale = xamlRoot.RasterizationScale();
+                    const auto transparentRect = winrt::Windows::Graphics::RectInt32{
+                        static_cast<int32_t>(bounds.X * scale),
+                        static_cast<int32_t>(bounds.Y * scale),
+                        static_cast<int32_t>(bounds.Width * scale),
+                        static_cast<int32_t>(bounds.Height * scale),
+                    };
+
+                    passthroughRects.push_back(transparentRect);
+                }
+
+                // Set list of rects as passthrough regions for the non-client area.
+                nonClientPointerSource.SetRegionRects(winrt::NonClientRegionKind::Passthrough, passthroughRects);
+            }
+            else
+            {
+                // There is no interactable areas. Clear previous passthrough rects.
+                nonClientPointerSource.ClearRegionRects(winrt::NonClientRegionKind::Passthrough);
+            }
+        }
+    }
+}
+
+void TitleBar::UpdateInteractableElementsList()
+{
+    m_interactableElementsList.clear();
+
+    if (IsBackButtonVisible() && IsBackEnabled())
+    {
+        if (const auto backButton = m_backButton.get())
+        {
+            m_interactableElementsList.push_back(backButton);
+        }
+    }
+
+    if (IsPaneToggleButtonVisible())
+    {
+        if (const auto paneToggleButton = m_paneToggleButton.get())
+        {
+            m_interactableElementsList.push_back(paneToggleButton);
+        }
+    }
+
+    if (Header() != nullptr)
+    {
+        if (const auto headerArea = m_headerArea.get())
+        {
+            m_interactableElementsList.push_back(headerArea);
+        }
+    }
+
+    if (Content() != nullptr)
+    {
+        if (const auto contentArea = m_contentArea.get())
+        {
+            m_interactableElementsList.push_back(contentArea);
+        }
+    }
+
+    if (Footer() != nullptr)
+    {
+        if (const auto footerArea = m_footerArea.get())
+        {
+            m_interactableElementsList.push_back(footerArea);
+        }
+    }
+}
+
+void TitleBar::LoadBackButton()
+{
+    m_backButton.set(GetTemplateChildT<winrt::Button>(s_backButtonPartName, *this));
+
+    if (const auto backButton = m_backButton.get())
+    {
+        m_backButtonClickRevoker = backButton.Click(winrt::auto_revoke, { this, &TitleBar::OnBackButtonClick });
+
+        // Do localization for the back button
+        if (winrt::AutomationProperties::GetName(backButton).empty())
+        {
+            const auto backButtonName = ResourceAccessor::GetLocalizedStringResource(SR_NavigationBackButtonName);
+            winrt::AutomationProperties::SetName(backButton, backButtonName);
+        }
+
+        // Setup the tooltip for the back button
+        const auto tooltip = winrt::ToolTip();
+        const auto backButtonTooltipText = ResourceAccessor::GetLocalizedStringResource(SR_NavigationBackButtonToolTip);
+        tooltip.Content(box_value(backButtonTooltipText));
+        winrt::ToolTipService::SetToolTip(backButton, tooltip);
+    }
+}
+
+void TitleBar::LoadPaneToggleButton()
+{
+    m_paneToggleButton.set(GetTemplateChildT<winrt::Button>(s_paneToggleButtonPartName, *this));
+
+    if (const auto paneToggleButton = m_paneToggleButton.get())
+    {
+        m_paneToggleButtonClickRevoker = paneToggleButton.Click(winrt::auto_revoke, { this, &TitleBar::OnPaneToggleButtonClick });
+
+        // Do localization for paneToggleButton
+        if (winrt::AutomationProperties::GetName(paneToggleButton).empty())
+        {
+            const auto paneToggleButtonName = ResourceAccessor::GetLocalizedStringResource(SR_NavigationButtonOpenName);
+            winrt::AutomationProperties::SetName(paneToggleButton, paneToggleButtonName);
+        }
+
+        // Setup the tooltip for the paneToggleButton
+        const auto tooltip = winrt::ToolTip();
+        tooltip.Content(box_value(winrt::AutomationProperties::GetName(paneToggleButton)));
+        winrt::ToolTipService::SetToolTip(paneToggleButton, tooltip);
+    }
+}
diff --git a/src/controls/dev/TitleBar/TitleBar.h b/src/controls/dev/TitleBar/TitleBar.h
index 23abf53c21..6785c3cdac 100644
--- a/src/controls/dev/TitleBar/TitleBar.h
+++ b/src/controls/dev/TitleBar/TitleBar.h
@@ -16,7 +16,7 @@ class TitleBar :
 
 public:
     TitleBar();
-    ~TitleBar() {}
+    virtual ~TitleBar();
 
     // IFrameworkElement
     void OnApplyTemplate();
@@ -24,37 +24,95 @@ class TitleBar :
     // UIElement
     winrt::AutomationPeer OnCreateAutomationPeer();
 
-    void OnIconSourcePropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args);
-    void OnIsBackButtonVisiblePropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args);
-    void OnCustomContentPropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args);
-    void OnTitlePropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args);
+    void OnPropertyChanged(winrt::DependencyPropertyChangedEventArgs const& args);
+    
 
 private:
-    void UpdateVisibility();
     void UpdatePadding();
     void UpdateIcon();
     void UpdateBackButton();
+    void UpdatePaneToggleButton();
     void UpdateHeight();
     void UpdateTheme();
     void UpdateTitle();
+    void UpdateSubtitle();
+    void UpdateHeader();
+    void UpdateContent();
+    void UpdateFooter();
+    void UpdateDragRegion();
+    void UpdateInteractableElementsList();
 
-    void OnWindowActivated(const winrt::IInspectable& sender, const winrt::WindowActivatedEventArgs& args);
-    void OnTitleBarMetricsChanged(const winrt::IInspectable& sender, const winrt::IInspectable& args);
-    void OnTitleBarIsVisibleChanged(const winrt::CoreApplicationViewTitleBar& sender, const winrt::IInspectable& args);
+    void OnInputActivationChanged(const winrt::InputActivationListener& sender, const winrt::InputActivationListenerActivationChangedEventArgs& args);
     void OnBackButtonClick(winrt::IInspectable const& sender, winrt::RoutedEventArgs const& args);
+    void OnPaneToggleButtonClick(winrt::IInspectable const& sender, winrt::RoutedEventArgs const& args);
     void OnSizeChanged(const winrt::IInspectable& sender, const winrt::SizeChangedEventArgs& args);
+    void OnLayoutUpdated(const winrt::IInspectable& sender, const winrt::IInspectable& args);
 
-    winrt::CoreApplicationViewTitleBar::LayoutMetricsChanged_revoker m_titleBarMetricsChangedRevoker{};
-    winrt::CoreApplicationViewTitleBar::IsVisibleChanged_revoker m_titleBarIsVisibleChangedRevoker{};
+    void LoadBackButton();
+    void LoadPaneToggleButton();
+
+    winrt::event_token m_inputActivationChangedToken{};
     winrt::Button::Click_revoker m_backButtonClickRevoker{};
+    winrt::Button::Click_revoker m_paneToggleButtonClickRevoker{};
     winrt::FrameworkElement::ActualThemeChanged_revoker m_actualThemeChangedRevoker{};
-    winrt::FrameworkElement::SizeChanged_revoker m_customContentChangedRevoker{};
+    winrt::FrameworkElement::SizeChanged_revoker m_contentChangedRevoker{};
+
+    std::list<winrt::FrameworkElement> m_interactableElementsList{};
+    winrt::InputActivationListener m_inputActivationListener = nullptr;
 
     tracker_ref<winrt::ColumnDefinition> m_leftPaddingColumn{ this };
     tracker_ref<winrt::ColumnDefinition> m_rightPaddingColumn{ this };
-    tracker_ref<winrt::Grid> m_layoutRoot{ this };
+    tracker_ref<winrt::Button> m_backButton{ this };
+    tracker_ref<winrt::Button> m_paneToggleButton{ this };
     tracker_ref<winrt::TextBlock> m_titleTextBlock{ this };
-    tracker_ref<winrt::FrameworkElement> m_customArea{ this };
+    tracker_ref<winrt::TextBlock> m_subtitleTextBlock{ this };
+    tracker_ref<winrt::Grid> m_contentAreaGrid{ this };
+    tracker_ref<winrt::FrameworkElement> m_headerArea{ this };
+    tracker_ref<winrt::FrameworkElement> m_contentArea{ this };
+    tracker_ref<winrt::FrameworkElement> m_footerArea{ this };
+
+    double m_compactModeThresholdWidth{ 0.0 };
+
+    static constexpr std::wstring_view s_leftPaddingColumnName{ L"LeftPaddingColumn"sv };
+    static constexpr std::wstring_view s_rightPaddingColumnName{ L"RightPaddingColumn"sv };
+    static constexpr std::wstring_view s_layoutRootPartName{ L"PART_LayoutRoot"sv };
+    static constexpr std::wstring_view s_backButtonPartName{ L"PART_BackButton"sv };
+    static constexpr std::wstring_view s_paneToggleButtonPartName{ L"PART_PaneToggleButton"sv };
+    static constexpr std::wstring_view s_headerContentPresenterPartName{ L"PART_HeaderContentPresenter"sv };
+    static constexpr std::wstring_view s_contentPresenterGridPartName{ L"PART_ContentPresenterGrid"sv };
+    static constexpr std::wstring_view s_contentPresenterPartName{ L"PART_ContentPresenter"sv };
+    static constexpr std::wstring_view s_footerPresenterPartName{ L"PART_FooterContentPresenter"sv };
+
+    static constexpr std::wstring_view s_compactVisualStateName{ L"Compact"sv };
+    static constexpr std::wstring_view s_expandedVisualStateName{ L"Expanded"sv };
+    static constexpr std::wstring_view s_compactHeightVisualStateName{ L"CompactHeight"sv };
+    static constexpr std::wstring_view s_expandedHeightVisualStateName{ L"ExpandedHeight"sv };
+    static constexpr std::wstring_view s_iconVisibleVisualStateName{ L"IconVisible"sv };
+    static constexpr std::wstring_view s_iconCollapsedVisualStateName{ L"IconCollapsed"sv };
+    static constexpr std::wstring_view s_backButtonDeactivatedVisualStateName{ L"BackButtonDeactivated"sv };
+    static constexpr std::wstring_view s_backButtonVisibleVisualStateName{ L"BackButtonVisible"sv };
+    static constexpr std::wstring_view s_backButtonCollapsedVisualStateName{ L"BackButtonCollapsed"sv };
+    static constexpr std::wstring_view s_paneToggleButtonDeactivatedVisualStateName{ L"PaneToggleButtonDeactivated"sv };
+    static constexpr std::wstring_view s_paneToggleButtonVisibleVisualStateName{ L"PaneToggleButtonVisible"sv };
+    static constexpr std::wstring_view s_paneToggleButtonCollapsedVisualStateName{ L"PaneToggleButtonCollapsed"sv };
+    static constexpr std::wstring_view s_titleTextDeactivatedVisualStateName{ L"TitleTextDeactivated"sv };
+    static constexpr std::wstring_view s_titleTextVisibleVisualStateName{ L"TitleTextVisible"sv };
+    static constexpr std::wstring_view s_titleTextCollapsedVisualStateName{ L"TitleTextCollapsed"sv };
+    static constexpr std::wstring_view s_subtitleTextDeactivatedVisualStateName{ L"SubtitleTextDeactivated"sv };
+    static constexpr std::wstring_view s_subtitleTextVisibleVisualStateName{ L"SubtitleTextVisible"sv };
+    static constexpr std::wstring_view s_subtitleTextCollapsedVisualStateName{ L"SubtitleTextCollapsed"sv };
+    static constexpr std::wstring_view s_headerVisibleVisualStateName{ L"HeaderVisible"sv };
+    static constexpr std::wstring_view s_headerCollapsedVisualStateName{ L"HeaderCollapsed"sv };
+    static constexpr std::wstring_view s_contentVisibleVisualStateName{ L"ContentVisible"sv };
+    static constexpr std::wstring_view s_contentCollapsedVisualStateName{ L"ContentCollapsed"sv };
+    static constexpr std::wstring_view s_footerVisibleVisualStateName{ L"FooterVisible"sv };
+    static constexpr std::wstring_view s_footerCollapsedVisualStateName{ L"FooterCollapsed"sv };
 
-    bool m_isTitleSquished{ false };
+    static constexpr std::wstring_view s_titleBarButtonForegroundColorName{ L"TitleBarButtonForegroundColor"sv };
+    static constexpr std::wstring_view s_titleBarButtonBackgroundColorName{ L"TitleBarButtonBackgroundColor"sv };
+    static constexpr std::wstring_view s_titleBarButtonHoverForegroundColorName{ L"TitleBarButtonHoverForegroundColor"sv };
+    static constexpr std::wstring_view s_titleBarButtonHoverBackgroundColorName{ L"TitleBarButtonHoverBackgroundColor"sv };
+    static constexpr std::wstring_view s_titleBarButtonPressedForegroundColorName{ L"TitleBarButtonPressedForegroundColor"sv };
+    static constexpr std::wstring_view s_titleBarButtonPressedBackgroundColorName{ L"TitleBarButtonPressedBackgroundColor"sv };
+    static constexpr std::wstring_view s_titleBarButtonInactiveForegroundColorName{ L"TitleBarButtonInactiveForegroundColor"sv };
 };
diff --git a/src/controls/dev/TitleBar/TitleBar.idl b/src/controls/dev/TitleBar/TitleBar.idl
index 8c06957b8e..c5a9012c98 100644
--- a/src/controls/dev/TitleBar/TitleBar.idl
+++ b/src/controls/dev/TitleBar/TitleBar.idl
@@ -1,40 +1,55 @@
-namespace MEU_XC_NAMESPACE
+namespace MU_XC_NAMESPACE
 {
 
-[MUX_EXPERIMENTAL]
+[MUX_PREVIEW]
 [webhosthidden]
+[contentproperty("Content")]
+[MUX_PROPERTY_CHANGED_CALLBACK(TRUE)]
+[MUX_PROPERTY_CHANGED_CALLBACK_METHODNAME("OnPropertyChanged")]
 unsealed runtimeclass TitleBar : Microsoft.UI.Xaml.Controls.Control
 {
     TitleBar();
 
-    [MUX_PROPERTY_CHANGED_CALLBACK(TRUE)]
-    String Title{ get; set; };
+    Object Header{ get; set; };
 
-    [MUX_PROPERTY_CHANGED_CALLBACK(TRUE)]
     Microsoft.UI.Xaml.Controls.IconSource IconSource{ get; set; };
 
-    [MUX_PROPERTY_CHANGED_CALLBACK(TRUE)]
+    String Title{ get; set; };
+
+    String Subtitle{ get; set; };
+
+    Object Content{ get; set; };
+
+    Object Footer{ get; set; };
+
+    [MUX_DEFAULT_VALUE("false")]
     Boolean IsBackButtonVisible{ get; set; };
 
+    [MUX_DEFAULT_VALUE("true")]
     Boolean IsBackEnabled{ get; set; };
 
-    [MUX_PROPERTY_CHANGED_CALLBACK(TRUE)]
-    Object CustomContent{ get; set; };
+    [MUX_DEFAULT_VALUE("false")]
+    Boolean IsPaneToggleButtonVisible{ get; set; };
 
     TitleBarTemplateSettings TemplateSettings{ get; };
 
     event Windows.Foundation.TypedEventHandler<TitleBar, Object> BackRequested;
+    event Windows.Foundation.TypedEventHandler<TitleBar, Object> PaneToggleRequested;
 
-    static Microsoft.UI.Xaml.DependencyProperty TitleProperty{ get; };
+    static Microsoft.UI.Xaml.DependencyProperty HeaderProperty{ get; };
     static Microsoft.UI.Xaml.DependencyProperty IconSourceProperty{ get; };
+    static Microsoft.UI.Xaml.DependencyProperty TitleProperty{ get; };
+    static Microsoft.UI.Xaml.DependencyProperty SubtitleProperty{ get; };
+    static Microsoft.UI.Xaml.DependencyProperty ContentProperty{ get; };
+    static Microsoft.UI.Xaml.DependencyProperty FooterProperty{ get; };
     static Microsoft.UI.Xaml.DependencyProperty IsBackButtonVisibleProperty{ get; };
     static Microsoft.UI.Xaml.DependencyProperty IsBackEnabledProperty{ get; };
-    static Microsoft.UI.Xaml.DependencyProperty CustomContentProperty{ get; };
+    static Microsoft.UI.Xaml.DependencyProperty IsPaneToggleButtonVisibleProperty{ get; };
 
     static Microsoft.UI.Xaml.DependencyProperty TemplateSettingsProperty{ get; };
 }
 
-[MUX_EXPERIMENTAL]
+[MUX_PREVIEW]
 [webhosthidden]
 unsealed runtimeclass TitleBarTemplateSettings : Microsoft.UI.Xaml.DependencyObject
 {
@@ -42,22 +57,14 @@ unsealed runtimeclass TitleBarTemplateSettings : Microsoft.UI.Xaml.DependencyObj
 
     Microsoft.UI.Xaml.Controls.IconElement IconElement;
 
-    [MUX_DEFAULT_VALUE("c_titleColumnGridLengthDefault")]
-    Microsoft.UI.Xaml.GridLength TitleColumnGridLength;
-
-    [MUX_DEFAULT_VALUE("c_customColumnGridLengthDefault")]
-    Microsoft.UI.Xaml.GridLength CustomColumnGridLength;
-
     static Microsoft.UI.Xaml.DependencyProperty IconElementProperty{ get; };
-    static Microsoft.UI.Xaml.DependencyProperty TitleColumnGridLengthProperty{ get; };
-    static Microsoft.UI.Xaml.DependencyProperty CustomColumnGridLengthProperty{ get; };
 }
 
-[MUX_EXPERIMENTAL]
+[MUX_PREVIEW]
 [webhosthidden]
 unsealed runtimeclass TitleBarAutomationPeer : Microsoft.UI.Xaml.Automation.Peers.FrameworkElementAutomationPeer
 {
-    TitleBarAutomationPeer(MEU_XC_NAMESPACE.TitleBar owner);
+    TitleBarAutomationPeer(MU_XC_NAMESPACE.TitleBar owner);
 }
 
 }
diff --git a/src/controls/dev/TitleBar/TitleBar.vcxitems b/src/controls/dev/TitleBar/TitleBar.vcxitems
index 5927cf5daa..55404a72b9 100644
--- a/src/controls/dev/TitleBar/TitleBar.vcxitems
+++ b/src/controls/dev/TitleBar/TitleBar.vcxitems
@@ -16,15 +16,17 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(MSBuildThisFileDirectory)TitleBar.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)TitleBarTemplateSettings.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)TitleBarAutomationPeer.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)TitleBarTemplateSettings.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\Generated\TitleBar.properties.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\Generated\TitleBarTemplateSettings.properties.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\GeneratedExperimental\TitleBar.properties.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\GeneratedExperimental\TitleBarTemplateSettings.properties.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Generated\TitleBar.properties.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Generated\TitleBarTemplateSettings.properties.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)TitleBar.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)TitleBarTemplateSettings.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)TitleBarAutomationPeer.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)TitleBarTemplateSettings.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Page Include="$(MSBuildThisFileDirectory)TitleBar.xaml">
diff --git a/src/controls/dev/TitleBar/TitleBar.xaml b/src/controls/dev/TitleBar/TitleBar.xaml
index b71c2a9f33..b871a9561e 100644
--- a/src/controls/dev/TitleBar/TitleBar.xaml
+++ b/src/controls/dev/TitleBar/TitleBar.xaml
@@ -1,88 +1,248 @@
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
-<ResourceDictionary xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="using:Microsoft.Experimental.UI.Xaml.Controls" xmlns:controls="using:Microsoft.UI.Xaml.Controls" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-  <Style TargetType="local:TitleBar">
-    <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="local:TitleBar">
-          <Grid x:Name="LayoutRoot" Height="{ThemeResource TitleBarCompactHeight}" Background="Transparent">
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="ActivationStateGroup">
-                <VisualState x:Name="Activated" />
-                <VisualState x:Name="Deactivated">
-                  <VisualState.Setters>
-                    <Setter Target="TitleText.Foreground" Value="{ThemeResource TitleBarDeactivatedForegroundBrush}" />
-                    <Setter Target="BackButton.Foreground" Value="{ThemeResource TitleBarDeactivatedForegroundBrush}" />
-                  </VisualState.Setters>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="BackButtonVisibilityGroup">
-                <VisualState x:Name="BackButtonVisible" />
-                <VisualState x:Name="BackButtonCollapsed">
-                  <VisualState.Setters>
-                    <Setter Target="BackButton.Visibility" Value="Collapsed" />
-                    <Setter Target="Icon.Margin" Value="16,0,0,0" />
-                  </VisualState.Setters>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="IconVisibilityGroup">
-                <VisualState x:Name="IconVisible" />
-                <VisualState x:Name="IconCollapsed">
-                  <VisualState.Setters>
-                    <Setter Target="Icon.Visibility" Value="Collapsed" />
-                  </VisualState.Setters>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="TitleTextVisibilityGroup">
-                <VisualState x:Name="TitleTextVisible" />
-                <VisualState x:Name="TitleTextCollapsed">
-                  <VisualState.Setters>
-                    <Setter Target="TitleText.Visibility" Value="Collapsed" />
-                  </VisualState.Setters>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="FullScreenGroup">
-                <VisualState x:Name="TitleBarVisible" />
-                <VisualState x:Name="TitleBarCollapsed">
-                  <VisualState.Setters>
-                    <Setter Target="LayoutRoot.Visibility" Value="Collapsed" />
-                  </VisualState.Setters>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="HeightGroup">
-                <VisualState x:Name="CompactHeight" />
-                <VisualState x:Name="ExpandedHeight">
-                  <VisualState.Setters>
-                    <Setter Target="LayoutRoot.Height" Value="{ThemeResource TitleBarExpandedHeight}" />
-                  </VisualState.Setters>
-                </VisualState>
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition x:Name="LeftPaddingColumn" Width="0" />
-              <ColumnDefinition Width="*" />
-              <ColumnDefinition x:Name="RightPaddingColumn" Width="0" />
-            </Grid.ColumnDefinitions>
-            <Grid Grid.Column="1">
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <!-- 0: back button -->
-                <ColumnDefinition Width="Auto" />
-                <!-- 1: icon -->
-                <ColumnDefinition Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TitleColumnGridLength}" />
-                <!-- 2: title -->
-                <ColumnDefinition Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.CustomColumnGridLength}" />
-                <!-- 3: custom content -->
-              </Grid.ColumnDefinitions>
-              <Button x:Name="BackButton" Grid.Column="0" Style="{ThemeResource TitleBarBackButtonStyle}" IsEnabled="{TemplateBinding IsBackEnabled}" ToolTipService.ToolTip="Back" />
-              <Viewbox x:Name="Icon" Grid.Column="1" VerticalAlignment="Center" MaxWidth="16" MaxHeight="16" Margin="4,0,0,0" Child="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.IconElement}" />
-              <TextBlock x:Name="TitleText" Grid.Column="2" Text="{TemplateBinding Title}" Style="{StaticResource CaptionTextBlockStyle}" Foreground="{ThemeResource TitleBarForegroundBrush}" TextTrimming="CharacterEllipsis" TextWrapping="NoWrap" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="16,0,16,2" MinWidth="48" />
-              <Grid x:Name="DragRegion" Grid.Column="1" Grid.ColumnSpan="3" Background="Transparent" />
-              <ContentPresenter x:Name="CustomContentPresenter" Grid.Column="3" Content="{TemplateBinding CustomContent}" />
-            </Grid>
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-</ResourceDictionary>
\ No newline at end of file
+<ResourceDictionary
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Microsoft.UI.Xaml.Controls"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+
+    <Style TargetType="controls:TitleBar" BasedOn="{StaticResource DefaultTitleBarStyle}"/>
+
+    <Style x:Key="DefaultTitleBarStyle" TargetType="controls:TitleBar">
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="controls:TitleBar">
+                    <Grid x:Name="PART_LayoutRoot" Height="{ThemeResource TitleBarCompactHeight}" Background="Transparent">
+                        <VisualStateManager.VisualStateGroups>
+                            
+                            <VisualStateGroup x:Name="BackButtonGroup">
+                                <VisualState x:Name="BackButtonCollapsed" />
+                                <VisualState x:Name="BackButtonVisible">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_BackButton.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="BackButtonDeactivated">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_BackButton.Visibility" Value="Visible" />
+                                        <Setter Target="PART_BackButton.Foreground" Value="{ThemeResource TitleBarDeactivatedForegroundBrush}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                            
+                            <VisualStateGroup x:Name="PaneToggleButtonGroup">
+                                <VisualState x:Name="PaneToggleButtonCollapsed" />
+                                <VisualState x:Name="PaneToggleButtonVisible">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_PaneToggleButton.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="PaneToggleButtonDeactivated">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_PaneToggleButton.Visibility" Value="Visible" />
+                                        <Setter Target="PART_PaneToggleButton.Foreground" Value="{ThemeResource TitleBarDeactivatedForegroundBrush}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                           
+                            <VisualStateGroup x:Name="HeaderVisibilityGroup">
+                                <VisualState x:Name="HeaderCollapsed" />
+                                <VisualState x:Name="HeaderVisible">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_HeaderContentPresenter.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                            
+                            <VisualStateGroup x:Name="IconVisibilityGroup">
+                                <VisualState x:Name="IconCollapsed" />
+                                <VisualState x:Name="IconVisible">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_Icon.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                            
+                            <VisualStateGroup x:Name="TitleTextGroup">
+                                <VisualState x:Name="TitleTextCollapsed" />
+                                <VisualState x:Name="TitleTextVisible">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_TitleText.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="TitleTextDeactivated">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_TitleText.Visibility" Value="Visible" />
+                                        <Setter Target="PART_TitleText.Foreground" Value="{ThemeResource TitleBarDeactivatedForegroundBrush}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                            
+                            <VisualStateGroup x:Name="SubtitleTextGroup">
+                                <VisualState x:Name="SubtitleTextCollapsed" />
+                                <VisualState x:Name="SubtitleTextVisible">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_SubtitleText.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="SubtitleTextDeactivated">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_SubtitleText.Visibility" Value="Visible" />
+                                        <Setter Target="PART_SubtitleText.Foreground" Value="{ThemeResource TitleBarDeactivatedForegroundBrush}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                            
+                            <VisualStateGroup x:Name="ContentVisibilityGroup">
+                                <VisualState x:Name="ContentCollapsed" />
+                                <VisualState x:Name="ContentVisible">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_ContentPresenterGrid.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                            
+                            <VisualStateGroup x:Name="FooterVisibilityGroup">
+                                <VisualState x:Name="FooterCollapsed" />
+                                <VisualState x:Name="FooterVisible">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_FooterContentPresenter.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                            
+                            <VisualStateGroup x:Name="HeightGroup">
+                                <VisualState x:Name="CompactHeight" />
+                                <VisualState x:Name="ExpandedHeight">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_LayoutRoot.Height" Value="{ThemeResource TitleBarExpandedHeight}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                            
+                            <VisualStateGroup x:Name="DisplayModeGroup">
+                                <VisualState x:Name="Expanded" />
+                                <VisualState x:Name="Compact">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_TitleText.Visibility" Value="Collapsed" />
+                                        <Setter Target="PART_SubtitleText.Visibility" Value="Collapsed" />
+                                        <Setter Target="PART_ContentPresenter.HorizontalAlignment" Value="Left" />
+                                        <Setter Target="PART_ContentPresenter.Margin" Value="16,0" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition x:Name="LeftPaddingColumn" Width="0" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition x:Name="RightPaddingColumn" Width="0" />
+                        </Grid.ColumnDefinitions>
+                        <Grid Grid.Column="1">
+                            <Grid.ColumnDefinitions>
+                                <!-- 0: Back Button -->
+                                <ColumnDefinition Width="Auto" />
+                                <!-- 1: Pane Toggle Button -->
+                                <ColumnDefinition Width="Auto" />
+                                <!-- 2: Header Content Presenter -->
+                                <ColumnDefinition Width="Auto" />
+                                <!-- 3: Icon -->
+                                <ColumnDefinition Width="Auto" />
+                                <!-- 4: Title -->
+                                <ColumnDefinition Width="Auto" />
+                                <!-- 5: Subtitle -->
+                                <ColumnDefinition Width="Auto" />
+                                <!-- 6: Content Presenter -->
+                                <ColumnDefinition Width="*" />
+                                <!-- 7: Footer Content Presenter -->
+                                <ColumnDefinition Width="Auto" />
+                                <!-- 8: Min Drag Region -->
+                                <ColumnDefinition Width="60" />
+                            </Grid.ColumnDefinitions>
+                            <Button
+                                x:Name="PART_BackButton"
+                                x:DeferLoadStrategy="Lazy"
+                                Visibility="Collapsed"
+                                Grid.Column="0"
+                                Style="{ThemeResource TitleBarBackButtonStyle}"
+                                IsEnabled="{TemplateBinding IsBackEnabled}"
+                                ToolTipService.ToolTip="Back" />
+
+                            <Button
+                                x:Name="PART_PaneToggleButton"
+                                x:DeferLoadStrategy="Lazy"
+                                Visibility="Collapsed"
+                                Grid.Column="1"
+                                Style="{ThemeResource TitleBarPaneToggleButtonStyle}"
+                                ToolTipService.ToolTip="Navigation" />
+
+                            <ContentPresenter
+                                x:Name="PART_HeaderContentPresenter"
+                                x:DeferLoadStrategy="Lazy"
+                                Visibility="Collapsed"
+                                Grid.Column="2"
+                                Content="{TemplateBinding Header}" />
+                            
+                            <Viewbox
+                                x:Name="PART_Icon"
+                                x:DeferLoadStrategy="Lazy"
+                                Visibility="Collapsed"
+                                Grid.Column="3"
+                                VerticalAlignment="Center"
+                                MaxWidth="16"
+                                MaxHeight="16"
+                                Margin="16,0,0,0"
+                                Child="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.IconElement}" />
+                            
+                            <TextBlock
+                                x:Name="PART_TitleText"
+                                x:DeferLoadStrategy="Lazy"
+                                Visibility="Collapsed"
+                                Grid.Column="4"
+                                Text="{TemplateBinding Title}"
+                                Style="{StaticResource CaptionTextBlockStyle}"
+                                Foreground="{ThemeResource TitleBarForegroundBrush}"
+                                Margin="16,0"
+                                TextTrimming="CharacterEllipsis"
+                                TextWrapping="NoWrap"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                MinWidth="48" />
+                            
+                            <TextBlock
+                                x:Name="PART_SubtitleText"
+                                x:DeferLoadStrategy="Lazy"
+                                Visibility="Collapsed"
+                                Grid.Column="5"
+                                Text="{TemplateBinding Subtitle}"
+                                Style="{StaticResource CaptionTextBlockStyle}"
+                                Foreground="{ThemeResource SubtitleBarForegroundBrush}"
+                                Margin="0,0,16,0"
+                                TextTrimming="CharacterEllipsis"
+                                TextWrapping="NoWrap"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                MinWidth="48" />
+                            
+                            <Grid
+                                x:Name="PART_ContentPresenterGrid"
+                                x:DeferLoadStrategy="Lazy"
+                                Visibility="Collapsed"
+                                Grid.Column="6">
+                                <ContentPresenter
+                                    x:Name="PART_ContentPresenter"
+                                    Content="{TemplateBinding Content}"
+                                    HorizontalAlignment="Center"/>
+                            </Grid>
+                           
+                            <ContentPresenter
+                                x:Name="PART_FooterContentPresenter"
+                                x:DeferLoadStrategy="Lazy"
+                                Visibility="Collapsed"
+                                Grid.Column="7"
+                                Content="{TemplateBinding Footer}" />
+                        </Grid>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
diff --git a/src/controls/dev/TitleBar/TitleBarTemplateSettings.h b/src/controls/dev/TitleBar/TitleBarTemplateSettings.h
index 882da64fdc..77fef2adea 100644
--- a/src/controls/dev/TitleBar/TitleBarTemplateSettings.h
+++ b/src/controls/dev/TitleBar/TitleBarTemplateSettings.h
@@ -6,9 +6,6 @@
 #include "TitleBarTemplateSettings.g.h"
 #include "TitleBarTemplateSettings.properties.h"
 
-static constexpr winrt::GridLength c_titleColumnGridLengthDefault{ 1, winrt::GridUnitType::Auto };
-static constexpr winrt::GridLength c_customColumnGridLengthDefault{ 1, winrt::GridUnitType::Star };
-
 class TitleBarTemplateSettings :
     public winrt::implementation::TitleBarTemplateSettingsT<TitleBarTemplateSettings>,
     public TitleBarTemplateSettingsProperties
diff --git a/src/controls/dev/TitleBar/TitleBar_themeresources.xaml b/src/controls/dev/TitleBar/TitleBar_themeresources.xaml
index 61d40b1002..7074d5f381 100644
--- a/src/controls/dev/TitleBar/TitleBar_themeresources.xaml
+++ b/src/controls/dev/TitleBar/TitleBar_themeresources.xaml
@@ -1,110 +1,189 @@
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
-<ResourceDictionary xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="using:Microsoft.Experimental.UI.Xaml.Controls" xmlns:controls="using:Microsoft.UI.Xaml.Controls" xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-  <ResourceDictionary.ThemeDictionaries>
-    <ResourceDictionary x:Key="Default">
-      <StaticResource x:Key="TitleBarForegroundBrush" ResourceKey="TextFillColorPrimaryBrush" />
-      <StaticResource x:Key="TitleBarDeactivatedForegroundBrush" ResourceKey="TextFillColorTertiaryBrush" />
-      <Color x:Key="TitleBarButtonForegroundColor">#FFFFFF</Color>
-      <Color x:Key="TitleBarButtonHoverForegroundColor">#FFFFFF</Color>
-      <Color x:Key="TitleBarButtonPressedForegroundColor">#CFCFCF</Color>
-      <Color x:Key="TitleBarButtonInactiveForegroundColor">#717171</Color>
-      <StaticResource x:Key="TitleBarButtonBackgroundColor" ResourceKey="SubtleFillColorTransparent" />
-      <StaticResource x:Key="TitleBarButtonHoverBackgroundColor" ResourceKey="SubtleFillColorSecondary" />
-      <StaticResource x:Key="TitleBarButtonPressedBackgroundColor" ResourceKey="SubtleFillColorTertiary" />
-      <x:Double x:Key="TitleBarCompactHeight">32</x:Double>
-      <x:Double x:Key="TitleBarExpandedHeight">48</x:Double>
-    </ResourceDictionary>
-    <ResourceDictionary x:Key="Light">
-      <StaticResource x:Key="TitleBarForegroundBrush" ResourceKey="TextFillColorPrimaryBrush" />
-      <StaticResource x:Key="TitleBarDeactivatedForegroundBrush" ResourceKey="TextFillColorTertiaryBrush" />
-      <Color x:Key="TitleBarButtonForegroundColor">#191919</Color>
-      <Color x:Key="TitleBarButtonHoverForegroundColor">#191919</Color>
-      <Color x:Key="TitleBarButtonPressedForegroundColor">#606060</Color>
-      <Color x:Key="TitleBarButtonInactiveForegroundColor">#9b9b9b</Color>
-      <StaticResource x:Key="TitleBarButtonBackgroundColor" ResourceKey="SubtleFillColorTransparent" />
-      <StaticResource x:Key="TitleBarButtonHoverBackgroundColor" ResourceKey="SubtleFillColorSecondary" />
-      <StaticResource x:Key="TitleBarButtonPressedBackgroundColor" ResourceKey="SubtleFillColorTertiary" />
-      <x:Double x:Key="TitleBarCompactHeight">32</x:Double>
-      <x:Double x:Key="TitleBarExpandedHeight">48</x:Double>
-    </ResourceDictionary>
-    <ResourceDictionary x:Key="HighContrast">
-      <StaticResource x:Key="TitleBarForegroundBrush" ResourceKey="TextFillColorPrimaryBrush" />
-      <StaticResource x:Key="TitleBarDeactivatedForegroundBrush" ResourceKey="TextFillColorTertiaryBrush" />
-      <StaticResource x:Key="TitleBarButtonForegroundColor" ResourceKey="TextFillColorPrimary" />
-      <StaticResource x:Key="TitleBarButtonHoverForegroundColor" ResourceKey="TextFillColorPrimary" />
-      <StaticResource x:Key="TitleBarButtonPressedForegroundColor" ResourceKey="TextFillColorSecondary" />
-      <StaticResource x:Key="TitleBarButtonInactiveForegroundColor" ResourceKey="TextFillColorTertiary" />
-      <StaticResource x:Key="TitleBarButtonBackgroundColor" ResourceKey="SubtleFillColorTransparent" />
-      <StaticResource x:Key="TitleBarButtonHoverBackgroundColor" ResourceKey="SubtleFillColorSecondary" />
-      <StaticResource x:Key="TitleBarButtonPressedBackgroundColor" ResourceKey="SubtleFillColorTertiary" />
-      <x:Double x:Key="TitleBarCompactHeight">32</x:Double>
-      <x:Double x:Key="TitleBarExpandedHeight">48</x:Double>
-    </ResourceDictionary>
-  </ResourceDictionary.ThemeDictionaries>
-  <Style x:Key="TitleBarBackButtonStyle" TargetType="Button">
-    <Setter Property="Background" Value="{ThemeResource NavigationViewBackButtonBackground}" />
-    <Setter Property="Foreground" Value="{ThemeResource NavigationViewItemForegroundChecked}" />
-    <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
-    <Setter Property="FontSize" Value="16" />
-    <Setter Property="Width" Value="44" />
-    <Setter Property="VerticalAlignment" Value="Stretch" />
-    <Setter Property="HorizontalContentAlignment" Value="Center" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
-    <Setter Property="Content" Value="&#xE72B;" />
-    <Setter Property="Margin" Value="0" />
-    <Setter Property="CornerRadius" Value="0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Button">
-          <Grid x:Name="RootGrid" Background="{TemplateBinding Background}" CornerRadius="{TemplateBinding CornerRadius}">
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="PointerOver">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Background">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewButtonBackgroundPointerOver}" />
-                    </ObjectAnimationUsingKeyFrames>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewButtonForegroundPointerOver}" />
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                  <VisualState.Setters>
-                    <Setter Target="Content.(AnimatedIcon.State)" Value="PointerOver" />
-                  </VisualState.Setters>
-                </VisualState>
-                <VisualState x:Name="Pressed">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Background">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewButtonBackgroundPressed}" />
-                    </ObjectAnimationUsingKeyFrames>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewButtonForegroundPressed}" />
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                  <VisualState.Setters>
-                    <Setter Target="Content.(AnimatedIcon.State)" Value="Pressed" />
-                  </VisualState.Setters>
-                </VisualState>
-                <VisualState x:Name="Disabled">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewButtonForegroundDisabled}" />
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <controls:AnimatedIcon x:Name="Content" Height="16" Width="16" controls:AnimatedIcon.State="Normal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" AutomationProperties.AccessibilityView="Raw">
-              <animatedvisuals:AnimatedBackVisualSource />
-              <controls:AnimatedIcon.FallbackIconSource>
-                <controls:FontIconSource FontSize="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=FontSize}" FontFamily="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=FontFamily}" Glyph="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content}" MirroredWhenRightToLeft="True" />
-              </controls:AnimatedIcon.FallbackIconSource>
-            </controls:AnimatedIcon>
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-</ResourceDictionary>
\ No newline at end of file
+<ResourceDictionary
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Microsoft.UI.Xaml.Controls"
+    xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+
+    <ResourceDictionary.ThemeDictionaries>
+      <ResourceDictionary x:Key="Default">
+        <StaticResource x:Key="TitleBarForegroundBrush" ResourceKey="TextFillColorPrimaryBrush" />
+        <StaticResource x:Key="TitleBarDeactivatedForegroundBrush" ResourceKey="TextFillColorTertiaryBrush" />
+        <StaticResource x:Key="SubtitleBarForegroundBrush" ResourceKey="TextFillColorSecondaryBrush" />
+        <StaticResource x:Key="SubtitleBarDeactivatedForegroundBrush" ResourceKey="TextFillColorTertiaryBrush" />
+        <Color x:Key="TitleBarButtonForegroundColor">#FFFFFF</Color>
+        <Color x:Key="TitleBarButtonHoverForegroundColor">#FFFFFF</Color>
+        <Color x:Key="TitleBarButtonPressedForegroundColor">#CFCFCF</Color>
+        <Color x:Key="TitleBarButtonInactiveForegroundColor">#717171</Color>
+        <StaticResource x:Key="TitleBarButtonBackgroundColor" ResourceKey="SubtleFillColorTransparent" />
+        <StaticResource x:Key="TitleBarButtonHoverBackgroundColor" ResourceKey="SubtleFillColorSecondary" />
+        <StaticResource x:Key="TitleBarButtonPressedBackgroundColor" ResourceKey="SubtleFillColorTertiary" />
+        <x:Double x:Key="TitleBarCompactHeight">32</x:Double>
+        <x:Double x:Key="TitleBarExpandedHeight">48</x:Double>
+      </ResourceDictionary>
+      <ResourceDictionary x:Key="Light">
+        <StaticResource x:Key="TitleBarForegroundBrush" ResourceKey="TextFillColorPrimaryBrush" />
+        <StaticResource x:Key="TitleBarDeactivatedForegroundBrush" ResourceKey="TextFillColorTertiaryBrush" />
+        <StaticResource x:Key="SubtitleBarForegroundBrush" ResourceKey="TextFillColorSecondaryBrush" />
+        <StaticResource x:Key="SubtitleBarDeactivatedForegroundBrush" ResourceKey="TextFillColorTertiaryBrush" />
+        <Color x:Key="TitleBarButtonForegroundColor">#191919</Color>
+        <Color x:Key="TitleBarButtonHoverForegroundColor">#191919</Color>
+        <Color x:Key="TitleBarButtonPressedForegroundColor">#606060</Color>
+        <Color x:Key="TitleBarButtonInactiveForegroundColor">#9b9b9b</Color>
+        <StaticResource x:Key="TitleBarButtonBackgroundColor" ResourceKey="SubtleFillColorTransparent" />
+        <StaticResource x:Key="TitleBarButtonHoverBackgroundColor" ResourceKey="SubtleFillColorSecondary" />
+        <StaticResource x:Key="TitleBarButtonPressedBackgroundColor" ResourceKey="SubtleFillColorTertiary" />
+        <x:Double x:Key="TitleBarCompactHeight">32</x:Double>
+        <x:Double x:Key="TitleBarExpandedHeight">48</x:Double>
+      </ResourceDictionary>
+      <ResourceDictionary x:Key="HighContrast">
+        <StaticResource x:Key="TitleBarForegroundBrush" ResourceKey="TextFillColorPrimaryBrush" />
+        <StaticResource x:Key="TitleBarDeactivatedForegroundBrush" ResourceKey="TextFillColorTertiaryBrush" />
+        <StaticResource x:Key="SubtitleBarForegroundBrush" ResourceKey="TextFillColorSecondaryBrush" />
+        <StaticResource x:Key="SubtitleBarDeactivatedForegroundBrush" ResourceKey="TextFillColorTertiaryBrush" />
+        <StaticResource x:Key="TitleBarButtonForegroundColor" ResourceKey="TextFillColorPrimary" />
+        <StaticResource x:Key="TitleBarButtonHoverForegroundColor" ResourceKey="TextFillColorPrimary" />
+        <StaticResource x:Key="TitleBarButtonPressedForegroundColor" ResourceKey="TextFillColorSecondary" />
+        <StaticResource x:Key="TitleBarButtonInactiveForegroundColor" ResourceKey="TextFillColorTertiary" />
+        <StaticResource x:Key="TitleBarButtonBackgroundColor" ResourceKey="SubtleFillColorTransparent" />
+        <StaticResource x:Key="TitleBarButtonHoverBackgroundColor" ResourceKey="SubtleFillColorSecondary" />
+        <StaticResource x:Key="TitleBarButtonPressedBackgroundColor" ResourceKey="SubtleFillColorTertiary" />
+        <x:Double x:Key="TitleBarCompactHeight">32</x:Double>
+        <x:Double x:Key="TitleBarExpandedHeight">48</x:Double>
+      </ResourceDictionary>
+    </ResourceDictionary.ThemeDictionaries>
+
+    <Style x:Key="TitleBarBackButtonStyle" TargetType="Button">
+      <Setter Property="Background" Value="{ThemeResource NavigationViewBackButtonBackground}" />
+      <Setter Property="Foreground" Value="{ThemeResource NavigationViewItemForegroundChecked}" />
+      <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
+      <Setter Property="FontSize" Value="16" />
+      <Setter Property="Width" Value="44" />
+      <Setter Property="VerticalAlignment" Value="Stretch" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+      <Setter Property="Content" Value="&#xE72B;" />
+      <Setter Property="Margin" Value="0" />
+      <Setter Property="CornerRadius" Value="0" />
+      <Setter Property="Template">
+        <Setter.Value>
+          <ControlTemplate TargetType="Button">
+            <Grid x:Name="RootGrid" Background="{TemplateBinding Background}" CornerRadius="{TemplateBinding CornerRadius}">
+              <VisualStateManager.VisualStateGroups>
+                <VisualStateGroup x:Name="CommonStates">
+                  <VisualState x:Name="Normal" />
+                  <VisualState x:Name="PointerOver">
+                    <Storyboard>
+                      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Background">
+                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewButtonBackgroundPointerOver}" />
+                      </ObjectAnimationUsingKeyFrames>
+                      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground">
+                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewButtonForegroundPointerOver}" />
+                      </ObjectAnimationUsingKeyFrames>
+                    </Storyboard>
+                    <VisualState.Setters>
+                      <Setter Target="Content.(AnimatedIcon.State)" Value="PointerOver" />
+                    </VisualState.Setters>
+                  </VisualState>
+                  <VisualState x:Name="Pressed">
+                    <Storyboard>
+                      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Background">
+                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewButtonBackgroundPressed}" />
+                      </ObjectAnimationUsingKeyFrames>
+                      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground">
+                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewButtonForegroundPressed}" />
+                      </ObjectAnimationUsingKeyFrames>
+                    </Storyboard>
+                    <VisualState.Setters>
+                      <Setter Target="Content.(AnimatedIcon.State)" Value="Pressed" />
+                    </VisualState.Setters>
+                  </VisualState>
+                  <VisualState x:Name="Disabled">
+                    <Storyboard>
+                      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground">
+                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewButtonForegroundDisabled}" />
+                      </ObjectAnimationUsingKeyFrames>
+                    </Storyboard>
+                  </VisualState>
+                </VisualStateGroup>
+              </VisualStateManager.VisualStateGroups>
+              <controls:AnimatedIcon x:Name="Content" Height="16" Width="16" controls:AnimatedIcon.State="Normal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" AutomationProperties.AccessibilityView="Raw">
+                <animatedvisuals:AnimatedBackVisualSource />
+                <controls:AnimatedIcon.FallbackIconSource>
+                  <controls:FontIconSource FontSize="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=FontSize}" FontFamily="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=FontFamily}" Glyph="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content}" MirroredWhenRightToLeft="True" />
+                </controls:AnimatedIcon.FallbackIconSource>
+              </controls:AnimatedIcon>
+            </Grid>
+          </ControlTemplate>
+        </Setter.Value>
+      </Setter>
+    </Style>
+
+    <Style x:Key="TitleBarPaneToggleButtonStyle" TargetType="Button">
+        <Setter Property="Background" Value="{ThemeResource NavigationViewBackButtonBackground}" />
+        <Setter Property="Foreground" Value="{ThemeResource NavigationViewItemForegroundChecked}" />
+        <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
+        <Setter Property="FontSize" Value="16" />
+        <Setter Property="Width" Value="44" />
+        <Setter Property="VerticalAlignment" Value="Stretch" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+        <Setter Property="Content" Value="&#xE700;" />
+        <Setter Property="Margin" Value="0" />
+        <Setter Property="CornerRadius" Value="0" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Grid x:Name="RootGrid" Background="{TemplateBinding Background}" CornerRadius="{TemplateBinding CornerRadius}">
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewButtonBackgroundPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewButtonForegroundPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                    <VisualState.Setters>
+                                        <Setter Target="Content.(AnimatedIcon.State)" Value="PointerOver" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewButtonBackgroundPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewButtonForegroundPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                    <VisualState.Setters>
+                                        <Setter Target="Content.(AnimatedIcon.State)" Value="Pressed" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewButtonForegroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                        <controls:AnimatedIcon x:Name="Content" Height="16" Width="16" controls:AnimatedIcon.State="Normal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" AutomationProperties.AccessibilityView="Raw">
+                            <animatedvisuals:AnimatedGlobalNavigationButtonVisualSource />
+                            <controls:AnimatedIcon.FallbackIconSource>
+                                <controls:FontIconSource FontSize="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=FontSize}" FontFamily="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=FontFamily}" Glyph="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content}" MirroredWhenRightToLeft="True" />
+                            </controls:AnimatedIcon.FallbackIconSource>
+                        </controls:AnimatedIcon>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
diff --git a/src/controls/dev/TreeView/TreeViewItem.cpp b/src/controls/dev/TreeView/TreeViewItem.cpp
index b00127607c..6b244e66f7 100644
--- a/src/controls/dev/TreeView/TreeViewItem.cpp
+++ b/src/controls/dev/TreeView/TreeViewItem.cpp
@@ -208,19 +208,18 @@ void TreeViewItem::OnDragEnter(winrt::DragEventArgs const& args)
                 {
                     if (m_expandContentTimer)
                     {
-                        const auto expandContentTimer = m_expandContentTimer.get();
-                        expandContentTimer.Stop();
-                        expandContentTimer.Start();
+                        m_expandContentTimer.Stop();
+                        m_expandContentTimer.Start();
                     }
                     else
                     {
                         // Initialize timer.
                         const winrt::TimeSpan interval = winrt::TimeSpan::duration(c_dragOverInterval);
-                        const auto expandContentTimer = winrt::DispatcherTimer();
-                        m_expandContentTimer.set(expandContentTimer);
-                        expandContentTimer.Interval(interval);
-                        expandContentTimer.Tick({ this, &TreeViewItem::OnExpandContentTimerTick });
-                        expandContentTimer.Start();
+
+                        m_expandContentTimer = winrt::DispatcherTimer();
+                        m_expandContentTimer.Interval(interval);
+                        m_expandContentTimer.Tick({ this, &TreeViewItem::OnExpandContentTimerTick });
+                        m_expandContentTimer.Start();
                     }
                 }
             }
@@ -242,7 +241,7 @@ void TreeViewItem::OnDragLeave(winrt::DragEventArgs const& args)
 
         if (m_expandContentTimer)
         {
-            m_expandContentTimer.get().Stop();
+            m_expandContentTimer.Stop();
         }
     }
 
@@ -350,7 +349,7 @@ void TreeViewItem::OnExpandContentTimerTick(const winrt::IInspectable& /*sender*
 {
     if (m_expandContentTimer)
     {
-        m_expandContentTimer.get().Stop();
+        m_expandContentTimer.Stop();
     }
     
     if (auto draggedOverNode = TreeNode())
@@ -516,7 +515,7 @@ bool TreeViewItem::IsSelectedInternal()
 void TreeViewItem::UpdateIndentation(int depth)
 {
     winrt::Thickness thickness;
-    thickness.Left = depth * 16;
+    thickness.Left = static_cast<double>(depth) * 16;
     thickness.Top = 0;
     thickness.Right = 0;
     thickness.Bottom = 0;
diff --git a/src/controls/dev/TreeView/TreeViewItem.h b/src/controls/dev/TreeView/TreeViewItem.h
index 7e4bb5242e..10773dd7a8 100644
--- a/src/controls/dev/TreeView/TreeViewItem.h
+++ b/src/controls/dev/TreeView/TreeViewItem.h
@@ -51,7 +51,7 @@ class TreeViewItem :
     com_ptr<TreeView> AncestorTreeView();
     winrt::weak_ref<winrt::TreeView> m_ancestorTreeView{ nullptr };
     tracker_ref<winrt::CheckBox> m_selectionBox{ this };
-    tracker_ref<winrt::DispatcherTimer> m_expandContentTimer{ this };
+    winrt::DispatcherTimer m_expandContentTimer{ nullptr };
     winrt::CheckBox::Checked_revoker m_checkedEventRevoker{};
     winrt::CheckBox::Unchecked_revoker m_uncheckedEventRevoker{};
     bool m_expansionCycled{ false };
diff --git a/src/controls/dev/TreeView/TreeViewItem.xaml b/src/controls/dev/TreeView/TreeViewItem.xaml
index 9669f6cb93..e6655da4fe 100644
--- a/src/controls/dev/TreeView/TreeViewItem.xaml
+++ b/src/controls/dev/TreeView/TreeViewItem.xaml
@@ -144,11 +144,11 @@
                 <TextBlock x:Name="CollapsedGlyph" Foreground="{TemplateBinding GlyphBrush}" Width="12" Height="12" Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TreeViewItemTemplateSettings.CollapsedGlyphVisibility}" FontSize="{TemplateBinding GlyphSize}" Text="{TemplateBinding CollapsedGlyph}" FontFamily="{StaticResource SymbolThemeFontFamily}" Padding="2" VerticalAlignment="Center" AutomationProperties.AccessibilityView="Raw" IsTextScaleFactorEnabled="False" IsHitTestVisible="False" />
                 <TextBlock x:Name="ExpandedGlyph" Foreground="{TemplateBinding GlyphBrush}" Width="12" Height="12" Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TreeViewItemTemplateSettings.ExpandedGlyphVisibility}" FontSize="{TemplateBinding GlyphSize}" Text="{TemplateBinding ExpandedGlyph}" FontFamily="{StaticResource SymbolThemeFontFamily}" Padding="2" VerticalAlignment="Center" AutomationProperties.AccessibilityView="Raw" IsTextScaleFactorEnabled="False" IsHitTestVisible="False" />
               </Grid>
-              <ContentPresenter x:Name="ContentPresenter" Grid.Column="2" ContentTransitions="{TemplateBinding ContentTransitions}" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" MinHeight="{ThemeResource TreeViewItemContentHeight}" Margin="{TemplateBinding Padding}" />
+              <ContentPresenter x:Name="ContentPresenter" Grid.Column="2" ContentTransitions="{TemplateBinding ContentTransitions}" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Foreground="{TemplateBinding Foreground}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" MinHeight="{ThemeResource TreeViewItemContentHeight}" Margin="{TemplateBinding Padding}" />
             </Grid>
           </Grid>
         </ControlTemplate>
       </Setter.Value>
     </Setter>
   </Style>
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/src/controls/dev/TwoPaneView/TwoPaneView.cpp b/src/controls/dev/TwoPaneView/TwoPaneView.cpp
index c00109be22..609166c6a1 100644
--- a/src/controls/dev/TwoPaneView/TwoPaneView.cpp
+++ b/src/controls/dev/TwoPaneView/TwoPaneView.cpp
@@ -218,17 +218,17 @@ void TwoPaneView::UpdateRowsColumns(ViewMode newMode, DisplayRegionHelperInfo in
 
             if (info.Mode == winrt::TwoPaneViewMode::Wide)
             {
-                m_columnMiddle.get().Width({ rc2.X - rc1.Width, winrt::GridUnitType::Pixel });
+                m_columnMiddle.get().Width({ static_cast<double>(rc2.X) - rc1.Width, winrt::GridUnitType::Pixel });
 
-                m_columnLeft.get().Width({ rc1.Width - rcControl.X , winrt::GridUnitType::Pixel });
-                m_columnRight.get().Width({ rc2.Width - ((rcWindow.Width - rcControl.Width) - rcControl.X) , winrt::GridUnitType::Pixel });
+                m_columnLeft.get().Width({ static_cast<double>(rc1.Width) - rcControl.X , winrt::GridUnitType::Pixel });
+                m_columnRight.get().Width({ static_cast<double>(rc2.Width) - ((static_cast<double>(rcWindow.Width) - rcControl.Width) - rcControl.X) , winrt::GridUnitType::Pixel });
             }
             else
             {
-                m_rowMiddle.get().Height({ rc2.Y - rc1.Height, winrt::GridUnitType::Pixel });
+                m_rowMiddle.get().Height({ static_cast<double>(rc2.Y) - rc1.Height, winrt::GridUnitType::Pixel });
 
-                m_rowTop.get().Height({ rc1.Height - rcControl.Y , winrt::GridUnitType::Pixel });
-                m_rowBottom.get().Height({ rc2.Height - ((rcWindow.Height - rcControl.Height) - rcControl.Y) , winrt::GridUnitType::Pixel });
+                m_rowTop.get().Height({ static_cast<double>(rc1.Height) - rcControl.Y , winrt::GridUnitType::Pixel });
+                m_rowBottom.get().Height({ static_cast<double>(rc2.Height) - ((static_cast<double>(rcWindow.Height) - rcControl.Height) - rcControl.Y) , winrt::GridUnitType::Pixel });
             }
         }
     }
diff --git a/src/controls/dev/WebView2/WebView2.cpp b/src/controls/dev/WebView2/WebView2.cpp
index de20cd8fb0..ce83413d2f 100644
--- a/src/controls/dev/WebView2/WebView2.cpp
+++ b/src/controls/dev/WebView2/WebView2.cpp
@@ -19,10 +19,6 @@
 #include "Windows.Globalization.h"
 #include <wrl\event.h>
 #include "MuxcTraceLogging.h"
-#include <FrameworkUdk/Containment.h>
-
-// Bug 51787766: [1.5 Servicing] [GitHub #2330][Acc][PowerBI][UWP MSAA][Amazon Prime] Initial focus not set to WebView2 when WV2 is the only control
-#define WINAPPSDK_CHANGEID_51787766 51787766
 
 using namespace Microsoft::WRL;
 
@@ -567,91 +563,44 @@ void WebView2::RegisterCoreEventHandlers()
                 if (moveFocusRequestedReason == winrt::CoreWebView2MoveFocusReason::Next ||
                     moveFocusRequestedReason == winrt::CoreWebView2MoveFocusReason::Previous)
                 {
+                    winrt::FocusNavigationDirection xamlDirection{ moveFocusRequestedReason == winrt::CoreWebView2MoveFocusReason::Next ?
+                                                                    winrt::FocusNavigationDirection::Next : winrt::FocusNavigationDirection::Previous };
+                    winrt::FindNextElementOptions findNextElementOptions;
                     winrt::XamlRoot xamlRoot = strongThis->XamlRoot();
                     if (xamlRoot)
                     {
-                        winrt::FocusNavigationDirection xamlDirection = moveFocusRequestedReason == winrt::CoreWebView2MoveFocusReason::Next
-                            ? winrt::FocusNavigationDirection::Next 
-                            : winrt::FocusNavigationDirection::Previous;
-                        
-                        winrt::FindNextElementOptions findNextElementOptions;
                         findNextElementOptions.SearchRoot(xamlRoot.Content());
-
                         winrt::DependencyObject nextElement = winrt::FocusManager::FindNextElement(xamlDirection, findNextElementOptions);
-
-                        if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_51787766>())
+                        if (nextElement)
                         {
-                            winrt::DependencyObject focusedElement = winrt::FocusManager::GetFocusedElement(xamlRoot).try_as<winrt::DependencyObject>();
-                            if (nextElement && nextElement != focusedElement)
-                            {
-                                // TODO_WebView2: We should check TryMoveFocusAsync() result before returning since FindNextElement()
-                                //                only finds the next focusable element, but does not guarantee that we can
-                                //                actually focus on it (eg it could be empty/in the process of loading).
-                                //                Waiting on this result via winrt/cpp coroutine results in the WINRT_ASSERT
-                                //                warning about a blocking wait on UI Thread.
-                                //
-                                //                We will address this scenario properly as part of:
-                                //                Task 23157748: WebView2 should implement IInternalCoreWindowFocus (use Xaml's unified focus model)
-                                //
-                                //                For now, we'll assign the return value of TryMoveFocusAsync() to a dummy variable
-                                //                in order to avoid the code analysis error C26444:
-                                //
-                                //                https://docs.microsoft.com/en-us/cpp/code-quality/c26444?view=vs-2019
-
-                                // If core webview is also losing focus via something other than TAB (web LostFocus event fired)
-                                // and the TAB handling is arriving later (eg due to longer MOJO delay), skip manually moving Xaml Focus to next element.
-                                winrt::DependencyObject thisElement = strongThis->try_as<winrt::DependencyObject>();
-                                if (thisElement == focusedElement)
-                                {
-                                    // Move focus to the next XAML element
-                                    const auto _ = winrt::FocusManager::TryMoveFocusAsync(xamlDirection, findNextElementOptions);
-                                }
-                            }
-                            else
+                            // TODO_WebView2: We should check TryMoveFocusAsync() result before returning since FindNextElement()
+                            //                only finds the next focusable element, but does not guarantee that we can
+                            //                actually focus on it (eg it could be empty/in the process of loading).
+                            //                Waiting on this result via winrt/cpp coroutine results in the WINRT_ASSERT
+                            //                warning about a blocking wait on UI Thread.
+                            //
+                            //                We will address this scenario properly as part of:
+                            //                Task 23157748: WebView2 should implement IInternalCoreWindowFocus (use Xaml's unified focus model)
+                            //
+                            //                For now, we'll assign the return value of TryMoveFocusAsync() to a dummy variable
+                            //                in order to avoid the code analysis error C26444:
+                            //
+                            //                https://docs.microsoft.com/en-us/cpp/code-quality/c26444?view=vs-2019
+
+                            // If core webview is also losing focus via something other than TAB (web LostFocus event fired)
+                            // and the TAB handling is arriving later (eg due to longer MOJO delay), skip manually moving Xaml Focus to next element.
+                            auto focusedElement = winrt::FocusManager::GetFocusedElement(xamlRoot).try_as<winrt::UIElement>();
+                            auto thisElement = strongThis->try_as<winrt::UIElement>();
+                            if (thisElement == focusedElement)
                             {
-                                // Handle the case where there is no "next" focusable XAML element (WebView2 is first/last/only element), 
-                                // which we are in if FindNextElement() returns either null or the (already focused) WebView2. The appropriate 
-                                // behavior here is to cycle focus inside the webview, "wrapping around" to the other end (regardless of
-                                //  WebView2.KeyboardNavigationMode).To achieve this, manually Call MoveFocus() in the specified direction.
-                                strongThis->MoveFocusIntoCoreWebView2(moveFocusRequestedReason);
+                                const auto _ = winrt::FocusManager::TryMoveFocusAsync(xamlDirection, findNextElementOptions);
                             }
 
-                            // Always mark the args handled to prevent CoreWebView2Controller's "default behavior" which breaks XAML focus expectations (by explicitly changing  HWND focus)
-                            // More info: https://learn.microsoft.com/en-us/microsoft-edge/webview2/reference/winrt/microsoft_web_webview2_core/corewebview2movefocusrequestedeventargs?view=webview2-winrt-1.0.2535.41#handled
                             args.Handled(TRUE);
                         }
-                        else
-                        {
-                            if (nextElement)
-                            {
-                                // TODO_WebView2: We should check TryMoveFocusAsync() result before returning since FindNextElement()
-                                //                only finds the next focusable element, but does not guarantee that we can
-                                //                actually focus on it (eg it could be empty/in the process of loading).
-                                //                Waiting on this result via winrt/cpp coroutine results in the WINRT_ASSERT
-                                //                warning about a blocking wait on UI Thread.
-                                //
-                                //                We will address this scenario properly as part of:
-                                //                Task 23157748: WebView2 should implement IInternalCoreWindowFocus (use Xaml's unified focus model)
-                                //
-                                //                For now, we'll assign the return value of TryMoveFocusAsync() to a dummy variable
-                                //                in order to avoid the code analysis error C26444:
-                                //
-                                //                https://docs.microsoft.com/en-us/cpp/code-quality/c26444?view=vs-2019
-
-                                // If core webview is also losing focus via something other than TAB (web LostFocus event fired)
-                                // and the TAB handling is arriving later (eg due to longer MOJO delay), skip manually moving Xaml Focus to next element.
-                                auto focusedElement = winrt::FocusManager::GetFocusedElement(xamlRoot).try_as<winrt::UIElement>();
-                                auto thisElement = strongThis->try_as<winrt::UIElement>();
-                                if (thisElement == focusedElement)
-                                {
-                                    const auto _ = winrt::FocusManager::TryMoveFocusAsync(xamlDirection, findNextElementOptions);
-                                }
-
-                                args.Handled(TRUE);
-                            }
-                             // If nextElement is null, focus is maintained in Anaheim by not marking Handled.
-                        }
                     }
+
+                    // If nextElement is null, focus is maintained in Anaheim by not marking Handled.
                 }
             }
         } });
@@ -1246,6 +1195,8 @@ void WebView2::FireNavigationStarting(const winrt::CoreWebView2NavigationStartin
 // Event fired when navigation has occurred in the WebView2.
 void WebView2::FireNavigationCompleted(const winrt::CoreWebView2NavigationCompletedEventArgs& args)
 {
+    XamlTelemetry::WebView2_FireNavigationCompleted(reinterpret_cast<uint64_t>(this), !!m_navigationCompletedEventSource);
+
     // UpdateSource to keep coherence between WebView2 and CoreWebView2.
     UpdateSourceInternal();
 
@@ -1297,35 +1248,15 @@ void WebView2::FireCoreWebView2Initialized(winrt::hresult exception)
     m_coreWebView2InitializedEventSource(*this, *eventArgs);
 }
 
-void WebView2::MoveFocusIntoCoreWebView2(winrt::CoreWebView2MoveFocusReason reason)
+void WebView2::HandleGotFocus(const winrt::Windows::Foundation::IInspectable&, const winrt::RoutedEventArgs&) noexcept
 {
-    if (m_coreWebView && m_coreWebViewController)
+    if (m_coreWebView && m_xamlFocusChangeInfo.m_isPending)
     {
         CoreWebView2RunIgnoreInvalidStateSync(
             [&]()
             {
-                m_coreWebViewController.MoveFocus(reason);
+                m_coreWebViewController.MoveFocus(m_xamlFocusChangeInfo.m_storedMoveFocusReason);
             });
-    }
-}
-
-void WebView2::HandleGotFocus(const winrt::Windows::Foundation::IInspectable&, const winrt::RoutedEventArgs&) noexcept
-{
-    if (m_coreWebView && m_xamlFocusChangeInfo.m_isPending)
-    {
-        if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_51787766>())
-        {
-            MoveFocusIntoCoreWebView2(m_xamlFocusChangeInfo.m_storedMoveFocusReason);
-        }
-        else
-        {
-            CoreWebView2RunIgnoreInvalidStateSync(
-                [&]()
-                {
-                    m_coreWebViewController.MoveFocus(m_xamlFocusChangeInfo.m_storedMoveFocusReason);
-                });
-        }
-
         m_xamlFocusChangeInfo.m_isPending = false;
     }
 }
diff --git a/src/controls/dev/WebView2/WebView2.h b/src/controls/dev/WebView2/WebView2.h
index c03950cbc7..5faaf0311a 100644
--- a/src/controls/dev/WebView2/WebView2.h
+++ b/src/controls/dev/WebView2/WebView2.h
@@ -115,7 +115,7 @@ class WebView2 :
     void UpdateSourceInternal();
     void FireCoreProcessFailedEvent(const winrt::CoreWebView2ProcessFailedEventArgs& args);
     void FireCoreWebView2Initialized(winrt::hresult exception);
-    void MoveFocusIntoCoreWebView2(winrt::CoreWebView2MoveFocusReason reason);
+
     void UpdateDefaultVisualBackgroundColor();
 
     HWND GetHostHwnd() noexcept;
diff --git a/src/controls/dev/dll/CommonHelpers.tt b/src/controls/dev/dll/CommonHelpers.tt
index 8f56dd6715..6889192594 100644
--- a/src/controls/dev/dll/CommonHelpers.tt
+++ b/src/controls/dev/dll/CommonHelpers.tt
@@ -428,6 +428,10 @@
                     WriteLine(string.Format("    map.as<{0}>().Insert(unbox_value<{1}>(key), unbox_value<{2}>(value));", winRtType.CppWinRtName, winRtType.MapWinRtTypes[0].CppWinRtName, winRtType.MapWinRtTypes[1].CppWinRtName));
                     WriteLine("});\r\n");
                 }
+                if(winRtType.IsBindable)
+                {
+                    WriteLine("xamlType->SetIsBindable(true);\r\n");
+                }
 
                 WriteLine("return static_cast<winrt::IXamlType>(*xamlType);");
             });
diff --git a/src/controls/dev/dll/ExperimentalXamlControlsResources.cpp b/src/controls/dev/dll/ExperimentalXamlControlsResources.cpp
deleted file mode 100644
index 601732a1b7..0000000000
--- a/src/controls/dev/dll/ExperimentalXamlControlsResources.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-#include "pch.h"
-#include "common.h"
-#include "ExperimentalXamlControlsResources.h"
-#include "MUXControlsFactory.h"
-
-#define MUX_EXPERIMENTAL_NAMESPACE_STR L"Microsoft.Experimental.UI.Xaml"
-
-ExperimentalXamlControlsResources::ExperimentalXamlControlsResources()
-{
-    MUXControlsFactory::EnsureInitialized();
-    UpdateSource();
-}
-
-
-void ExperimentalXamlControlsResources::UpdateSource()
-{
-    // At runtime choose the URI to use. 
-    winrt::Uri uri {
-        []() -> hstring {
-            const bool isRS3OrHigher = SharedHelpers::DoesListViewItemPresenterVSMWork();
-            const bool isRS4OrHigher = SharedHelpers::IsRS4OrHigher();
-            const bool isRS5OrHigher = SharedHelpers::IsRS5OrHigher() && SharedHelpers::IsControlCornerRadiusAvailable();
-            const bool is19H1OrHigher = SharedHelpers::Is19H1OrHigher();
-            const bool is21H1OrHigher = SharedHelpers::Is21H1OrHigher();
-
-            hstring packagePrefix = L"ms-appx:///" MUX_EXPERIMENTAL_NAMESPACE_STR "/Themes/";
-            hstring postfix = L"themeresources.xaml";
-
-            hstring releasePrefix;
-
-            if (is21H1OrHigher)
-            {
-                releasePrefix = L"21h1_";
-            }
-            else if (is19H1OrHigher)
-            {
-                releasePrefix = L"19h1_";
-            }
-            else if (isRS5OrHigher)
-            {
-                releasePrefix = L"rs5_";
-            }
-            else if (isRS4OrHigher)
-            {
-                releasePrefix = L"rs4_";
-            }
-            else if (isRS3OrHigher)
-            {
-                releasePrefix = L"rs3_";
-            }
-            else
-            {
-                releasePrefix = L"rs2_";
-            }
-
-            return packagePrefix + releasePrefix + postfix;
-        }()
-    };
-
-    ThemeDictionaries().Clear();
-
-    Source(uri);
-}
-
-void SetDefaultStyleKeyWorker(winrt::IControlProtected const& controlProtected, std::wstring_view const& className) 
-{
-    controlProtected.DefaultStyleKey(box_value(className));
-
-    if (auto control5 = controlProtected.try_as<winrt::IControl5>())
-    {
-        winrt::Uri uri{
-            []() {
-            
-            // RS3 styles should be used on builds where ListViewItemPresenter's VSM integration works.
-            const bool isRS3OrHigher = SharedHelpers::DoesListViewItemPresenterVSMWork();
-            const bool isRS4OrHigher = SharedHelpers::IsRS4OrHigher();
-            const bool isRS5OrHigher = SharedHelpers::IsRS5OrHigher() && SharedHelpers::IsControlCornerRadiusAvailable();
-            const bool is19H1OrHigher = SharedHelpers::Is19H1OrHigher();
-            const bool is21H1OrHigher = SharedHelpers::Is21H1OrHigher();
-            
-            std::wstring postfix = L"generic.xaml";
-            std::wstring releasePrefix = L"";
-
-            if (is21H1OrHigher)
-            {
-                releasePrefix = L"ms-appx:///" MUX_EXPERIMENTAL_NAMESPACE_STR "/Themes/21h1_";
-            }
-            else if (is19H1OrHigher)
-            {
-                releasePrefix =  L"ms-appx:///" MUX_EXPERIMENTAL_NAMESPACE_STR "/Themes/19h1_";
-            }
-            else if (isRS5OrHigher)
-            {
-                releasePrefix =  L"ms-appx:///" MUX_EXPERIMENTAL_NAMESPACE_STR "/Themes/rs5_";
-            }
-            else if (isRS4OrHigher)
-            {
-                releasePrefix =  L"ms-appx:///" MUX_EXPERIMENTAL_NAMESPACE_STR "/Themes/rs4_";
-            }
-            else if (isRS3OrHigher)
-            {
-                releasePrefix =  L"ms-appx:///" MUX_EXPERIMENTAL_NAMESPACE_STR "/Themes/rs3_";
-            }
-            else
-            {
-                releasePrefix =  L"ms-appx:///" MUX_EXPERIMENTAL_NAMESPACE_STR "/Themes/rs2_";
-            }
-
-            return releasePrefix + postfix;
-        }()
-        };
-        control5.DefaultStyleResourceUri(uri);
-    }
-}
diff --git a/src/controls/dev/dll/ExperimentalXamlControlsResources.h b/src/controls/dev/dll/ExperimentalXamlControlsResources.h
deleted file mode 100644
index af380a5d54..0000000000
--- a/src/controls/dev/dll/ExperimentalXamlControlsResources.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-#pragma once
-
-#include "ExperimentalXamlControlsResources.g.h"
-
-class ExperimentalXamlControlsResources :
-    public ReferenceTracker<ExperimentalXamlControlsResources, winrt::implementation::ExperimentalXamlControlsResourcesT, winrt::composable>
-{
-public:
-    ExperimentalXamlControlsResources();
-private:
-    void UpdateSource();
-};
diff --git a/src/controls/dev/dll/MUXControlsFactory.h b/src/controls/dev/dll/MUXControlsFactory.h
index d2b44521fa..2c9a547533 100644
--- a/src/controls/dev/dll/MUXControlsFactory.h
+++ b/src/controls/dev/dll/MUXControlsFactory.h
@@ -29,16 +29,8 @@ class MUXControlsFactory :
     static bool s_initialized;
 };
 
-#ifndef MUX_EXPERIMENTAL
 namespace winrt::Microsoft::UI::Xaml::XamlTypeInfo
 {
     namespace factory_implementation { using XamlControlsXamlMetaDataProvider = MUXControlsFactory; }
     namespace implementation { using XamlControlsXamlMetaDataProvider = XamlMetadataProvider; }
-}
-#else
-namespace winrt::Microsoft::Experimental::UI::Xaml::XamlTypeInfo
-{
-    namespace factory_implementation { using XamlControlsXamlMetaDataProvider = MUXControlsFactory; }
-    namespace implementation { using XamlControlsXamlMetaDataProvider = XamlMetadataProvider; }
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/controls/dev/dll/Microsoft.Experimental.UI.Xaml.def b/src/controls/dev/dll/Microsoft.Experimental.UI.Xaml.def
deleted file mode 100644
index 5d2ee5677d..0000000000
--- a/src/controls/dev/dll/Microsoft.Experimental.UI.Xaml.def
+++ /dev/null
@@ -1,6 +0,0 @@
-LIBRARY
-
-EXPORTS
-DllMain PRIVATE
-DllGetActivationFactory PRIVATE
-DllCanUnloadNow PRIVATE
\ No newline at end of file
diff --git a/src/controls/dev/dll/Microsoft.Experimental.UI.Xaml.rc b/src/controls/dev/dll/Microsoft.Experimental.UI.Xaml.rc
deleted file mode 100644
index be7064ae9e..0000000000
--- a/src/controls/dev/dll/Microsoft.Experimental.UI.Xaml.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <winresrc.h>
-var VER_INTERNALNAME_STR "Microsoft.Experimental.UI.Xaml.dll"
-#include "WinUIrc.ver"
-
diff --git a/src/controls/dev/dll/Microsoft.Experimental.UI.Xaml.vcxproj b/src/controls/dev/dll/Microsoft.Experimental.UI.Xaml.vcxproj
deleted file mode 100644
index 7426145878..0000000000
--- a/src/controls/dev/dll/Microsoft.Experimental.UI.Xaml.vcxproj
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildThisFileDirectory)Microsoft.UI.Xaml.Common.props" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4647FA1B-124E-4447-AF56-4016AB6FAF4A}</ProjectGuid>
-    <Keyword>DynamicLibrary</Keyword>
-    <TargetName>$(MEUXTargetName)</TargetName>
-    <RootNamespace>$(MEUXNamespace)</RootNamespace>
-    <CppWinRTNamespaceMergeDepth>2</CppWinRTNamespaceMergeDepth>
-    <MdMergeNamespaceMergeDepth>4</MdMergeNamespaceMergeDepth>
-    <ProjectWinMDName>Microsoft.Experimental.winmd</ProjectWinMDName>
-    <DependencyPropertyCodeGenOutputDirectory>$(MSBuildThisFileDirectory)..\GeneratedExperimental</DependencyPropertyCodeGenOutputDirectory>
-    <DisablePGO>True</DisablePGO>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ItemDefinitionGroup>
-    <Link>
-      <ModuleDefinitionFile>Microsoft.Experimental.UI.Xaml.def</ModuleDefinitionFile>
-    </Link>
-    <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);MUX_EXPERIMENTAL</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <Midl Include="..\..\idl\Microsoft.Experimental.UI.Xaml.idl" />
-    <ResourceCompile Include="Microsoft.Experimental.UI.Xaml.rc" />
-    <ClInclude Include="ExperimentalXamlControlsResources.h" />
-    <ClCompile Include="$(DependencyPropertyCodeGenOutputDirectory)\ExperimentalXamlControlsResources.properties.cpp" />
-    <ClCompile Include="ExperimentalXamlControlsResources.cpp" />
-  </ItemGroup>
-  <ImportGroup Label="Shared">
-    <Import Project="..\CommonStyles\CommonStyles.vcxitems" Label="Shared" />
-    <Import Project="..\Collections\Collections.vcxitems" Label="Shared" />
-    <Import Project="..\ResourceHelper\ResourceHelper.vcxitems" Label="Shared" />
-    <Import Project="..\SampleControl\SampleControl.vcxitems" Label="Shared" />
-    <Import Project="..\TitleBar\TitleBar.vcxitems" Label="Shared" />
-  </ImportGroup>
-  <ItemGroup>
-    <SharedPage Include="@(Page)" />
-    <SharedPage Update="@(Page)">
-      <ControlsResourcesVersion2 Condition="'%(Page.ControlsResourcesVersion)' != 'Version1'">true</ControlsResourcesVersion2>
-      <ControlsResourcesVersion1 Condition="'%(Page.ControlsResourcesVersion)' != 'Version2'">true</ControlsResourcesVersion1>
-    </SharedPage>
-  </ItemGroup>
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\packages\Microsoft.UI.Xaml.2.6.1\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\packages\Microsoft.UI.Xaml.2.6.1\build\native\Microsoft.UI.Xaml.targets')" />
-  </ImportGroup>
-  <Import Project="$(MSBuildThisFileDirectory)Microsoft.UI.Xaml.Common.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports2" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Microsoft.UI.Xaml.2.6.1\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.UI.Xaml.2.6.1\build\native\Microsoft.UI.Xaml.targets'))" />
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/src/controls/dev/dll/Microsoft.UI.Xaml.Common.targets b/src/controls/dev/dll/Microsoft.UI.Xaml.Common.targets
index 78fe976665..05b8b184ba 100644
--- a/src/controls/dev/dll/Microsoft.UI.Xaml.Common.targets
+++ b/src/controls/dev/dll/Microsoft.UI.Xaml.Common.targets
@@ -36,7 +36,7 @@
       <Enumclass>false</Enumclass>
     </Midl>
     <Link>
-      <AdditionalDependencies>user32.lib;mincore.lib;dxguid.lib;dcomp.lib;$(FrameworkUdkLibPath)\Microsoft.Internal.FrameworkUdk.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>user32.lib;mincore.lib;dxguid.lib;dcomp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <!-- Microsoft.winmd will contain the definition of both public, preview and private types. -->
       <WindowsMetadataFile>$(OutDir)$(ProjectWinMDName)</WindowsMetadataFile>
       <GenerateMapFile>true</GenerateMapFile>
@@ -50,6 +50,10 @@
       <!-- Disabling 4505 because it's firing incorrectly on C++/WinRT headers. Filed this issue for tracking: https://developercommunity.visualstudio.com/content/problem/848007/warning-4505-unreferenced-local-function-has-been.html-->
       <!-- Temporarily disabling 6285, recent regression in VS 16.10 Preview 4 (which vs_buildtools is somehow installing): https://vsf-prod.westus.cloudapp.azure.com/content/problem/1429721/codeanalysis-warning-c6285-in-stl-functionalh-in-v.html -->
       <DisableSpecificWarnings>4505;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <!-- A C++/WinRT header is currently giving the following warning:
+           "C28112: A variable (s_module) which is accessed via an Interlocked function must always be accessed via an Interlocked function. See line 78: It is not always safe to access a variable which is accessed via the Interlocked* family of functions in any other way."
+           We'll disable it until it gets fixed. Bug 50575671 tracks this issue. -->
+      <DisableSpecificWarnings>28112;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <AdditionalIncludeDirectories>
         %(AdditionalIncludeDirectories);
         $(WindowsSDK_IncludePath)\winrt;
@@ -300,7 +304,7 @@
   <PropertyGroup>
     <GenerateXamlFileBeforeTargets>BeforeBuildGenerateSources;CompileXaml;Prep_ComputeProcessXamlFiles;CompilePageRequiringCustomCompilation</GenerateXamlFileBeforeTargets>
   </PropertyGroup>
-  <!-- MergeXamlConfig is using msbuild task batching, each BatchMergeXaml below is executed multilple times. 
+  <!-- MergeXamlConfig is using msbuild task batching, each BatchMergeXaml below is executed multilple times.
         https://docs.microsoft.com/en-us/visualstudio/msbuild/item-metadata-in-task-batching?view=vs-2019 -->
   <Target Name="GenerateGenericResourceFile" DependsOnTargets="CategorizeSharedPages" BeforeTargets="$(GenerateXamlFileBeforeTargets)" Inputs="@(StylePage)" Outputs="$(OutDir)generic.xaml">
     <Message Text="Generating generic resources XAML file " />
@@ -322,7 +326,7 @@
       to only set a property if the target actually runs. -->
     <CreateProperty Value="True">
       <Output TaskParameter="ValueSetByTask" PropertyName="ThemeResourceFileNeedsCompilation" />
-    </CreateProperty>    
+    </CreateProperty>
   </Target>
   <!-- Controls styles were missing in packaged generic.xaml file. Merge MUX Generic.xaml with MUXC Generic.xaml and ThemeResource.xaml -->
   <Target Name="MergeMuxMuxcGenericResourceFiles" AfterTargets="GenerateThemeResourceFile" Inputs="$(ScriptPath)GenerateMergedXaml.ps1;$(MUXProjectRoot)dxaml\xcp\dxaml\themes\generic.xaml;$(OutDir)generic.xaml;$(OutDir)themeresources.xaml" Outputs="$(TempRoot)\generic.xaml">
@@ -652,5 +656,5 @@
         <AdditionalOptions>%(Link.AdditionalOptions) /sourcelink:"$(SourceLink)"</AdditionalOptions>
       </Link>
     </ItemGroup>
-  </Target>  
+  </Target>
 </Project>
diff --git a/src/controls/dev/dll/SharedHelpers.cpp b/src/controls/dev/dll/SharedHelpers.cpp
index 2c03547d2b..ca70ca59e2 100644
--- a/src/controls/dev/dll/SharedHelpers.cpp
+++ b/src/controls/dev/dll/SharedHelpers.cpp
@@ -9,6 +9,11 @@
 #include <appmodel.h>
 #include <roapi.h>
 
+// This needs to be here instead of in CppWinRTIncludes.h because it includes Microsoft.UI.h,
+// which contains definitions of a few types like WindowId that conflict with their definitions
+// in Microsoft.UI.Content.h.
+#include <winrt\Microsoft.UI.Interop.h>
+
 // Package constants copied from AppModel.h. These values were only defined for Vb and later;
 // when passed as flags to ::GetCurrentPackageInfo() on pre-Vb, they are simply ignored.
 #define PACKAGE_PROPERTY_STATIC             0x00080000
@@ -267,6 +272,25 @@ void SharedHelpers::QueueCallbackForCompositionRendering(std::function<void()> c
 
 // Rect helpers
 
+bool SharedHelpers::DoesRectContainPoint(
+    const winrt::Rect& rect,
+    const winrt::Point& point)
+{
+    return winrt::RectHelper::Contains(rect, point);
+}
+
+bool SharedHelpers::DoesRectContainPoint(
+    const winrt::RectInt32& rect,
+    const winrt::PointInt32& point)
+{
+    const auto doesContain =
+        rect.X <= point.X &&
+        rect.X + rect.Width >= point.X &&
+        rect.Y <= point.Y &&
+        rect.Y + rect.Height >= point.Y;
+    return doesContain;
+}
+
 // Returns TRUE if either rect is empty or the rects
 // have an empty intersection.
 bool SharedHelpers::DoRectsIntersect(
diff --git a/src/controls/dev/dll/WinRtType.tt b/src/controls/dev/dll/WinRtType.tt
index 81e2d3d1ab..d7c2446700 100644
--- a/src/controls/dev/dll/WinRtType.tt
+++ b/src/controls/dev/dll/WinRtType.tt
@@ -27,6 +27,14 @@
                                     WinmdType.FullName.StartsWith("Windows.UI.Xaml") || 
                                     WinmdType.FullName.StartsWith("Microsoft.UI.Xaml"); } }
 
+        public bool IsBindable 
+        { 
+            get 
+            { 
+                return GetCustomAttribute(WinmdType, "BindableAttribute") != null;
+            } 
+        }
+
         public WinRtType(Type winmdType)
         {
             if (winmdType.FullName == "System.Runtime.InteropServices.WindowsRuntime.RuntimeClass")
diff --git a/src/controls/dev/dll/XamlMetadataProviderGenerated.h b/src/controls/dev/dll/XamlMetadataProviderGenerated.h
index bfd6e0f61c..c99caa0175 100644
--- a/src/controls/dev/dll/XamlMetadataProviderGenerated.h
+++ b/src/controls/dev/dll/XamlMetadataProviderGenerated.h
@@ -6,12 +6,7 @@
 
 #include "pch.h"
 #include "common.h"
-
-#ifndef MUX_EXPERIMENTAL
 #include "XamlControlsResources.h"
-#else
-#include "ExperimentalXamlControlsResources.h"
-#endif
 
 namespace {
 
@@ -3057,6 +3052,11 @@ Entry c_typeEntries[] =
                         xamlType.AddDPMember(L"SelectedPipStyle", L"Microsoft.UI.Xaml.Style", statics.SelectedPipStyleProperty(), false /* isContent */);
                     }
 
+                    winrt::IPipsPagerStatics2 statics2 = GetFactory<winrt::IPipsPagerStatics2>(L"Microsoft.UI.Xaml.Controls.PipsPager");
+                    {
+                        xamlType.AddDPMember(L"WrapMode", L"Microsoft.UI.Xaml.Controls.PipsPagerWrapMode", statics2.WrapModeProperty(), false /* isContent */);
+                    }
+
                     xamlType.AddMember(
                         L"TemplateSettings", /* propertyName */
                         L"Microsoft.UI.Xaml.Controls.PipsPagerTemplateSettings", /* propertyType */
@@ -3120,6 +3120,26 @@ Entry c_typeEntries[] =
             return static_cast<winrt::IXamlType>(*xamlType);
         }
     },
+    {
+        /* Arg1 TypeName */ 
+        L"Microsoft.UI.Xaml.Controls.PipsPagerWrapMode",
+        /* Arg2 CreateXamlTypeCallback */ 
+        []()
+        {
+            auto xamlType = winrt::make<EnumXamlType>(
+                /* Arg 1 - TypeName */ 
+                (PCWSTR)L"Microsoft.UI.Xaml.Controls.PipsPagerWrapMode",
+                /* Arg 2 - CreateFromString func */ 
+                (std::function<winrt::IInspectable(hstring)>)[](hstring fromString)
+                {
+                    if (fromString == L"None") return box_value(winrt::PipsPagerWrapMode::None);
+                    if (fromString == L"Wrap") return box_value(winrt::PipsPagerWrapMode::Wrap);
+                    throw winrt::hresult_invalid_argument();
+                });
+
+            return xamlType;
+        }
+    },
     {
         /* Arg1 TypeName */ 
         L"Microsoft.UI.Xaml.Controls.PlayerAnimationOptimization",
@@ -5472,7 +5492,7 @@ Entry c_typeEntries[] =
 
                     winrt::IStackLayoutStatics2 statics2 = GetFactory<winrt::IStackLayoutStatics2>(L"Microsoft.UI.Xaml.Controls.StackLayout");
                     {
-                        xamlType.AddDPMember(L"DisableVirtualization", L"Boolean", statics2.DisableVirtualizationProperty(), false /* isContent */);
+                        xamlType.AddDPMember(L"IsVirtualizationEnabled", L"Boolean", statics2.IsVirtualizationEnabledProperty(), false /* isContent */);
                     }
 
                 });
@@ -5671,6 +5691,11 @@ Entry c_typeEntries[] =
                         xamlType.AddDPMember(L"TabWidthMode", L"Microsoft.UI.Xaml.Controls.TabViewWidthMode", statics.TabWidthModeProperty(), false /* isContent */);
                     }
 
+                    winrt::ITabViewStatics2 statics2 = GetFactory<winrt::ITabViewStatics2>(L"Microsoft.UI.Xaml.Controls.TabView");
+                    {
+                        xamlType.AddDPMember(L"CanTearOutTabs", L"Boolean", statics2.CanTearOutTabsProperty(), false /* isContent */);
+                    }
+
                 });
 
             return static_cast<winrt::IXamlType>(*xamlType);
@@ -5968,6 +5993,67 @@ Entry c_typeEntries[] =
             return static_cast<winrt::IXamlType>(*xamlType);
         }
     },
+    {
+        /* Arg1 TypeName */ 
+        L"Microsoft.UI.Xaml.Controls.TitleBar",
+        /* Arg2 CreateXamlTypeCallback */ 
+        []()
+        {
+            auto xamlType = winrt::make_self<XamlType>(
+                /* Arg 1 - TypeName */ 
+                (PCWSTR)L"Microsoft.UI.Xaml.Controls.TitleBar",
+                /* Arg 2 - BaseTypeName */ 
+                (PCWSTR)L"Microsoft.UI.Xaml.Controls.Control",
+                /* Arg 3 - Activator func */ 
+                (std::function<winrt::IInspectable()>)[](){ return ActivateInstanceWithFactory<winrt::ITitleBarFactory>(L"Microsoft.UI.Xaml.Controls.TitleBar"); },
+                /* Arg 4 - Populate properties func */ 
+                (std::function<void(XamlTypeBase&)>)[](XamlTypeBase& xamlType)
+                {
+                    winrt::ITitleBarStatics statics = GetFactory<winrt::ITitleBarStatics>(L"Microsoft.UI.Xaml.Controls.TitleBar");
+                    {
+                        xamlType.AddDPMember(L"Content", L"Object", statics.ContentProperty(), true /* isContent */);
+                        xamlType.AddDPMember(L"Footer", L"Object", statics.FooterProperty(), false /* isContent */);
+                        xamlType.AddDPMember(L"Header", L"Object", statics.HeaderProperty(), false /* isContent */);
+                        xamlType.AddDPMember(L"IconSource", L"Microsoft.UI.Xaml.Controls.IconSource", statics.IconSourceProperty(), false /* isContent */);
+                        xamlType.AddDPMember(L"IsBackButtonVisible", L"Boolean", statics.IsBackButtonVisibleProperty(), false /* isContent */);
+                        xamlType.AddDPMember(L"IsBackEnabled", L"Boolean", statics.IsBackEnabledProperty(), false /* isContent */);
+                        xamlType.AddDPMember(L"IsPaneToggleButtonVisible", L"Boolean", statics.IsPaneToggleButtonVisibleProperty(), false /* isContent */);
+                        xamlType.AddDPMember(L"Subtitle", L"String", statics.SubtitleProperty(), false /* isContent */);
+                        xamlType.AddDPMember(L"TemplateSettings", L"Microsoft.UI.Xaml.Controls.TitleBarTemplateSettings", statics.TemplateSettingsProperty(), false /* isContent */);
+                        xamlType.AddDPMember(L"Title", L"String", statics.TitleProperty(), false /* isContent */);
+                    }
+
+                });
+
+            return static_cast<winrt::IXamlType>(*xamlType);
+        }
+    },
+    {
+        /* Arg1 TypeName */ 
+        L"Microsoft.UI.Xaml.Controls.TitleBarTemplateSettings",
+        /* Arg2 CreateXamlTypeCallback */ 
+        []()
+        {
+            auto xamlType = winrt::make_self<XamlType>(
+                /* Arg 1 - TypeName */ 
+                (PCWSTR)L"Microsoft.UI.Xaml.Controls.TitleBarTemplateSettings",
+                /* Arg 2 - BaseTypeName */ 
+                (PCWSTR)L"Microsoft.UI.Xaml.DependencyObject",
+                /* Arg 3 - Activator func */ 
+                (std::function<winrt::IInspectable()>)[](){ return ActivateInstanceWithFactory<winrt::ITitleBarTemplateSettingsFactory>(L"Microsoft.UI.Xaml.Controls.TitleBarTemplateSettings"); },
+                /* Arg 4 - Populate properties func */ 
+                (std::function<void(XamlTypeBase&)>)[](XamlTypeBase& xamlType)
+                {
+                    winrt::ITitleBarTemplateSettingsStatics statics = GetFactory<winrt::ITitleBarTemplateSettingsStatics>(L"Microsoft.UI.Xaml.Controls.TitleBarTemplateSettings");
+                    {
+                        xamlType.AddDPMember(L"IconElement", L"Microsoft.UI.Xaml.Controls.IconElement", statics.IconElementProperty(), false /* isContent */);
+                    }
+
+                });
+
+            return static_cast<winrt::IXamlType>(*xamlType);
+        }
+    },
     {
         /* Arg1 TypeName */ 
         L"Microsoft.UI.Xaml.Controls.ToggleSplitButton",
@@ -6202,6 +6288,8 @@ Entry c_typeEntries[] =
                         false /* isAttachable */);
                 });
 
+            xamlType->SetIsBindable(true);
+
             return static_cast<winrt::IXamlType>(*xamlType);
         }
     },
@@ -7825,6 +7913,8 @@ hstring c_knownNamespacePrefixes[] =
 #include "TabViewItemTemplateSettings.properties.h"
 #include "TeachingTip.properties.h"
 #include "TeachingTipTemplateSettings.properties.h"
+#include "TitleBar.properties.h"
+#include "TitleBarTemplateSettings.properties.h"
 #include "ToggleSplitButton.properties.h"
 #include "TreeView.properties.h"
 #include "TreeViewItem.properties.h"
@@ -7919,6 +8009,8 @@ void ClearTypeProperties()
     TabViewItemTemplateSettingsProperties::ClearProperties();
     TeachingTipProperties::ClearProperties();
     TeachingTipTemplateSettingsProperties::ClearProperties();
+    TitleBarProperties::ClearProperties();
+    TitleBarTemplateSettingsProperties::ClearProperties();
     ToggleSplitButtonProperties::ClearProperties();
     TreeViewProperties::ClearProperties();
     TreeViewItemProperties::ClearProperties();
diff --git a/src/controls/dev/dll/XamlMetadataProviderGenerated.tt b/src/controls/dev/dll/XamlMetadataProviderGenerated.tt
index c15d9c7f09..4ff2e5bd3f 100644
--- a/src/controls/dev/dll/XamlMetadataProviderGenerated.tt
+++ b/src/controls/dev/dll/XamlMetadataProviderGenerated.tt
@@ -16,12 +16,7 @@
 
 #include "pch.h"
 #include "common.h"
-
-#ifndef MUX_EXPERIMENTAL
 #include "XamlControlsResources.h"
-#else
-#include "ExperimentalXamlControlsResources.h"
-#endif
 
 namespace {
 
diff --git a/src/controls/dev/dll/XamlType.cpp b/src/controls/dev/dll/XamlType.cpp
index df49e1e053..d345c27c86 100644
--- a/src/controls/dev/dll/XamlType.cpp
+++ b/src/controls/dev/dll/XamlType.cpp
@@ -73,7 +73,7 @@ bool XamlTypeBase::IsMarkupExtension()
 
 bool XamlTypeBase::IsBindable()
 {
-    return false;
+    return m_isBindable;
 }
 
 winrt::IXamlType XamlTypeBase::ItemType()
@@ -213,6 +213,11 @@ void XamlType::SetAddToMapFunc(std::function<void(winrt::IInspectable const&, wi
     m_addToMap = addToMap;
 }
 
+void XamlType::SetIsBindable(bool isBindable)
+{
+    m_isBindable = isBindable;
+}
+
 EnumXamlType::EnumXamlType(
     wstring_view const& typeName,
     std::function<winrt::IInspectable(hstring)> createFromString
diff --git a/src/controls/dev/dll/XamlType.h b/src/controls/dev/dll/XamlType.h
index 6e53d1ae4f..299af0e6f0 100644
--- a/src/controls/dev/dll/XamlType.h
+++ b/src/controls/dev/dll/XamlType.h
@@ -57,6 +57,7 @@ class XamlTypeBase :
     std::vector<winrt::IXamlMember> m_members;
 
     bool m_isSystemType = false;
+    bool m_isBindable = false;
 };
 
 class XamlType : public XamlTypeBase
@@ -71,6 +72,7 @@ class XamlType : public XamlTypeBase
 
     void SetCollectionAddFunc(std::function<void(winrt::IInspectable const&, winrt::IInspectable const&)> collectionAdd);
     void SetAddToMapFunc(std::function<void(winrt::IInspectable const&, winrt::IInspectable const&, winrt::IInspectable const&)> addToMap);
+    void SetIsBindable(bool isBindable);
 };
 
 class EnumXamlType : public XamlTypeBase
diff --git a/src/controls/dev/dll/dllmain.cpp b/src/controls/dev/dll/dllmain.cpp
index 0c01ae3223..0940f52f50 100644
--- a/src/controls/dev/dll/dllmain.cpp
+++ b/src/controls/dev/dll/dllmain.cpp
@@ -12,9 +12,8 @@
 
 using namespace Microsoft::WRL;
 
-#ifndef MUX_EXPERIMENTAL
 #include "MuxcTraceLogging.h"
-#endif
+
 
 HINSTANCE g_hInstance = nullptr;
 
@@ -29,18 +28,13 @@ STDAPI_(BOOL) DllMain(_In_ HINSTANCE hInstance, _In_ DWORD reason, _In_opt_ void
     {
         g_hInstance = hInstance;
         DisableThreadLibraryCalls(hInstance);
-#ifndef MUX_EXPERIMENTAL
         RegisterTraceLogging();
-#endif
-
         _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG);
     }
     else if (DLL_PROCESS_DETACH == reason)
     {
-#ifndef MUX_EXPERIMENTAL
         SendTelemetryOnSuspend();
         UnRegisterTraceLogging();
-#endif
     }
 
     return TRUE;
diff --git a/src/controls/dev/dll/pch.h b/src/controls/dev/dll/pch.h
index 566f09984b..84db757383 100644
--- a/src/controls/dev/dll/pch.h
+++ b/src/controls/dev/dll/pch.h
@@ -263,9 +263,7 @@ void constexpr specialize_guids()
     winrt::guid_of<struct winrt::Windows::Foundation::IReference<enum winrt::Microsoft::UI::Xaml::Media::RevealBrushState>>();
 #endif
  
-#ifndef MUX_EXPERIMENTAL
     winrt::guid_of<struct winrt::Windows::Foundation::TypedEventHandler<struct winrt::Windows::Foundation::IInspectable, struct winrt::Microsoft::UI::Private::Controls::MUXControlsTestHooksLoggingMessageEventArgs>>();
-#endif
     
     winrt::guid_of<struct winrt::Windows::Foundation::Collections::IIterable<struct winrt::Windows::Foundation::Collections::IKeyValuePair<struct winrt::hstring,struct winrt::Microsoft::UI::Xaml::DataTemplate> >>();
     winrt::guid_of<struct winrt::Windows::Foundation::Collections::IIterable<struct winrt::Windows::Foundation::IInspectable>>();
diff --git a/src/controls/dev/inc/CppWinRTIncludes.h b/src/controls/dev/inc/CppWinRTIncludes.h
index b15597eb04..42cc8c9979 100644
--- a/src/controls/dev/inc/CppWinRTIncludes.h
+++ b/src/controls/dev/inc/CppWinRTIncludes.h
@@ -17,6 +17,7 @@
 #include <winrt\Windows.Devices.Geolocation.h>
 #include <winrt\Windows.Globalization.h>
 #include <winrt\Windows.Globalization.NumberFormatting.h>
+#include <winrt\Windows.Graphics.h>
 #include <winrt\Windows.Graphics.Imaging.h>
 #include <winrt\Windows.Graphics.Display.h>
 #include <winrt\Windows.Graphics.Effects.h>
@@ -37,7 +38,6 @@
 
 #include <winrt\Microsoft.Windows.ApplicationModel.Resources.h>
 #include <winrt\Microsoft.UI.Dispatching.h>
-#include <winrt\Microsoft.UI.h>
 #include <winrt\Microsoft.UI.Composition.h>
 #include <winrt\Microsoft.UI.Composition.Effects.h>
 #include <winrt\Microsoft.UI.Composition.Interactions.h>
@@ -47,6 +47,7 @@
 #include <winrt\Microsoft.UI.Input.h>
 #include <winrt\Microsoft.UI.Input.Experimental.h>
 #include <winrt\Microsoft.UI.Text.h>
+#include <winrt\Microsoft.UI.Windowing.h>
 #include <winrt\Microsoft.UI.Xaml.h>
 #include <winrt\Microsoft.UI.Xaml.Automation.Peers.h>
 #include <winrt\Microsoft.UI.Xaml.Automation.Provider.h>
@@ -86,6 +87,7 @@ namespace winrt
     using namespace ::winrt::Windows::Foundation::Numerics;
     using namespace ::winrt::Windows::Globalization;
     using namespace ::winrt::Windows::Globalization::NumberFormatting;
+    using namespace ::winrt::Windows::Graphics;
     using namespace ::winrt::Windows::Graphics::Display;
     using namespace ::winrt::Windows::Graphics::Imaging;
     using namespace ::winrt::Windows::Graphics::Effects;
@@ -250,6 +252,7 @@ namespace winrt
     using IColorHelperStatics = winrt::Microsoft::UI::IColorHelperStatics;
     using Colors = winrt::Microsoft::UI::Colors;
     using IColorsStatics = winrt::Microsoft::UI::IColorsStatics;
+    using WindowId = winrt::Microsoft::UI::WindowId;
 
     // using namespace winrt::Microsoft::UI::Text
     using FontWeights = winrt::Microsoft::UI::Text::FontWeights;
@@ -259,6 +262,9 @@ namespace winrt
     using TextGetOptions = winrt::Microsoft::UI::Text::TextGetOptions;
     using TextRangeUnit = winrt::Microsoft::UI::Text::TextRangeUnit;
     using UnderlineType = winrt::Microsoft::UI::Text::UnderlineType;
+
+    // using namespace winrt::Microsoft::UI::Windowing
+    using AppWindow = winrt::Microsoft::UI::Windowing::AppWindow;
     
     // using namespace ::winrt::Microsoft::UI::Xaml::Controls;
     using FxZoomMode = winrt::Microsoft::UI::Xaml::Controls::ZoomMode;
diff --git a/src/controls/dev/inc/SharedHelpers.h b/src/controls/dev/inc/SharedHelpers.h
index 602f4f418d..69ceaa9ccc 100644
--- a/src/controls/dev/inc/SharedHelpers.h
+++ b/src/controls/dev/inc/SharedHelpers.h
@@ -33,6 +33,8 @@ class SharedHelpers
     static bool IsMouseModeEnabled();
 
     // Rect helpers
+    static bool DoesRectContainPoint(const winrt::Rect& rect, const winrt::Point& point);
+    static bool DoesRectContainPoint(const winrt::RectInt32& rect, const winrt::PointInt32& point);
     static bool DoRectsIntersect(const winrt::Rect& rect1, const winrt::Rect& rect2);
 
     // DependencyObject helpers
diff --git a/src/controls/idl/Microsoft.Experimental.UI.Xaml.idl b/src/controls/idl/Microsoft.Experimental.UI.Xaml.idl
deleted file mode 100644
index 97be60712c..0000000000
--- a/src/controls/idl/Microsoft.Experimental.UI.Xaml.idl
+++ /dev/null
@@ -1,43 +0,0 @@
-#include "DPCodeGenAttributes.idl"
-
-#define MEU_XC_NAMESPACE Microsoft.Experimental.UI.Xaml.Controls
-#define MEU_XCP_NAMESPACE Microsoft.Experimental.UI.Xaml.Controls.Primitives
-#define MEU_XM_NAMESPACE Microsoft.Experimental.UI.Xaml.Media
-#define MEU_XAP_NAMESPACE Microsoft.Experimental.UI.Xaml.Automation.Peers
-#define MEU_X_XTI_NAMESPACE Microsoft.Experimental.UI.Xaml.XamlTypeInfo
-
-
-namespace Microsoft.Experimental.UI.Xaml
-{
-    [contractversion(2)]
-    apicontract ExperimentalXamlContract
-    {
-    }
-}
-
-#define MUX_EXPERIMENTAL contract(Microsoft.Experimental.UI.Xaml.ExperimentalXamlContract, 1)
-
-namespace MEU_X_XTI_NAMESPACE
-{
-    [MUX_EXPERIMENTAL]
-    [webhosthidden]
-    [default_interface]
-    [Microsoft.UI.Xaml.CustomAttributes.MUXHasCustomActivationFactory]
-    runtimeclass XamlControlsXamlMetaDataProvider : [default] Windows.UI.Xaml.Markup.IXamlMetadataProvider
-    {
-        XamlControlsXamlMetaDataProvider();
-
-        static void Initialize();
-    }
-}
-
-namespace MEU_XC_NAMESPACE
-{
-    [MUX_EXPERIMENTAL]
-    [webhosthidden]
-    [default_interface]
-    runtimeclass ExperimentalXamlControlsResources : Windows.UI.Xaml.ResourceDictionary
-    {
-        ExperimentalXamlControlsResources();
-    }
-}
diff --git a/src/controls/idl/Microsoft.UI.Xaml.Controls.idl b/src/controls/idl/Microsoft.UI.Xaml.Controls.idl
index 5d78da8a9d..fda7838903 100644
--- a/src/controls/idl/Microsoft.UI.Xaml.Controls.idl
+++ b/src/controls/idl/Microsoft.UI.Xaml.Controls.idl
@@ -122,17 +122,18 @@ namespace Microsoft.UI.Xaml.CustomAttributes
 // as long as we want.
 //
 
-#define MUX_PUBLIC contract(Microsoft.UI.Xaml.XamlContract, 1)
-#define MUX_PUBLIC_V2 contract(Microsoft.UI.Xaml.XamlContract, 2)
-#define MUX_PUBLIC_V3 contract(Microsoft.UI.Xaml.XamlContract, 3)
-#define MUX_PUBLIC_V4 contract(Microsoft.UI.Xaml.XamlContract, 4)
-#define MUX_PUBLIC_V5 contract(Microsoft.UI.Xaml.XamlContract, 5)
-#define MUX_PUBLIC_V6 contract(Microsoft.UI.Xaml.XamlContract, 6)
+#define MUX_PUBLIC contract(Microsoft.UI.Xaml.XamlContract, 1)      // WinAppSDK 1.0
+#define MUX_PUBLIC_V2 contract(Microsoft.UI.Xaml.XamlContract, 2)   // WinAppSDK 1.1
+#define MUX_PUBLIC_V3 contract(Microsoft.UI.Xaml.XamlContract, 3)   // WinAppSDK 1.2
+#define MUX_PUBLIC_V4 contract(Microsoft.UI.Xaml.XamlContract, 4)   // WinAppSDK 1.3
+#define MUX_PUBLIC_V5 contract(Microsoft.UI.Xaml.XamlContract, 5)   // WinAppSDK 1.4
+#define MUX_PUBLIC_V6 contract(Microsoft.UI.Xaml.XamlContract, 6)   // WinAppSDK 1.5
+#define MUX_PUBLIC_V7 contract(Microsoft.UI.Xaml.XamlContract, 7)   // WinAppSDK 1.6
 
 // Note: It's expected that these are the same version because we require internal be in a different namespace,
 // and we split out the public vs internal metadata by namespace as well as feature attributes.
-#define MUX_PREVIEW contract(Microsoft.UI.Xaml.XamlContract, 6), feature(Feature_Experimental)
-#define MUX_INTERNAL contract(Microsoft.UI.Xaml.XamlContract, 6), feature(Feature_Experimental)
+#define MUX_PREVIEW contract(Microsoft.UI.Xaml.XamlContract, 7), feature(Feature_Experimental)
+#define MUX_INTERNAL contract(Microsoft.UI.Xaml.XamlContract, 7), feature(Feature_Experimental)
 
 // If this is specified then codegen will not create or register a default activation factory.
 #define MUX_HAS_CUSTOM_FACTORY Microsoft.UI.Xaml.CustomAttributes.MUXHasCustomActivationFactory
diff --git a/src/controls/test/Directory.Build.props b/src/controls/test/Directory.Build.props
index 10a9fcbf21..eac630ca40 100644
--- a/src/controls/test/Directory.Build.props
+++ b/src/controls/test/Directory.Build.props
@@ -7,6 +7,7 @@
     <BinplaceOutputAssemblies Condition="!$(MSBuildProjectName.Contains('TAEF'))">false</BinplaceOutputAssemblies>
     <!-- Use the version in the mock, not the repo -->
     <UseXamlCompiler Condition="'$(UseXamlCompiler)'==''">false</UseXamlCompiler>
+    <UseRidGraph>true</UseRidGraph>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
   <PropertyGroup>
diff --git a/src/controls/test/IXMPTestApp/IXMPTestApp.csproj b/src/controls/test/IXMPTestApp/IXMPTestApp.csproj
index f026f8c520..b2d5fe8353 100644
--- a/src/controls/test/IXMPTestApp/IXMPTestApp.csproj
+++ b/src/controls/test/IXMPTestApp/IXMPTestApp.csproj
@@ -182,6 +182,25 @@
     <PackageReference Include="Microsoft.Taef" Version="$(TaefNugetPackageVersion)" />
     <PackageReference Include="MUXCustomBuildTasks" Version="$(MuxCustomBuildTasksPackageVersion)" />
   </ItemGroup>
+  <!-- Due to a recent change to include WinMDs when unpacking for WindowsAppSdkSelfContained
+    (https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKAggregator/pullrequest/9751288)
+    The build will fails
+    error APPX1112: Payload contains two or more files with the same destination path 'Microsoft.Foundation.winmd', but they have different content.
+    Source files:
+      [C:\__w\1\s\controls\test\IXMPTestApp\IXMPTestApp.csproj]
+    error APPX1112: C:\__w\1\s\perf\scenarios\packages\microsoft.windowsappsdk\999.0.0-mock-3.0.0-zmain.240214.1-nightly-x64-release\lib\uap10.0.17763\Microsoft.Foundation.winmd
+      [C:\__w\1\s\controls\test\IXMPTestApp\IXMPTestApp.csproj]
+    error APPX1112: C:\__w\1\s\BuildOutput\obj\x86chk\controls\test\IXMPTestApp\MsixContent\Microsoft.Foundation.winmd
+      [C:\__w\1\s\controls\test\IXMPTestApp\IXMPTestApp.csproj]
+    This error originated because the WindowsAppSDK FWP takes 18362 version of the winmd instead of 17763. But the apps targets 17763 hence the difference.
+    But we can use MicrosoftWindowsAppSDKFilesExcluded to exclude all the WinMDs from being unpacked preventing this issue. -->
+  <Target Name="ExcludeMicrosoftWindowsAppSDKPayloadFiles"
+      BeforeTargets="AddMicrosoftWindowsAppSDKPayloadFiles"
+      DependsOnTargets="ExtractMicrosoftWindowsAppSDKMsixFiles" >
+    <ItemGroup>
+      <MicrosoftWindowsAppSDKFilesExcluded Include="$(MicrosoftWindowsAppSDKMsixContent)\**\*.winmd"/>
+    </ItemGroup>
+  </Target>
   <Import Project="$(MUXCProjectRoot)dev\CommonManaged\CommonManaged.projitems" Label="Shared" />
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0' ">
     <VisualStudioVersion>15.0</VisualStudioVersion>
diff --git a/src/controls/test/MUXControls.Test/MUXControls.Test.csproj b/src/controls/test/MUXControls.Test/MUXControls.Test.csproj
index f11cb0008a..4eacbf327e 100644
--- a/src/controls/test/MUXControls.Test/MUXControls.Test.csproj
+++ b/src/controls/test/MUXControls.Test/MUXControls.Test.csproj
@@ -16,6 +16,8 @@
     <RuntimeIdentifier Condition="'$(Platform)' == 'x64'">win-x64</RuntimeIdentifier>
     <RuntimeIdentifier Condition="'$(Platform)' == 'ARM64'">win-arm64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
+    <!-- PrivateMetaDataTests.cs and many InteractionTests use reflection, not AOT-compatible -->
+    <PublishAot>false</PublishAot>
     <PublishSingleFile>False</PublishSingleFile>
     <PublishReadyToRun>True</PublishReadyToRun>
     <RunSettingsFilePath>$(OutDir)$(MSBuildProjectName).runsettings</RunSettingsFilePath>
@@ -117,6 +119,7 @@
   <Import Project="..\..\dev\AnnotatedScrollBar\InteractionTests\AnnotatedScrollBar_InteractionTests.projitems" Label="Shared" Condition="$(FeatureAnnotatedScrollBarEnabled) == 'true'" />
   <Import Project="..\..\dev\MapControl\InteractionTests\MapControl_InteractionTests.projitems" Label="Shared" Condition="$(FeatureMapControlEnabled) == 'true'" />
   <Import Project="..\..\dev\SelectorBar\InteractionTests\SelectorBar_InteractionTests.projitems" Label="Shared" Condition="$(FeatureSelectorBarEnabled) == 'true'" />
+  <Import Project="..\..\dev\TitleBar\InteractionTests\TitleBar_InteractionTests.projitems" Label="Shared" Condition="$(FeatureTitleBarEnabled) == 'true'" />
   <PropertyGroup>
     <TargetDestination>$(TestBinplaceDestinationPath)</TargetDestination>
   </PropertyGroup>
diff --git a/src/controls/test/MUXControls.Test/ScenarioAppTests/WinUICppDesktopSampleAppTests.cs b/src/controls/test/MUXControls.Test/ScenarioAppTests/WinUICppDesktopSampleAppTests.cs
index 3f4f2269c6..d8bec5a9d7 100644
--- a/src/controls/test/MUXControls.Test/ScenarioAppTests/WinUICppDesktopSampleAppTests.cs
+++ b/src/controls/test/MUXControls.Test/ScenarioAppTests/WinUICppDesktopSampleAppTests.cs
@@ -700,7 +700,6 @@ public void LocalCustomWindowLifeTime()
 
         [TestMethod]
         [Description("This test tests the event order on minimize, restore, maximize for Main Window")]
-        [TestProperty("Ignore", "True")]    // 32252939: event order has changed during WinUI Desktop
         public void WindowChromeTestMainWindowEvents()
         {
             WindowChromeCommonSetup();
@@ -716,15 +715,17 @@ public void WindowChromeTestMainWindowEvents()
             WinUISampleAppTestsUtils.VerifyNoErrorReport();
             TestHelpers.MinimizeWindow();
 
-            // TODO: Task 32252939: Test Failure: event order has changed during WinUI Desktop window minimization
-            // The last event fired was XamlRoot_Changed at the time of the 0.5 GA release
-            //WinUISampleAppTestsUtils.VerifyText("textBoxLastEvent", "XamlRoot_Changed event");
-            WinUISampleAppTestsUtils.VerifyText("textBoxLastEvent", "Window_Activated - Window=Main, Handled=False, WindowActivationState=1");
+            WinUISampleAppTestsUtils.VerifyText("textBoxLastEvent", "XamlRoot_Changed event");
 
             TestHelpers.RestoreWindow();
-            WinUISampleAppTestsUtils.VerifyText("textBoxLastEvent", "Window_Activated - Window=Main, Handled=False, WindowActivationState=0");
+            WinUISampleAppTestsUtils.VerifyText("textBoxLastEvent", "XamlRoot_Changed event");
+
             TestHelpers.MaximizeWindow();
+            WinUISampleAppTestsUtils.VerifyText("textBoxLastEvent", "XamlRoot_Changed event");
+
             TestHelpers.RestoreWindow();
+            WinUISampleAppTestsUtils.VerifyText("textBoxLastEvent", "XamlRoot_Changed event");
+
             WinUISampleAppTestsUtils.VerifyNoErrorReport();
 
             List<string> expectedLogEvents = new List<string>();
@@ -734,17 +735,18 @@ public void WindowChromeTestMainWindowEvents()
 
             // TODO: Task 32252939: Test Failure: event order has changed during WinUI Desktop window minimization
             // These next two events were in the opposite order for 0.5 GA release
-            expectedLogEvents.Add("XamlRoot_Changed event");
+            // minimize
             expectedLogEvents.Add("Window_Activated - Window=Main, Handled=False, WindowActivationState=1");
-
+            expectedLogEvents.Add("XamlRoot_Changed event");
+            // restore
             expectedLogEvents.Add("Window_Activated - Window=Main, Handled=False, WindowActivationState=0");
             expectedLogEvents.Add("Window_VisibilityChanged - Handled=False, Visible=True");
             expectedLogEvents.Add("Window_Activated - Window=Main, Handled=False, WindowActivationState=0");
             expectedLogEvents.Add("XamlRoot_Changed event");
-            expectedLogEvents.Add("Window_Activated - Window=Main, Handled=False, WindowActivationState=1");
-            expectedLogEvents.Add("Window_Activated - Window=Main, Handled=False, WindowActivationState=0");
+            // maximize
             expectedLogEvents.Add("Window_SizeChanged - Handled=False");
             expectedLogEvents.Add("XamlRoot_Changed event");
+            // restore
             expectedLogEvents.Add("Window_SizeChanged - Handled=False");
             expectedLogEvents.Add("XamlRoot_Changed event");
             WinUISampleAppTestsUtils.VerifyLogEvents(expectedLogEvents.ToArray());
@@ -776,19 +778,43 @@ public void TestHandlingClosedEventPreventsWindowFromClosing()
         }
 
         [TestMethod]
-        [Description("Validate the running cleanup code in DispatcherQueue.ShutdownStarting handler is safe.")]
-         public void RunCleanupCodeInShutdownStarting()
+        [Description("Validate the order of various shutdown events remains constant.")]
+         public void ValidateShutdownOrder()
         {
             UIObject root = TestEnvironment.Application.ApplicationFrameWindow ?? TestEnvironment.Application.CoreWindow;
             WindowChromeCommonSetup();
             SelectWindowUI();
 
-            Log.Comment("Check cleanupCheckbox");
-            WinUISampleAppTestsUtils.SelectCheckbox("cleanupCheckbox");
+            Log.Comment("Check testShutdownCheckbox");
+            WinUISampleAppTestsUtils.SelectCheckbox("testShutdownCheckbox");
             Log.Comment("Clicking Close button");
             TestHelpers.TryCaptionButtonLeftClick(TestHelpers.CaptionButtons.Close, true);
-            // The validation here is that the test process doesn't crash during shutdown.
+            
             TestEnvironment.Application.WaitForExit();
+
+            // Read contents of %temp%\ShutdownOrderLog_<pid>.txt, this is written out by the test app.
+            string logFilePath = System.IO.Path.Combine(
+                System.IO.Path.GetTempPath(),
+                "ShutdownOrderLog_" + TestEnvironment.Application.Process.Id + ".txt");
+            
+            string shutdownLog = System.IO.File.ReadAllText(logFilePath);
+
+            Log.Comment($"Validate that shutdown log $logFilePath contains expected order of events.");
+            
+            // NOTE: the dtors listed below are not officially part of the contract, but they can be important because
+            // Cpp apps may rely on the timing of when they're called (intentionally or not).
+            string expectedShutdownLog =             
+            @"  Window.Closed raised.
+                ShutdownStarting raised.
+                DispatcherQueue work is running.
+                Page1 Unloaded event raised.
+                Page1::~Page1 called.
+                App::~App called.
+                MainWindow::~MainWindow called.
+                XamlShutdownCompletedOnThread raised.
+                ShutdownCompleted raised.";
+
+            VerifyLogsEqual(expectedShutdownLog, shutdownLog);
         }
 
         [TestMethod]
@@ -1558,5 +1584,55 @@ private void DragToMoveOrResize(global::System.Drawing.Point startPoint, int amo
             }
         }
 
+        private static string[] SplitIntoLines(string str)
+        {
+            List<string> lines = new List<string>();
+            foreach (var line in str.Split(new char[] { '\n' }, StringSplitOptions.RemoveEmptyEntries))
+            {
+                if (!line.StartsWith("#"))
+                {
+                    lines.Add(line.Trim());
+                }
+            }
+            return lines.ToArray();
+        }
+
+        private static void VerifyLogsEqual(string expected, string observed)
+        {
+            string[] expectedLines = SplitIntoLines(expected);
+            string[] observedLines = SplitIntoLines(observed);
+
+            bool passed = true;
+
+            if (expectedLines.Length != observedLines.Length)
+            {
+                passed = false;
+            }
+            else
+            {
+                for (int i = 0; i < expectedLines.Length; i++)
+                {
+                    if (expectedLines[i] != observedLines[i])
+                    {
+                        passed = false;
+                        break;
+                    }
+                }
+            }
+
+            if (!passed)
+            {
+                Log.Comment("Logs did not match. Expected:");
+                Log.Comment("---");
+                Log.Comment(string.Join("\n", expectedLines));
+                Log.Comment("---");
+                Log.Comment("Observed:");
+                Log.Comment("---");
+                Log.Comment(string.Join("\n", observedLines));
+                Log.Comment("---");
+                Verify.Fail("Logs did not match.");
+            }
+        }
+
     }
 }
diff --git a/src/controls/test/MUXControls.Test/ScenarioAppTests/WinUICsDesktopSampleAppTests.cs b/src/controls/test/MUXControls.Test/ScenarioAppTests/WinUICsDesktopSampleAppTests.cs
index cef9bc797e..7852048435 100644
--- a/src/controls/test/MUXControls.Test/ScenarioAppTests/WinUICsDesktopSampleAppTests.cs
+++ b/src/controls/test/MUXControls.Test/ScenarioAppTests/WinUICsDesktopSampleAppTests.cs
@@ -53,7 +53,6 @@ public static void ClassInitialize(TestContext testContext)
         [TestInitialize]
         public static void TestInitialize()
         {
-            ClickSafeElement();
         }
 
         /// <summary>
@@ -93,6 +92,7 @@ public static void ClassCleanup()
         [Description("Invoke a Button coming from a separate class library.")]
         public void SimpleLaunchTest()
         {
+            ClickSafeElement();
             WinUISampleAppTestsUtils.VerifyText("TestTextBlock", "Loaded");
             WinUISampleAppTestsUtils.InvokeButton("MyButton");
             WinUISampleAppTestsUtils.VerifyText("TestTextBlock", "Clicked");
@@ -103,6 +103,7 @@ public void SimpleLaunchTest()
         [Description("Create a second instance of the MainWindow and then close it.")]
         public void CreateSecondMainWindowTest()
         {
+            ClickSafeElement();
             WinUISampleAppTestsUtils.VerifyText("TestTextBlock", null);
             WinUISampleAppTestsUtils.InvokeButton("CreateWindowButton");
             WinUISampleAppTestsUtils.InvokeButton("CloseLastestWindowButton");
@@ -112,6 +113,7 @@ public void CreateSecondMainWindowTest()
         [Description("Validate DependencyObject.Dispatcher returns null")]
         public void TestDependencyObjectDispatcher()
         {
+            ClickSafeElement();
             WinUISampleAppTestsUtils.InvokeButton("buttonGetDODispatcher");
             WinUISampleAppTestsUtils.VerifyText("textBlockDODispatcher", "null");
         }
@@ -695,6 +697,19 @@ public void PreviewKeyUpOnPopupOpenTest()
             WinUISampleAppTestsUtils.VerifyText("upTextBlock", "Last key up detected was: Space");
         }
 
+        [TestMethod]
+        [Description("Test if you launch an app with custom titlebar, the first element automatically gets focus")]
+        public void TestFirstControlHasFocusOnAppLaunch()
+        {
+            // Navigation View pane is the first element
+            // this sample already has custom titlebar set
+            Log.Comment("Testing if navigation view has focus by pressing space key. It should close the pane");
+            KeyboardHelper.PressKey(Key.Space);
+            Wait.ForIdle();
+            WinUISampleAppTestsUtils.VerifyText("NavigationPaneStatusBlk", "Navigation View: Pane Closed");
+            Log.Comment("It worked. Navigation View pane is closed. It did have the focus 🎉🎉");
+        }
+
         private void SelectKeyPressUI()
         {
             ClickSafeElement();
diff --git a/src/controls/test/MUXControls.Test/ScenarioAppTests/WinUIGalleryDesktopTests.cs b/src/controls/test/MUXControls.Test/ScenarioAppTests/WinUIGalleryDesktopTests.cs
index d41d234b8a..b1a5cfcdcd 100644
--- a/src/controls/test/MUXControls.Test/ScenarioAppTests/WinUIGalleryDesktopTests.cs
+++ b/src/controls/test/MUXControls.Test/ScenarioAppTests/WinUIGalleryDesktopTests.cs
@@ -207,7 +207,7 @@ public void DoSimplePageNavigateTest()
                 return;
             }
 
-            // TODO 46819062: Re-enable these tests when the bugd are fixed, where going to the SemanticZoom page crashes the app.
+            // TODO 46819062: Re-enable these tests when the bugs are fixed, where going to the SemanticZoom page crashes the app.
             if (sectionName == "Scrolling" && pageName == "SemanticZoom")
             {
                 disabledTest = "SimplePageNavigateTest_Scrolling#SemanticZoom";
@@ -215,7 +215,7 @@ public void DoSimplePageNavigateTest()
 
             if (disabledTest != null)
             {
-                Log.Warning(disabledTest + " is currently disabled due to a crash in the SemanticZoom page .");
+                Log.Warning(disabledTest + " is currently disabled due to a crash in the SemanticZoom page.");
                 return;
             }
 
@@ -250,7 +250,19 @@ public void DoSimplePageNavigateTest()
             }
             else if (sectionName == "Motion" && pageName == "ParallaxView")
             {
-                disabledTest = "SimplePageNavigateTest_Scrolling#ParallaxView";
+                disabledTest = "SimplePageNavigateTest_Motion#ParallaxView";
+            }
+            else if (sectionName == "Navigation" && pageName == "SelectorBar")
+            {
+                disabledTest = "SimplePageNavigateTest_Navigation#SelectorBar";
+            }
+            else if (sectionName == "Media" && pageName == "MapControl")
+            {
+                disabledTest = "SimplePageNavigateTest_Media#MapControl";
+            }
+            else if (sectionName == "Media" && pageName == "MediaPlayerElement")
+            {
+                disabledTest = "SimplePageNavigateTest_Media#MediaPlayerElement";
             }
 
             if (disabledTest != null)
diff --git a/src/controls/test/MUXControls.Test/ScenarioAppTests/WinUISampleAppTestsUtils.cs b/src/controls/test/MUXControls.Test/ScenarioAppTests/WinUISampleAppTestsUtils.cs
index d3f0b6a52f..88356f8b9a 100644
--- a/src/controls/test/MUXControls.Test/ScenarioAppTests/WinUISampleAppTestsUtils.cs
+++ b/src/controls/test/MUXControls.Test/ScenarioAppTests/WinUISampleAppTestsUtils.cs
@@ -82,6 +82,7 @@ public static void VerifyLogEvents(string[] expectedLogEvents)
                 foreach (var logEvent in comboBoxEvents.AllItems)
                 {
                     Log.Comment(logEvent.Name);
+
                 }
                 Log.Comment("=== END ===");
             }
diff --git a/src/controls/test/MUXControlsTestApp/MUXControlsTestApp.csproj b/src/controls/test/MUXControlsTestApp/MUXControlsTestApp.csproj
index 6aa6791505..9471ba8a02 100644
--- a/src/controls/test/MUXControlsTestApp/MUXControlsTestApp.csproj
+++ b/src/controls/test/MUXControlsTestApp/MUXControlsTestApp.csproj
@@ -300,6 +300,7 @@
   <Import Project="$(MSBuildThisFileDirectory)\..\..\dev\MapControl\APITests\MapControl_APITests.projitems" Label="Shared" Condition="$(FeatureMapControlEnabled) == 'true'" />
   <Import Project="$(MUXCProjectRoot)dev\SelectorBar\TestUI\SelectorBar_TestUI.projitems" Label="Shared" Condition="$(FeatureSelectorBarEnabled) == 'true'" />
   <Import Project="$(MUXCProjectRoot)dev\SelectorBar\APITests\SelectorBar_APITests.projitems" Label="Shared" Condition="$(FeatureSelectorBarEnabled) == 'true'" />
+  <Import Project="$(MUXCProjectRoot)dev\TitleBar\TestUI\TitleBar_TestUI.projitems" Label="Shared" Condition="$(FeatureTitleBarEnabled) == 'true'" />
 
   <!-- For some reason, TAEF binplaces the wrong version of Wex.Logger.Interop.dll - we need to fix that.
        Removing the version from the binaries directory to allow us to use the version from the lib directory is sufficient here.-->
diff --git a/src/controls/test/MUXControlsTestApp/MainPage.xaml.cs b/src/controls/test/MUXControlsTestApp/MainPage.xaml.cs
index 2a836ff7f6..3837c4372f 100644
--- a/src/controls/test/MUXControlsTestApp/MainPage.xaml.cs
+++ b/src/controls/test/MUXControlsTestApp/MainPage.xaml.cs
@@ -21,6 +21,7 @@
 using Microsoft.UI.Xaml.Markup;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Navigation;
+using MUXControlsTestApp.Utilities;
 using Common;
 
 using WEX.TestExecution;
@@ -176,6 +177,9 @@ private void OnLoaded(object sender, RoutedEventArgs e)
             {
                 RasterizationScaleTextBox.Text = XamlRoot.RasterizationScale.ToString();
             }
+
+            var navigateToTestCommand = Resources["NavigateToTestCommand"] as NavigateToTestCommand;
+            navigateToTestCommand.TestFrame = this.FindVisualParentByType<TestFrame>();
         }
 
         public List<TestDeclaration> Tests
diff --git a/src/controls/test/MUXControlsTestApp/verification/AppBarButton.xml b/src/controls/test/MUXControlsTestApp/verification/AppBarButton.xml
index 2d5c0553b3..f10d6574e6 100644
--- a/src/controls/test/MUXControlsTestApp/verification/AppBarButton.xml
+++ b/src/controls/test/MUXControlsTestApp/verification/AppBarButton.xml
@@ -118,7 +118,7 @@
             Margin=2,0,2,8
             Name=TextLabel
             Padding=0,0,0,0
-            RenderSize=64,16
+            RenderSize=64,14.400001
             Visibility=Visible
         [Microsoft.UI.Xaml.Controls.TextBlock]
             FocusVisualPrimaryBrush=#E4000000
diff --git a/src/controls/test/MUXControlsTestApp/verification/ComboBox.xml b/src/controls/test/MUXControlsTestApp/verification/ComboBox.xml
index 4acf392d00..4434b9e6fa 100644
--- a/src/controls/test/MUXControlsTestApp/verification/ComboBox.xml
+++ b/src/controls/test/MUXControlsTestApp/verification/ComboBox.xml
@@ -80,7 +80,7 @@
         Margin=12,5,0,7
         Name=ContentPresenter
         Padding=0,0,0,0
-        RenderSize=20,19
+        RenderSize=20,17
         Visibility=Visible
       [Microsoft.UI.Xaml.Controls.TextBlock]
           FocusVisualPrimaryBrush=#E4000000
@@ -91,7 +91,7 @@
           Margin=0,0,0,0
           Name=PlaceholderTextBlock
           Padding=0,0,0,0
-          RenderSize=20,19
+          RenderSize=20,17
           Visibility=Visible
     [Microsoft.UI.Xaml.Controls.TextBox]
         Background=#B3FFFFFF
diff --git a/src/controls/test/MUXControlsTestApp/verification/CommandBarOverflowMenu.xml b/src/controls/test/MUXControlsTestApp/verification/CommandBarOverflowMenu.xml
index 38b578e1cc..211b9b7198 100644
--- a/src/controls/test/MUXControlsTestApp/verification/CommandBarOverflowMenu.xml
+++ b/src/controls/test/MUXControlsTestApp/verification/CommandBarOverflowMenu.xml
@@ -11,7 +11,7 @@
     MinWidth=160
     Name=OverflowContentRoot
     Padding=0,0,0,0
-    RenderSize=160,170
+    RenderSize=160,164
     Visibility=Visible
   [Microsoft.UI.Xaml.Controls.Grid]
       Background=[NULL]
@@ -25,7 +25,7 @@
       Margin=0,0,0,0
       Name=SecondaryItemsControlShadowWrapper
       Padding=0,0,0,0
-      RenderSize=160,106
+      RenderSize=160,100
       Visibility=Visible
     [Microsoft.UI.Xaml.Controls.CommandBarOverflowPresenter]
         Background=Microsoft.UI.Xaml.Media.AcrylicBrush
@@ -40,7 +40,7 @@
         Margin=0,0,0,0
         Name=SecondaryItemsControl
         Padding=0,0,0,0
-        RenderSize=160,106
+        RenderSize=160,100
         Visibility=Visible
       [Microsoft.UI.Xaml.Controls.Grid]
           Background=Microsoft.UI.Xaml.Media.AcrylicBrush
@@ -54,7 +54,7 @@
           Margin=0,0,0,0
           Name=LayoutRoot
           Padding=0,0,0,0
-          RenderSize=160,106
+          RenderSize=160,100
           Visibility=Visible
         [Microsoft.UI.Xaml.Controls.ScrollViewer]
             Background=#00FFFFFF
@@ -68,7 +68,7 @@
             Foreground=#E4000000
             Margin=0,0,0,0
             Padding=0,0,0,0
-            RenderSize=158,104
+            RenderSize=158,98
             Visibility=Visible
           [Microsoft.UI.Xaml.Controls.Border]
               Background=[NULL]
@@ -82,7 +82,7 @@
               Margin=0,0,0,0
               Name=Root
               Padding=0,0,0,0
-              RenderSize=158,104
+              RenderSize=158,98
               Visibility=Visible
             [Microsoft.UI.Xaml.Controls.Grid]
                 Background=#00FFFFFF
@@ -95,7 +95,7 @@
                 FocusVisualSecondaryThickness=1,1,1,1
                 Margin=0,0,0,0
                 Padding=0,0,0,0
-                RenderSize=158,104
+                RenderSize=158,98
                 Visibility=Visible
               [Microsoft.UI.Xaml.Controls.ScrollContentPresenter]
                   Background=[NULL]
@@ -110,7 +110,7 @@
                   Margin=0,0,0,0
                   Name=ScrollContentPresenter
                   Padding=0,0,0,0
-                  RenderSize=158,104
+                  RenderSize=158,98
                   Visibility=Visible
                 [Microsoft.UI.Xaml.Controls.ItemsPresenter]
                     FocusVisualPrimaryBrush=#E4000000
@@ -120,7 +120,7 @@
                     Margin=0,4,0,4
                     Name=ItemsPresenter
                     Padding=0,0,0,0
-                    RenderSize=158,96
+                    RenderSize=158,90
                     Visibility=Visible
                   [Microsoft.UI.Xaml.Controls.ContentControl]
                       Background=[NULL]
@@ -147,7 +147,7 @@
                       FocusVisualSecondaryThickness=1,1,1,1
                       Margin=0,0,0,0
                       Padding=0,0,0,0
-                      RenderSize=158,96
+                      RenderSize=158,90
                       Visibility=Visible
                     [Microsoft.UI.Xaml.Controls.AppBarButton]
                         Background=#00FFFFFF
@@ -161,7 +161,7 @@
                         Foreground=#E4000000
                         Margin=0,0,0,0
                         Padding=0,0,0,0
-                        RenderSize=158,32
+                        RenderSize=158,30
                         Visibility=Visible
                       [Microsoft.UI.Xaml.Controls.Grid]
                           Background=#00FFFFFF
@@ -175,7 +175,7 @@
                           Margin=0,0,0,0
                           Name=Root
                           Padding=0,0,0,0
-                          RenderSize=158,32
+                          RenderSize=158,30
                           Visibility=Visible
                         [Microsoft.UI.Xaml.Controls.Border]
                             Background=#00FFFFFF
@@ -189,7 +189,7 @@
                             Margin=4,0,4,0
                             Name=AppBarButtonInnerBorder
                             Padding=0,0,0,0
-                            RenderSize=150,32
+                            RenderSize=150,30
                             Visibility=Visible
                         [Microsoft.UI.Xaml.Controls.Grid]
                             Background=[NULL]
@@ -203,7 +203,7 @@
                             Margin=0,0,0,0
                             Name=ContentRoot
                             Padding=0,0,0,0
-                            RenderSize=158,32
+                            RenderSize=158,30
                             Visibility=Visible
                           [Microsoft.UI.Xaml.Controls.Viewbox]
                               FocusVisualPrimaryBrush=#E4000000
@@ -263,7 +263,7 @@
                               Margin=38,0,12,0
                               Name=OverflowTextLabel
                               Padding=0,5,0,8
-                              RenderSize=108,32
+                              RenderSize=108,30
                               Visibility=Visible
                           [Microsoft.UI.Xaml.Controls.TextBlock]
                               FocusVisualPrimaryBrush=#E4000000
@@ -322,7 +322,7 @@
                         Foreground=#E4000000
                         Margin=0,0,0,0
                         Padding=0,0,0,0
-                        RenderSize=158,32
+                        RenderSize=158,30
                         Visibility=Visible
                       [Microsoft.UI.Xaml.Controls.Grid]
                           Background=#00FFFFFF
@@ -336,7 +336,7 @@
                           Margin=0,0,0,0
                           Name=Root
                           Padding=0,0,0,0
-                          RenderSize=158,32
+                          RenderSize=158,30
                           Visibility=Visible
                         [Microsoft.UI.Xaml.Controls.Border]
                             Background=#00FFFFFF
@@ -350,7 +350,7 @@
                             Margin=4,0,4,0
                             Name=AppBarButtonInnerBorder
                             Padding=0,0,0,0
-                            RenderSize=150,32
+                            RenderSize=150,30
                             Visibility=Visible
                         [Microsoft.UI.Xaml.Controls.Grid]
                             Background=[NULL]
@@ -364,7 +364,7 @@
                             Margin=0,0,0,0
                             Name=ContentRoot
                             Padding=0,0,0,0
-                            RenderSize=158,32
+                            RenderSize=158,30
                             Visibility=Visible
                           [Microsoft.UI.Xaml.Controls.Viewbox]
                               FocusVisualPrimaryBrush=#E4000000
@@ -424,7 +424,7 @@
                               Margin=38,0,12,0
                               Name=OverflowTextLabel
                               Padding=0,5,0,8
-                              RenderSize=108,32
+                              RenderSize=108,30
                               Visibility=Visible
                           [Microsoft.UI.Xaml.Controls.TextBlock]
                               FocusVisualPrimaryBrush=#E4000000
@@ -483,7 +483,7 @@
                         Foreground=#E4000000
                         Margin=0,0,0,0
                         Padding=0,0,0,0
-                        RenderSize=158,32
+                        RenderSize=158,30
                         Visibility=Visible
                       [Microsoft.UI.Xaml.Controls.Grid]
                           Background=#00FFFFFF
@@ -497,7 +497,7 @@
                           Margin=0,0,0,0
                           Name=Root
                           Padding=0,0,0,0
-                          RenderSize=158,32
+                          RenderSize=158,30
                           Visibility=Visible
                         [Microsoft.UI.Xaml.Controls.Border]
                             Background=#00FFFFFF
@@ -511,7 +511,7 @@
                             Margin=4,0,4,0
                             Name=AppBarToggleButtonInnerBorder
                             Padding=0,0,0,0
-                            RenderSize=150,32
+                            RenderSize=150,30
                             Visibility=Visible
                         [Microsoft.UI.Xaml.Controls.Grid]
                             Background=[NULL]
@@ -525,7 +525,7 @@
                             Margin=0,0,0,0
                             Name=ContentRoot
                             Padding=0,0,0,0
-                            RenderSize=158,32
+                            RenderSize=158,30
                             Visibility=Visible
                           [Microsoft.UI.Xaml.Controls.TextBlock]
                               FocusVisualPrimaryBrush=#E4000000
@@ -598,7 +598,7 @@
                               Margin=38,0,12,0
                               Name=OverflowTextLabel
                               Padding=0,5,0,8
-                              RenderSize=108,32
+                              RenderSize=108,30
                               Visibility=Visible
                           [Microsoft.UI.Xaml.Controls.TextBlock]
                               FocusVisualPrimaryBrush=#E4000000
@@ -636,7 +636,7 @@
                   FocusVisualSecondaryThickness=1,1,1,1
                   Margin=0,0,0,0
                   Padding=0,0,0,0
-                  RenderSize=158,104
+                  RenderSize=158,98
                   Visibility=Visible
               [Microsoft.UI.Xaml.Controls.Grid]
                   Background=[NULL]
diff --git a/src/controls/test/MUXControlsTestApp/verification/DatePicker.xml b/src/controls/test/MUXControlsTestApp/verification/DatePicker.xml
index b000002f5a..fa73260184 100644
--- a/src/controls/test/MUXControlsTestApp/verification/DatePicker.xml
+++ b/src/controls/test/MUXControlsTestApp/verification/DatePicker.xml
@@ -25,7 +25,7 @@
       Foreground=#E4000000
       Margin=0,0,0,0
       Padding=0,0,0,0
-      RenderSize=296,30
+      RenderSize=296,28
       Visibility=Visible
     [Microsoft.UI.Xaml.Controls.Grid]
         Background=[NULL]
@@ -39,7 +39,7 @@
         Margin=0,0,0,0
         Name=LayoutRoot
         Padding=0,0,0,0
-        RenderSize=296,30
+        RenderSize=296,28
         Visibility=Visible
       [Microsoft.UI.Xaml.Controls.ContentPresenter]
           Background=[NULL]
@@ -72,7 +72,7 @@
           MinWidth=296
           Name=FlyoutButton
           Padding=11,5,11,6
-          RenderSize=296,30
+          RenderSize=296,28
           Visibility=Visible
         [Microsoft.UI.Xaml.Controls.Grid]
             Background=[NULL]
@@ -85,7 +85,7 @@
             FocusVisualSecondaryThickness=1,1,1,1
             Margin=0,0,0,0
             Padding=0,0,0,0
-            RenderSize=296,30
+            RenderSize=296,28
             Visibility=Visible
           [Microsoft.UI.Xaml.Controls.ContentPresenter]
               Background=#B3FFFFFF
@@ -100,7 +100,7 @@
               Margin=0,0,0,0
               Name=ContentPresenter
               Padding=0,0,0,0
-              RenderSize=296,30
+              RenderSize=296,28
               Visibility=Visible
             [Microsoft.UI.Xaml.Controls.Grid]
                 Background=[NULL]
@@ -114,7 +114,7 @@
                 Margin=0,0,0,0
                 Name=FlyoutButtonContentGrid
                 Padding=0,0,0,0
-                RenderSize=294,28
+                RenderSize=294,26
                 Visibility=Visible
               [Microsoft.UI.Xaml.Controls.TextBlock]
                   FocusVisualPrimaryBrush=#E4000000
@@ -125,7 +125,7 @@
                   Margin=0,0,0,0
                   Name=DayTextBlock
                   Padding=0,3,0,6
-                  RenderSize=79,28
+                  RenderSize=79,26
                   Visibility=Visible
               [Microsoft.UI.Xaml.Controls.TextBlock]
                   FocusVisualPrimaryBrush=#E4000000
@@ -136,7 +136,7 @@
                   Margin=1,0,0,0
                   Name=MonthTextBlock
                   Padding=9,3,0,6
-                  RenderSize=133,28
+                  RenderSize=133,26
                   Visibility=Visible
               [Microsoft.UI.Xaml.Controls.TextBlock]
                   FocusVisualPrimaryBrush=#E4000000
@@ -147,7 +147,7 @@
                   Margin=0,0,0,0
                   Name=YearTextBlock
                   Padding=0,3,0,6
-                  RenderSize=79,28
+                  RenderSize=79,26
                   Visibility=Visible
               [Microsoft.UI.Xaml.Shapes.Rectangle]
                   FocusVisualPrimaryBrush=#E4000000
@@ -156,7 +156,7 @@
                   FocusVisualSecondaryThickness=1,1,1,1
                   Margin=0,0,0,0
                   Name=FirstPickerSpacing
-                  RenderSize=1,28
+                  RenderSize=1,26
                   StrokeThickness=1
                   Visibility=Visible
                   Width=1
@@ -167,7 +167,7 @@
                   FocusVisualSecondaryThickness=1,1,1,1
                   Margin=0,0,0,0
                   Name=SecondPickerSpacing
-                  RenderSize=1,28
+                  RenderSize=1,26
                   StrokeThickness=1
                   Visibility=Visible
                   Width=1
diff --git a/src/controls/test/MUXControlsTestApp/verification/NavigationViewAuto.xml b/src/controls/test/MUXControlsTestApp/verification/NavigationViewAuto.xml
index 82527230c3..caf49fad8c 100644
--- a/src/controls/test/MUXControlsTestApp/verification/NavigationViewAuto.xml
+++ b/src/controls/test/MUXControlsTestApp/verification/NavigationViewAuto.xml
@@ -258,7 +258,7 @@
                   Margin=0,-2,0,0
                   Name=PaneTitleTextBlock
                   Padding=0,0,0,0
-                  RenderSize=28,19
+                  RenderSize=28,17
                   Visibility=Visible
         [Microsoft.UI.Xaml.Controls.Grid]
             Background=[NULL]
@@ -960,7 +960,7 @@
                                                   RenderSize=20,20
                                                   Visibility=Visible
                                                 [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                                                    Background=[NULL]
+                                                    Background=#FFFF0000
                                                     BorderBrush=[NULL]
                                                     BorderThickness=0,0,0,0
                                                     CornerRadius=0,0,0,0
@@ -1019,7 +1019,7 @@
                                               Margin=4,-1,8,-1
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
-                                              RenderSize=46,19
+                                              RenderSize=46,17
                                               Visibility=Visible
                                             [Microsoft.UI.Xaml.Controls.TextBlock]
                                                 FocusVisualPrimaryBrush=#E4000000
@@ -1029,7 +1029,7 @@
                                                 Foreground=#E4000000
                                                 Margin=0,0,0,0
                                                 Padding=0,0,0,0
-                                                RenderSize=34,19
+                                                RenderSize=34,17
                                                 Visibility=Visible
                                           [Microsoft.UI.Xaml.Controls.ContentPresenter]
                                               Background=[NULL]
@@ -1197,7 +1197,7 @@
                                                   RenderSize=20,20
                                                   Visibility=Visible
                                                 [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                                                    Background=[NULL]
+                                                    Background=#00FFFFFF
                                                     BorderBrush=[NULL]
                                                     BorderThickness=0,0,0,0
                                                     CornerRadius=0,0,0,0
@@ -1256,7 +1256,7 @@
                                               Margin=4,-1,8,-1
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
-                                              RenderSize=46,19
+                                              RenderSize=46,17
                                               Visibility=Visible
                                             [Microsoft.UI.Xaml.Controls.TextBlock]
                                                 FocusVisualPrimaryBrush=#E4000000
@@ -1266,7 +1266,7 @@
                                                 Foreground=#E4000000
                                                 Margin=0,0,0,0
                                                 Padding=0,0,0,0
-                                                RenderSize=22,19
+                                                RenderSize=22,17
                                                 Visibility=Visible
                                           [Microsoft.UI.Xaml.Controls.ContentPresenter]
                                               Background=[NULL]
@@ -1642,7 +1642,7 @@
                                                   RenderSize=48,48
                                                   Visibility=Visible
                                                 [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                                                    Background=[NULL]
+                                                    Background=#00FFFFFF
                                                     BorderBrush=[NULL]
                                                     BorderThickness=0,0,0,0
                                                     CornerRadius=0,0,0,0
@@ -1700,7 +1700,7 @@
                                               Margin=4,-1,8,-1
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
-                                              RenderSize=46,19
+                                              RenderSize=46,17
                                               Visibility=Visible
                                             [Microsoft.UI.Xaml.Controls.TextBlock]
                                                 FocusVisualPrimaryBrush=#E4000000
@@ -1710,7 +1710,7 @@
                                                 Foreground=#E4000000
                                                 Margin=0,0,0,0
                                                 Padding=0,0,0,0
-                                                RenderSize=50,19
+                                                RenderSize=50,17
                                                 Visibility=Visible
                                           [Microsoft.UI.Xaml.Controls.ContentPresenter]
                                               Background=[NULL]
@@ -1935,7 +1935,7 @@
                       Foreground=#E4000000
                       Margin=0,0,0,0
                       Padding=0,0,0,0
-                      RenderSize=120,19
+                      RenderSize=120,17
                       Visibility=Visible
             [Microsoft.UI.Xaml.Shapes.Rectangle]
                 FocusVisualPrimaryBrush=#E4000000
diff --git a/src/controls/test/MUXControlsTestApp/verification/NavigationViewHierarchy.xml b/src/controls/test/MUXControlsTestApp/verification/NavigationViewHierarchy.xml
index 65bd08830a..b2440dc8a9 100644
--- a/src/controls/test/MUXControlsTestApp/verification/NavigationViewHierarchy.xml
+++ b/src/controls/test/MUXControlsTestApp/verification/NavigationViewHierarchy.xml
@@ -258,7 +258,7 @@
                   Margin=0,-2,0,0
                   Name=PaneTitleTextBlock
                   Padding=0,0,0,0
-                  RenderSize=66,19
+                  RenderSize=66,17
                   Visibility=Visible
         [Microsoft.UI.Xaml.Controls.Grid]
             Background=[NULL]
@@ -960,7 +960,7 @@
                                                   RenderSize=0,0
                                                   Visibility=Visible
                                                 [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                                                    Background=[NULL]
+                                                    Background=#00FFFFFF
                                                     BorderBrush=[NULL]
                                                     BorderThickness=0,0,0,0
                                                     CornerRadius=0,0,0,0
@@ -987,7 +987,7 @@
                                               Margin=4,-1,8,-1
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
-                                              RenderSize=52,19
+                                              RenderSize=52,17
                                               Visibility=Visible
                                             [Microsoft.UI.Xaml.Controls.TextBlock]
                                                 FocusVisualPrimaryBrush=#E4000000
@@ -997,7 +997,7 @@
                                                 Foreground=#E4000000
                                                 Margin=0,0,0,0
                                                 Padding=0,0,0,0
-                                                RenderSize=31,19
+                                                RenderSize=31,17
                                                 Visibility=Visible
                                           [Microsoft.UI.Xaml.Controls.Grid]
                                               Background=#00FFFFFF
@@ -1224,7 +1224,7 @@
                                                   RenderSize=0,0
                                                   Visibility=Visible
                                                 [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                                                    Background=[NULL]
+                                                    Background=#00FFFFFF
                                                     BorderBrush=[NULL]
                                                     BorderThickness=0,0,0,0
                                                     CornerRadius=0,0,0,0
@@ -1251,7 +1251,7 @@
                                               Margin=4,-1,8,-1
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
-                                              RenderSize=78,19
+                                              RenderSize=78,17
                                               Visibility=Visible
                                             [Microsoft.UI.Xaml.Controls.TextBlock]
                                                 FocusVisualPrimaryBrush=#E4000000
@@ -1261,7 +1261,7 @@
                                                 Foreground=#E4000000
                                                 Margin=0,0,0,0
                                                 Padding=0,0,0,0
-                                                RenderSize=31,19
+                                                RenderSize=31,17
                                                 Visibility=Visible
                                           [Microsoft.UI.Xaml.Controls.ContentPresenter]
                                               Background=[NULL]
@@ -1637,7 +1637,7 @@
                                                   RenderSize=48,48
                                                   Visibility=Visible
                                                 [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                                                    Background=[NULL]
+                                                    Background=#00FFFFFF
                                                     BorderBrush=[NULL]
                                                     BorderThickness=0,0,0,0
                                                     CornerRadius=0,0,0,0
@@ -1695,7 +1695,7 @@
                                               Margin=4,-1,8,-1
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
-                                              RenderSize=46,19
+                                              RenderSize=46,17
                                               Visibility=Visible
                                             [Microsoft.UI.Xaml.Controls.TextBlock]
                                                 FocusVisualPrimaryBrush=#E4000000
@@ -1705,7 +1705,7 @@
                                                 Foreground=#E4000000
                                                 Margin=0,0,0,0
                                                 Padding=0,0,0,0
-                                                RenderSize=50,19
+                                                RenderSize=50,17
                                                 Visibility=Visible
                                           [Microsoft.UI.Xaml.Controls.ContentPresenter]
                                               Background=[NULL]
@@ -1930,7 +1930,7 @@
                       Foreground=#E4000000
                       Margin=0,0,0,0
                       Padding=0,0,0,0
-                      RenderSize=301,19
+                      RenderSize=301,17
                       Visibility=Visible
             [Microsoft.UI.Xaml.Shapes.Rectangle]
                 FocusVisualPrimaryBrush=#E4000000
diff --git a/src/controls/test/MUXControlsTestApp/verification/NavigationViewLeftCompact.xml b/src/controls/test/MUXControlsTestApp/verification/NavigationViewLeftCompact.xml
index cf61eda70d..02b33f73f1 100644
--- a/src/controls/test/MUXControlsTestApp/verification/NavigationViewLeftCompact.xml
+++ b/src/controls/test/MUXControlsTestApp/verification/NavigationViewLeftCompact.xml
@@ -258,7 +258,7 @@
                   Margin=0,-2,0,0
                   Name=PaneTitleTextBlock
                   Padding=0,0,0,0
-                  RenderSize=20,19
+                  RenderSize=20,17
                   Visibility=Collapsed
         [Microsoft.UI.Xaml.Controls.Grid]
             Background=[NULL]
@@ -961,7 +961,7 @@
                                                   RenderSize=20,20
                                                   Visibility=Visible
                                                 [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                                                    Background=[NULL]
+                                                    Background=#FFFF0000
                                                     BorderBrush=[NULL]
                                                     BorderThickness=0,0,0,0
                                                     CornerRadius=0,0,0,0
@@ -1020,7 +1020,7 @@
                                               Margin=0,0,0,0
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
-                                              RenderSize=0,19
+                                              RenderSize=0,17
                                               Visibility=Visible
                                             [Microsoft.UI.Xaml.Controls.TextBlock]
                                                 FocusVisualPrimaryBrush=#E4000000
@@ -1030,7 +1030,7 @@
                                                 Foreground=#E4000000
                                                 Margin=0,0,0,0
                                                 Padding=0,0,0,0
-                                                RenderSize=34,19
+                                                RenderSize=34,17
                                                 Visibility=Visible
                                           [Microsoft.UI.Xaml.Controls.ContentPresenter]
                                               Background=[NULL]
@@ -1198,7 +1198,7 @@
                                                   RenderSize=20,20
                                                   Visibility=Visible
                                                 [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                                                    Background=[NULL]
+                                                    Background=#00FFFFFF
                                                     BorderBrush=[NULL]
                                                     BorderThickness=0,0,0,0
                                                     CornerRadius=0,0,0,0
@@ -1257,7 +1257,7 @@
                                               Margin=0,0,0,0
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
-                                              RenderSize=0,19
+                                              RenderSize=0,17
                                               Visibility=Visible
                                             [Microsoft.UI.Xaml.Controls.TextBlock]
                                                 FocusVisualPrimaryBrush=#E4000000
@@ -1267,7 +1267,7 @@
                                                 Foreground=#E4000000
                                                 Margin=0,0,0,0
                                                 Padding=0,0,0,0
-                                                RenderSize=22,19
+                                                RenderSize=22,17
                                                 Visibility=Visible
                                           [Microsoft.UI.Xaml.Controls.ContentPresenter]
                                               Background=[NULL]
@@ -1643,7 +1643,7 @@
                                                   RenderSize=48,48
                                                   Visibility=Visible
                                                 [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                                                    Background=[NULL]
+                                                    Background=#00FFFFFF
                                                     BorderBrush=[NULL]
                                                     BorderThickness=0,0,0,0
                                                     CornerRadius=0,0,0,0
@@ -1701,7 +1701,7 @@
                                               Margin=0,0,0,0
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
-                                              RenderSize=0,19
+                                              RenderSize=0,17
                                               Visibility=Visible
                                             [Microsoft.UI.Xaml.Controls.TextBlock]
                                                 FocusVisualPrimaryBrush=#E4000000
@@ -1711,7 +1711,7 @@
                                                 Foreground=#E4000000
                                                 Margin=0,0,0,0
                                                 Padding=0,0,0,0
-                                                RenderSize=50,19
+                                                RenderSize=50,17
                                                 Visibility=Visible
                                           [Microsoft.UI.Xaml.Controls.ContentPresenter]
                                               Background=[NULL]
@@ -1936,7 +1936,7 @@
                       Foreground=#E4000000
                       Margin=0,0,0,0
                       Padding=0,0,0,0
-                      RenderSize=120,19
+                      RenderSize=120,17
                       Visibility=Visible
             [Microsoft.UI.Xaml.Shapes.Rectangle]
                 FocusVisualPrimaryBrush=#E4000000
diff --git a/src/controls/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal.xml b/src/controls/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal.xml
index 9d77490051..177c266a34 100644
--- a/src/controls/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal.xml
+++ b/src/controls/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal.xml
@@ -258,7 +258,7 @@
                   Margin=0,-2,0,0
                   Name=PaneTitleTextBlock
                   Padding=0,0,0,0
-                  RenderSize=20,19
+                  RenderSize=20,17
                   Visibility=Visible
         [Microsoft.UI.Xaml.Controls.Grid]
             Background=[NULL]
@@ -960,7 +960,7 @@
                                                   RenderSize=0,0
                                                   Visibility=Visible
                                                 [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                                                    Background=[NULL]
+                                                    Background=#FFFF0000
                                                     BorderBrush=[NULL]
                                                     BorderThickness=0,0,0,0
                                                     CornerRadius=0,0,0,0
@@ -1197,7 +1197,7 @@
                                                   RenderSize=0,0
                                                   Visibility=Visible
                                                 [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                                                    Background=[NULL]
+                                                    Background=#00FFFFFF
                                                     BorderBrush=[NULL]
                                                     BorderThickness=0,0,0,0
                                                     CornerRadius=0,0,0,0
@@ -1642,7 +1642,7 @@
                                                   RenderSize=0,0
                                                   Visibility=Visible
                                                 [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                                                    Background=[NULL]
+                                                    Background=#00FFFFFF
                                                     BorderBrush=[NULL]
                                                     BorderThickness=0,0,0,0
                                                     CornerRadius=0,0,0,0
@@ -1924,7 +1924,7 @@
                       Foreground=#E4000000
                       Margin=0,0,0,0
                       Padding=0,0,0,0
-                      RenderSize=120,19
+                      RenderSize=120,17
                       Visibility=Visible
             [Microsoft.UI.Xaml.Shapes.Rectangle]
                 FocusVisualPrimaryBrush=#E4000000
diff --git a/src/controls/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent.xml b/src/controls/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent.xml
index fef0b20f03..9c445c8beb 100644
--- a/src/controls/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent.xml
+++ b/src/controls/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent.xml
@@ -258,7 +258,7 @@
                   Margin=0,-2,0,0
                   Name=PaneTitleTextBlock
                   Padding=0,0,0,0
-                  RenderSize=0,19
+                  RenderSize=0,17
                   Visibility=Visible
         [Microsoft.UI.Xaml.Controls.Grid]
             Background=[NULL]
@@ -655,7 +655,7 @@
                           Foreground=#E4000000
                           Margin=0,0,0,0
                           Padding=11,5,11,6
-                          RenderSize=115,32
+                          RenderSize=115,30
                           Visibility=Visible
                         [Microsoft.UI.Xaml.Controls.ContentPresenter]
                             Background=#B3FFFFFF
@@ -670,7 +670,7 @@
                             Margin=0,0,0,0
                             Name=ContentPresenter
                             Padding=11,5,11,6
-                            RenderSize=115,32
+                            RenderSize=115,30
                             Visibility=Visible
                           [Microsoft.UI.Xaml.Controls.TextBlock]
                               FocusVisualPrimaryBrush=#E4000000
@@ -680,7 +680,7 @@
                               Foreground=#E4000000
                               Margin=0,0,0,0
                               Padding=0,0,0,0
-                              RenderSize=91,19
+                              RenderSize=91,17
                               Visibility=Visible
                 [Microsoft.UI.Xaml.Controls.Grid]
                     Background=[NULL]
@@ -1117,7 +1117,7 @@
                       FocusVisualSecondaryBrush=#B3FFFFFF
                       FocusVisualSecondaryThickness=1,1,1,1
                       Margin=0,0,0,0
-                      RenderSize=300,388
+                      RenderSize=300,390
                       Visibility=Visible
                     [Microsoft.UI.Xaml.Controls.ScrollViewer]
                         Background=#00FFFFFF
@@ -1130,10 +1130,10 @@
                         FocusVisualSecondaryThickness=1,1,1,1
                         Foreground=#E4000000
                         Margin=0,0,0,0
-                        MaxHeight=388
+                        MaxHeight=390
                         Name=MenuItemsScrollViewer
                         Padding=0,0,0,0
-                        RenderSize=300,388
+                        RenderSize=300,390
                         Visibility=Visible
                       [Microsoft.UI.Xaml.Controls.Border]
                           Background=[NULL]
@@ -1147,7 +1147,7 @@
                           Margin=0,0,0,0
                           Name=Root
                           Padding=0,0,0,0
-                          RenderSize=300,388
+                          RenderSize=300,390
                           Visibility=Visible
                         [Microsoft.UI.Xaml.Controls.Grid]
                             Background=#00FFFFFF
@@ -1160,7 +1160,7 @@
                             FocusVisualSecondaryThickness=1,1,1,1
                             Margin=0,0,0,0
                             Padding=0,0,0,0
-                            RenderSize=300,388
+                            RenderSize=300,390
                             Visibility=Visible
                           [Microsoft.UI.Xaml.Controls.ScrollContentPresenter]
                               Background=[NULL]
@@ -1175,7 +1175,7 @@
                               Margin=0,0,0,0
                               Name=ScrollContentPresenter
                               Padding=0,0,0,0
-                              RenderSize=300,388
+                              RenderSize=300,390
                               Visibility=Visible
                             [Microsoft.UI.Xaml.Controls.ItemsRepeater]
                                 Background=[NULL]
@@ -1185,7 +1185,7 @@
                                 FocusVisualSecondaryThickness=1,1,1,1
                                 Margin=0,0,0,0
                                 Name=MenuItemsHost
-                                RenderSize=300,388
+                                RenderSize=300,390
                                 Visibility=Visible
                               [Microsoft.UI.Xaml.Controls.NavigationViewItem]
                                   Background=#00FFFFFF
@@ -1338,7 +1338,7 @@
                                                   RenderSize=20,20
                                                   Visibility=Visible
                                                 [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                                                    Background=[NULL]
+                                                    Background=#00FFFFFF
                                                     BorderBrush=[NULL]
                                                     BorderThickness=0,0,0,0
                                                     CornerRadius=0,0,0,0
@@ -1397,7 +1397,7 @@
                                               Margin=4,-1,8,-1
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
-                                              RenderSize=226,19
+                                              RenderSize=226,17
                                               Visibility=Visible
                                             [Microsoft.UI.Xaml.Controls.TextBlock]
                                                 FocusVisualPrimaryBrush=#E4000000
@@ -1407,7 +1407,7 @@
                                                 Foreground=#E4000000
                                                 Margin=0,0,0,0
                                                 Padding=0,0,0,0
-                                                RenderSize=34,19
+                                                RenderSize=34,17
                                                 Visibility=Visible
                                           [Microsoft.UI.Xaml.Controls.ContentPresenter]
                                               Background=[NULL]
@@ -1575,7 +1575,7 @@
                                                   RenderSize=20,20
                                                   Visibility=Visible
                                                 [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                                                    Background=[NULL]
+                                                    Background=#00FFFFFF
                                                     BorderBrush=[NULL]
                                                     BorderThickness=0,0,0,0
                                                     CornerRadius=0,0,0,0
@@ -1634,7 +1634,7 @@
                                               Margin=4,-1,8,-1
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
-                                              RenderSize=226,19
+                                              RenderSize=226,17
                                               Visibility=Visible
                                             [Microsoft.UI.Xaml.Controls.TextBlock]
                                                 FocusVisualPrimaryBrush=#E4000000
@@ -1644,7 +1644,7 @@
                                                 Foreground=#E4000000
                                                 Margin=0,0,0,0
                                                 Padding=0,0,0,0
-                                                RenderSize=22,19
+                                                RenderSize=22,17
                                                 Visibility=Visible
                                           [Microsoft.UI.Xaml.Controls.ContentPresenter]
                                               Background=[NULL]
@@ -1672,7 +1672,7 @@
                               FocusVisualSecondaryThickness=1,1,1,1
                               Margin=0,0,0,0
                               Padding=0,0,0,0
-                              RenderSize=300,388
+                              RenderSize=300,390
                               Visibility=Visible
                           [Microsoft.UI.Xaml.Controls.Grid]
                               Background=[NULL]
@@ -1776,7 +1776,7 @@
                       Margin=0,0,0,4
                       Name=FooterContentBorder
                       Padding=0,0,0,0
-                      RenderSize=300,32
+                      RenderSize=300,30
                       Visibility=Visible
                     [Microsoft.UI.Xaml.Controls.ContentPresenter]
                         Background=[NULL]
@@ -1790,7 +1790,7 @@
                         Foreground=#E4000000
                         Margin=0,0,0,0
                         Padding=0,0,0,0
-                        RenderSize=300,32
+                        RenderSize=300,30
                         Visibility=Visible
                       [Microsoft.UI.Xaml.Controls.Button]
                           Background=#B3FFFFFF
@@ -1804,7 +1804,7 @@
                           Foreground=#E4000000
                           Margin=0,0,0,0
                           Padding=11,5,11,6
-                          RenderSize=110,32
+                          RenderSize=110,30
                           Visibility=Visible
                         [Microsoft.UI.Xaml.Controls.ContentPresenter]
                             Background=#B3FFFFFF
@@ -1819,7 +1819,7 @@
                             Margin=0,0,0,0
                             Name=ContentPresenter
                             Padding=11,5,11,6
-                            RenderSize=110,32
+                            RenderSize=110,30
                             Visibility=Visible
                           [Microsoft.UI.Xaml.Controls.TextBlock]
                               FocusVisualPrimaryBrush=#E4000000
@@ -1829,7 +1829,7 @@
                               Foreground=#E4000000
                               Margin=0,0,0,0
                               Padding=0,0,0,0
-                              RenderSize=86,19
+                              RenderSize=86,17
                               Visibility=Visible
                   [Microsoft.UI.Xaml.Controls.ItemsRepeaterScrollHost]
                       FocusVisualPrimaryBrush=#E4000000
@@ -2059,7 +2059,7 @@
                                                   RenderSize=48,48
                                                   Visibility=Visible
                                                 [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                                                    Background=[NULL]
+                                                    Background=#00FFFFFF
                                                     BorderBrush=[NULL]
                                                     BorderThickness=0,0,0,0
                                                     CornerRadius=0,0,0,0
@@ -2117,7 +2117,7 @@
                                               Margin=4,-1,8,-1
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
-                                              RenderSize=226,19
+                                              RenderSize=226,17
                                               Visibility=Visible
                                             [Microsoft.UI.Xaml.Controls.TextBlock]
                                                 FocusVisualPrimaryBrush=#E4000000
@@ -2127,7 +2127,7 @@
                                                 Foreground=#E4000000
                                                 Margin=0,0,0,0
                                                 Padding=0,0,0,0
-                                                RenderSize=50,19
+                                                RenderSize=50,17
                                                 Visibility=Visible
                                           [Microsoft.UI.Xaml.Controls.ContentPresenter]
                                               Background=[NULL]
@@ -2310,7 +2310,7 @@
                     Margin=0,0,0,0
                     Name=ContentLeftPadding
                     Padding=0,0,0,0
-                    RenderSize=0,82
+                    RenderSize=0,80
                     Visibility=Visible
                     Width=0
                 [Microsoft.UI.Xaml.Controls.ContentControl]
@@ -2327,7 +2327,7 @@
                     MinHeight=36
                     Name=HeaderContent
                     Padding=0,0,0,0
-                    RenderSize=443,38
+                    RenderSize=443,36
                     Visibility=Visible
                   [Microsoft.UI.Xaml.Controls.ContentPresenter]
                       Background=[NULL]
@@ -2341,7 +2341,7 @@
                       Foreground=#E4000000
                       Margin=0,0,0,0
                       Padding=0,0,0,0
-                      RenderSize=443,38
+                      RenderSize=443,36
                       Visibility=Visible
                     [Microsoft.UI.Xaml.Controls.TextBlock]
                         FocusVisualPrimaryBrush=#E4000000
@@ -2351,7 +2351,7 @@
                         Foreground=#E4000000
                         Margin=0,0,0,0
                         Padding=0,0,0,0
-                        RenderSize=301,38
+                        RenderSize=301,34
                         Visibility=Visible
                 [Microsoft.UI.Xaml.Controls.ContentPresenter]
                     Background=[NULL]
@@ -2366,7 +2366,7 @@
                     Margin=0,0,0,0
                     Name=ContentPresenter
                     Padding=0,0,0,0
-                    RenderSize=499,517
+                    RenderSize=499,519
                     Visibility=Visible
                   [Microsoft.UI.Xaml.Controls.StackPanel]
                       Background=[NULL]
@@ -2379,7 +2379,7 @@
                       FocusVisualSecondaryThickness=1,1,1,1
                       Margin=0,0,0,0
                       Padding=0,0,0,0
-                      RenderSize=499,517
+                      RenderSize=499,519
                       Visibility=Visible
                     [Microsoft.UI.Xaml.Controls.Button]
                         Background=#B3FFFFFF
@@ -2393,7 +2393,7 @@
                         Foreground=#E4000000
                         Margin=0,0,0,0
                         Padding=11,5,11,6
-                        RenderSize=149,32
+                        RenderSize=149,30
                         Visibility=Visible
                       [Microsoft.UI.Xaml.Controls.ContentPresenter]
                           Background=#B3FFFFFF
@@ -2408,7 +2408,7 @@
                           Margin=0,0,0,0
                           Name=ContentPresenter
                           Padding=11,5,11,6
-                          RenderSize=149,32
+                          RenderSize=149,30
                           Visibility=Visible
                         [Microsoft.UI.Xaml.Controls.TextBlock]
                             FocusVisualPrimaryBrush=#E4000000
@@ -2418,7 +2418,7 @@
                             Foreground=#E4000000
                             Margin=0,0,0,0
                             Padding=0,0,0,0
-                            RenderSize=125,19
+                            RenderSize=125,17
                             Visibility=Visible
                     [Microsoft.UI.Xaml.Controls.Button]
                         Background=#B3FFFFFF
@@ -2432,7 +2432,7 @@
                         Foreground=#E4000000
                         Margin=50,0,0,0
                         Padding=11,5,11,6
-                        RenderSize=148,32
+                        RenderSize=148,30
                         Visibility=Visible
                       [Microsoft.UI.Xaml.Controls.ContentPresenter]
                           Background=#B3FFFFFF
@@ -2447,7 +2447,7 @@
                           Margin=0,0,0,0
                           Name=ContentPresenter
                           Padding=11,5,11,6
-                          RenderSize=148,32
+                          RenderSize=148,30
                           Visibility=Visible
                         [Microsoft.UI.Xaml.Controls.TextBlock]
                             FocusVisualPrimaryBrush=#E4000000
@@ -2457,7 +2457,7 @@
                             Foreground=#E4000000
                             Margin=0,0,0,0
                             Padding=0,0,0,0
-                            RenderSize=124,19
+                            RenderSize=124,17
                             Visibility=Visible
             [Microsoft.UI.Xaml.Shapes.Rectangle]
                 FocusVisualPrimaryBrush=#E4000000
diff --git a/src/controls/test/MUXControlsTestApp/verification/NavigationViewScrolling.xml b/src/controls/test/MUXControlsTestApp/verification/NavigationViewScrolling.xml
index 31edff55a6..bfe3083910 100644
--- a/src/controls/test/MUXControlsTestApp/verification/NavigationViewScrolling.xml
+++ b/src/controls/test/MUXControlsTestApp/verification/NavigationViewScrolling.xml
@@ -258,7 +258,7 @@
                   Margin=0,-2,0,0
                   Name=PaneTitleTextBlock
                   Padding=0,0,0,0
-                  RenderSize=0,19
+                  RenderSize=0,17
                   Visibility=Visible
         [Microsoft.UI.Xaml.Controls.Grid]
             Background=[NULL]
@@ -960,7 +960,7 @@
                                                   RenderSize=20,20
                                                   Visibility=Visible
                                                 [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                                                    Background=[NULL]
+                                                    Background=#00FFFFFF
                                                     BorderBrush=[NULL]
                                                     BorderThickness=0,0,0,0
                                                     CornerRadius=0,0,0,0
@@ -1019,7 +1019,7 @@
                                               Margin=4,-1,8,-1
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
-                                              RenderSize=46,19
+                                              RenderSize=46,17
                                               Visibility=Visible
                                             [Microsoft.UI.Xaml.Controls.TextBlock]
                                                 FocusVisualPrimaryBrush=#E4000000
@@ -1029,7 +1029,7 @@
                                                 Foreground=#E4000000
                                                 Margin=0,0,0,0
                                                 Padding=0,0,0,0
-                                                RenderSize=48,19
+                                                RenderSize=48,17
                                                 Visibility=Visible
                                           [Microsoft.UI.Xaml.Controls.ContentPresenter]
                                               Background=[NULL]
@@ -1197,7 +1197,7 @@
                                                   RenderSize=20,20
                                                   Visibility=Visible
                                                 [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                                                    Background=[NULL]
+                                                    Background=#00FFFFFF
                                                     BorderBrush=[NULL]
                                                     BorderThickness=0,0,0,0
                                                     CornerRadius=0,0,0,0
@@ -1256,7 +1256,7 @@
                                               Margin=4,-1,8,-1
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
-                                              RenderSize=46,19
+                                              RenderSize=46,17
                                               Visibility=Visible
                                             [Microsoft.UI.Xaml.Controls.TextBlock]
                                                 FocusVisualPrimaryBrush=#E4000000
@@ -1266,7 +1266,7 @@
                                                 Foreground=#E4000000
                                                 Margin=0,0,0,0
                                                 Padding=0,0,0,0
-                                                RenderSize=48,19
+                                                RenderSize=48,17
                                                 Visibility=Visible
                                           [Microsoft.UI.Xaml.Controls.ContentPresenter]
                                               Background=[NULL]
@@ -1335,7 +1335,7 @@
                                         Margin=0,-1,0,-1
                                         Name=HeaderText
                                         Padding=0,0,0,0
-                                        RenderSize=49,19
+                                        RenderSize=49,17
                                         Visibility=Visible
                               [Microsoft.UI.Xaml.Controls.NavigationViewItem]
                                   Background=#00FFFFFF
@@ -1488,7 +1488,7 @@
                                                   RenderSize=20,20
                                                   Visibility=Visible
                                                 [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                                                    Background=[NULL]
+                                                    Background=#00FFFFFF
                                                     BorderBrush=[NULL]
                                                     BorderThickness=0,0,0,0
                                                     CornerRadius=0,0,0,0
@@ -1547,7 +1547,7 @@
                                               Margin=4,-1,8,-1
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
-                                              RenderSize=46,19
+                                              RenderSize=46,17
                                               Visibility=Visible
                                             [Microsoft.UI.Xaml.Controls.TextBlock]
                                                 FocusVisualPrimaryBrush=#E4000000
@@ -1557,7 +1557,7 @@
                                                 Foreground=#E4000000
                                                 Margin=0,0,0,0
                                                 Padding=0,0,0,0
-                                                RenderSize=48,19
+                                                RenderSize=48,17
                                                 Visibility=Visible
                                           [Microsoft.UI.Xaml.Controls.ContentPresenter]
                                               Background=[NULL]
@@ -1725,7 +1725,7 @@
                                                   RenderSize=20,20
                                                   Visibility=Visible
                                                 [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                                                    Background=[NULL]
+                                                    Background=#00FFFFFF
                                                     BorderBrush=[NULL]
                                                     BorderThickness=0,0,0,0
                                                     CornerRadius=0,0,0,0
@@ -1784,7 +1784,7 @@
                                               Margin=4,-1,8,-1
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
-                                              RenderSize=46,19
+                                              RenderSize=46,17
                                               Visibility=Visible
                                             [Microsoft.UI.Xaml.Controls.TextBlock]
                                                 FocusVisualPrimaryBrush=#E4000000
@@ -1794,7 +1794,7 @@
                                                 Foreground=#E4000000
                                                 Margin=0,0,0,0
                                                 Padding=0,0,0,0
-                                                RenderSize=48,19
+                                                RenderSize=48,17
                                                 Visibility=Visible
                                           [Microsoft.UI.Xaml.Controls.ContentPresenter]
                                               Background=[NULL]
@@ -2001,7 +2001,7 @@
                                                   RenderSize=20,20
                                                   Visibility=Visible
                                                 [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                                                    Background=[NULL]
+                                                    Background=#00FFFFFF
                                                     BorderBrush=[NULL]
                                                     BorderThickness=0,0,0,0
                                                     CornerRadius=0,0,0,0
@@ -2060,7 +2060,7 @@
                                               Margin=4,-1,8,-1
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
-                                              RenderSize=46,19
+                                              RenderSize=46,17
                                               Visibility=Visible
                                             [Microsoft.UI.Xaml.Controls.TextBlock]
                                                 FocusVisualPrimaryBrush=#E4000000
@@ -2070,7 +2070,7 @@
                                                 Foreground=#E4000000
                                                 Margin=0,0,0,0
                                                 Padding=0,0,0,0
-                                                RenderSize=48,19
+                                                RenderSize=48,17
                                                 Visibility=Visible
                                           [Microsoft.UI.Xaml.Controls.ContentPresenter]
                                               Background=[NULL]
@@ -2238,7 +2238,7 @@
                                                   RenderSize=20,20
                                                   Visibility=Visible
                                                 [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                                                    Background=[NULL]
+                                                    Background=#00FFFFFF
                                                     BorderBrush=[NULL]
                                                     BorderThickness=0,0,0,0
                                                     CornerRadius=0,0,0,0
@@ -2297,7 +2297,7 @@
                                               Margin=4,-1,8,-1
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
-                                              RenderSize=46,19
+                                              RenderSize=46,17
                                               Visibility=Visible
                                             [Microsoft.UI.Xaml.Controls.TextBlock]
                                                 FocusVisualPrimaryBrush=#E4000000
@@ -2307,7 +2307,7 @@
                                                 Foreground=#E4000000
                                                 Margin=0,0,0,0
                                                 Padding=0,0,0,0
-                                                RenderSize=48,19
+                                                RenderSize=48,17
                                                 Visibility=Visible
                                           [Microsoft.UI.Xaml.Controls.ContentPresenter]
                                               Background=[NULL]
@@ -2475,7 +2475,7 @@
                                                   RenderSize=20,20
                                                   Visibility=Visible
                                                 [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                                                    Background=[NULL]
+                                                    Background=#00FFFFFF
                                                     BorderBrush=[NULL]
                                                     BorderThickness=0,0,0,0
                                                     CornerRadius=0,0,0,0
@@ -2534,7 +2534,7 @@
                                               Margin=4,-1,8,-1
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
-                                              RenderSize=46,19
+                                              RenderSize=46,17
                                               Visibility=Visible
                                             [Microsoft.UI.Xaml.Controls.TextBlock]
                                                 FocusVisualPrimaryBrush=#E4000000
@@ -2544,7 +2544,7 @@
                                                 Foreground=#E4000000
                                                 Margin=0,0,0,0
                                                 Padding=0,0,0,0
-                                                RenderSize=48,19
+                                                RenderSize=48,17
                                                 Visibility=Visible
                                           [Microsoft.UI.Xaml.Controls.ContentPresenter]
                                               Background=[NULL]
@@ -2712,7 +2712,7 @@
                                                   RenderSize=20,20
                                                   Visibility=Visible
                                                 [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                                                    Background=[NULL]
+                                                    Background=#00FFFFFF
                                                     BorderBrush=[NULL]
                                                     BorderThickness=0,0,0,0
                                                     CornerRadius=0,0,0,0
@@ -2771,7 +2771,7 @@
                                               Margin=4,-1,8,-1
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
-                                              RenderSize=46,19
+                                              RenderSize=46,17
                                               Visibility=Visible
                                             [Microsoft.UI.Xaml.Controls.TextBlock]
                                                 FocusVisualPrimaryBrush=#E4000000
@@ -2781,7 +2781,7 @@
                                                 Foreground=#E4000000
                                                 Margin=0,0,0,0
                                                 Padding=0,0,0,0
-                                                RenderSize=56,19
+                                                RenderSize=56,17
                                                 Visibility=Visible
                                           [Microsoft.UI.Xaml.Controls.ContentPresenter]
                                               Background=[NULL]
@@ -2850,7 +2850,7 @@
                                         Margin=0,-1,0,-1
                                         Name=HeaderText
                                         Padding=0,0,0,0
-                                        RenderSize=53,19
+                                        RenderSize=53,17
                                         Visibility=Visible
                               [Microsoft.UI.Xaml.Controls.NavigationViewItem]
                                   Background=#00FFFFFF
@@ -3003,7 +3003,7 @@
                                                   RenderSize=20,20
                                                   Visibility=Visible
                                                 [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                                                    Background=[NULL]
+                                                    Background=#00FFFFFF
                                                     BorderBrush=[NULL]
                                                     BorderThickness=0,0,0,0
                                                     CornerRadius=0,0,0,0
@@ -3062,7 +3062,7 @@
                                               Margin=4,-1,8,-1
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
-                                              RenderSize=46,19
+                                              RenderSize=46,17
                                               Visibility=Visible
                                             [Microsoft.UI.Xaml.Controls.TextBlock]
                                                 FocusVisualPrimaryBrush=#E4000000
@@ -3072,7 +3072,7 @@
                                                 Foreground=#E4000000
                                                 Margin=0,0,0,0
                                                 Padding=0,0,0,0
-                                                RenderSize=56,19
+                                                RenderSize=56,17
                                                 Visibility=Visible
                                           [Microsoft.UI.Xaml.Controls.ContentPresenter]
                                               Background=[NULL]
@@ -3240,7 +3240,7 @@
                                                   RenderSize=20,20
                                                   Visibility=Visible
                                                 [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                                                    Background=[NULL]
+                                                    Background=#00FFFFFF
                                                     BorderBrush=[NULL]
                                                     BorderThickness=0,0,0,0
                                                     CornerRadius=0,0,0,0
@@ -3299,7 +3299,7 @@
                                               Margin=4,-1,8,-1
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
-                                              RenderSize=46,19
+                                              RenderSize=46,17
                                               Visibility=Visible
                                             [Microsoft.UI.Xaml.Controls.TextBlock]
                                                 FocusVisualPrimaryBrush=#E4000000
@@ -3309,7 +3309,7 @@
                                                 Foreground=#E4000000
                                                 Margin=0,0,0,0
                                                 Padding=0,0,0,0
-                                                RenderSize=56,19
+                                                RenderSize=56,17
                                                 Visibility=Visible
                                           [Microsoft.UI.Xaml.Controls.ContentPresenter]
                                               Background=[NULL]
@@ -3516,7 +3516,7 @@
                                                   RenderSize=20,20
                                                   Visibility=Visible
                                                 [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                                                    Background=[NULL]
+                                                    Background=#00FFFFFF
                                                     BorderBrush=[NULL]
                                                     BorderThickness=0,0,0,0
                                                     CornerRadius=0,0,0,0
@@ -3575,7 +3575,7 @@
                                               Margin=4,-1,8,-1
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
-                                              RenderSize=46,19
+                                              RenderSize=46,17
                                               Visibility=Visible
                                             [Microsoft.UI.Xaml.Controls.TextBlock]
                                                 FocusVisualPrimaryBrush=#E4000000
@@ -3585,7 +3585,7 @@
                                                 Foreground=#E4000000
                                                 Margin=0,0,0,0
                                                 Padding=0,0,0,0
-                                                RenderSize=56,19
+                                                RenderSize=56,17
                                                 Visibility=Visible
                                           [Microsoft.UI.Xaml.Controls.ContentPresenter]
                                               Background=[NULL]
@@ -4408,7 +4408,7 @@
                                                   RenderSize=48,48
                                                   Visibility=Visible
                                                 [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                                                    Background=[NULL]
+                                                    Background=#00FFFFFF
                                                     BorderBrush=[NULL]
                                                     BorderThickness=0,0,0,0
                                                     CornerRadius=0,0,0,0
@@ -4466,7 +4466,7 @@
                                               Margin=4,-1,8,-1
                                               Name=ContentPresenter
                                               Padding=0,0,0,0
-                                              RenderSize=46,19
+                                              RenderSize=46,17
                                               Visibility=Visible
                                             [Microsoft.UI.Xaml.Controls.TextBlock]
                                                 FocusVisualPrimaryBrush=#E4000000
@@ -4476,7 +4476,7 @@
                                                 Foreground=#E4000000
                                                 Margin=0,0,0,0
                                                 Padding=0,0,0,0
-                                                RenderSize=50,19
+                                                RenderSize=50,17
                                                 Visibility=Visible
                                           [Microsoft.UI.Xaml.Controls.ContentPresenter]
                                               Background=[NULL]
@@ -4701,7 +4701,7 @@
                       Foreground=#E4000000
                       Margin=0,0,0,0
                       Padding=0,0,0,0
-                      RenderSize=372,19
+                      RenderSize=372,17
                       Visibility=Visible
             [Microsoft.UI.Xaml.Shapes.Rectangle]
                 FocusVisualPrimaryBrush=#E4000000
diff --git a/src/controls/test/MUXControlsTestApp/verification/NavigationViewTop.xml b/src/controls/test/MUXControlsTestApp/verification/NavigationViewTop.xml
index c6c8c39363..fc624a4267 100644
--- a/src/controls/test/MUXControlsTestApp/verification/NavigationViewTop.xml
+++ b/src/controls/test/MUXControlsTestApp/verification/NavigationViewTop.xml
@@ -497,7 +497,7 @@
                                       RenderSize=20,20
                                       Visibility=Visible
                                     [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                                        Background=[NULL]
+                                        Background=#FFFF0000
                                         BorderBrush=[NULL]
                                         BorderThickness=0,0,0,0
                                         CornerRadius=0,0,0,0
@@ -556,7 +556,7 @@
                                     Margin=8,-1,12,-1
                                     Name=ContentPresenter
                                     Padding=0,0,0,0
-                                    RenderSize=34,19
+                                    RenderSize=34,17
                                     Visibility=Visible
                                   [Microsoft.UI.Xaml.Controls.TextBlock]
                                       FocusVisualPrimaryBrush=#E4000000
@@ -566,7 +566,7 @@
                                       Foreground=#E4000000
                                       Margin=0,0,0,0
                                       Padding=0,0,0,0
-                                      RenderSize=34,19
+                                      RenderSize=34,17
                                       Visibility=Visible
                                 [Microsoft.UI.Xaml.Controls.Grid]
                                     Background=#00FFFFFF
@@ -742,7 +742,7 @@
                                       RenderSize=20,20
                                       Visibility=Visible
                                     [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                                        Background=[NULL]
+                                        Background=#00FFFFFF
                                         BorderBrush=[NULL]
                                         BorderThickness=0,0,0,0
                                         CornerRadius=0,0,0,0
@@ -801,7 +801,7 @@
                                     Margin=8,-1,12,-1
                                     Name=ContentPresenter
                                     Padding=0,0,0,0
-                                    RenderSize=22,19
+                                    RenderSize=22,17
                                     Visibility=Visible
                                   [Microsoft.UI.Xaml.Controls.TextBlock]
                                       FocusVisualPrimaryBrush=#E4000000
@@ -811,7 +811,7 @@
                                       Foreground=#E4000000
                                       Margin=0,0,0,0
                                       Padding=0,0,0,0
-                                      RenderSize=22,19
+                                      RenderSize=22,17
                                       Visibility=Visible
                                 [Microsoft.UI.Xaml.Controls.Grid]
                                     Background=#00FFFFFF
@@ -1193,7 +1193,7 @@
                             RenderSize=48,48
                             Visibility=Visible
                           [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                              Background=[NULL]
+                              Background=#00FFFFFF
                               BorderBrush=[NULL]
                               BorderThickness=0,0,0,0
                               CornerRadius=0,0,0,0
@@ -1710,7 +1710,7 @@
                       Foreground=#E4000000
                       Margin=0,0,0,0
                       Padding=0,0,0,0
-                      RenderSize=120,19
+                      RenderSize=120,17
                       Visibility=Visible
             [Microsoft.UI.Xaml.Shapes.Rectangle]
                 FocusVisualPrimaryBrush=#E4000000
diff --git a/src/controls/test/MUXControlsTestApp/verification/NavigationViewTopPaneContent.xml b/src/controls/test/MUXControlsTestApp/verification/NavigationViewTopPaneContent.xml
index 2a89068eb6..991a80b712 100644
--- a/src/controls/test/MUXControlsTestApp/verification/NavigationViewTopPaneContent.xml
+++ b/src/controls/test/MUXControlsTestApp/verification/NavigationViewTopPaneContent.xml
@@ -314,7 +314,7 @@
                   Foreground=#E4000000
                   Margin=0,0,0,0
                   Padding=11,5,11,6
-                  RenderSize=115,32
+                  RenderSize=115,30
                   Visibility=Visible
                 [Microsoft.UI.Xaml.Controls.ContentPresenter]
                     Background=#B3FFFFFF
@@ -329,7 +329,7 @@
                     Margin=0,0,0,0
                     Name=ContentPresenter
                     Padding=11,5,11,6
-                    RenderSize=115,32
+                    RenderSize=115,30
                     Visibility=Visible
                   [Microsoft.UI.Xaml.Controls.TextBlock]
                       FocusVisualPrimaryBrush=#E4000000
@@ -339,7 +339,7 @@
                       Foreground=#E4000000
                       Margin=0,0,0,0
                       Padding=0,0,0,0
-                      RenderSize=91,19
+                      RenderSize=91,17
                       Visibility=Visible
           [Microsoft.UI.Xaml.Controls.ContentControl]
               Background=[NULL]
@@ -536,7 +536,7 @@
                                       RenderSize=20,20
                                       Visibility=Visible
                                     [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                                        Background=[NULL]
+                                        Background=#00FFFFFF
                                         BorderBrush=[NULL]
                                         BorderThickness=0,0,0,0
                                         CornerRadius=0,0,0,0
@@ -595,7 +595,7 @@
                                     Margin=8,-1,12,-1
                                     Name=ContentPresenter
                                     Padding=0,0,0,0
-                                    RenderSize=34,19
+                                    RenderSize=34,17
                                     Visibility=Visible
                                   [Microsoft.UI.Xaml.Controls.TextBlock]
                                       FocusVisualPrimaryBrush=#E4000000
@@ -605,7 +605,7 @@
                                       Foreground=#E4000000
                                       Margin=0,0,0,0
                                       Padding=0,0,0,0
-                                      RenderSize=34,19
+                                      RenderSize=34,17
                                       Visibility=Visible
                                 [Microsoft.UI.Xaml.Controls.Grid]
                                     Background=#00FFFFFF
@@ -781,7 +781,7 @@
                                       RenderSize=20,20
                                       Visibility=Visible
                                     [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                                        Background=[NULL]
+                                        Background=#00FFFFFF
                                         BorderBrush=[NULL]
                                         BorderThickness=0,0,0,0
                                         CornerRadius=0,0,0,0
@@ -840,7 +840,7 @@
                                     Margin=8,-1,12,-1
                                     Name=ContentPresenter
                                     Padding=0,0,0,0
-                                    RenderSize=22,19
+                                    RenderSize=22,17
                                     Visibility=Visible
                                   [Microsoft.UI.Xaml.Controls.TextBlock]
                                       FocusVisualPrimaryBrush=#E4000000
@@ -850,7 +850,7 @@
                                       Foreground=#E4000000
                                       Margin=0,0,0,0
                                       Padding=0,0,0,0
-                                      RenderSize=22,19
+                                      RenderSize=22,17
                                       Visibility=Visible
                                 [Microsoft.UI.Xaml.Controls.Grid]
                                     Background=#00FFFFFF
@@ -1464,7 +1464,7 @@
                   Foreground=#E4000000
                   Margin=0,0,0,0
                   Padding=11,5,11,6
-                  RenderSize=110,32
+                  RenderSize=110,30
                   Visibility=Visible
                 [Microsoft.UI.Xaml.Controls.ContentPresenter]
                     Background=#B3FFFFFF
@@ -1479,7 +1479,7 @@
                     Margin=0,0,0,0
                     Name=ContentPresenter
                     Padding=11,5,11,6
-                    RenderSize=110,32
+                    RenderSize=110,30
                     Visibility=Visible
                   [Microsoft.UI.Xaml.Controls.TextBlock]
                       FocusVisualPrimaryBrush=#E4000000
@@ -1489,7 +1489,7 @@
                       Foreground=#E4000000
                       Margin=0,0,0,0
                       Padding=0,0,0,0
-                      RenderSize=86,19
+                      RenderSize=86,17
                       Visibility=Visible
           [Microsoft.UI.Xaml.Controls.ItemsRepeater]
               Background=[NULL]
@@ -1610,7 +1610,7 @@
                             RenderSize=48,48
                             Visibility=Visible
                           [Microsoft.UI.Xaml.Controls.ContentPresenter]
-                              Background=[NULL]
+                              Background=#00FFFFFF
                               BorderBrush=[NULL]
                               BorderThickness=0,0,0,0
                               CornerRadius=0,0,0,0
@@ -2085,7 +2085,7 @@
                     Margin=0,0,0,0
                     Name=ContentLeftPadding
                     Padding=0,0,0,0
-                    RenderSize=0,82
+                    RenderSize=0,80
                     Visibility=Visible
                     Width=0
                 [Microsoft.UI.Xaml.Controls.ContentControl]
@@ -2102,7 +2102,7 @@
                     MinHeight=36
                     Name=HeaderContent
                     Padding=0,0,0,0
-                    RenderSize=744,38
+                    RenderSize=744,36
                     Visibility=Visible
                   [Microsoft.UI.Xaml.Controls.ContentPresenter]
                       Background=[NULL]
@@ -2116,7 +2116,7 @@
                       Foreground=#E4000000
                       Margin=0,0,0,0
                       Padding=0,0,0,0
-                      RenderSize=744,38
+                      RenderSize=744,36
                       Visibility=Visible
                     [Microsoft.UI.Xaml.Controls.TextBlock]
                         FocusVisualPrimaryBrush=#E4000000
@@ -2126,7 +2126,7 @@
                         Foreground=#E4000000
                         Margin=0,0,0,0
                         Padding=0,0,0,0
-                        RenderSize=301,38
+                        RenderSize=301,34
                         Visibility=Visible
                 [Microsoft.UI.Xaml.Controls.ContentPresenter]
                     Background=[NULL]
@@ -2141,7 +2141,7 @@
                     Margin=0,0,0,0
                     Name=ContentPresenter
                     Padding=0,0,0,0
-                    RenderSize=800,469
+                    RenderSize=800,471
                     Visibility=Visible
                   [Microsoft.UI.Xaml.Controls.StackPanel]
                       Background=[NULL]
@@ -2154,7 +2154,7 @@
                       FocusVisualSecondaryThickness=1,1,1,1
                       Margin=0,0,0,0
                       Padding=0,0,0,0
-                      RenderSize=800,469
+                      RenderSize=800,471
                       Visibility=Visible
                     [Microsoft.UI.Xaml.Controls.Button]
                         Background=#B3FFFFFF
@@ -2168,7 +2168,7 @@
                         Foreground=#E4000000
                         Margin=0,0,0,0
                         Padding=11,5,11,6
-                        RenderSize=149,32
+                        RenderSize=149,30
                         Visibility=Visible
                       [Microsoft.UI.Xaml.Controls.ContentPresenter]
                           Background=#B3FFFFFF
@@ -2183,7 +2183,7 @@
                           Margin=0,0,0,0
                           Name=ContentPresenter
                           Padding=11,5,11,6
-                          RenderSize=149,32
+                          RenderSize=149,30
                           Visibility=Visible
                         [Microsoft.UI.Xaml.Controls.TextBlock]
                             FocusVisualPrimaryBrush=#E4000000
@@ -2193,7 +2193,7 @@
                             Foreground=#E4000000
                             Margin=0,0,0,0
                             Padding=0,0,0,0
-                            RenderSize=125,19
+                            RenderSize=125,17
                             Visibility=Visible
                     [Microsoft.UI.Xaml.Controls.Button]
                         Background=#B3FFFFFF
@@ -2207,7 +2207,7 @@
                         Foreground=#E4000000
                         Margin=50,0,0,0
                         Padding=11,5,11,6
-                        RenderSize=148,32
+                        RenderSize=148,30
                         Visibility=Visible
                       [Microsoft.UI.Xaml.Controls.ContentPresenter]
                           Background=#B3FFFFFF
@@ -2222,7 +2222,7 @@
                           Margin=0,0,0,0
                           Name=ContentPresenter
                           Padding=11,5,11,6
-                          RenderSize=148,32
+                          RenderSize=148,30
                           Visibility=Visible
                         [Microsoft.UI.Xaml.Controls.TextBlock]
                             FocusVisualPrimaryBrush=#E4000000
@@ -2232,7 +2232,7 @@
                             Foreground=#E4000000
                             Margin=0,0,0,0
                             Padding=0,0,0,0
-                            RenderSize=124,19
+                            RenderSize=124,17
                             Visibility=Visible
             [Microsoft.UI.Xaml.Shapes.Rectangle]
                 FocusVisualPrimaryBrush=#E4000000
diff --git a/src/controls/test/MUXControlsTestApp/verification/TimePicker.xml b/src/controls/test/MUXControlsTestApp/verification/TimePicker.xml
index e18b0956fb..f7033c49d5 100644
--- a/src/controls/test/MUXControlsTestApp/verification/TimePicker.xml
+++ b/src/controls/test/MUXControlsTestApp/verification/TimePicker.xml
@@ -25,7 +25,7 @@
       Foreground=#E4000000
       Margin=0,0,0,0
       Padding=0,0,0,0
-      RenderSize=242,30
+      RenderSize=242,28
       Visibility=Visible
     [Microsoft.UI.Xaml.Controls.Grid]
         Background=[NULL]
@@ -39,7 +39,7 @@
         Margin=0,0,0,0
         Name=LayoutRoot
         Padding=0,0,0,0
-        RenderSize=242,30
+        RenderSize=242,28
         Visibility=Visible
       [Microsoft.UI.Xaml.Controls.ContentPresenter]
           Background=[NULL]
@@ -72,7 +72,7 @@
           MinWidth=242
           Name=FlyoutButton
           Padding=11,5,11,6
-          RenderSize=242,30
+          RenderSize=242,28
           Visibility=Visible
         [Microsoft.UI.Xaml.Controls.Grid]
             Background=[NULL]
@@ -85,7 +85,7 @@
             FocusVisualSecondaryThickness=1,1,1,1
             Margin=0,0,0,0
             Padding=0,0,0,0
-            RenderSize=242,30
+            RenderSize=242,28
             Visibility=Visible
           [Microsoft.UI.Xaml.Controls.ContentPresenter]
               Background=#B3FFFFFF
@@ -100,7 +100,7 @@
               Margin=0,0,0,0
               Name=ContentPresenter
               Padding=0,0,0,0
-              RenderSize=242,30
+              RenderSize=242,28
               Visibility=Visible
             [Microsoft.UI.Xaml.Controls.Grid]
                 Background=[NULL]
@@ -114,7 +114,7 @@
                 Margin=0,0,0,0
                 Name=FlyoutButtonContentGrid
                 Padding=0,0,0,0
-                RenderSize=240,28
+                RenderSize=240,26
                 Visibility=Visible
               [Microsoft.UI.Xaml.Controls.Border]
                   Background=[NULL]
@@ -128,7 +128,7 @@
                   Margin=0,0,0,0
                   Name=FirstPickerHost
                   Padding=0,0,0,0
-                  RenderSize=79,28
+                  RenderSize=79,26
                   Visibility=Visible
                 [Microsoft.UI.Xaml.Controls.TextBlock]
                     FocusVisualPrimaryBrush=#E4000000
@@ -139,7 +139,7 @@
                     Margin=0,0,0,0
                     Name=HourTextBlock
                     Padding=0,3,0,6
-                    RenderSize=79,28
+                    RenderSize=79,26
                     Visibility=Visible
               [Microsoft.UI.Xaml.Shapes.Rectangle]
                   FocusVisualPrimaryBrush=#E4000000
@@ -148,7 +148,7 @@
                   FocusVisualSecondaryThickness=1,1,1,1
                   Margin=0,0,0,0
                   Name=FirstColumnDivider
-                  RenderSize=1,28
+                  RenderSize=1,26
                   StrokeThickness=1
                   Visibility=Visible
                   Width=1
@@ -164,7 +164,7 @@
                   Margin=0,0,0,0
                   Name=SecondPickerHost
                   Padding=0,0,0,0
-                  RenderSize=80,28
+                  RenderSize=80,26
                   Visibility=Visible
                 [Microsoft.UI.Xaml.Controls.TextBlock]
                     FocusVisualPrimaryBrush=#E4000000
@@ -175,7 +175,7 @@
                     Margin=0,0,0,0
                     Name=MinuteTextBlock
                     Padding=0,3,0,6
-                    RenderSize=80,28
+                    RenderSize=80,26
                     Visibility=Visible
               [Microsoft.UI.Xaml.Shapes.Rectangle]
                   FocusVisualPrimaryBrush=#E4000000
@@ -184,7 +184,7 @@
                   FocusVisualSecondaryThickness=1,1,1,1
                   Margin=0,0,0,0
                   Name=SecondColumnDivider
-                  RenderSize=1,28
+                  RenderSize=1,26
                   StrokeThickness=1
                   Visibility=Visible
                   Width=1
@@ -200,7 +200,7 @@
                   Margin=0,0,0,0
                   Name=ThirdPickerHost
                   Padding=0,0,0,0
-                  RenderSize=79,28
+                  RenderSize=79,26
                   Visibility=Visible
                 [Microsoft.UI.Xaml.Controls.TextBlock]
                     FocusVisualPrimaryBrush=#E4000000
@@ -211,5 +211,5 @@
                     Margin=0,0,0,0
                     Name=PeriodTextBlock
                     Padding=0,3,0,6
-                    RenderSize=79,28
+                    RenderSize=79,26
                     Visibility=Visible
diff --git a/src/controls/test/MUXControlsTestApp/verification/ToggleSwitch.xml b/src/controls/test/MUXControlsTestApp/verification/ToggleSwitch.xml
index 74d52e92b8..d65e7b84f4 100644
--- a/src/controls/test/MUXControlsTestApp/verification/ToggleSwitch.xml
+++ b/src/controls/test/MUXControlsTestApp/verification/ToggleSwitch.xml
@@ -81,7 +81,7 @@
             Margin=0,0,0,0
             Name=OffContentPresenter
             Padding=0,0,0,0
-            RenderSize=20,19
+            RenderSize=20,17
             Visibility=Visible
           [Microsoft.UI.Xaml.Controls.TextBlock]
               FocusVisualPrimaryBrush=#E4000000
@@ -91,7 +91,7 @@
               Foreground=#E4000000
               Margin=0,0,0,0
               Padding=0,0,0,0
-              RenderSize=20,19
+              RenderSize=20,17
               Visibility=Visible
         [Microsoft.UI.Xaml.Controls.ContentPresenter]
             Background=[NULL]
@@ -106,7 +106,7 @@
             Margin=0,0,0,0
             Name=OnContentPresenter
             Padding=0,0,0,0
-            RenderSize=19,19
+            RenderSize=19,17
             Visibility=Visible
           [Microsoft.UI.Xaml.Controls.TextBlock]
               FocusVisualPrimaryBrush=#E4000000
@@ -116,7 +116,7 @@
               Foreground=#E4000000
               Margin=0,0,0,0
               Padding=0,0,0,0
-              RenderSize=19,19
+              RenderSize=19,17
               Visibility=Visible
         [Microsoft.UI.Xaml.Shapes.Rectangle]
             FocusVisualPrimaryBrush=#E4000000
diff --git a/src/controls/test/MUXControlsTestApp/verification/TreeView.xml b/src/controls/test/MUXControlsTestApp/verification/TreeView.xml
index 34c4ca1ada..1e38ae1544 100644
--- a/src/controls/test/MUXControlsTestApp/verification/TreeView.xml
+++ b/src/controls/test/MUXControlsTestApp/verification/TreeView.xml
@@ -310,7 +310,7 @@
                               Foreground=#E4000000
                               Margin=0,0,0,0
                               Padding=0,0,0,0
-                              RenderSize=42,19
+                              RenderSize=42,17
                               Visibility=Visible
                 [Microsoft.UI.Xaml.Controls.ContentControl]
                     Background=[NULL]
diff --git a/src/controls/test/MUXControlsTestApp/verification/VerifyVerifyHeaderContentMarginOnMinimalNav.xml b/src/controls/test/MUXControlsTestApp/verification/VerifyVerifyHeaderContentMarginOnMinimalNav.xml
index 74479f5048..375e11ac21 100644
--- a/src/controls/test/MUXControlsTestApp/verification/VerifyVerifyHeaderContentMarginOnMinimalNav.xml
+++ b/src/controls/test/MUXControlsTestApp/verification/VerifyVerifyHeaderContentMarginOnMinimalNav.xml
@@ -12,7 +12,7 @@
     MinHeight=36
     Name=HeaderContent
     Padding=0,0,0,0
-    RenderSize=344,38
+    RenderSize=344,36
     Visibility=Visible
   [Microsoft.UI.Xaml.Controls.ContentPresenter]
       Background=[NULL]
@@ -26,7 +26,7 @@
       Foreground=#E4000000
       Margin=0,0,0,0
       Padding=0,0,0,0
-      RenderSize=344,38
+      RenderSize=344,36
       Visibility=Visible
     [Microsoft.UI.Xaml.Controls.TextBlock]
         FocusVisualPrimaryBrush=#E4000000
@@ -36,5 +36,5 @@
         Foreground=#E4000000
         Margin=0,0,0,0
         Padding=0,0,0,0
-        RenderSize=107,38
+        RenderSize=107,34
         Visibility=Visible
diff --git a/src/controls/test/MUXControlsTestApp/verification/VerifyVerifyHeaderContentMarginOnTopNav.xml b/src/controls/test/MUXControlsTestApp/verification/VerifyVerifyHeaderContentMarginOnTopNav.xml
index e33a26b411..ac0ddc164f 100644
--- a/src/controls/test/MUXControlsTestApp/verification/VerifyVerifyHeaderContentMarginOnTopNav.xml
+++ b/src/controls/test/MUXControlsTestApp/verification/VerifyVerifyHeaderContentMarginOnTopNav.xml
@@ -12,7 +12,7 @@
     MinHeight=36
     Name=HeaderContent
     Padding=0,0,0,0
-    RenderSize=344,38
+    RenderSize=344,36
     Visibility=Visible
   [Microsoft.UI.Xaml.Controls.ContentPresenter]
       Background=[NULL]
@@ -26,7 +26,7 @@
       Foreground=#E4000000
       Margin=0,0,0,0
       Padding=0,0,0,0
-      RenderSize=344,38
+      RenderSize=344,36
       Visibility=Visible
     [Microsoft.UI.Xaml.Controls.TextBlock]
         FocusVisualPrimaryBrush=#E4000000
@@ -36,5 +36,5 @@
         Foreground=#E4000000
         Margin=0,0,0,0
         Padding=0,0,0,0
-        RenderSize=107,38
+        RenderSize=107,34
         Visibility=Visible
diff --git a/src/controls/test/MUXControlsTestApp/verification/VerifyVisualTreeExampleWithCustomerFilter.xml b/src/controls/test/MUXControlsTestApp/verification/VerifyVisualTreeExampleWithCustomerFilter.xml
index 962e053469..f2d5f6f8f9 100644
--- a/src/controls/test/MUXControlsTestApp/verification/VerifyVisualTreeExampleWithCustomerFilter.xml
+++ b/src/controls/test/MUXControlsTestApp/verification/VerifyVisualTreeExampleWithCustomerFilter.xml
@@ -23,17 +23,17 @@
     VerticalAlignment=Stretch
     Width=400
   [Microsoft.UI.Xaml.Controls.TextBlock]
-      ActualHeight=18.62109375
+      ActualHeight=16.80000114440918
       ActualOffset=<0, 0, 0>
       ActualSize=<400, 400>
       ActualTheme=Light
       ActualWidth=23.7275390625
-      BaselineOffset=15.107421875
+      BaselineOffset=12.59999942779541
       CompositeMode=Inherit
       ContentEnd=Microsoft.UI.Xaml.Documents.TextPointer
       ContentStart=Microsoft.UI.Xaml.Documents.TextPointer
       ContextFlyout=Microsoft.UI.Xaml.Controls.TextCommandBarFlyout
-      DesiredSize=24,19
+      DesiredSize=24,17
       DispatcherQueue=Microsoft.UI.Dispatching.DispatcherQueue
       FocusVisualPrimaryBrush=#E4000000
       FocusVisualSecondaryBrush=#B3FFFFFF
diff --git a/src/controls/test/MUXControlsTestApp/verification/VerifyVisualTreeForAppBarAndAppBarToggleButton.xml b/src/controls/test/MUXControlsTestApp/verification/VerifyVisualTreeForAppBarAndAppBarToggleButton.xml
index 12e3dc3601..d52124d03d 100644
--- a/src/controls/test/MUXControlsTestApp/verification/VerifyVisualTreeForAppBarAndAppBarToggleButton.xml
+++ b/src/controls/test/MUXControlsTestApp/verification/VerifyVisualTreeForAppBarAndAppBarToggleButton.xml
@@ -163,7 +163,7 @@
               Margin=2,0,2,8
               Name=TextLabel
               Padding=0,0,0,0
-              RenderSize=64,16
+              RenderSize=64,15
               Visibility=Visible
           [Microsoft.UI.Xaml.Controls.TextBlock]
               FocusVisualPrimaryBrush=#E4000000
@@ -371,7 +371,7 @@
               Margin=2,0,2,8
               Name=TextLabel
               Padding=0,0,0,0
-              RenderSize=64,16
+              RenderSize=64,15
               Visibility=Visible
           [Microsoft.UI.Xaml.Controls.TextBlock]
               FocusVisualPrimaryBrush=#E4000000
diff --git a/src/controls/test/MUXControlsTestApp/verification/VerifyVisualTreeForCommandBarCornerRadius.xml b/src/controls/test/MUXControlsTestApp/verification/VerifyVisualTreeForCommandBarCornerRadius.xml
index fa85cedd9d..57189bd510 100644
--- a/src/controls/test/MUXControlsTestApp/verification/VerifyVisualTreeForCommandBarCornerRadius.xml
+++ b/src/controls/test/MUXControlsTestApp/verification/VerifyVisualTreeForCommandBarCornerRadius.xml
@@ -93,7 +93,7 @@
               Margin=4,0,0,0
               Name=ContentControl
               Padding=0,0,0,0
-              RenderSize=111,47
+              RenderSize=111,45
               Visibility=Visible
             [Microsoft.UI.Xaml.Controls.ContentPresenter]
                 Background=[NULL]
@@ -107,7 +107,7 @@
                 Foreground=#E4000000
                 Margin=0,0,0,0
                 Padding=0,0,0,0
-                RenderSize=111,47
+                RenderSize=111,45
                 Visibility=Visible
               [Microsoft.UI.Xaml.Controls.TextBlock]
                   FocusVisualPrimaryBrush=#E4000000
@@ -117,7 +117,7 @@
                   Foreground=#E4000000
                   Margin=12,14,12,14
                   Padding=0,0,0,0
-                  RenderSize=87,19
+                  RenderSize=87,17
                   Visibility=Visible
           [Microsoft.UI.Xaml.Controls.ItemsControl]
               Background=[NULL]
@@ -321,7 +321,7 @@
                           Margin=2,0,2,8
                           Name=TextLabel
                           Padding=0,0,0,0
-                          RenderSize=64,16
+                          RenderSize=64,15
                           Visibility=Visible
                       [Microsoft.UI.Xaml.Controls.TextBlock]
                           FocusVisualPrimaryBrush=#E4000000
@@ -495,7 +495,7 @@
                           Margin=2,0,2,8
                           Name=TextLabel
                           Padding=0,0,0,0
-                          RenderSize=64,16
+                          RenderSize=64,15
                           Visibility=Visible
                       [Microsoft.UI.Xaml.Controls.TextBlock]
                           FocusVisualPrimaryBrush=#E4000000
@@ -753,7 +753,7 @@
               Margin=4,0,0,0
               Name=ContentControl
               Padding=0,0,0,0
-              RenderSize=111,47
+              RenderSize=111,45
               Visibility=Visible
             [Microsoft.UI.Xaml.Controls.ContentPresenter]
                 Background=[NULL]
@@ -767,7 +767,7 @@
                 Foreground=#E4000000
                 Margin=0,0,0,0
                 Padding=0,0,0,0
-                RenderSize=111,47
+                RenderSize=111,45
                 Visibility=Visible
               [Microsoft.UI.Xaml.Controls.TextBlock]
                   FocusVisualPrimaryBrush=#E4000000
@@ -777,7 +777,7 @@
                   Foreground=#E4000000
                   Margin=12,14,12,14
                   Padding=0,0,0,0
-                  RenderSize=87,19
+                  RenderSize=87,17
                   Visibility=Visible
           [Microsoft.UI.Xaml.Controls.ItemsControl]
               Background=[NULL]
diff --git a/src/controls/test/MUXExperimentalTest/MUXExperimental.Test/MSTest/MUXExperimental.Test.csproj b/src/controls/test/MUXExperimentalTest/MUXExperimental.Test/MSTest/MUXExperimental.Test.csproj
deleted file mode 100644
index 0deb34c771..0000000000
--- a/src/controls/test/MUXExperimentalTest/MUXExperimental.Test/MSTest/MUXExperimental.Test.csproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v3.1</TargetFrameworkVersion>
-    <RuntimeIdentifiers>win-x86;win-x64;win-arm;win-arm64</RuntimeIdentifiers>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestNetSdkVersion)" />
-    <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Windows.Apps.Test" Version="1.0.181205002" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
-    <PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
-    <PackageReference Include="System.Drawing.Primitives" Version="4.3.0" />
-    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.1" />
-  </ItemGroup>
-<ItemGroup>
-    <ProjectReference Include="..\..\..\testinfra\MUXTestInfra\MSTest\MUXTestInfra.MSTest.csproj" />
-  </ItemGroup>
-  <Import Project="..\MUXExperimental.Test.Shared.projitems" />
-</Project>
\ No newline at end of file
diff --git a/src/controls/test/MUXExperimentalTest/MUXExperimental.Test/MUXExperimental.Test.Shared.projitems b/src/controls/test/MUXExperimentalTest/MUXExperimental.Test/MUXExperimental.Test.Shared.projitems
deleted file mode 100644
index 8e68a6ca65..0000000000
--- a/src/controls/test/MUXExperimentalTest/MUXExperimental.Test/MUXExperimental.Test.Shared.projitems
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildProjectDirectory)\..\..\MUXExperimentalTest.props" />
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <HasSharedItems>true</HasSharedItems>
-    <SharedGUID>3823C8CC-5FF5-4FA5-9DFB-94BCBE180B20</SharedGUID>
-    <DefineConstants Condition="'$(Configuration)' == 'Release' and '$(PGOBuildMode)' == 'Instrument'">$(DefineConstants);PGO_INSTRUMENT</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <Import_RootNamespace>MUXExperimental.Test</Import_RootNamespace>
-  </PropertyGroup>
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{0133B2CB-960C-4BA5-ABFA-570F18CDB47A}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>MUXExperimental.Test</RootNamespace>
-    <AssemblyName>MUXExperimental.Test</AssemblyName>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">$(ReleaseTestSdkVersion)</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>$(DefineConstants);TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <PlatformTarget>x86</PlatformTarget>
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>$(DefineConstants);TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
-    <PlatformTarget>ARM64</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM64\Debug\</OutputPath>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>ARM64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
-    <PlatformTarget>ARM64</PlatformTarget>
-    <OutputPath>bin\ARM64\Release\</OutputPath>
-    <DefineConstants>$(DefineConstants);TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>ARM64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <PlatformTarget>x64</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <PlatformTarget>x64</PlatformTarget>
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>$(DefineConstants);TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup>
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)MUXExperimentalTestEnvironment.cs" />
-    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Properties\MUXExperimental.Test.rd.xml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0' ">
-    <VisualStudioVersion>15.0</VisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="..\..\..\dev\SampleControl\InteractionTests\SampleControl_InteractionTests.projitems" Label="Shared" />
-  <Import Project="..\..\..\dev\TitleBar\InteractionTests\TitleBar_InteractionTests.projitems" Label="Shared" />
-</Project>
\ No newline at end of file
diff --git a/src/controls/test/MUXExperimentalTest/MUXExperimental.Test/MUXExperimental.Test.Shared.shproj b/src/controls/test/MUXExperimentalTest/MUXExperimental.Test/MUXExperimental.Test.Shared.shproj
deleted file mode 100644
index 751cbce281..0000000000
--- a/src/controls/test/MUXExperimentalTest/MUXExperimental.Test/MUXExperimental.Test.Shared.shproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{815C5F42-3DEB-4DCB-B143-1C088FCE97F9}</ProjectGuid>
-    <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
-  <PropertyGroup />
-  <Import Project="MUXExperimental.Test.Shared.projitems" Label="Shared" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
-</Project>
\ No newline at end of file
diff --git a/src/controls/test/MUXExperimentalTest/MUXExperimental.Test/MUXExperimentalTestEnvironment.cs b/src/controls/test/MUXExperimentalTest/MUXExperimental.Test/MUXExperimentalTestEnvironment.cs
deleted file mode 100644
index ed6c24a806..0000000000
--- a/src/controls/test/MUXExperimentalTest/MUXExperimental.Test/MUXExperimentalTestEnvironment.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-using Microsoft.UI.Xaml.Tests.MUXControls.InteractionTests.Infra;
-using Common;
-
-using WEX.TestExecution;
-using WEX.TestExecution.Markup;
-using WEX.Logging.Interop;
-
-namespace MUXExperimental.Test
-{
-    // This is marked as a test class to make sure our AssemblyInitialize and AssemblyCleanup
-    // fixtures get executed.  It won't actually host any tests.
-    [TestClass]
-    public class MUXExperimentalTestEnvironment
-    {
-        [AssemblyInitialize]
-        [TestProperty("CoreClrProfile", ".netcoreapp3.1")]
-        [TestProperty("RunFixtureAs:Assembly", "ElevatedUserOrSystem")]
-        [TestProperty("HelixWorkItemCreation", "CreateWorkItemPerTestClass")]
-        public static void AssemblyInitialize(TestContext testContext)
-        {
-            TestEnvironment.AssemblyInitialize(testContext, TestApplicationInfo.MUXExperimentalTestApp.TestAppPackageName + ".cer");
-        }
-    }
-}
diff --git a/src/controls/test/MUXExperimentalTest/MUXExperimental.Test/Properties/MUXExperimental.Test.rd.xml b/src/controls/test/MUXExperimentalTest/MUXExperimental.Test/Properties/MUXExperimental.Test.rd.xml
deleted file mode 100644
index 044577aa8b..0000000000
--- a/src/controls/test/MUXExperimentalTest/MUXExperimental.Test/Properties/MUXExperimental.Test.rd.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    This file contains Runtime Directives, specifications about types your application accesses
-    through reflection and other dynamic code patterns. Runtime Directives are used to control the
-    .NET Native optimizer and ensure that it does not remove code accessed by your library. If your
-    library does not do any reflection, then you generally do not need to edit this file. However,
-    if your library reflects over types, especially types passed to it or derived from its types,
-    then you should write Runtime Directives.
-
-    The most common use of reflection in libraries is to discover information about types passed
-    to the library. Runtime Directives have three ways to express requirements on types passed to
-    your library.
-
-    1.  Parameter, GenericParameter, TypeParameter, TypeEnumerableParameter
-        Use these directives to reflect over types passed as a parameter.
-
-    2.  SubTypes
-        Use a SubTypes directive to reflect over types derived from another type.
-
-    3.  AttributeImplies
-        Use an AttributeImplies directive to indicate that your library needs to reflect over
-        types or methods decorated with an attribute.
-
-    For more information on writing Runtime Directives for libraries, please visit
-    https://go.microsoft.com/fwlink/?LinkID=391919
--->
-<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
-  <Library Name="MUXExperimental.Test">
-
-    <!-- add directives for your library here -->
-
-  </Library>
-</Directives>
diff --git a/src/controls/test/MUXExperimentalTest/MUXExperimental.Test/TAEF/MUXExperimental.Test.TAEF.csproj b/src/controls/test/MUXExperimentalTest/MUXExperimental.Test/TAEF/MUXExperimental.Test.TAEF.csproj
deleted file mode 100644
index aba35733c6..0000000000
--- a/src/controls/test/MUXExperimentalTest/MUXExperimental.Test/TAEF/MUXExperimental.Test.TAEF.csproj
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v3.1</TargetFrameworkVersion>
-    <RuntimeIdentifiers>win-x86;win-x64;win-arm;win-arm64</RuntimeIdentifiers>
-    <!-- The binaries we're building against are managed, so which platform's folder they come out of is immaterial.
-         For simplicity's sake, we'll always get them from the x86 folder, but the CoreClr binaries are the same everywhere. -->
-    <TaefRootDirectory>$(NuGetPackageRoot)taef.redist.wlk\10.31.180822002\build\Binaries\x86\CoreClr\</TaefRootDirectory>
-    <ProjectGuid>{14018522-0223-4334-87D2-C343074DDD48}</ProjectGuid>
-    <DefineConstants>$(DefineConstants);USING_TAEF</DefineConstants>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="TE.Managed">
-      <HintPath>$(TaefRootDirectory)TE.Managed.dll</HintPath>
-    </Reference>
-    <Reference Include="TE.ManagedTestMode">
-      <HintPath>$(TaefRootDirectory)TE.ManagedTestMode.dll</HintPath>
-    </Reference>
-    <Reference Include="Wex.Common.Managed">
-      <HintPath>$(TaefRootDirectory)Wex.Common.Managed.dll</HintPath>
-    </Reference>
-    <Reference Include="Wex.Logger.Interop">
-      <HintPath>$(TaefRootDirectory)Wex.Logger.Interop.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Windows.Apps.Test" Version="1.0.181205002" />
-    <PackageReference Include="TAEF.Redist.Wlk" Version="10.31.180822002" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\testinfra\MUXTestInfra\TAEF\MUXTestInfra.TAEF.csproj" />
-  </ItemGroup>
-  <Import Project="..\MUXExperimental.Test.Shared.projitems" />
-</Project>
\ No newline at end of file
diff --git a/src/controls/test/MUXExperimentalTest/MUXExperimentalTest.props b/src/controls/test/MUXExperimentalTest/MUXExperimentalTest.props
deleted file mode 100644
index 67445c19bd..0000000000
--- a/src/controls/test/MUXExperimentalTest/MUXExperimentalTest.props
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\SdkVersion.props" />
-
-  <!-- Global Properties -->
-  <PropertyGroup>
-    <GenerateProjectSpecificOutputFolder>True</GenerateProjectSpecificOutputFolder>   
-  </PropertyGroup>
-
-</Project>
diff --git a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/App.xaml b/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/App.xaml
deleted file mode 100644
index b10d4828cd..0000000000
--- a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/App.xaml
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
-<Application
-    x:Class="MUXExperimentalTestApp.App"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:experimental="using:Microsoft.Experimental.UI.Xaml.Controls"
-    xmlns:controls="using:Microsoft.UI.Xaml.Controls"
-    xmlns:local="using:MUXExperimentalTestApp">
-    <Application.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <controls:XamlControlsResources />
-                <experimental:ExperimentalXamlControlsResources />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Application.Resources>
-</Application>
diff --git a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/App.xaml.cs b/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/App.xaml.cs
deleted file mode 100644
index 57f4ed9578..0000000000
--- a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/App.xaml.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-using MUXControlsTestApp;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.ApplicationModel;
-using Windows.ApplicationModel.Activation;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-
-namespace MUXExperimentalTestApp
-{
-    /// <summary>
-    /// Provides application-specific behavior to supplement the default Application class.
-    /// </summary>
-    sealed partial class App : Application
-    {
-        /// <summary>
-        /// Initializes the singleton application object.  This is the first line of authored code
-        /// executed, and as such is the logical equivalent of main() or WinMain().
-        /// </summary>
-        public App()
-        {
-            this.InitializeComponent();
-            this.Suspending += OnSuspending;
-        }
-
-        /// <summary>
-        /// Invoked when the application is launched normally by the end user.  Other entry points
-        /// will be used such as when the application is launched to open a specific file.
-        /// </summary>
-        /// <param name="e">Details about the launch request and process.</param>
-        protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs e)
-        {
-            Frame rootFrame = Window.Current.Content as TestFrame;
-
-            // Do not repeat app initialization when the Window already has content,
-            // just ensure that the window is active
-            if (rootFrame == null)
-            {
-                // Create a Frame to act as the navigation context and navigate to the first page
-                rootFrame = new TestFrame(typeof(MainPage));
-
-                rootFrame.NavigationFailed += OnNavigationFailed;
-
-                if (e.PreviousExecutionState == ApplicationExecutionState.Terminated)
-                {
-                    //TODO: Load state from previously suspended application
-                }
-
-                // Place the frame in the current Window
-                Window.Current.Content = rootFrame;
-            }
-
-            Microsoft.UI.Xaml.Controls.BackdropMaterial.SetApplyToRootOrPageBackground(rootFrame, true);
-
-            if (e.PrelaunchActivated == false)
-            {
-                if (rootFrame.Content == null)
-                {
-                    // When the navigation stack isn't restored navigate to the first page,
-                    // configuring the new page by passing required information as a navigation
-                    // parameter
-                    rootFrame.Navigate(typeof(MainPage), e.Arguments);
-                }
-                // Ensure the current window is active
-                Window.Current.Activate();
-            }
-        }
-
-        /// <summary>
-        /// Invoked when Navigation to a certain page fails
-        /// </summary>
-        /// <param name="sender">The Frame which failed navigation</param>
-        /// <param name="e">Details about the navigation failure</param>
-        void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
-        {
-            throw new Exception("Failed to load Page " + e.SourcePageType.FullName);
-        }
-
-        /// <summary>
-        /// Invoked when application execution is being suspended.  Application state is saved
-        /// without knowing whether the application will be terminated or resumed with the contents
-        /// of memory still intact.
-        /// </summary>
-        /// <param name="sender">The source of the suspend request.</param>
-        /// <param name="e">Details about the suspend request.</param>
-        private void OnSuspending(object sender, SuspendingEventArgs e)
-        {
-            var deferral = e.SuspendingOperation.GetDeferral();
-            //TODO: Save application state and stop any background activity
-            deferral.Complete();
-        }
-    }
-}
diff --git a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/Assets/LockScreenLogo.scale-200.png b/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/Assets/LockScreenLogo.scale-200.png
deleted file mode 100644
index c4393bbc22..0000000000
Binary files a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/Assets/LockScreenLogo.scale-200.png and /dev/null differ
diff --git a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/Assets/SplashScreen.scale-200.png b/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/Assets/SplashScreen.scale-200.png
deleted file mode 100644
index 203ec9d005..0000000000
Binary files a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/Assets/SplashScreen.scale-200.png and /dev/null differ
diff --git a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/Assets/Square150x150Logo.scale-200.png b/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/Assets/Square150x150Logo.scale-200.png
deleted file mode 100644
index ef5aa24f3a..0000000000
Binary files a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/Assets/Square150x150Logo.scale-200.png and /dev/null differ
diff --git a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/Assets/Square44x44Logo.scale-200.png b/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/Assets/Square44x44Logo.scale-200.png
deleted file mode 100644
index 5f765eb779..0000000000
Binary files a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/Assets/Square44x44Logo.scale-200.png and /dev/null differ
diff --git a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
deleted file mode 100644
index ce738d9882..0000000000
Binary files a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/Assets/Square44x44Logo.targetsize-24_altform-unplated.png and /dev/null differ
diff --git a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/Assets/StoreLogo.png b/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/Assets/StoreLogo.png
deleted file mode 100644
index f48dd01979..0000000000
Binary files a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/Assets/StoreLogo.png and /dev/null differ
diff --git a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/Assets/Wide310x150Logo.scale-200.png b/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/Assets/Wide310x150Logo.scale-200.png
deleted file mode 100644
index 6a0c0bd22e..0000000000
Binary files a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/Assets/Wide310x150Logo.scale-200.png and /dev/null differ
diff --git a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/MUXExperimentalTestApp.csproj b/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/MUXExperimentalTestApp.csproj
deleted file mode 100644
index b98afa4c17..0000000000
--- a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/MUXExperimentalTestApp.csproj
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildProjectDirectory)\..\MUXExperimentalTest.props" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProjectGuid>{CCA3696F-5CAC-421D-8528-4D9122B4D240}</ProjectGuid>
-    <OutputType>AppContainerExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>MUXExperimentalTestApp</RootNamespace>
-    <AssemblyName>MUXExperimentalTestApp</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">$(MuxSdkVersion)</TargetPlatformVersion>
-    <TargetPlatformMinVersion>$(WindowsAppSdkTargetPlatformVersion)</TargetPlatformMinVersion>
-    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
-    <PackageCertificateKeyFile>..\..\..\..\build\WinUITest.pfx</PackageCertificateKeyFile>
-    <AppxPackageName>MUXExperimentalTestApp</AppxPackageName>
-    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
-    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
-    <AppxBundle>Never</AppxBundle>
-    <AppxBundlePlatforms>x86</AppxBundlePlatforms>
-    <AppInstallerUpdateFrequency>1</AppInstallerUpdateFrequency>
-    <AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
-    <GenerateAppxPackageOnBuild>True</GenerateAppxPackageOnBuild>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
-    <DebugSymbols>true</DebugSymbols>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>ARM64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>ARM64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <PropertyGroup>
-    <NoWarn>
-      $(NoWarn);
-      8305 <!-- 'x' is for evaluation purposes only and is subject to change or removal in future updates. --></NoWarn>
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="MainPage.xaml.cs">
-      <DependentUpon>MainPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TestInventory.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <AppxManifest Include="Package.appxmanifest">
-      <SubType>Designer</SubType>
-    </AppxManifest>
-    <None Include="..\..\..\build\MSTest.pfx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Properties\Default.rd.xml" />
-    <Content Include="Assets\LockScreenLogo.scale-200.png" />
-    <Content Include="Assets\SplashScreen.scale-200.png" />
-    <Content Include="Assets\Square150x150Logo.scale-200.png" />
-    <Content Include="Assets\Square44x44Logo.scale-200.png" />
-    <Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
-    <Content Include="Assets\StoreLogo.png" />
-    <Content Include="Assets\Wide310x150Logo.scale-200.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Page Include="MainPage.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.8</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.6.1</Version>
-    </PackageReference>
-    <PackageReference Include="MUXCustomBuildTasks">
-      <Version>1.0.67</Version>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\dev\dll\Microsoft.Experimental.UI.Xaml.vcxproj">
-      <Project>{4647fa1b-124e-4447-af56-4016ab6faf4a}</Project>
-      <Name>Microsoft.Experimental.UI.Xaml</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="..\..\TestAppUtils\TestAppUtils.projitems" Label="Shared" />
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
-    <VisualStudioVersion>14.0</VisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\dev\SampleControl\TestUI\SampleControl_TestUI.projitems" Label="Shared" />
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\dev\TitleBar\TestUI\TitleBar_TestUI.projitems" Label="Shared" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <Import Project="$(MSBuildProjectDirectory)\..\..\..\CustomInlineTasks.targets" />
-  <Target Name="AfterBuild">
-    <RunPowershellScript Path="$(SolutionDir)\tools\ExtractPackageDependencies.ps1" Parameters="-sourceFile $(OutDir)\$(AppxPackageName).build.appxrecipe -platform $(PlatformName) -outputFile $(AppxPackageTestDir)\$(AppxPackageName).dependencies.txt" FilesWritten="$(AppxPackageTestDir)\$(AppxPackageName).dependencies.txt" />
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/MainPage.xaml b/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/MainPage.xaml
deleted file mode 100644
index a8e2838358..0000000000
--- a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/MainPage.xaml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
-<Page
-    x:Class="MUXExperimentalTestApp.MainPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:utils="using:MUXControlsTestApp"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-
-    <Page.Resources>
-        <utils:NavigateToTestCommand x:Key="NavigateToTestCommand"/>
-    </Page.Resources>
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <ScrollViewer VerticalAlignment="Top" HorizontalAlignment="Center" VerticalScrollBarVisibility="Auto" Margin="40">
-            <ItemsControl ItemsSource="{x:Bind Tests}">
-                <ItemsControl.ItemTemplate>
-                    <DataTemplate>
-                        <Button
-                                Content="{Binding Name}"
-                                CommandParameter="{Binding}"
-                                Command="{StaticResource NavigateToTestCommand}"
-                                AutomationProperties.Name="{Binding Name}"
-                                MinWidth="250"
-                                Margin="2"
-                                />
-                    </DataTemplate>
-                </ItemsControl.ItemTemplate>
-            </ItemsControl>
-        </ScrollViewer>
-    </Grid>
-</Page>
diff --git a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/MainPage.xaml.cs b/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/MainPage.xaml.cs
deleted file mode 100644
index decb3490a3..0000000000
--- a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/MainPage.xaml.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-using MUXControlsTestApp;
-using System.Collections.Generic;
-using System.Diagnostics;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Automation;
-using Microsoft.UI.Xaml.Automation.Peers;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-
-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=402352&clcid=0x409
-
-namespace MUXExperimentalTestApp
-{
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class MainPage : Page
-    {
-        public MainPage()
-        {
-            this.InitializeComponent();
-
-            AutomationProperties.SetName(this, "MainPage");
-
-            var sc = new Microsoft.Experimental.UI.Xaml.Controls.SampleControl();
-
-            Loaded += OnLoaded;
-        }
-
-        public List<TestDeclaration> Tests
-        {
-            get { return TestInventory.Tests; }
-        }
-
-        protected override AutomationPeer OnCreateAutomationPeer()
-        {
-            return new FrameworkElementAutomationPeer(this);
-        }
-
-        private void OnLoaded(object sender, RoutedEventArgs e)
-        {
-            var automationPeer = new FrameworkElementAutomationPeer(this);
-            automationPeer.RaiseAutomationEvent(AutomationEvents.AsyncContentLoaded);
-        }
-
-        DependencyObject SearchVisualTree(DependencyObject root, string name)
-        {
-            int size = VisualTreeHelper.GetChildrenCount(root);
-            DependencyObject child = null;
-
-            for (int i = 0; i < size && child == null; i++)
-            {
-                DependencyObject depObj = VisualTreeHelper.GetChild(root, i);
-                FrameworkElement fe = depObj as FrameworkElement;
-
-                if (fe.Name.Equals(name))
-                {
-                    child = fe;
-                }
-                else
-                {
-                    child = SearchVisualTree(fe, name);
-                }
-            }
-
-            return child;
-        }
-
-        protected override void OnNavigatedTo(NavigationEventArgs e)
-        {
-            var testContentLoadedCheckBox = SearchVisualTree(this.Frame, "TestContentLoadedCheckBox") as CheckBox;
-            if (testContentLoadedCheckBox != null)
-            {
-                testContentLoadedCheckBox.IsChecked = false;
-            }
-            else
-            {
-                Debug.WriteLine("Warning: Couldn't find the TestContentLoadedCheckBox to uncheck in OnNavigatedTo");
-            }
-        }
-    }
-}
diff --git a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/Package.appxmanifest b/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/Package.appxmanifest
deleted file mode 100644
index 97045f7c20..0000000000
--- a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/Package.appxmanifest
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="MUXExperimentalTestApp" Publisher="CN=WinUITest" Version="1.0.0.0" />
-  <mp:PhoneIdentity PhoneProductId="1cab2070-ecbb-489e-adf4-580a014e9d7f" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
-  <Properties>
-    <DisplayName>MUXExperimentalTestApp</DisplayName>
-    <PublisherDisplayName>Microsoft Corporation</PublisherDisplayName>
-    <Logo>Assets\StoreLogo.png</Logo>
-  </Properties>
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
-  </Dependencies>
-  <Resources>
-    <Resource Language="x-generate" />
-  </Resources>
-  <Applications>
-    <Application Id="App" Executable="MUXExperimentalTestApp.exe" EntryPoint="MUXExperimentalTestApp.App">
-      <uap:VisualElements DisplayName="MUXExperimentalTestApp" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="MUXExperimentalTestApp" BackgroundColor="transparent">
-        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png">
-        </uap:DefaultTile>
-        <uap:SplashScreen Image="Assets\SplashScreen.png" />
-      </uap:VisualElements>
-    </Application>
-  </Applications>
-  <Capabilities>
-    <Capability Name="internetClient" />
-    <Capability Name="internetClientServer" />
-  </Capabilities>
-</Package>
\ No newline at end of file
diff --git a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/Properties/AssemblyInfo.cs b/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/Properties/AssemblyInfo.cs
deleted file mode 100644
index 68109dbf1d..0000000000
--- a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("MUXExperimentalTestApp")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("MUXExperimentalTestApp")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/Properties/Default.rd.xml b/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/Properties/Default.rd.xml
deleted file mode 100644
index f3ed5a5241..0000000000
--- a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/Properties/Default.rd.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
-    This file contains Runtime Directives used by .NET Native. The defaults here are suitable for most
-    developers. However, you can modify these parameters to modify the behavior of the .NET Native
-    optimizer.
-
-    Runtime Directives are documented at https://go.microsoft.com/fwlink/?LinkID=391919
-
-    To fully enable reflection for App1.MyClass and all of its public/private members
-    <Type Name="App1.MyClass" Dynamic="Required All"/>
-
-    To enable dynamic creation of the specific instantiation of AppClass<T> over System.Int32
-    <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />
-
-    Using the Namespace directive to apply reflection policy to all the types in a particular namespace
-    <Namespace Name="DataClasses.ViewModels" Serialize="All" />
--->
-
-<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
-  <Application>
-    <!--
-      An Assembly element with Name="*Application*" applies to all assemblies in
-      the application package. The asterisks are not wildcards.
-    -->
-    <Assembly Name="*Application*" Dynamic="Required All" />
-
-    <!-- Add your application specific runtime directives here. -->
-
-
-  </Application>
-</Directives>
diff --git a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/TestInventory.cs b/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/TestInventory.cs
deleted file mode 100644
index 6c021c22ca..0000000000
--- a/src/controls/test/MUXExperimentalTest/MUXExperimentalTestApp/TestInventory.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-using MUXControlsTestApp;
-using System.Collections.Generic;
-
-namespace MUXExperimentalTestApp
-{
-    class TestInventory
-    {
-        static TestInventory()
-        {
-            Tests = new List<TestDeclaration>
-            {
-                new TestDeclaration()
-                {
-                    Name = "SampleControl Tests",
-                    PageType = typeof(SampleControlPage),
-                },
-                
-                new TestDeclaration()
-                {
-                    Name = "TitleBar Tests",
-                    PageType = typeof(TitleBarPage),
-                },
-            };
-        }
-
-        public static List<TestDeclaration> Tests { get; private set; }
-    }
-}
diff --git a/src/controls/test/TabViewTearOutApp/App.cpp b/src/controls/test/TabViewTearOutApp/App.cpp
new file mode 100644
index 0000000000..5a181bf92a
--- /dev/null
+++ b/src/controls/test/TabViewTearOutApp/App.cpp
@@ -0,0 +1,48 @@
+#include "pch.h"
+
+#include "App.h"
+
+using namespace winrt;
+using namespace ::Windows::Foundation;
+
+using namespace winrt::Microsoft::UI::Input;
+using namespace winrt::Microsoft::UI::Xaml;
+using namespace winrt::Microsoft::UI::Xaml::Controls;
+using namespace winrt::Microsoft::UI::Xaml::Hosting;
+using namespace winrt::Microsoft::UI::Xaml::Navigation;
+
+using namespace TabViewTearOutApp;
+using namespace TabViewTearOutApp::implementation;
+
+winrt::com_ptr<App> App::s_instance{ nullptr };
+
+App::App()
+{
+    WindowsXamlManager::InitializeForCurrentThread();
+    
+    InitializeComponent();
+
+#if defined _DEBUG && !defined DISABLE_XAML_GENERATED_BREAK_ON_UNHANDLED_EXCEPTION
+    UnhandledException([this](IInspectable const&, UnhandledExceptionEventArgs const& e)
+    {
+        if (IsDebuggerPresent())
+        {
+            auto errorMessage = e.Message();
+            __debugbreak();
+        }
+    });
+#endif
+}
+
+void App::InitInstance()
+{
+    if (!s_instance)
+    {
+        winrt::make<winrt::TabViewTearOutApp::implementation::App>().as(s_instance);
+    }
+}
+
+com_ptr<App> App::GetInstance()
+{
+    return s_instance;
+}
diff --git a/src/controls/test/TabViewTearOutApp/App.h b/src/controls/test/TabViewTearOutApp/App.h
new file mode 100644
index 0000000000..b31e5e2bde
--- /dev/null
+++ b/src/controls/test/TabViewTearOutApp/App.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#pragma push_macro("GetCurrentTime")
+#undef GetCurrentTime
+
+#include "App.xaml.g.h"
+
+#pragma pop_macro("GetCurrentTime")
+
+namespace winrt::TabViewTearOutApp::implementation
+{
+    struct App : AppT<App>
+    {
+        App();
+
+        static void InitInstance();
+        static winrt::com_ptr<App> GetInstance();
+
+    private:
+        static winrt::com_ptr<App> s_instance;
+    };
+}
diff --git a/src/controls/test/TabViewTearOutApp/App.idl b/src/controls/test/TabViewTearOutApp/App.idl
new file mode 100644
index 0000000000..c468e9f5e6
--- /dev/null
+++ b/src/controls/test/TabViewTearOutApp/App.idl
@@ -0,0 +1,3 @@
+namespace TabViewTearOutApp
+{
+}
diff --git a/src/controls/test/TabViewTearOutApp/App.xaml b/src/controls/test/TabViewTearOutApp/App.xaml
new file mode 100644
index 0000000000..a199a38a23
--- /dev/null
+++ b/src/controls/test/TabViewTearOutApp/App.xaml
@@ -0,0 +1,18 @@
+<Application
+    x:Class="TabViewTearOutApp.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="using:System"
+    xmlns:local="using:TabViewTearOutApp">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
+                <!-- Other merged dictionaries here -->
+            </ResourceDictionary.MergedDictionaries>
+            <!-- Other app resources here -->
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>
+
+    
\ No newline at end of file
diff --git a/src/controls/test/TabViewTearOutApp/DesktopWindow.cpp b/src/controls/test/TabViewTearOutApp/DesktopWindow.cpp
new file mode 100644
index 0000000000..fc0d177483
--- /dev/null
+++ b/src/controls/test/TabViewTearOutApp/DesktopWindow.cpp
@@ -0,0 +1,262 @@
+#include "pch.h"
+
+#include "DesktopWindow.h"
+#include "resource.h"
+#include <inspectable.h>
+
+using namespace winrt;
+using namespace winrt::Microsoft::UI;
+using namespace winrt::Microsoft::UI::Xaml;
+using namespace winrt::Microsoft::UI::Xaml::Hosting;
+
+const auto static invalidReason = static_cast<XamlSourceFocusNavigationReason>(-1);
+static const WPARAM invalidKey = (WPARAM)-1;
+
+static XamlSourceFocusNavigationReason GetReasonFromKey(WPARAM key)
+{
+    if (key == VK_TAB)
+    {
+        byte keyboardState[256] = {};
+        WINRT_VERIFY(::GetKeyboardState(keyboardState));
+        auto reason = (keyboardState[VK_SHIFT] & 0x80) ?
+            XamlSourceFocusNavigationReason::Last :
+            XamlSourceFocusNavigationReason::First;
+        return reason;
+    }
+    if (key == VK_LEFT)
+    {
+        return XamlSourceFocusNavigationReason::Left;
+    }
+    if (key == VK_RIGHT)
+    {
+        return XamlSourceFocusNavigationReason::Right;
+    }
+    if (key == VK_UP)
+    {
+        return XamlSourceFocusNavigationReason::Up;
+    }
+    if (key == VK_DOWN)
+    {
+        return XamlSourceFocusNavigationReason::Down;
+    }
+    return invalidReason;
+}
+
+static WPARAM GetKeyFromReason(XamlSourceFocusNavigationReason reason)
+{
+    if (reason == XamlSourceFocusNavigationReason::Last || reason == XamlSourceFocusNavigationReason::First)
+    {
+        return VK_TAB;
+    }
+    if (reason == XamlSourceFocusNavigationReason::Left)
+    {
+        return VK_LEFT;
+    }
+    if (reason == XamlSourceFocusNavigationReason::Right)
+    {
+        return VK_RIGHT;
+    }
+    if (reason == XamlSourceFocusNavigationReason::Up)
+    {
+        return VK_UP;
+    }
+    if (reason == XamlSourceFocusNavigationReason::Down)
+    {
+        return VK_DOWN;
+    }
+    return invalidKey;
+}
+
+int DesktopWindow::s_windowCount{ 0 };
+
+DesktopWindowXamlSource DesktopWindow::GetNextFocusedIsland(MSG* msg)
+{
+    if (msg->message == WM_KEYDOWN)
+    {
+        const auto key = msg->wParam;
+        auto reason = GetReasonFromKey(key);
+        if (reason != invalidReason)
+        {
+            const BOOL previous =
+                (reason == XamlSourceFocusNavigationReason::First ||
+                    reason == XamlSourceFocusNavigationReason::Down ||
+                    reason == XamlSourceFocusNavigationReason::Right) ? false : true;
+
+            const auto currentFocusedWindow = ::GetFocus();
+            const auto nextElement = ::GetNextDlgTabItem(m_hMainWnd, currentFocusedWindow, previous);
+            for (auto const& xamlSource : m_xamlSources)
+            {
+                HWND islandWnd = GetWindowFromWindowId(xamlSource.SiteBridge().WindowId());
+                if (nextElement == islandWnd)
+                {
+                    return xamlSource;
+                }
+            }
+        }
+    }
+
+    return nullptr;
+}
+
+DesktopWindowXamlSource DesktopWindow::GetFocusedIsland()
+{
+    for (auto const& xamlSource : m_xamlSources)
+    {
+        if (xamlSource.HasFocus())
+        {
+            return xamlSource;
+        }
+    }
+    return nullptr;
+}
+
+bool DesktopWindow::NavigateFocus(MSG* msg)
+{
+    if (const auto nextFocusedIsland = GetNextFocusedIsland(msg))
+    {
+        WINRT_VERIFY(!nextFocusedIsland.HasFocus());
+        const auto previousFocusedWindow = ::GetFocus();
+        RECT rect = {};
+        WINRT_VERIFY(::GetWindowRect(previousFocusedWindow, &rect));
+        HWND islandWnd = GetWindowFromWindowId(nextFocusedIsland.SiteBridge().WindowId());
+        POINT pt = { rect.left, rect.top };
+        SIZE size = { rect.right - rect.left, rect.bottom - rect.top };
+        ::ScreenToClient(islandWnd, &pt);
+        const auto hintRect = winrt::Windows::Foundation::Rect({ static_cast<float>(pt.x), static_cast<float>(pt.y), static_cast<float>(size.cx), static_cast<float>(size.cy) });
+        const auto reason = GetReasonFromKey(msg->wParam);
+        const auto request = XamlSourceFocusNavigationRequest(reason, hintRect);
+        lastFocusRequestId = request.CorrelationId();
+        const auto result = nextFocusedIsland.NavigateFocus(request);
+        return result.WasFocusMoved();
+    }
+    else
+    {
+        const bool islandIsFocused = GetFocusedIsland() != nullptr;
+        byte keyboardState[256] = {};
+        WINRT_VERIFY(::GetKeyboardState(keyboardState));
+        const bool isMenuModifier = keyboardState[VK_MENU] & 0x80;
+        if (islandIsFocused && !isMenuModifier)
+        {
+            return false;
+        }
+        const bool isDialogMessage = IsDialogMessage(m_hMainWnd, msg) != 0;
+        return isDialogMessage;
+    }
+}
+
+// ContentPreTranslateMessage is currently in the private/internal IXP package.  For now we just LoadLibrary/GetProcAddress for it,
+// but let's call it directly when it's available.
+typedef BOOL (__stdcall *ContentPreTranslateMessageFuncPtr)(const MSG *pmsg);
+
+int DesktopWindow::MessageLoop(HACCEL hAccelTable)
+{
+    HMODULE windowingDll = ::LoadLibrary(L"Microsoft.UI.Windowing.Core.dll");
+    WINRT_VERIFY(windowingDll != nullptr);
+
+    auto contentPreTranslateMessagePtr = reinterpret_cast<ContentPreTranslateMessageFuncPtr>(
+            ::GetProcAddress(windowingDll, "ContentPreTranslateMessage"));
+    
+    MSG msg = {};
+    
+    while (GetMessage(&msg, nullptr, 0, 0))
+    {        
+        if (!contentPreTranslateMessagePtr(&msg) && !TranslateAccelerator(msg.hwnd, hAccelTable, &msg))
+        {
+            if (!NavigateFocus(&msg))
+            {
+                TranslateMessage(&msg);
+                DispatchMessage(&msg);
+            }
+        }
+    }
+
+    FreeLibrary(windowingDll);
+
+    return (int)msg.wParam;
+}
+
+void DesktopWindow::OnNCCreate(HWND const window, LPARAM const lparam) noexcept
+{
+    auto cs = reinterpret_cast<CREATESTRUCT*>(lparam);
+    auto that = static_cast<DesktopWindow*>(cs->lpCreateParams);
+    WINRT_ASSERT(that);
+    WINRT_ASSERT(!that->GetHandle());
+    that->m_hMainWnd = window;
+    SetWindowLongPtr(window, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(that));
+}
+
+void DesktopWindow::OnTakeFocusRequested(DesktopWindowXamlSource const& sender, DesktopWindowXamlSourceTakeFocusRequestedEventArgs const& args)
+{
+    if (args.Request().CorrelationId() != lastFocusRequestId)
+    {
+        const auto reason = args.Request().Reason();
+        const BOOL previous =
+            (reason == XamlSourceFocusNavigationReason::First ||
+                reason == XamlSourceFocusNavigationReason::Down ||
+                reason == XamlSourceFocusNavigationReason::Right) ? false : true;
+
+        HWND senderHwnd = GetWindowFromWindowId(sender.SiteBridge().WindowId());
+
+        MSG msg = {};
+        msg.hwnd = senderHwnd;
+        msg.message = WM_KEYDOWN;
+        msg.wParam = GetKeyFromReason(reason);
+        if (!NavigateFocus(&msg))
+        {
+            const auto nextElement = ::GetNextDlgTabItem(m_hMainWnd, senderHwnd, previous);
+            ::SetFocus(nextElement);
+        }
+    }
+    else
+    {
+        const auto request = XamlSourceFocusNavigationRequest(XamlSourceFocusNavigationReason::Restore);
+        lastFocusRequestId = request.CorrelationId();
+        sender.NavigateFocus(request);
+    }
+}
+
+DesktopWindowXamlSource DesktopWindow::CreateDesktopWindowsXamlSource(DWORD dwStyle)
+{
+    DesktopWindowXamlSource desktopSource;
+
+    // Parent the DesktopWindowXamlSource object to current window
+    WindowId mainWndId = GetWindowIdFromWindow(m_hMainWnd);
+    desktopSource.Initialize(mainWndId);
+
+    // Get the new child window's hwnd 
+    WindowId childWndId = desktopSource.SiteBridge().WindowId();
+    HWND hWndXamlIsland = GetWindowFromWindowId(childWndId);
+    DWORD dwNewStyle = GetWindowLong(hWndXamlIsland, GWL_STYLE);
+    dwNewStyle |= dwStyle;
+    SetWindowLong(hWndXamlIsland, GWL_STYLE, dwNewStyle);
+
+    m_takeFocusEventRevokers.push_back(desktopSource.TakeFocusRequested(winrt::auto_revoke, { this, &DesktopWindow::OnTakeFocusRequested }));
+
+    m_xamlSources.push_back(desktopSource);
+
+    return desktopSource;
+}
+
+void DesktopWindow::RemoveDesktopWindowXamlSource(winrt::Microsoft::UI::Xaml::Hosting::DesktopWindowXamlSource dwxs)
+{
+    for (int i = 0; i < static_cast<int>(m_xamlSources.size()); ++i)
+    {
+        
+        if (m_xamlSources[i].as<IInspectable>() == dwxs.as<IInspectable>())
+        {
+            m_xamlSources[i].Close();
+            m_xamlSources.erase(m_xamlSources.begin() + i);
+            m_takeFocusEventRevokers.erase(m_takeFocusEventRevokers.begin() + i);
+            
+            return;
+        }
+    }
+}
+
+void DesktopWindow::ClearXamlIslands()
+{
+    while (!m_xamlSources.empty())
+    {
+        RemoveDesktopWindowXamlSource(m_xamlSources.back());
+    }
+}
diff --git a/src/controls/test/TabViewTearOutApp/DesktopWindow.h b/src/controls/test/TabViewTearOutApp/DesktopWindow.h
new file mode 100644
index 0000000000..2557af7c01
--- /dev/null
+++ b/src/controls/test/TabViewTearOutApp/DesktopWindow.h
@@ -0,0 +1,97 @@
+#pragma once
+
+class DesktopWindow
+{
+public:
+    int MessageLoop(HACCEL hAccelTable);
+
+    HWND GetHandle() const
+    {
+        return m_hMainWnd;
+    }
+
+private:
+    winrt::Microsoft::UI::Xaml::Hosting::DesktopWindowXamlSource GetFocusedIsland();
+    void OnTakeFocusRequested(winrt::Microsoft::UI::Xaml::Hosting::DesktopWindowXamlSource const& sender, winrt::Microsoft::UI::Xaml::Hosting::DesktopWindowXamlSourceTakeFocusRequestedEventArgs const& args);
+    winrt::Microsoft::UI::Xaml::Hosting::DesktopWindowXamlSource GetNextFocusedIsland(MSG* msg);
+    bool NavigateFocus(MSG* msg);
+
+protected:
+
+    winrt::Microsoft::UI::Xaml::Hosting::DesktopWindowXamlSource CreateDesktopWindowsXamlSource(DWORD dwStylet);
+    void ClearXamlIslands();
+    void RemoveDesktopWindowXamlSource(winrt::Microsoft::UI::Xaml::Hosting::DesktopWindowXamlSource dwxs);
+
+    static void OnNCCreate(HWND const window, LPARAM const lparam) noexcept;
+
+    bool m_shouldQuitMessagePump { false };
+
+    HWND m_hMainWnd { NULL };
+    winrt::guid lastFocusRequestId;
+    std::vector<winrt::Microsoft::UI::Xaml::Hosting::DesktopWindowXamlSource::TakeFocusRequested_revoker> m_takeFocusEventRevokers;
+    std::vector<winrt::Microsoft::UI::Xaml::Hosting::DesktopWindowXamlSource> m_xamlSources;
+    static int s_windowCount;
+};
+
+template <typename T>
+class DesktopWindowT : public DesktopWindow
+{
+protected:
+    using base_type = DesktopWindowT<T>;
+
+    static LRESULT __stdcall WndProc(HWND const window, UINT const message, WPARAM const wparam, LPARAM const lparam) noexcept
+    {
+        WINRT_ASSERT(window);
+
+        if (WM_NCCREATE == message)
+        {
+            DesktopWindow::OnNCCreate(window, lparam);
+        }
+        else if (T * that = GetThisFromHandle(window))
+        {
+            return that->MessageHandler(message, wparam, lparam);
+        }
+
+        return DefWindowProc(window, message, wparam, lparam);
+    }
+
+    [[nodiscard]] LRESULT MessageHandler(UINT const message, WPARAM const wParam, LPARAM const lParam) noexcept
+    {
+        switch (message)
+        {
+            HANDLE_MSG(GetHandle(), WM_ACTIVATE, OnActivate);
+            HANDLE_MSG(GetHandle(), WM_SETFOCUS, OnSetFocus);
+        }
+        return DefWindowProc(GetHandle(), message, wParam, lParam);
+    }
+
+private:
+
+    void OnActivate(HWND, UINT state, HWND hwndActDeact, BOOL fMinimized)
+    {
+        UNREFERENCED_PARAMETER(hwndActDeact);
+        UNREFERENCED_PARAMETER(fMinimized);
+
+        if (state == WA_INACTIVE)
+        {
+            m_hwndLastFocus = GetFocus();
+        }
+    }
+
+    void OnSetFocus(HWND, HWND hwndOldFocus)
+    {
+        UNREFERENCED_PARAMETER(hwndOldFocus);
+
+        if (m_hwndLastFocus) 
+        {
+            SetFocus(m_hwndLastFocus);
+        }
+    }
+
+    static T* GetThisFromHandle(HWND const window) noexcept
+    {
+        return reinterpret_cast<T*>(GetWindowLongPtr(window, GWLP_USERDATA));
+    }
+
+    HWND m_hwndLastFocus = nullptr;
+};
diff --git a/src/controls/test/TabViewTearOutApp/MainPage.idl b/src/controls/test/TabViewTearOutApp/MainPage.idl
new file mode 100644
index 0000000000..3a10e8b978
--- /dev/null
+++ b/src/controls/test/TabViewTearOutApp/MainPage.idl
@@ -0,0 +1,10 @@
+namespace TabViewTearOutApp
+{
+    [default_interface]
+    runtimeclass MainPage : Microsoft.UI.Xaml.Controls.Page
+    {
+        MainPage();
+
+        IObservableVector<IInspectable> StringList{ get; };
+    }
+}
diff --git a/src/controls/test/TabViewTearOutApp/MainPage.xaml b/src/controls/test/TabViewTearOutApp/MainPage.xaml
new file mode 100644
index 0000000000..30fc1f8aea
--- /dev/null
+++ b/src/controls/test/TabViewTearOutApp/MainPage.xaml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Page
+    x:Class="TabViewTearOutApp.MainPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:helpers="using:AppTestAutomationHelpers"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <StackPanel>
+        <StackPanel.Resources>
+            <DataTemplate x:Key="TabViewItemTemplate">
+                <TabViewItem AutomationProperties.Name="{Binding}" Header="{Binding}" Content="{Binding}">
+                    <TabViewItem.ContentTemplate>
+                        <DataTemplate>
+                            <Grid Margin="16">
+                                <TextBlock Text="{Binding}"/>
+                            </Grid>
+                        </DataTemplate>
+                    </TabViewItem.ContentTemplate>
+                </TabViewItem>
+            </DataTemplate>
+        </StackPanel.Resources>
+        
+        <helpers:TestAutomationHelpersPanel />
+        <TabView
+            AutomationProperties.Name="TearOutTabsTabView"
+            CanTearOutTabs="True"
+            TabItemsSource="{x:Bind StringList}"
+            TabItemTemplate="{StaticResource TabViewItemTemplate}"
+            TabTearOutWindowRequested="OnTabTearOutWindowRequested"
+            TabTearOutRequested="OnTabTearOutRequested"
+            ExternalTornOutTabsDropping="OnExternalTornOutTabsDropping"
+            ExternalTornOutTabsDropped="OnExternalTornOutTabsDropped" />
+        <TabView
+            AutomationProperties.Name="NonTearOutTabsTabView"
+            TabItemsSource="{x:Bind StringList}"
+            TabItemTemplate="{StaticResource TabViewItemTemplate}" />
+    </StackPanel>
+</Page>
diff --git a/src/controls/test/TabViewTearOutApp/MainPage.xaml.cpp b/src/controls/test/TabViewTearOutApp/MainPage.xaml.cpp
new file mode 100644
index 0000000000..f675162adf
--- /dev/null
+++ b/src/controls/test/TabViewTearOutApp/MainPage.xaml.cpp
@@ -0,0 +1,86 @@
+#include "pch.h"
+#include "MainPage.xaml.h"
+#if __has_include("MainPage.g.cpp")
+#include "MainPage.g.cpp"
+#endif
+
+#include "MainWindow.h"
+
+using namespace winrt;
+using namespace Microsoft::UI::Xaml;
+using namespace Microsoft::UI::Xaml::Controls;
+using namespace Windows::Foundation::Collections;
+
+namespace winrt::TabViewTearOutApp::implementation
+{
+    MainPage::MainPage()
+    {
+        m_stringList.Append(winrt::box_value(L"Item 1"));
+        m_stringList.Append(winrt::box_value(L"Item 2"));
+        m_stringList.Append(winrt::box_value(L"Item 3"));
+    }
+
+    void MainPage::Init(winrt::com_array<IInspectable> const& stringList)
+    {
+        if (!stringList.empty())
+        {
+            m_stringList.Clear();
+
+            for (IInspectable string : stringList)
+            {
+                m_stringList.Append(string);
+            }
+        }
+    }
+
+    void MainPage::OnTabTearOutWindowRequested(TabView const& sender, TabViewTabTearOutWindowRequestedEventArgs const& args)
+    {
+        UNREFERENCED_PARAMETER(sender);
+
+        HWND newWindowHwnd = MainWindow::CreateNewWindow(SW_HIDE, args.Items());
+        args.NewWindowId(winrt::Microsoft::UI::GetWindowIdFromWindow(newWindowHwnd));
+    }
+
+    void MainPage::OnTabTearOutRequested(TabView const& sender, TabViewTabTearOutRequestedEventArgs const& args)
+    {
+        UNREFERENCED_PARAMETER(sender);
+        auto items = args.Items();
+
+        for (uint32_t i = 0; i < items.size(); i++)
+        {
+            auto item = items[i];
+            uint32_t index;
+            if (m_stringList.IndexOf(item, index))
+            {
+                m_stringList.RemoveAt(index);
+            }
+        }
+    }
+
+    void MainPage::OnExternalTornOutTabsDropping(TabView const& sender, TabViewExternalTornOutTabsDroppingEventArgs const& args)
+    {
+        UNREFERENCED_PARAMETER(sender);
+
+        args.AllowDrop(true);
+    }
+
+    void MainPage::OnExternalTornOutTabsDropped(TabView const& sender, TabViewExternalTornOutTabsDroppedEventArgs const& args)
+    {
+        UNREFERENCED_PARAMETER(sender);
+        auto items = args.Items();
+
+        for (uint32_t i = 0; i < items.size(); i++)
+        {
+            uint32_t index;
+            if (m_stringList.IndexOf(items[i], index))
+            {
+                m_stringList.RemoveAt(index);
+            }
+        }
+
+        for (uint32_t i = 0; i < items.size(); i++)
+        {
+            m_stringList.InsertAt(args.DropIndex() + i, items[i]);
+        }
+    }
+}
diff --git a/src/controls/test/TabViewTearOutApp/MainPage.xaml.h b/src/controls/test/TabViewTearOutApp/MainPage.xaml.h
new file mode 100644
index 0000000000..cd2214ac4c
--- /dev/null
+++ b/src/controls/test/TabViewTearOutApp/MainPage.xaml.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include "MainPage.g.h"
+
+namespace winrt::TabViewTearOutApp::implementation
+{
+    struct MainPage : MainPageT<MainPage>
+    {
+        MainPage();
+
+        void Init(winrt::com_array<winrt::Windows::Foundation::IInspectable> const& stringList);
+
+        winrt::Windows::Foundation::Collections::IObservableVector<winrt::Windows::Foundation::IInspectable> StringList() { return m_stringList; }
+
+        void OnTabTearOutWindowRequested(winrt::Microsoft::UI::Xaml::Controls::TabView const& sender, winrt::Microsoft::UI::Xaml::Controls::TabViewTabTearOutWindowRequestedEventArgs const& args);
+        void OnTabTearOutRequested(winrt::Microsoft::UI::Xaml::Controls::TabView const& sender, winrt::Microsoft::UI::Xaml::Controls::TabViewTabTearOutRequestedEventArgs const& args);
+        void OnExternalTornOutTabsDropping(winrt::Microsoft::UI::Xaml::Controls::TabView const& sender, winrt::Microsoft::UI::Xaml::Controls::TabViewExternalTornOutTabsDroppingEventArgs const& args);
+        void OnExternalTornOutTabsDropped(winrt::Microsoft::UI::Xaml::Controls::TabView const& sender, winrt::Microsoft::UI::Xaml::Controls::TabViewExternalTornOutTabsDroppedEventArgs const& args);
+
+    private:
+        winrt::Windows::Foundation::Collections::IObservableVector<winrt::Windows::Foundation::IInspectable> m_stringList{ winrt::single_threaded_observable_vector<winrt::Windows::Foundation::IInspectable>() };
+    };
+}
+
+namespace winrt::TabViewTearOutApp::factory_implementation
+{
+    struct MainPage : MainPageT<MainPage, implementation::MainPage>
+    {
+    };
+}
diff --git a/src/controls/test/TabViewTearOutApp/MainWindow.cpp b/src/controls/test/TabViewTearOutApp/MainWindow.cpp
new file mode 100644
index 0000000000..e991bb4874
--- /dev/null
+++ b/src/controls/test/TabViewTearOutApp/MainWindow.cpp
@@ -0,0 +1,208 @@
+#include "pch.h"
+
+#include "App.h"
+#include "MainWindow.h"
+#include "DesktopWindow.h"
+#include <Psapi.h>
+#include "XamlUtil.h"
+
+#include "MainPage.xaml.h"
+
+using namespace winrt;
+using namespace winrt::Windows::Foundation;
+using namespace winrt::Windows::Foundation::Collections;
+using namespace winrt::Windows::Graphics;
+
+using namespace winrt::Microsoft::UI;
+using namespace winrt::Microsoft::UI::Input;
+using namespace winrt::Microsoft::UI::Windowing;
+using namespace winrt::Microsoft::UI::Xaml;
+using namespace winrt::Microsoft::UI::Xaml::Automation;
+using namespace winrt::Microsoft::UI::Xaml::Controls;
+using namespace winrt::Microsoft::UI::Xaml::Markup;
+using namespace winrt::Microsoft::UI::Xaml::Media;
+using namespace winrt::TabViewTearOutApp;
+
+#define MAX_LOADSTRING 100
+
+HINSTANCE g_hInst = nullptr;
+
+#ifdef MULTITHREADED_WINDOWS
+std::vector<std::thread> g_childThreads;
+#endif
+
+HWND MainWindow::CreateNewWindow(int nCmdShow, winrt::com_array<IInspectable> const& stringList)
+{
+#ifdef MULTITHREADED_WINDOWS
+    auto windowReadyEvent = ::CreateEventW(nullptr, FALSE, FALSE, nullptr);
+    HWND newWindowHwnd = nullptr;
+
+    auto createNewWindowThreadFunc = [nCmdShow, windowReadyEvent, stringList, &newWindowHwnd]()
+        {
+            winrt::init_apartment(winrt::apartment_type::single_threaded);
+
+            // Start a DispatcherQueueController.  A DispatcherQueue must be running on the thread for XAML to work.
+            auto dqc = winrt::Microsoft::UI::Dispatching::DispatcherQueueController::CreateOnCurrentThread();
+
+            MainWindow newWindow(nCmdShow, stringList);
+            newWindowHwnd = newWindow.GetHandle();
+            ::SetEvent(windowReadyEvent);
+            newWindow.Run();
+
+            dqc.ShutdownQueue();
+        };
+
+    g_childThreads.push_back(std::thread(createNewWindowThreadFunc));
+    WaitForSingleObject(windowReadyEvent, INFINITE);
+
+    return newWindowHwnd;
+#else
+    auto newWindow = new MainWindow(nCmdShow, stringList);
+    return newWindow->GetHandle();
+#endif
+}
+
+void MainWindow::Run()
+{
+    HACCEL hAccelTable = LoadAccelerators(g_hInst, MAKEINTRESOURCE(IDC_WINDOWCLASS));
+    m_returnValue = MessageLoop(hAccelTable);
+}
+
+MainWindow::MainWindow(int nCmdShow, winrt::com_array<IInspectable> const& stringList) noexcept
+    : m_stringList(winrt::com_array<IInspectable>(stringList.cbegin(), stringList.cend()))
+{
+    WCHAR g_szTitle[MAX_LOADSTRING];
+    WCHAR g_szWindowClass[MAX_LOADSTRING];
+
+    LoadStringW(g_hInst, IDS_APP_TITLE, g_szTitle, MAX_LOADSTRING);
+    LoadStringW(g_hInst, IDC_WINDOWCLASS, g_szWindowClass, MAX_LOADSTRING);
+
+    WNDCLASSEXW wcex = {};
+
+    wcex.cbSize = sizeof(WNDCLASSEX);
+
+    wcex.style = CS_HREDRAW | CS_VREDRAW;
+    wcex.lpfnWndProc = WndProc;
+    wcex.cbClsExtra = 0;
+    wcex.cbWndExtra = 0;
+    wcex.hInstance = g_hInst;
+    wcex.hIcon = LoadIcon(g_hInst, MAKEINTRESOURCE(IDI_LARGE));
+    wcex.hCursor = LoadCursor(nullptr, IDC_ARROW);
+    wcex.hbrBackground = CreateSolidBrush(RGB(234, 246, 249));
+    wcex.lpszMenuName = MAKEINTRESOURCEW(IDC_WINDOWCLASS);
+    wcex.lpszClassName = g_szWindowClass;
+    wcex.hIconSm = LoadIcon(wcex.hInstance, MAKEINTRESOURCE(IDI_SMALL));
+
+    WINRT_VERIFY(RegisterClassExW(&wcex));
+    WINRT_ASSERT(!GetHandle());
+
+    HWND hMainWnd = CreateWindowW(
+        g_szWindowClass,
+        g_szTitle,
+        WS_OVERLAPPEDWINDOW,
+        CW_USEDEFAULT,
+        CW_USEDEFAULT,
+        800,
+        300,
+        nullptr,
+        nullptr,
+        g_hInst,
+        this);
+
+    if (!hMainWnd)
+    {
+        winrt::check_hresult(E_FAIL);
+        return;
+    }
+
+    if (stringList.empty())
+    {
+        ShowWindow(hMainWnd, nCmdShow);
+        UpdateWindow(hMainWnd);
+    }
+}
+
+[[nodiscard]] LRESULT MainWindow::MessageHandler(UINT const message, WPARAM const wParam, LPARAM const lParam) noexcept
+{
+    switch (message)
+    {
+        HANDLE_MSG(GetHandle(), WM_CREATE, OnCreate);
+        HANDLE_MSG(GetHandle(), WM_CLOSE, OnClose);
+        HANDLE_MSG(GetHandle(), WM_DESTROY, OnDestroy);
+        HANDLE_MSG(GetHandle(), WM_ACTIVATE, OnActivate);
+        HANDLE_MSG(GetHandle(), WM_SIZE, OnSize);
+    }
+
+    return base_type::MessageHandler(message, wParam, lParam);
+}
+
+bool MainWindow::OnCreate(HWND, LPCREATESTRUCT)
+{
+    s_windowCount++;
+    winrt::TabViewTearOutApp::implementation::App::InitInstance();
+
+    // If XAML's not already running on the thread, creating a XAML element before creating the DesktopWindowXamlSource will fail.
+    m_desktopWindowXamlSource = CreateDesktopWindowsXamlSource(WS_TABSTOP);
+
+    auto mainPage = winrt::make_self<winrt::TabViewTearOutApp::implementation::MainPage>();
+    mainPage->Init(m_stringList);
+    m_desktopWindowXamlSource.Content(*mainPage);
+
+    m_desktopWindowXamlSource.SystemBackdrop(MicaBackdrop());
+
+    RECT windowRect;
+    ::GetWindowRect(m_hMainWnd, &windowRect);
+    SizeXamlWindow(windowRect.right - windowRect.left, 200);
+
+    return true;
+}
+
+void MainWindow::OnClose(HWND hwnd)
+{
+    m_desktopWindowXamlSource.Close();
+    ::DestroyWindow(hwnd);
+}
+
+void MainWindow::OnDestroy(HWND)
+{
+    s_windowCount--;
+
+    if (s_windowCount == 0)
+    {
+        ::PostQuitMessage(0);
+    }
+}
+
+void MainWindow::OnActivate(HWND hwnd, UINT state, HWND hwndActDeact, BOOL fMinimized)
+{
+    UNREFERENCED_PARAMETER(hwnd);
+    UNREFERENCED_PARAMETER(hwndActDeact);
+    UNREFERENCED_PARAMETER(fMinimized);
+
+    if (state == WA_ACTIVE)
+    {
+        RECT windowRect;
+        ::GetWindowRect(m_hMainWnd, &windowRect);
+        SizeXamlWindow(windowRect.right - windowRect.left, 200);
+    }
+}
+
+void MainWindow::OnSize(HWND hwnd, UINT state, int cx, int cy)
+{
+    UNREFERENCED_PARAMETER(hwnd);
+    UNREFERENCED_PARAMETER(state);
+    UNREFERENCED_PARAMETER(cy);
+
+    SizeXamlWindow(cx, 200);
+}
+
+void MainWindow::SizeXamlWindow(int width, int height)
+{
+    SIZE margin = { 10, 10 };
+    RectInt32 dwxsPosition = { margin.cx, margin.cy, width - margin.cx * 2, height };
+
+    if (m_desktopWindowXamlSource)
+    {
+        m_desktopWindowXamlSource.SiteBridge().MoveAndResize(dwxsPosition);
+    }
+}
diff --git a/src/controls/test/TabViewTearOutApp/MainWindow.h b/src/controls/test/TabViewTearOutApp/MainWindow.h
new file mode 100644
index 0000000000..5d58171b3c
--- /dev/null
+++ b/src/controls/test/TabViewTearOutApp/MainWindow.h
@@ -0,0 +1,43 @@
+#pragma once
+
+#include "resource.h"
+#include "DesktopWindow.h"
+
+// Uncomment this to enable multi-threaded windows (not currently supported by LiftedIXP - see deliverable 48456352 for the work needed before we can enable it).
+//#define MULTITHREADED_WINDOWS
+
+struct Win32Button
+{
+    Win32Button(HWND hwnd, std::function<void(HWND)> func) : m_hwnd(hwnd), m_func(func) {}
+
+    HWND m_hwnd;
+    std::function<void(HWND)> m_func;
+};
+
+class MainWindow : public DesktopWindowT<MainWindow>
+{
+public:
+    static HWND CreateNewWindow(int nCmdShow, winrt::com_array<winrt::Windows::Foundation::IInspectable> const& stringList);
+
+    void Run();
+
+    MainWindow(int nCmdShow, _In_ winrt::com_array<winrt::Windows::Foundation::IInspectable> const& stringList) noexcept;
+
+    [[nodiscard]] LRESULT MessageHandler(UINT const message, WPARAM const wParam, LPARAM const lParam) noexcept;
+
+    int GetReturnValue() const { return m_returnValue; }
+
+private:
+    bool OnCreate(HWND, LPCREATESTRUCT);
+    void OnClose(HWND hwnd);
+    void OnDestroy(HWND hwnd);
+    void OnActivate(HWND hwnd, UINT state, HWND hwndActDeact, BOOL fMinimized);
+    void OnSize(HWND hwnd, UINT state, int cx, int cy);
+
+    void SizeXamlWindow(int width, int height);
+
+    winrt::Microsoft::UI::Xaml::Hosting::DesktopWindowXamlSource m_desktopWindowXamlSource{ nullptr };
+    winrt::com_array<winrt::Windows::Foundation::IInspectable> m_stringList{};
+    
+    int m_returnValue{ 0 };
+};
diff --git a/src/controls/test/TabViewTearOutApp/README.md b/src/controls/test/TabViewTearOutApp/README.md
new file mode 100644
index 0000000000..c78c76a2d2
--- /dev/null
+++ b/src/controls/test/TabViewTearOutApp/README.md
@@ -0,0 +1,3 @@
+# Tab Tear-Out Test App
+
+A key scenario for tab tear-out is having XAML in an island that hosts the tab view - for example, that's the scenario in the case of File Explorer.  As such, we should make sure that that scenario is working properly.  This test app provides an example of that scenario, and will enable us to catch issues there before they bubble up to the larger WinAppSDK and to consumers thereof.
\ No newline at end of file
diff --git a/src/controls/test/TabViewTearOutApp/TabViewTearOutApp.ico b/src/controls/test/TabViewTearOutApp/TabViewTearOutApp.ico
new file mode 100644
index 0000000000..b3ec03bd61
Binary files /dev/null and b/src/controls/test/TabViewTearOutApp/TabViewTearOutApp.ico differ
diff --git a/src/controls/test/TabViewTearOutApp/TabViewTearOutApp.rc b/src/controls/test/TabViewTearOutApp/TabViewTearOutApp.rc
new file mode 100644
index 0000000000..8681f28a43
Binary files /dev/null and b/src/controls/test/TabViewTearOutApp/TabViewTearOutApp.rc differ
diff --git a/src/controls/test/TabViewTearOutApp/TabViewTearOutApp.vcxproj b/src/controls/test/TabViewTearOutApp/TabViewTearOutApp.vcxproj
new file mode 100644
index 0000000000..c7369a2765
--- /dev/null
+++ b/src/controls/test/TabViewTearOutApp/TabViewTearOutApp.vcxproj
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(environment.props))" />
+  <PropertyGroup Label="Globals">
+    <CppWinRTOptimized>true</CppWinRTOptimized>
+    <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
+    <MinimalCoreWin>true</MinimalCoreWin>
+    <ProjectGuid>{86317243-45a8-4770-a4b2-768f721e5f9b}</ProjectGuid>
+    <ProjectName>TabViewTearOutApp</ProjectName>
+    <RootNamespace>TabViewTearOutApp</RootNamespace>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
+    <AppContainerApplication>false</AppContainerApplication>
+    <AppxPackage>false</AppxPackage>
+    <ApplicationType>Windows Store</ApplicationType>
+    <ApplicationTypeRevision>$(MuxSdkVersion)</ApplicationTypeRevision>
+    <WindowsTargetPlatformVersion>$(MuxSdkVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
+    <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
+    <MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);WMC1501</MSBuildWarningsAsMessages>
+    <!-- This app is unpackaged, so we need to separate the intermediate output path from the output path
+         so we can selectively only binplace the latter. -->
+    <IntermediateOutputPathSubdirectory>Intermediate</IntermediateOutputPathSubdirectory>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.$(WindowsAppSdkPackageVersion)\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.$(WindowsAppSdkPackageVersion)\build\native\Microsoft.WindowsAppSDK.props')" />
+  <Import Project="$(NugetPackageDirectory)\Microsoft.Windows.CppWinRT.$(CppWinRTVersion)\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(NugetPackageDirectory)\Microsoft.Windows.CppWinRT.$(CppWinRTVersion)\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level4</WarningLevel>
+      <AdditionalOptions>%(AdditionalOptions) /bigobj /FS</AdditionalOptions>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;%(PreprocessorDefinitions);DISABLE_XAML_GENERATED_MAIN</PreprocessorDefinitions>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(LiftedIxpInternalIncludePath);$(LiftedIxpIncludePath)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>
+        kernel32.lib;
+        user32.lib;
+        %(AdditionalDependencies);
+        gdi32.lib;
+      </AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <Manifest Include="app.manifest" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="MainPage.xaml.h">
+      <DependentUpon>MainPage.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </ClInclude>
+    <ClInclude Include="DesktopWindow.h" />
+    <ClInclude Include="MainWindow.h" />
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="App.h">
+      <DependentUpon>App.xaml</DependentUpon>
+    </ClInclude>
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="targetver.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="MainPage.xaml.cpp">
+      <DependentUpon>MainPage.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </ClCompile>
+    <ClCompile Include="DesktopWindow.cpp" />
+    <ClCompile Include="MainWindow.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="App.cpp">
+      <DependentUpon>App.xaml</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="WinMain.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <Midl Include="App.idl">
+      <SubType>Code</SubType>
+      <DependentUpon>App.xaml</DependentUpon>
+    </Midl>
+    <Midl Include="MainPage.idl">
+      <DependentUpon>MainPage.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Midl>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="TabViewTearOutApp.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="small.ico" />
+    <Image Include="TabViewTearOutApp.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(MUXProjectRoot)\Samples\AppTestAutomationHelpers\AppTestAutomationHelpers.vcxproj">
+      <Project>{128e6f7a-578c-48dc-bd3f-750ec662c268}</Project>
+      <Name>AppTestAutomationHelpers</Name>
+    </ProjectReference>
+    <ProjectReference Include="$(MUXProjectRoot)\MergedWinMD\private\MergedWinMD.vcxproj" ReferenceOutputAssembly="False" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="MainPage.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.$(WindowsAppSdkPackageVersion)\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.$(WindowsAppSdkPackageVersion)\build\native\Microsoft.WindowsAppSDK.targets')" />
+    <Import Project="$(NugetPackageDirectory)\Microsoft.Windows.CppWinRT.$(CppWinRTVersion)\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.Windows.CppWinRT.$(CppWinRTVersion)\build\native\Microsoft.Windows.CppWinRT.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.$(WindowsAppSdkPackageVersion)\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.$(WindowsAppSdkPackageVersion)\build\native\Microsoft.WindowsAppSDK.props'))" />
+    <Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.$(WindowsAppSdkPackageVersion)\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.$(WindowsAppSdkPackageVersion)\build\native\Microsoft.WindowsAppSDK.targets'))" />
+    <Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.Windows.CppWinRT.$(CppWinRTVersion)\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.Windows.CppWinRT.$(CppWinRTVersion)\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.Windows.CppWinRT.$(CppWinRTVersion)\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.Windows.CppWinRT.$(CppWinRTVersion)\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+  </Target>
+  <PropertyGroup>
+    <ResolveReferencesDependsOn>ReferencePrivateWinUIWinMDs;$(ResolveReferencesDependsOn)</ResolveReferencesDependsOn>
+  </PropertyGroup>
+  <Target Name="ReferencePrivateWinUIWinMDs">
+    <!-- This is a test app that can exercise preview or private APIs, so we need to ensure we reference the set of private WinMDs. -->
+    <PropertyGroup>
+      <WinUIPackagePath>$(NugetPackageDirectory)\Microsoft.WindowsAppSDK.$(WindowsAppSdkPackageVersion)\</WinUIPackagePath>
+      <WinMDTempPath>$(TEMP)\TabViewTearOutAppWinMDs\</WinMDTempPath>
+    </PropertyGroup>
+    <ItemGroup>
+      <Reference Remove="@(Reference)" Condition="$([System.String]::Copy('%(Identity)').StartsWith('$(WinUIPackagePath)'))" />
+      <Reference Remove="@(Reference)" Condition="$([System.String]::Copy('%(HintPath)').StartsWith('$(WinUIPackagePath)'))" />
+      <Reference Include="$(ArtifactsObjDir)MergedWinMD\private\Merged\*.winmd" />
+    </ItemGroup>
+    <!-- We do, however, need to include these WinMDs that are not included in our merged WinMDs.
+         We can't include them in-place, though, because Microsoft.UI.Xaml.winmd will also be pulled in then, since C++/WinRT references metadata folders rather than files.
+         To get around that limitation, we'll copy the WinMDs we need to a temp folder and include them from there. -->
+    <ItemGroup>
+      <OtherWinMDs Include="$(WinUIPackagePath)\lib\uap10.0\*.winmd" Exclude="$(WinUIPackagePath)\lib\uap10.0\Microsoft.UI.Xaml.winmd" />
+    </ItemGroup>
+    <RemoveDir Directories="$(WinMDTempPath)" />
+    <MakeDir Directories="$(WinMDTempPath)" />
+    <Copy SourceFiles="@(OtherWinMDs)" DestinationFiles="@(OtherWinMDs->'$(WinMDTempPath)%(Filename)%(Extension)')" SkipUnchangedFiles="True" />
+    <ItemGroup>
+      <Reference Include="$(WinMDTempPath)*.winmd" />
+    </ItemGroup>
+    <ItemGroup>
+      <FileWrites Include="$(WinMDTempPath)*" />
+    </ItemGroup>
+  </Target>
+  <Target Name="AddExtraPayloadFiles" AfterTargets="AddMicrosoftWindowsAppSDKPayloadFiles">
+    <ItemGroup>
+      <AdditionalMicrosoftWindowsAppSDKFiles Include="$(MicrosoftWindowsAppSDKMsixContent)\**\*.xaml" />
+      <AdditionalMicrosoftWindowsAppSDKFiles Include="$(MicrosoftWindowsAppSDKMsixContent)\**\*.xbf" />
+      <AdditionalMicrosoftWindowsAppSDKFiles Include="$(MicrosoftWindowsAppSDKMsixContent)\**\*.html" />
+    </ItemGroup>
+    <CreateItem Include="@(AdditionalMicrosoftWindowsAppSDKFiles)" AdditionalMetadata="CopyToOutputDirectory=PreserveNewest;Link=%(AdditionalMicrosoftWindowsAppSDKFiles.RecursiveDir)%(AdditionalMicrosoftWindowsAppSDKFiles.Filename)%(AdditionalMicrosoftWindowsAppSDKFiles.Extension)">
+      <Output TaskParameter="Include" ItemName="None" />
+    </CreateItem>
+    <CreateItem Include="@(AdditionalMicrosoftWindowsAppSDKFiles)" AdditionalMetadata="CopyToOutputDirectory=PreserveNewest;Link=%(AdditionalMicrosoftWindowsAppSDKFiles.RecursiveDir)%(AdditionalMicrosoftWindowsAppSDKFiles.Filename)%(AdditionalMicrosoftWindowsAppSDKFiles.Extension)">
+      <Output TaskParameter="Include" ItemName="None" />
+    </CreateItem>
+  </Target>
+  <Target Name="CopyPayloadFiles" AfterTargets="Build">
+    <Copy SourceFiles="@(Content)" DestinationFiles="@(Content->'$(OutDir)%(Link)')" Condition="'%(Content.Link)' != ''" />
+    <Copy SourceFiles="@(Content)" DestinationFiles="@(Content->'$(OutDir)%(Identity)')" Condition="'%(Content.Link)' == '' and !$([System.IO.Path]::IsPathRooted('%(Identity)'))" />
+    <Copy SourceFiles="@(Content)" DestinationFiles="@(Content->'$(OutDir)%(Filename)%(Extension)')" Condition="'%(Content.Link)' == '' and $([System.IO.Path]::IsPathRooted('%(Identity)'))" />
+  </Target>
+  <PropertyGroup>
+    <TargetDestination>$(TestBinplaceDestinationPath)</TargetDestination>
+  </PropertyGroup>
+  <Target Name="BinplaceOutDir" BeforeTargets="Binplace" DependsOnTargets="CopyPayloadFiles">
+    <PropertyGroup>
+      <UnpackagedAppsDirectory>$(ArtifactsObjDir)controls\test\MUXControls.Test\UnpackagedApps\$(MSBuildProjectName)\</UnpackagedAppsDirectory>
+    </PropertyGroup>
+    <ItemGroup>
+      <BinplaceItem Include="$(OutDir)**\*" Exclude="$(GeneratedFilesDir)**\*;$(IntermediateOutputPath)**\*">
+        <Destination>$(TargetDestination)\UnpackagedApps\$(MSBuildProjectName)</Destination>
+      </BinplaceItem>
+    </ItemGroup>
+    <Copy SourceFiles="@(BinplaceItem)" DestinationFiles="@(BinplaceItem->'$(UnpackagedAppsDirectory)%(RecursiveDir)%(Filename)%(Extension)')" />
+  </Target>
+</Project>
diff --git a/src/controls/test/TabViewTearOutApp/TabViewTearOutApp.vcxproj.filters b/src/controls/test/TabViewTearOutApp/TabViewTearOutApp.vcxproj.filters
new file mode 100644
index 0000000000..ae7f7a28d6
--- /dev/null
+++ b/src/controls/test/TabViewTearOutApp/TabViewTearOutApp.vcxproj.filters
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Midl Include="App.idl" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="pch.cpp" />
+    <ClCompile Include="App.cpp" />
+    <ClCompile Include="DesktopWindow.cpp" />
+    <ClCompile Include="MainWindow.cpp" />
+    <ClCompile Include="WinMain.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="targetver.h" />
+    <ClInclude Include="DesktopWindow.h" />
+    <ClInclude Include="MainWindow.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="app.manifest" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="TabViewTearOutApp.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="small.ico" />
+    <Image Include="TabViewTearOutApp.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="MainPage.xaml" />
+  </ItemGroup>
+</Project>
diff --git a/src/controls/test/TabViewTearOutApp/WinMain.cpp b/src/controls/test/TabViewTearOutApp/WinMain.cpp
new file mode 100644
index 0000000000..15ad71ae5b
--- /dev/null
+++ b/src/controls/test/TabViewTearOutApp/WinMain.cpp
@@ -0,0 +1,47 @@
+#include "pch.h"
+
+#include "App.h"
+#include "MainWindow.h"
+
+extern HINSTANCE g_hInst;
+
+#ifdef MULTITHREADED_WINDOWS
+extern std::vector<std::thread> g_childThreads;
+#endif
+
+int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
+    _In_opt_ HINSTANCE hPrevInstance,
+    _In_ LPWSTR    lpCmdLine,
+    _In_ int       nCmdShow)
+{
+    UNREFERENCED_PARAMETER(hPrevInstance);
+    UNREFERENCED_PARAMETER(lpCmdLine);
+
+    g_hInst = hInstance;
+
+#ifdef MULTITHREADED_WINDOWS
+    MainWindow::CreateNewWindow(nCmdShow);
+
+    for (int i = 0; i < g_childThreads.size(); i++)
+    {
+        g_childThreads[i].join();
+    }
+#else
+    winrt::init_apartment(winrt::apartment_type::single_threaded);
+
+    // Start a DispatcherQueueController.  A DispatcherQueue must be running on the thread for XAML to work.
+    auto dqc = winrt::Microsoft::UI::Dispatching::DispatcherQueueController::CreateOnCurrentThread();
+
+    MainWindow::CreateNewWindow(nCmdShow, {});
+
+    MSG msg;
+    while (GetMessage(&msg, nullptr, 0, 0))
+    {
+        TranslateMessage(&msg);
+        DispatchMessage(&msg);
+    }
+
+#endif
+
+    return 0;
+}
diff --git a/src/controls/test/TabViewTearOutApp/XamlUtil.h b/src/controls/test/TabViewTearOutApp/XamlUtil.h
new file mode 100644
index 0000000000..d15d146209
--- /dev/null
+++ b/src/controls/test/TabViewTearOutApp/XamlUtil.h
@@ -0,0 +1,35 @@
+#pragma once
+
+namespace XamlUtil
+{
+    inline bool IsXamlLoaded()
+    {
+        return (::GetModuleHandle(L"Microsoft.UI.Xaml.dll") != nullptr);
+    }
+
+    inline bool IsXamlRunningInProcess()
+    {
+        if (IsXamlLoaded())
+        {
+            auto app = winrt::Microsoft::UI::Xaml::Application::Current();
+            return (app != nullptr);
+        }
+        return false;
+    }
+
+    inline bool IsXamlRunningOnThread()
+    {
+        if (IsXamlLoaded())
+        {
+            try
+            {
+                // Creating a button will throw a RPC_E_WRONG_THREAD HRESULT if XAML's not running on the thread.
+                auto b = winrt::Microsoft::UI::Xaml::Controls::Button();
+                return true;
+            }
+            catch (winrt::hresult_wrong_thread) {}
+        }
+        return false;
+    }
+
+}
\ No newline at end of file
diff --git a/src/controls/test/TabViewTearOutApp/app.manifest b/src/controls/test/TabViewTearOutApp/app.manifest
new file mode 100644
index 0000000000..7fac828a04
--- /dev/null
+++ b/src/controls/test/TabViewTearOutApp/app.manifest
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="TabViewTearOutApp.app"/>
+
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <!-- The combination of below two tags have the following effect:
+           1) Per-Monitor for >= Windows 10 Anniversary Update
+           2) System < Windows 10 Anniversary Update
+      -->
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor</dpiAwareness>
+    </windowsSettings>
+  </application>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+        type="win32"
+        name="Microsoft.Windows.Common-Controls"
+        version="6.0.0.0"
+        processorArchitecture="*"
+        publicKeyToken="6595b64144ccf1df"
+        language="*"
+      />
+    </dependentAssembly>
+  </dependency>
+</assembly>
diff --git a/src/controls/test/TabViewTearOutApp/pch.cpp b/src/controls/test/TabViewTearOutApp/pch.cpp
new file mode 100644
index 0000000000..bcb5590be1
--- /dev/null
+++ b/src/controls/test/TabViewTearOutApp/pch.cpp
@@ -0,0 +1 @@
+#include "pch.h"
diff --git a/src/controls/test/TabViewTearOutApp/pch.h b/src/controls/test/TabViewTearOutApp/pch.h
new file mode 100644
index 0000000000..7b377d9e20
--- /dev/null
+++ b/src/controls/test/TabViewTearOutApp/pch.h
@@ -0,0 +1,44 @@
+#pragma once
+#include <windows.h>
+#include <unknwn.h>
+#include <restrictederrorinfo.h>
+#include <hstring.h>
+#include <strsafe.h>
+
+#define _VSDESIGNER_DONT_LOAD_AS_DLL
+
+// Undefine GetCurrentTime macro to prevent
+// conflict with Storyboard::GetCurrentTime
+#undef GetCurrentTime
+
+#include <windowsx.h>
+
+#include <winrt/Windows.Foundation.h>
+#include <winrt/Windows.Foundation.Collections.h>
+#include <winrt/Windows.ApplicationModel.Activation.h>
+#include <winrt/Windows.UI.Input.h>
+
+#include <winrt/Microsoft.UI.Xaml.h>
+#include <winrt/Microsoft.UI.Xaml.Automation.h>
+#include <winrt/Microsoft.UI.Xaml.Controls.h>
+#include <winrt/Microsoft.UI.Xaml.Controls.Primitives.h>
+#include <winrt/Microsoft.UI.Xaml.Data.h>
+#include <winrt/Microsoft.UI.Xaml.Hosting.h>
+#include <winrt/Microsoft.UI.Xaml.Interop.h>
+#include <winrt/Microsoft.UI.Xaml.Markup.h>
+#include <winrt/Microsoft.UI.Xaml.Media.h>
+#include <winrt/Microsoft.UI.Xaml.Navigation.h>
+#include <winrt/Microsoft.UI.Xaml.Shapes.h>
+#include <winrt/Microsoft.UI.Dispatching.h>
+
+#include <winrt/Microsoft.UI.h>
+#include <winrt/Microsoft.UI.Composition.h>
+#include <winrt/Microsoft.UI.Content.h>
+#include <winrt/Microsoft.UI.Interop.h>
+#include <winrt/Microsoft.UI.Input.h>
+#include <winrt/Microsoft.UI.Windowing.h>
+
+#include <winrt/AppTestAutomationHelpers.h>
+
+#include <vector>
+#include <functional>
diff --git a/src/controls/test/TabViewTearOutApp/resource.h b/src/controls/test/TabViewTearOutApp/resource.h
new file mode 100644
index 0000000000..522aadf495
--- /dev/null
+++ b/src/controls/test/TabViewTearOutApp/resource.h
@@ -0,0 +1,9 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by TabViewTearOutApp.rc
+//
+#define IDS_APP_TITLE                   103
+#define IDI_LARGE                       107
+#define IDI_SMALL                       108
+#define IDC_WINDOWCLASS                 109
+
diff --git a/src/controls/test/TabViewTearOutApp/small.ico b/src/controls/test/TabViewTearOutApp/small.ico
new file mode 100644
index 0000000000..b3ec03bd61
Binary files /dev/null and b/src/controls/test/TabViewTearOutApp/small.ico differ
diff --git a/src/controls/test/TabViewTearOutApp/targetver.h b/src/controls/test/TabViewTearOutApp/targetver.h
new file mode 100644
index 0000000000..bf75e0895e
--- /dev/null
+++ b/src/controls/test/TabViewTearOutApp/targetver.h
@@ -0,0 +1,6 @@
+#pragma once
+
+// // Including SDKDDKVer.h defines the highest available Windows platform.
+// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
+// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
+#include <SDKDDKVer.h>
diff --git a/src/controls/test/TestAppUtils/NavigateToTestCommand.cs b/src/controls/test/TestAppUtils/NavigateToTestCommand.cs
index 5142bf642c..7fa222d4e6 100644
--- a/src/controls/test/TestAppUtils/NavigateToTestCommand.cs
+++ b/src/controls/test/TestAppUtils/NavigateToTestCommand.cs
@@ -18,6 +18,8 @@ public NavigateToTestCommand()
             CanExecuteChanged?.Invoke(this, null);
         }
 
+        public TestFrame TestFrame { get; set; }
+
         public bool CanExecute(object parameter)
         {
             return (parameter != null && parameter is TestDeclaration);
@@ -26,7 +28,7 @@ public bool CanExecute(object parameter)
         public void Execute(object parameter)
         {
             var testDeclaration = parameter as TestDeclaration;
-            TestFrame.Instance.NavigateWithoutAnimation(testDeclaration.PageType, testDeclaration.Name);
+            TestFrame.NavigateWithoutAnimation(testDeclaration.PageType, testDeclaration.Name);
         }
     }
 
diff --git a/src/controls/test/TestAppUtils/TestFrame.cs b/src/controls/test/TestAppUtils/TestFrame.cs
index cf7951f033..84e062c0b8 100644
--- a/src/controls/test/TestAppUtils/TestFrame.cs
+++ b/src/controls/test/TestAppUtils/TestFrame.cs
@@ -39,17 +39,10 @@ public UIElement CustomElement
         private CheckBox _keyInputReceived = null;
         public Grid BackupThemeBackground { get; private set; }
 
-        internal static TestFrame Instance
-        {
-            get;
-            private set;
-        }
-
         public TestFrame(Type mainPageType)
         {
             _mainPageType = mainPageType;
             this.DefaultStyleKey = typeof(TestFrame);
-            Instance = this;
 
             AddHandler(FrameworkElement.KeyDownEvent, new KeyEventHandler(TestFrame_KeyDown) , true);
         }
diff --git a/src/controls/test/TestAppUtils/TestPage.cs b/src/controls/test/TestAppUtils/TestPage.cs
index 882063f52e..4194695a60 100644
--- a/src/controls/test/TestAppUtils/TestPage.cs
+++ b/src/controls/test/TestAppUtils/TestPage.cs
@@ -107,24 +107,27 @@ DependencyObject SearchVisualTree(DependencyObject root, string name)
 
         public static DependencyObject FindVisualChildByName(FrameworkElement parent, string name)
         {
-            if (parent.Name == name)
+            if (parent != null)
             {
-                return parent;
-            }
-
-            int childrenCount = VisualTreeHelper.GetChildrenCount(parent);
+                if (parent.Name == name)
+                {
+                    return parent;
+                }
 
-            for (int i = 0; i < childrenCount; i++)
-            {
-                FrameworkElement childAsFE = VisualTreeHelper.GetChild(parent, i) as FrameworkElement;
+                int childrenCount = VisualTreeHelper.GetChildrenCount(parent);
 
-                if (childAsFE != null)
+                for (int i = 0; i < childrenCount; i++)
                 {
-                    DependencyObject result = FindVisualChildByName(childAsFE, name);
+                    FrameworkElement childAsFE = VisualTreeHelper.GetChild(parent, i) as FrameworkElement;
 
-                    if (result != null)
+                    if (childAsFE != null)
                     {
-                        return result;
+                        DependencyObject result = FindVisualChildByName(childAsFE, name);
+
+                        if (result != null)
+                        {
+                            return result;
+                        }
                     }
                 }
             }
@@ -174,7 +177,7 @@ private void OnLoaded(object sender, RoutedEventArgs e)
                 var frame = XamlRoot.Content != null ? 
                                 XamlRoot.Content as Frame:
                                 this.Frame;
-                var testContentLoadedCheckBox = FindVisualChildByName(frame, "TestContentLoadedCheckBox") as CheckBox;
+                var testContentLoadedCheckBox = FindVisualChildByName(frame ?? (FrameworkElement)XamlRoot.Content, "TestContentLoadedCheckBox") as CheckBox;
                 if (testContentLoadedCheckBox != null)
                 {
                     testContentLoadedCheckBox.IsChecked = true;
diff --git a/src/controls/test/testinfra/MUXTestInfra/Common/InputHelper.cs b/src/controls/test/testinfra/MUXTestInfra/Common/InputHelper.cs
index c0c0012035..f27c3a0a5d 100644
--- a/src/controls/test/testinfra/MUXTestInfra/Common/InputHelper.cs
+++ b/src/controls/test/testinfra/MUXTestInfra/Common/InputHelper.cs
@@ -392,6 +392,16 @@ public static void Pan(UIObject obj, Point start, Point end, uint holdDuration =
         }
 
         public static void DragToTarget(UIObject obj, UIObject obj2, int xOffset = 0, int yOffset = 0)
+        {
+            DragToTargetHelper(obj, obj2, xOffset, yOffset, useMouse: false);
+        }
+
+        public static void MouseDragToTarget(UIObject obj, UIObject obj2, int xOffset = 0, int yOffset = 0)
+        {
+            DragToTargetHelper(obj, obj2, xOffset, yOffset, useMouse: true);
+        }
+
+        public static void DragToTargetHelper(UIObject obj, UIObject obj2, int xOffset, int yOffset, bool useMouse)
         {
             Point startPoint = obj.GetClickablePoint();
             Log.Comment("Start Point X:{0} Y:{1}", startPoint.X, startPoint.Y);
@@ -406,9 +416,27 @@ public static void DragToTarget(UIObject obj, UIObject obj2, int xOffset = 0, in
             using (var waiter = GetWaiterForInputEvent(obj, InputEvent.Drag))
             {
                 Log.Comment("Move input to Start Point.");
-                SinglePointGesture.Current.Move(startPoint);
+
+                if (useMouse)
+                {
+                    PointerInput.Move(startPoint);
+                }
+                else
+                {
+                    SinglePointGesture.Current.Move(startPoint);
+                }
+
                 Log.Comment("Begin Drag.");
-                SinglePointGesture.Current.PressAndDrag(end, dragDuration, 500);
+
+                if (useMouse)
+                {
+                    PointerInput.ClickDrag(end, PointerButtons.Primary, dragDuration);
+                }
+                else
+                {
+                    SinglePointGesture.Current.PressAndDrag(end, dragDuration, 500);
+                }
+
                 Log.Comment("Drag Complete.");
             }
             Wait.ForIdle();
diff --git a/src/controls/test/testinfra/MUXTestInfra/Infra/Application.cs b/src/controls/test/testinfra/MUXTestInfra/Infra/Application.cs
index 75929aa817..7b2c617ceb 100644
--- a/src/controls/test/testinfra/MUXTestInfra/Infra/Application.cs
+++ b/src/controls/test/testinfra/MUXTestInfra/Infra/Application.cs
@@ -121,7 +121,7 @@ public IntPtr Hwnd
         #endregion
 
         #region Methods
-        internal bool Initialize(bool doLaunch = false, string deploymentDir = null)
+        internal bool Initialize(bool doLaunch = false, string deploymentDir = null, bool shouldMaximize = true)
         {
             var topWindowCondition = _windowCondition.OrWith(_appFrameWindowCondition);
 
@@ -185,17 +185,20 @@ internal bool Initialize(bool doLaunch = false, string deploymentDir = null)
                 throw new UIObjectNotFoundException("Could not find application window.");
             }
 
-            // If this is running on desktop (it has an app frame window) then try to
-            // maximize the window.
-
-            if (ApplicationFrameWindow != null)
-            {
-                MaximizeWindow(ApplicationFrameWindow);
-            }
-            else if (!_isUWPApp && CoreWindow != null)
+            if (shouldMaximize)
             {
-                // If we're not a UWP app, then the CoreWindow object we got is a Window that can be maximized.
-                MaximizeWindow(CoreWindow);
+                // If this is running on desktop (it has an app frame window) then try to
+                // maximize the window.
+
+                if (ApplicationFrameWindow != null)
+                {
+                    MaximizeWindow(ApplicationFrameWindow);
+                }
+                else if (!_isUWPApp && CoreWindow != null)
+                {
+                    // If we're not a UWP app, then the CoreWindow object we got is a Window that can be maximized.
+                    MaximizeWindow(CoreWindow);
+                }
             }
 
             Process = Process.GetProcessById(CoreWindow.ProcessId);
@@ -455,19 +458,26 @@ public void Close()
             }
             else
             {
-                if (CloseAppWindowWithCloseButton())
+                try
                 {
-                    if (!Process.GetProcessById(appWindowsProcessId).WaitForExit(20 * 1000 /*milliseconds*/))
+                    if (CloseAppWindowWithCloseButton())
+                    {
+                        if (!Process.GetProcessById(appWindowsProcessId).WaitForExit(20 * 1000 /*milliseconds*/))
+                        {
+                            Log.Comment("Invoked the close button, but the process has not exited as expected.");
+                        }
+                    }
+                    else
                     {
-                        Log.Comment("Invoked the close button, but the process has not exited as expected.");
+                        Log.Comment("Failed to close application window. We will fall back to terminating the app process.");
                     }
+
+                    EnsureApplicationProcessHasExited(appWindowsProcessId);
                 }
-                else
+                catch (System.ArgumentException)
                 {
-                    Log.Comment("Failed to close application window. We will fall back to terminating the app process.");
+                    // Ignore. GetProcessById throws if the process has already exited.
                 }
-
-                EnsureApplicationProcessHasExited(appWindowsProcessId);
             }
 
             if (Process != null)
@@ -510,14 +520,7 @@ private void EnsureApplicationProcessHasExited(int appWindowsProcessId)
 
             if (appWindowsProcessId != -1)
             {
-                try
-                {
-                    appProcesses.Add(Process.GetProcessById(appWindowsProcessId));
-                }
-                catch (Exception)
-                {
-                    // Ignore. GetProcessById throws if the process has already exited.
-                }
+                appProcesses.Add(Process.GetProcessById(appWindowsProcessId));
             }
 
             if (Process != null)
diff --git a/src/controls/test/testinfra/MUXTestInfra/Infra/TestEnvironment.cs b/src/controls/test/testinfra/MUXTestInfra/Infra/TestEnvironment.cs
index 032d6ee2cb..9f2896eabb 100644
--- a/src/controls/test/testinfra/MUXTestInfra/Infra/TestEnvironment.cs
+++ b/src/controls/test/testinfra/MUXTestInfra/Infra/TestEnvironment.cs
@@ -308,9 +308,16 @@ public static void Initialize(TestContext testContext, TestApplicationInfo testA
 
             Application = CreateApplication(testAppInfo);
 
+            bool shouldMaximize = true;
+
+            if (TestContext.Properties.Contains("MaximizeWindowAtStart"))
+            {
+                shouldMaximize = (bool)TestContext.Properties["MaximizeWindowAtStart"];
+            }
+
             // Initialize relies on TestEnvironment.Application to be set, so we'll call this method
             // outside of the constructor.
-            if (!Application.Initialize(true, TestContext.TestDeploymentDir))
+            if (!Application.Initialize(true, TestContext.TestDeploymentDir, shouldMaximize))
             {
                 Log.Error("Application failed to initialize.");
             }
diff --git a/src/controls/test/testinfra/MUXTestInfra/Infra/TestHelpers.cs b/src/controls/test/testinfra/MUXTestInfra/Infra/TestHelpers.cs
index 39c9654a52..1b859ee9e6 100644
--- a/src/controls/test/testinfra/MUXTestInfra/Infra/TestHelpers.cs
+++ b/src/controls/test/testinfra/MUXTestInfra/Infra/TestHelpers.cs
@@ -31,6 +31,11 @@ public class TestSetupHelper : IDisposable
     {
         private int OpenedTestPages = 0;
 
+        // Tests that fail will automatically get a screenshot taken when run in the ADO pipeline. We have to leave the
+        // test in the broken state and not clean up after it so that the screenshot is meaningful. This flag lets a
+        // test control whether or not to clean up and only clean up if the test passes.
+        private bool _doCleanup = true;
+
         public class TestSetupHelperOptions
         {
             public string LanguageOverride {get; set;}
@@ -38,6 +43,8 @@ public class TestSetupHelperOptions
             public string ClassNameOfNavigationItemToInvoke { get; set; } = "Button";
 
             public string AutomationIdOfSafeItemToClick { get; set; } = "__CurrentPage";
+
+            public bool AutomaticCleanup { get; set; } = true;
         }
 
         public TestSetupHelper(string testName, TestSetupHelperOptions options = null)
@@ -108,11 +115,11 @@ private void PreTestSetup()
         // this function returns true for successful run and false for unsuccessful run
         // in case of false, the calling function will retry calling this function
         private bool TestSingleRun(ICollection<string> testNames, bool shouldRestrictInnerFrameSize)
-        {   
+        {
             PreTestSetup();
 
-            // We were hitting an issue in the lab where sometimes the very first click would fail to go through resulting in 
-            // test instability. We work around this by clicking on element when the app launches. 
+            // We were hitting an issue in the lab where sometimes the very first click would fail to go through resulting in
+            // test instability. We work around this by clicking on element when the app launches.
             if (!string.IsNullOrEmpty(Options.AutomationIdOfSafeItemToClick))
             {
                 var safeItemToClick = FindElement.ById(Options.AutomationIdOfSafeItemToClick);
@@ -197,7 +204,7 @@ private bool TestSingleRun(ICollection<string> testNames, bool shouldRestrictInn
             }
 
             TestCleanupHelper.TestSetupHelperPendingDisposals++;
-            
+
             return true;  //no retry needed, it is a success
         }
 
@@ -218,8 +225,10 @@ public TestSetupHelper(
             this.OutputDebugStringLevel = outputDebugStringLevel;
             this.OutputDebugStringComponentTypes = outputDebugStringComponentTypes;
 
-            // If a test crashes, it can take a little bit of time before we can 
-            // restart the app again especially if watson is collecting dumps. Adding a 
+            this._doCleanup = options.AutomaticCleanup;
+
+            // If a test crashes, it can take a little bit of time before we can
+            // restart the app again especially if watson is collecting dumps. Adding a
             // delayed retry can help avoid the case where we might otherwise fail a slew of
             // tests that come after the one that crashes the app.
             var retryCount = 10;
@@ -257,6 +266,11 @@ public TestSetupHelper(
             }
         }
 
+        public void AllowCleanup()
+        {
+            _doCleanup = true;
+        }
+
         public static void SetInnerFrameInLabDimensions(bool shouldRestrictInnerFrameSize)
         {
             UIObject innerFrameButton = TryFindElement.ById("__InnerFrameInLabDimensions");
@@ -329,13 +343,20 @@ protected virtual void TestPageLoaded(string testName)
 
         protected virtual void Dispose(bool isDisposing)
         {
-            TestEnvironment.LogVerbose("TestSetupHelper.Dispose()");
+            Log.Comment("TestSetupHelper.Dispose()");
             TestCleanupHelper.TestSetupHelperPendingDisposals--;
 
-            while (OpenedTestPages > 0)
+            if (_doCleanup)
+            {
+                while (OpenedTestPages > 0)
+                {
+                    GoBack();
+                    OpenedTestPages--;
+                }
+            }
+            else
             {
-                GoBack();
-                OpenedTestPages--;
+                Log.Comment("> Skipping going back due to test failure.");
             }
         }
     }
@@ -350,7 +371,7 @@ public static void Cleanup()
 
             if (TestEnvironment.TestContext == null || TestEnvironment.Application == null)
             {
-                Log.Error("TestContext or Application is not initialized successfully! TestContext is null: {0}", 
+                Log.Error("TestContext or Application is not initialized successfully! TestContext is null: {0}",
                     TestEnvironment.TestContext == null);
                 return;
             }
@@ -444,7 +465,7 @@ public static void CompareStringSets(IList<string> englishStrings, IList<string>
             {
                 Log.Comment(otherLanguageString);
             }
-            
+
             Log.Comment(Environment.NewLine);
 
             // We want to make sure that every English string is different than its non-English counterpart -
diff --git a/src/controls/test/testinfra/MUXTestInfra/TestAppInstallHelper.cs b/src/controls/test/testinfra/MUXTestInfra/TestAppInstallHelper.cs
index ef1728ef34..5778aeb485 100644
--- a/src/controls/test/testinfra/MUXTestInfra/TestAppInstallHelper.cs
+++ b/src/controls/test/testinfra/MUXTestInfra/TestAppInstallHelper.cs
@@ -53,7 +53,7 @@ FileInfo FirstFileWithExtension(params string[] extensions)
                     return fileInfo;
                 }
 
-                var packageFile = FirstFileWithExtension("appx", "appxbundle", "msix", "msixbundle");
+                var packageFile = FirstFileWithExtension("appx", "appxbundle", "msixbundle",  "msix");
 
                 if (packageFile?.Exists == true)
                 {
diff --git a/src/dxaml/atl.props b/src/dxaml/atl.props
index 23907d9a2d..c4ad5cf8a9 100644
--- a/src/dxaml/atl.props
+++ b/src/dxaml/atl.props
@@ -10,7 +10,7 @@
       <PreprocessorDefinitions>%(PreprocessorDefinitions) _ATL_STATIC_REGISTRY; _WINDLL;</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>%(AdditionalDependencies) $(AtlMfcPath)\lib\$(WindowsSDKArch)\atls.lib;</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies) $(ATL_KeyFile)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 </Project>
diff --git a/src/dxaml/msbuild/BuildSettings/LibraryCompile.props b/src/dxaml/msbuild/BuildSettings/LibraryCompile.props
index 73ad2539d1..6c649308e8 100644
--- a/src/dxaml/msbuild/BuildSettings/LibraryCompile.props
+++ b/src/dxaml/msbuild/BuildSettings/LibraryCompile.props
@@ -152,7 +152,7 @@
     <!-- These items can't be determined until after the project has fully defined itself.  We will need to figure out a long -->
     <!-- term plan for props vs. targets vs. new custom props/targets                                                         -->
     <PropertyGroup>
-        <!-- 
+        <!--
              Only use /Zc:lambda for non-C++/CX projects due to a bug in Visual Studio 17.3:
              https://developercommunity.visualstudio.com/t/Zc:lambda-causes-unexpected-conversion-/10088738
         -->
diff --git a/src/dxaml/phone/lib/DatePickerFlyoutPresenter_Partial.h b/src/dxaml/phone/lib/DatePickerFlyoutPresenter_Partial.h
index b199882c2f..9deacd060c 100644
--- a/src/dxaml/phone/lib/DatePickerFlyoutPresenter_Partial.h
+++ b/src/dxaml/phone/lib/DatePickerFlyoutPresenter_Partial.h
@@ -278,17 +278,17 @@ XAML_ABI_NAMESPACE_BEGIN namespace Microsoft { namespace UI { namespace Xaml { n
          // Represent the first date choosable by datepicker. Note that the year of this date can be
          // different from the MinYear as the MinYear value can be unrepresentable depending on the
          // type of the calendar.
-         wf::DateTime _startDate;
+         wf::DateTime _startDate{};
 
          // The year of this date is the latest year that can be selectable by the date picker. Note that
          // month and date values do not necessarily represent the end date of  our date picker since we
          // do not need that information readily. Also note that, this year may be different from the MaxYear
          // since MaxYear may be unrepresentable depending on the calendar.
-         wf::DateTime _endDate;
+         wf::DateTime _endDate{};
 
-         EventRegistrationToken _daySelectionChangedToken;
-         EventRegistrationToken _monthSelectionChangedToken;
-         EventRegistrationToken _yearSelectionChangedToken;
+         EventRegistrationToken _daySelectionChangedToken{};
+         EventRegistrationToken _monthSelectionChangedToken{};
+         EventRegistrationToken _yearSelectionChangedToken{};
 
          // See the comment of AllowReactionToSelectionChange method for use of this variable.
          BOOLEAN _reactionToSelectionChangeAllowed;
diff --git a/src/dxaml/phone/lib/DatePickerFlyout_Partial.h b/src/dxaml/phone/lib/DatePickerFlyout_Partial.h
index c076b0b1d3..33fccfa745 100644
--- a/src/dxaml/phone/lib/DatePickerFlyout_Partial.h
+++ b/src/dxaml/phone/lib/DatePickerFlyout_Partial.h
@@ -74,9 +74,9 @@ XAML_ABI_NAMESPACE_BEGIN namespace Microsoft { namespace UI { namespace Xaml { n
 
         Private::TrackerPtr<xaml_primitives::IButtonBase> _tpAcceptButton;
         Private::TrackerPtr<xaml_primitives::IButtonBase> _tpDismissButton;
-        EventRegistrationToken _acceptClickToken;
-        EventRegistrationToken _dismissClickToken;
-        EventRegistrationToken _keyDownToken;
+        EventRegistrationToken _acceptClickToken{};
+        EventRegistrationToken _dismissClickToken{};
+        EventRegistrationToken _keyDownToken{};
     };
 
     ActivatableClassWithFactory(DatePickerFlyout, DatePickerFlyoutFactory);
diff --git a/src/dxaml/phone/lib/Pivot_Automation_Partial.cpp b/src/dxaml/phone/lib/Pivot_Automation_Partial.cpp
index faf91c6945..d34ca75c49 100644
--- a/src/dxaml/phone/lib/Pivot_Automation_Partial.cpp
+++ b/src/dxaml/phone/lib/Pivot_Automation_Partial.cpp
@@ -420,7 +420,7 @@ Pivot::AutomationFocusSelectedItem()
 
     if (selectedIndex >= 0)
     {
-        AutomationFocusItem(selectedIndex);
+        IFC_RETURN(AutomationFocusItem(selectedIndex));
     }
 
     return S_OK;
diff --git a/src/dxaml/phone/lib/Pivot_Partial.cpp b/src/dxaml/phone/lib/Pivot_Partial.cpp
index 28703d8b4a..1185f9a229 100644
--- a/src/dxaml/phone/lib/Pivot_Partial.cpp
+++ b/src/dxaml/phone/lib/Pivot_Partial.cpp
@@ -2802,7 +2802,7 @@ _Check_return_ HRESULT Pivot::OnHeaderFocusVisualPlacementChanged()
             {
                 // For SelectedItemHeader, we use the FocusFollower as the template focus target
                 spIControlStatics->SetIsTemplateFocusTarget(m_tpFocusFollower.Get(), true);
-                UpdateFocusFollower();
+                IFC_RETURN(UpdateFocusFollower());
             }
             else
             {
diff --git a/src/dxaml/phone/lib/Pivot_Partial.h b/src/dxaml/phone/lib/Pivot_Partial.h
index 91fb8d1592..9615da279a 100644
--- a/src/dxaml/phone/lib/Pivot_Partial.h
+++ b/src/dxaml/phone/lib/Pivot_Partial.h
@@ -478,24 +478,24 @@ class Pivot :
 
     xaml::Controls::IControl *m_pThisAsControlNoRef;
 
-    EventRegistrationToken m_viewChangingToken;
-    EventRegistrationToken m_viewChangedToken;
-    EventRegistrationToken m_sizeChangedToken;
-    EventRegistrationToken m_directManipulationStartedToken;
-    EventRegistrationToken m_directManipulationCompletedToken;
-    EventRegistrationToken m_scrollViewerLoadedToken;
-    EventRegistrationToken m_headerGotFocusToken;
-    EventRegistrationToken m_headerLostFocusToken;
-    EventRegistrationToken m_headerKeyDownToken;
-    EventRegistrationToken m_layoutElementKeyDownToken;
-    EventRegistrationToken m_pointerEnteredHeaderToken;
-    EventRegistrationToken m_pointerExitedHeaderToken;
-    EventRegistrationToken m_pointerEnteredPreviousButtonToken;
-    EventRegistrationToken m_pointerExitedPreviousButtonToken;
-    EventRegistrationToken m_pointerEnteredNextButtonToken;
-    EventRegistrationToken m_pointerExitedNextButtonToken;
-    EventRegistrationToken m_previousButtonClickedToken;
-    EventRegistrationToken m_nextButtonClickedToken;
+    EventRegistrationToken m_viewChangingToken{};
+    EventRegistrationToken m_viewChangedToken{};
+    EventRegistrationToken m_sizeChangedToken{};
+    EventRegistrationToken m_directManipulationStartedToken{};
+    EventRegistrationToken m_directManipulationCompletedToken{};
+    EventRegistrationToken m_scrollViewerLoadedToken{};
+    EventRegistrationToken m_headerGotFocusToken{};
+    EventRegistrationToken m_headerLostFocusToken{};
+    EventRegistrationToken m_headerKeyDownToken{};
+    EventRegistrationToken m_layoutElementKeyDownToken{};
+    EventRegistrationToken m_pointerEnteredHeaderToken{};
+    EventRegistrationToken m_pointerExitedHeaderToken{};
+    EventRegistrationToken m_pointerEnteredPreviousButtonToken{};
+    EventRegistrationToken m_pointerExitedPreviousButtonToken{};
+    EventRegistrationToken m_pointerEnteredNextButtonToken{};
+    EventRegistrationToken m_pointerExitedNextButtonToken{};
+    EventRegistrationToken m_previousButtonClickedToken{};
+    EventRegistrationToken m_nextButtonClickedToken{};
 
     bool HasValidTemplate() const
     {
diff --git a/src/dxaml/phone/lib/RoVariant.h b/src/dxaml/phone/lib/RoVariant.h
index bf44b590dc..4b9d13befe 100644
--- a/src/dxaml/phone/lib/RoVariant.h
+++ b/src/dxaml/phone/lib/RoVariant.h
@@ -327,7 +327,7 @@ class RoVariant
             _pI->AddRef();
         }
     }
-    RoVariant(RoVariant&& other)
+    RoVariant(RoVariant&& other) noexcept
     {
         _pI = other._pI;
         _hrState = other._hrState;
diff --git a/src/dxaml/phone/lib/ThemeTransitions.cpp b/src/dxaml/phone/lib/ThemeTransitions.cpp
index 9a73a55bee..39b7aa2ed5 100644
--- a/src/dxaml/phone/lib/ThemeTransitions.cpp
+++ b/src/dxaml/phone/lib/ThemeTransitions.cpp
@@ -1659,7 +1659,7 @@ XAML_ABI_NAMESPACE_BEGIN namespace Microsoft { namespace UI { namespace Xaml { n
         }
 
         // Ensure sure that the animated pages are not hit test visible while animating.
-        NavigateTransitionHelper::RemoveHitTestVisbility(spStoryboardStatics.Get(), spTimelines.Get(), spAnimationTargetAsDO.Get());
+        IFC_RETURN(NavigateTransitionHelper::RemoveHitTestVisbility(spStoryboardStatics.Get(), spTimelines.Get(), spAnimationTargetAsDO.Get()));
 
         IFC_RETURN(storyboards->Append(spStoryboard.Get()));
 
diff --git a/src/dxaml/phone/lib/TimePickerFlyoutPresenter_Partial.h b/src/dxaml/phone/lib/TimePickerFlyoutPresenter_Partial.h
index d62d564be1..98198cfd02 100644
--- a/src/dxaml/phone/lib/TimePickerFlyoutPresenter_Partial.h
+++ b/src/dxaml/phone/lib/TimePickerFlyoutPresenter_Partial.h
@@ -278,9 +278,9 @@ XAML_ABI_NAMESPACE_BEGIN namespace Microsoft { namespace UI { namespace Xaml { n
         INT32 _minuteIncrement;
         wf::TimeSpan _time;
 
-        EventRegistrationToken _hourSelectionChangedToken;
-        EventRegistrationToken _minuteSelectionChangedToken;
-        EventRegistrationToken _periodSelectionChangedToken;
+        EventRegistrationToken _hourSelectionChangedToken{};
+        EventRegistrationToken _minuteSelectionChangedToken{};
+        EventRegistrationToken _periodSelectionChangedToken{};
     };
 
     ActivatableClass(TimePickerFlyoutPresenter);
diff --git a/src/dxaml/phone/lib/TimePickerFlyout_Partial.h b/src/dxaml/phone/lib/TimePickerFlyout_Partial.h
index 6ee398d3a7..fc8c82ebb9 100644
--- a/src/dxaml/phone/lib/TimePickerFlyout_Partial.h
+++ b/src/dxaml/phone/lib/TimePickerFlyout_Partial.h
@@ -65,7 +65,7 @@ XAML_ABI_NAMESPACE_BEGIN namespace Microsoft { namespace UI { namespace Xaml { n
         xaml_controls::FlyoutAsyncOperationManager<wf::IReference<wf::TimeSpan>*, TimePickerFlyout, TimePickerFlyoutShowAtAsyncOperationName> _asyncOperationManager;
         EventRegistrationToken _acceptClickToken;
         EventRegistrationToken _dismissClickToken;
-        EventRegistrationToken _keyDownToken;
+        EventRegistrationToken _keyDownToken{};
     };
 
     ActivatableClassWithFactory(TimePickerFlyout, TimePickerFlyoutFactory);
diff --git a/src/dxaml/phone/lib/UIAsyncBase.h b/src/dxaml/phone/lib/UIAsyncBase.h
index 6b399f8819..2646cba731 100644
--- a/src/dxaml/phone/lib/UIAsyncBase.h
+++ b/src/dxaml/phone/lib/UIAsyncBase.h
@@ -496,7 +496,7 @@ XAML_ABI_NAMESPACE_BEGIN namespace Microsoft { namespace UI { namespace Xaml { n
             wrl::ComPtr<wf::IAsyncInfo> m_spInnerAsyncInfo;
             wrl::ComPtr<xaml_controls::IListPickerFlyout> m_spPendingFlyout;
             bool m_isCompleted;
-            INT32 m_selectedIndex;
+            INT32 m_selectedIndex{};
     };
 
 } } } } XAML_ABI_NAMESPACE_END
\ No newline at end of file
diff --git a/src/dxaml/xcp/components/AccessKeys/AccessKey/AccessKey.cpp b/src/dxaml/xcp/components/AccessKeys/AccessKey/AccessKey.cpp
index 62566f7b4c..6f2848dbd0 100644
--- a/src/dxaml/xcp/components/AccessKeys/AccessKey/AccessKey.cpp
+++ b/src/dxaml/xcp/components/AccessKeys/AccessKey/AccessKey.cpp
@@ -12,7 +12,7 @@ AKAccessKey::AKAccessKey(_In_ const wchar_t accessKey)
     (*this) = accessKey;
 }
 
-AKAccessKey::AKAccessKey(const std::wstring & accessKey)
+AKAccessKey::AKAccessKey(_In_ const std::wstring & accessKey)
 {
     (*this) = accessKey;
 }
diff --git a/src/dxaml/xcp/components/AccessKeys/Export/AKExport.cpp b/src/dxaml/xcp/components/AccessKeys/Export/AKExport.cpp
index 815c9d6a73..f4a8b2605e 100644
--- a/src/dxaml/xcp/components/AccessKeys/Export/AKExport.cpp
+++ b/src/dxaml/xcp/components/AccessKeys/Export/AKExport.cpp
@@ -67,6 +67,7 @@ AccessKeyExport::~AccessKeyExport() = default;
 
 _Check_return_ HRESULT AccessKeyExport::TryProcessInputForAccessKey(_In_ const InputMessage* const inputMessage, _Out_ bool* keyProcessed) const
 {
+    *keyProcessed = false;
     if (impl->IsValid())
     {
         // We anticipate input messages to arrive with XCP_CHAR only when we are not hosted inside a CoreWindow
@@ -103,6 +104,7 @@ _Check_return_ HRESULT AccessKeyExport::ProcessPointerInput(_In_ const InputMess
 
 _Check_return_ HRESULT AccessKeyExport::TryProcessInputForCharacterReceived(_In_ mui::ICharacterReceivedEventArgs* args, _Out_ bool* keyProcessed) const
 {
+    *keyProcessed = false;
     if (impl->IsValid())
     {
         IFC_RETURN(impl->m_inputInterceptor.TryProcessInputForCharacterReceived(args, keyProcessed));
@@ -198,6 +200,6 @@ _Check_return_ HRESULT AccessKeyExport::EnterAccessKeyMode() const
         return S_OK;
     }
     impl->m_container.SetIsActive(true);
-    impl->m_scopeTree.EnterScope();
+    IFC_RETURN(impl->m_scopeTree.EnterScope());
     return S_OK;
 }
\ No newline at end of file
diff --git a/src/dxaml/xcp/components/AccessKeys/Parser/AccessKeysParser.cpp b/src/dxaml/xcp/components/AccessKeys/Parser/AccessKeysParser.cpp
index 503f9333f7..4fbbe6b07d 100644
--- a/src/dxaml/xcp/components/AccessKeys/Parser/AccessKeysParser.cpp
+++ b/src/dxaml/xcp/components/AccessKeys/Parser/AccessKeysParser.cpp
@@ -43,7 +43,7 @@ bool AKParser::IsValidAccessKey(_In_ const std::wstring& accessString)
     return true;
 }
 
-bool AccessKeys::AKParser::ContainsInvalidSubstring(const std::wstring & accessString)
+bool AccessKeys::AKParser::ContainsInvalidSubstring(_In_ const std::wstring & accessString)
 {
     // For each string in invalidStringList, check it's not a substring in accessString
     for (const auto& invalidString : invalidStringList)
diff --git a/src/dxaml/xcp/components/AccessKeys/inc/AccessKey.h b/src/dxaml/xcp/components/AccessKeys/inc/AccessKey.h
index 22c71cc33b..3455209bc8 100644
--- a/src/dxaml/xcp/components/AccessKeys/inc/AccessKey.h
+++ b/src/dxaml/xcp/components/AccessKeys/inc/AccessKey.h
@@ -34,7 +34,7 @@ namespace AccessKeys {
 
         // Collection of characters parsed from the UI element owner's AutomationProperties.AccessKey field.
         // Declaring this with room for a null terminator.
-        wchar_t accessKey[maxAccessKeyLength+1]; 
+        wchar_t accessKey[maxAccessKeyLength+1] {}; 
     };
 }
 
diff --git a/src/dxaml/xcp/components/AccessKeys/inc/InputInterceptor.h b/src/dxaml/xcp/components/AccessKeys/inc/InputInterceptor.h
index d28f0031d4..9e2c0a259b 100644
--- a/src/dxaml/xcp/components/AccessKeys/inc/InputInterceptor.h
+++ b/src/dxaml/xcp/components/AccessKeys/inc/InputInterceptor.h
@@ -73,6 +73,7 @@ namespace AccessKeys {
         {
             AK_TRACE(L"AK> TryProcessKeyImpl %x\n", inputMessage->m_platformKeyCode);
 
+            *keyProcessed = false;
             bool shouldEvaluate = false;
 
             //If we are attempting to entering AK mode, we need to scan the visual tree to verify that we have
diff --git a/src/dxaml/xcp/components/AccessKeys/inc/KeyTip.h b/src/dxaml/xcp/components/AccessKeys/inc/KeyTip.h
index 53ffac8ce5..56ef56d493 100644
--- a/src/dxaml/xcp/components/AccessKeys/inc/KeyTip.h
+++ b/src/dxaml/xcp/components/AccessKeys/inc/KeyTip.h
@@ -44,11 +44,11 @@ struct KeyTip
     KeyTip(const KeyTip& other) = delete;
     KeyTip& operator=(const KeyTip& other) = delete;
 
-    KeyTip(_Inout_ KeyTip&& other)
+    KeyTip(_Inout_ KeyTip&& other) noexcept
     {
         *this = std::move(other);
     }
-    KeyTip& operator=(_Inout_ KeyTip&& other)
+    KeyTip& operator=(_Inout_ KeyTip&& other) noexcept
     {
         Popup = std::move(other.Popup);
         Object = std::move(other.Object);
diff --git a/src/dxaml/xcp/components/AccessKeys/inc/ModeContainer.h b/src/dxaml/xcp/components/AccessKeys/inc/ModeContainer.h
index 262aaa5f2d..83eba08c47 100644
--- a/src/dxaml/xcp/components/AccessKeys/inc/ModeContainer.h
+++ b/src/dxaml/xcp/components/AccessKeys/inc/ModeContainer.h
@@ -11,7 +11,7 @@ class CFocusManager;
 namespace AccessKeys
 {
     // Global callback to be defined by caller
-    _Check_return_ HRESULT AKOnIsActiveChanged(_In_ CFocusManager* focusManager, _In_ IInspectable* sender, _Out_ IInspectable* args);
+    _Check_return_ HRESULT AKOnIsActiveChanged(_In_opt_ CFocusManager* focusManager, _In_ IInspectable* sender, _In_ IInspectable* args);
 
     class AKModeContainer
     {
diff --git a/src/dxaml/xcp/components/AccessKeys/inc/ScopeTree.h b/src/dxaml/xcp/components/AccessKeys/inc/ScopeTree.h
index 53a530bdc6..deb6d882b0 100644
--- a/src/dxaml/xcp/components/AccessKeys/inc/ScopeTree.h
+++ b/src/dxaml/xcp/components/AccessKeys/inc/ScopeTree.h
@@ -293,7 +293,7 @@ namespace AccessKeys {
             }
 
             // We walked all the way up without finding any valid scopes.  Exit AccessKey DisplayMode.
-            m_modeContainer.SetIsActive(false);
+            IFC_RETURN(m_modeContainer.SetIsActive(false));
             
             return S_OK;
         }
@@ -308,6 +308,8 @@ namespace AccessKeys {
 
         _Check_return_ HRESULT ProcessNormalKey(_In_ const wchar_t character, _In_ const bool wasActive, _Out_ bool* wasInvoked)
         {
+            *wasInvoked = false;
+
             // Invoke can be reentrant, we need to protect m_current by having our own reference
             std::shared_ptr<Scope> current = m_current;
             if (current)
@@ -348,7 +350,7 @@ namespace AccessKeys {
                         // The invoke handles entering the scope.
                         if (!wasActive)
                         {
-                            m_modeContainer.SetIsActive(true);
+                            IFC_RETURN(m_modeContainer.SetIsActive(true));
                         }
                         IFC_RETURN(EnterScope(invokedElement.get(), wasActive));
                     }
diff --git a/src/dxaml/xcp/components/CValue/CValue.cpp b/src/dxaml/xcp/components/CValue/CValue.cpp
index d7fce5867e..81a2a4d52b 100644
--- a/src/dxaml/xcp/components/CValue/CValue.cpp
+++ b/src/dxaml/xcp/components/CValue/CValue.cpp
@@ -596,7 +596,7 @@ CValue::~CValue()
 }
 
 CValue& CValue::operator=(
-    _Inout_ CValue&& source)
+    _Inout_ CValue&& source) noexcept
 {
     if (this != &source)
     {
diff --git a/src/dxaml/xcp/components/CValue/CValueUtil.cpp b/src/dxaml/xcp/components/CValue/CValueUtil.cpp
index 7ace736675..5d9e1ce9b4 100644
--- a/src/dxaml/xcp/components/CValue/CValueUtil.cpp
+++ b/src/dxaml/xcp/components/CValue/CValueUtil.cpp
@@ -37,7 +37,7 @@ KnownTypeIndex CValueUtil::GetTypeIndex(
             {
                 uint32_t enumValue = 0;
                 KnownTypeIndex enumTypeIndex = KnownTypeIndex::UnknownType;
-                value.GetEnum(enumValue, enumTypeIndex);
+                VERIFYHR(value.GetEnum(enumValue, enumTypeIndex));
                 return enumTypeIndex;
             }
     }
diff --git a/src/dxaml/xcp/components/Collection/Inc/VisualStateGroupCollection.h b/src/dxaml/xcp/components/Collection/Inc/VisualStateGroupCollection.h
index b9a1d23b3b..2388f5668a 100644
--- a/src/dxaml/xcp/components/Collection/Inc/VisualStateGroupCollection.h
+++ b/src/dxaml/xcp/components/Collection/Inc/VisualStateGroupCollection.h
@@ -46,6 +46,11 @@ class CVisualStateGroupCollection final
     _Check_return_ HRESULT
     LeaveImpl(_In_ CDependencyObject* namescopeOwner, _In_ LeaveParams params) override;
 
+    // When this collection is added to the the visual tree we need to ensure that we handle any
+    // state changes that may have occured before we joined.
+    _Check_return_ HRESULT
+        EnterImpl(_In_ CDependencyObject* namescopeOwner, _In_ EnterParams params) override;
+
 #pragma region Optimized Storage and Data Accessors
     _Check_return_ HRESULT SetCustomWriterRuntimeData(std::shared_ptr<CustomWriterRuntimeData> data,
         std::unique_ptr<CustomWriterRuntimeContext> context) override;
diff --git a/src/dxaml/xcp/components/Collection/PointCollection.cpp b/src/dxaml/xcp/components/Collection/PointCollection.cpp
index 3faaa98bc2..a6e4084718 100644
--- a/src/dxaml/xcp/components/Collection/PointCollection.cpp
+++ b/src/dxaml/xcp/components/Collection/PointCollection.cpp
@@ -384,7 +384,7 @@ CPointCollection::EnsureValue(_In_ const CValue& vOriginal, _Out_ CValue& vCoerc
 
     if (vOriginal.GetType() == valuePoint)
     {
-        vCoerced.CopyConverted(vOriginal);
+        IFC_RETURN(vCoerced.CopyConverted(vOriginal));
     }
     else
     {
diff --git a/src/dxaml/xcp/components/Collection/VisualStateGroupCollection.cpp b/src/dxaml/xcp/components/Collection/VisualStateGroupCollection.cpp
index 3a373e685d..76461dc6d0 100644
--- a/src/dxaml/xcp/components/Collection/VisualStateGroupCollection.cpp
+++ b/src/dxaml/xcp/components/Collection/VisualStateGroupCollection.cpp
@@ -170,6 +170,23 @@ void CVisualStateGroupCollection::UnregisterDeferredStandardNameScopeEntries(_In
     }
 }
 
+
+_Check_return_ HRESULT
+CVisualStateGroupCollection::EnterImpl(_In_ CDependencyObject* namescopeOwner, _In_ EnterParams params)
+{
+    IFC_RETURN(CDOCollection::EnterImpl(namescopeOwner, params));
+
+    if (params.fIsLive && m_vsmActivitySinceLastLeave)
+    {
+        // If a group has been modified while it is outside of the tree, then the setters may not have
+        // the correct themed value, so when we re-enter, if there has been activity refresh the theme
+        // resources.
+        IFC_RETURN(NotifyThemeChanged(GetTheme(), true /* forceRefresh */));
+    }
+    return S_OK;
+}
+
+
 _Check_return_ HRESULT
 CVisualStateGroupCollection::LeaveImpl(_In_ CDependencyObject* namescopeOwner, _In_ LeaveParams params)
 {
diff --git a/src/dxaml/xcp/components/ContentRoot/ContentRoot.cpp b/src/dxaml/xcp/components/ContentRoot/ContentRoot.cpp
index f2b3795358..c02fc24f4d 100644
--- a/src/dxaml/xcp/components/ContentRoot/ContentRoot.cpp
+++ b/src/dxaml/xcp/components/ContentRoot/ContentRoot.cpp
@@ -274,7 +274,7 @@ _Check_return_ HRESULT CContentRoot::Close()
     m_lifetimeState = LifetimeState::Closing;
     bool releasePopupRoot = false;
 
-    ResetCompositionContent();
+    IFC_RETURN(ResetCompositionContent());
 
     IFC_RETURN(m_visualTree.ResetRoots(&releasePopupRoot));
 
diff --git a/src/dxaml/xcp/components/ContentRoot/InputDeviceCache.cpp b/src/dxaml/xcp/components/ContentRoot/InputDeviceCache.cpp
index 0b43e6b686..98a0f4d5dc 100644
--- a/src/dxaml/xcp/components/ContentRoot/InputDeviceCache.cpp
+++ b/src/dxaml/xcp/components/ContentRoot/InputDeviceCache.cpp
@@ -73,7 +73,7 @@ void InputDeviceCache::SetLastInputDeviceType(DirectUI::InputDeviceType deviceTy
     {
         if (CControl *pEngagedControl = contentRoot->GetFocusManagerNoRef()->GetEngagedControlNoRef())
         {
-            pEngagedControl->RemoveFocusEngagement();
+            VERIFYHR(pEngagedControl->RemoveFocusEngagement());
         }
     }
 }
diff --git a/src/dxaml/xcp/components/ContentRoot/PointerInputProcessor.cpp b/src/dxaml/xcp/components/ContentRoot/PointerInputProcessor.cpp
index 9a49e58869..9fc8b33ea9 100644
--- a/src/dxaml/xcp/components/ContentRoot/PointerInputProcessor.cpp
+++ b/src/dxaml/xcp/components/ContentRoot/PointerInputProcessor.cpp
@@ -45,6 +45,9 @@
 
 using namespace ContentRootInput;
 
+// Define as 1 (i.e. XCP_TRACE_OUTPUT_MSG) to get DirectManipulation debug outputs, and 0 otherwise
+#define DMIM_DBG 0
+
 static const XUINT32 sc_Mouse_Pointer_Id = 1;
 
 PointerInputProcessor::PointerInputProcessor(_In_ CInputManager& inputManager)
@@ -442,7 +445,7 @@ _Check_return_ HRESULT PointerInputProcessor::ProcessPointerInput(
             if (m_inputManager.m_coreServices.GetInputServices()->IsDMInfoTracingEnabled())
             {
                 IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER | DMIM_DBG) /*traceType*/, L"DMIM[0x%p]:  ProcessPointerInput - Raising PointerCaptureLost for 0x%p and pointerId=%d.",
-                    this, spDOContact, pointerId));
+                    this, spDOContact.get(), pointerId));
             }
     #endif // DM_DEBUG
 
@@ -531,7 +534,7 @@ _Check_return_ HRESULT PointerInputProcessor::ProcessPointerInput(
 #ifdef DM_DEBUG
         if (m_inputManager.m_coreServices.GetInputServices()->IsDMInfoTracingEnabled())
         {
-            IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER | DMIM_DBG) /*traceType*/, L"DMIM[0x%p]:  ProcessPointerInput - Raising PointerPressed for 0x%p.", this, spDOContact));
+            IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER | DMIM_DBG) /*traceType*/, L"DMIM[0x%p]:  ProcessPointerInput - Raising PointerPressed for 0x%p.", this, spDOContact.get()));
         }
 #endif // DM_DEBUG
 
@@ -609,7 +612,7 @@ _Check_return_ HRESULT PointerInputProcessor::ProcessPointerInput(
         if (m_inputManager.m_coreServices.GetInputServices()->IsDMInfoTracingEnabled())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER | DMIM_DBG) /*traceType*/, L"DMIM[0x%p]:  ProcessPointerInput - Raising PointerReleased for 0x%p.",
-                this, pPointerCaptureDO ? pPointerCaptureDO : spDOContact));
+                this, pPointerCaptureDO ? pPointerCaptureDO : spDOContact.get()));
         }
 #endif // DM_DEBUG
 
diff --git a/src/dxaml/xcp/components/ContentRoot/inc/ContentRoot.h b/src/dxaml/xcp/components/ContentRoot/inc/ContentRoot.h
index f6a85243a1..99c8498163 100644
--- a/src/dxaml/xcp/components/ContentRoot/inc/ContentRoot.h
+++ b/src/dxaml/xcp/components/ContentRoot/inc/ContentRoot.h
@@ -192,7 +192,7 @@ class CContentRoot
 
     bool m_hasPendingChangedEvent = false;
 
-    bool m_isInputActive;
+    bool m_isInputActive{};
 };
 
 struct XamlRootStateChangedRaiiHelper
diff --git a/src/dxaml/xcp/components/ContentRoot/inc/PointerInputProcessor.h b/src/dxaml/xcp/components/ContentRoot/inc/PointerInputProcessor.h
index d57d5c9186..65e94548e1 100644
--- a/src/dxaml/xcp/components/ContentRoot/inc/PointerInputProcessor.h
+++ b/src/dxaml/xcp/components/ContentRoot/inc/PointerInputProcessor.h
@@ -122,7 +122,7 @@ namespace ContentRootInput
         // PointerDownThemeAnimation uses PointerAnimationUsingKeyFrames, which gets the position of the pointer. Since
         // input injection isn't reliable, we're going to return a constant provided by the test.
         bool m_hasPrimaryPointerLastPositionOverride = false;
-        XPOINTF m_primaryPointerLastPositionOverride;
+        XPOINTF m_primaryPointerLastPositionOverride{};
 
         // This is only set when the InputMessage is being held by a stack variable, so a raw pointer is OK here.
         InputMessage* m_messageBeingProcessed = nullptr;
diff --git a/src/dxaml/xcp/components/DependencyObject/PropertySystem.cpp b/src/dxaml/xcp/components/DependencyObject/PropertySystem.cpp
index 6ac123feab..28e4817cdf 100644
--- a/src/dxaml/xcp/components/DependencyObject/PropertySystem.cpp
+++ b/src/dxaml/xcp/components/DependencyObject/PropertySystem.cpp
@@ -94,7 +94,7 @@ struct UpdateValueInfo
     KnownPropertyIndex m_propertyIndex  = KnownPropertyIndex::UnknownType_UnknownProperty;
     uint16_t m_threadId                 = 0;
     CDependencyObject* m_target         = nullptr;
-    uint8_t m_untypedEffectiveValue[sizeof(CValue)];
+    uint8_t m_untypedEffectiveValue[sizeof(CValue)]{};
 };
 
 static CircularMemoryLogger<8, UpdateValueInfo> s_failedUpdates;
diff --git a/src/dxaml/xcp/components/DependencyObject/inc/ValueBuffer.h b/src/dxaml/xcp/components/DependencyObject/inc/ValueBuffer.h
index c2b28c3a4a..3fdb70a4cc 100644
--- a/src/dxaml/xcp/components/DependencyObject/inc/ValueBuffer.h
+++ b/src/dxaml/xcp/components/DependencyObject/inc/ValueBuffer.h
@@ -55,7 +55,7 @@ class ValueBuffer
         XPOINTD _ptd;
     } m_primitive = {};
 
-    CCoreServices* m_core;
+    CCoreServices* m_core{};
     xref_ptr<CDependencyObject> m_obj;
     xref_ptr<Flyweight::PropertyValueObjectBase> m_vo;
     CValue m_value;
diff --git a/src/dxaml/xcp/components/ExtMetadataProvider/XamlType.h b/src/dxaml/xcp/components/ExtMetadataProvider/XamlType.h
index 38cab18c24..7c4530f4b8 100644
--- a/src/dxaml/xcp/components/ExtMetadataProvider/XamlType.h
+++ b/src/dxaml/xcp/components/ExtMetadataProvider/XamlType.h
@@ -98,11 +98,11 @@ namespace Internal
         bool IsEnum()           { return (m_pUserTypeData->iEnumIndex != -1); }
 
     private:
-        Private::XamlTypeInfoProvider* m_pTypeInfoProvider;
+        Private::XamlTypeInfoProvider* m_pTypeInfoProvider{};
 
-        const Private::XamlTypeName* m_pTypeName;
-        const Private::UserTypeInfo* m_pUserTypeData;
-        const INT32* m_piMemberIndices;
+        const Private::XamlTypeName* m_pTypeName{};
+        const Private::UserTypeInfo* m_pUserTypeData{};
+        const INT32* m_piMemberIndices{};
     };
 }
 
diff --git a/src/dxaml/xcp/components/ExtMetadataProvider/XamlTypeInfoProvider.h b/src/dxaml/xcp/components/ExtMetadataProvider/XamlTypeInfoProvider.h
index 1582a0eb80..967ca91b77 100644
--- a/src/dxaml/xcp/components/ExtMetadataProvider/XamlTypeInfoProvider.h
+++ b/src/dxaml/xcp/components/ExtMetadataProvider/XamlTypeInfoProvider.h
@@ -22,7 +22,7 @@ namespace Private
     public:
         XamlTypeInfoProvider(PCWSTR moduleName);
         XamlTypeInfoProvider(const XamlTypeInfoProvider& other) = delete;
-        XamlTypeInfoProvider(const XamlTypeInfoProvider&& other) :
+        XamlTypeInfoProvider(const XamlTypeInfoProvider&& other) noexcept :
             m_cXamlTypeNameTableSize(other.m_cXamlTypeNameTableSize),
             m_cXamlMemberTableSize(other.m_cXamlMemberTableSize),
             m_aspXamlTypeDataCache(std::move(other.m_aspXamlTypeDataCache)),
@@ -120,8 +120,8 @@ namespace Private
             return LoadFromResource<T>(resId, typeId, ppData, &size);
         }
 
-        size_t m_cXamlTypeNameTableSize;
-        size_t m_cXamlMemberTableSize;
+        size_t m_cXamlTypeNameTableSize{};
+        size_t m_cXamlMemberTableSize{};
 
         std::vector<wrl::ComPtr<xaml_markup::IXamlType>> m_aspXamlTypeDataCache;
         std::vector<wrl::ComPtr<xaml_markup::IXamlMember>> m_aspXamlMemberDataCache;
diff --git a/src/dxaml/xcp/components/FocusRect/FocusRectManager.cpp b/src/dxaml/xcp/components/FocusRect/FocusRectManager.cpp
index c4ca96afbb..c85d3ab45f 100644
--- a/src/dxaml/xcp/components/FocusRect/FocusRectManager.cpp
+++ b/src/dxaml/xcp/components/FocusRect/FocusRectManager.cpp
@@ -235,7 +235,7 @@ CFocusRectManager::GetFocusOptionsForElement(
 CFocusRectManager::CallCustomizationFunction(
     _In_ CDependencyObject* focusTarget,
     _Inout_ FocusRectangleOptions& options,
-    _Out_ bool* shouldDrawFocusRect)
+    _Inout_ bool* shouldDrawFocusRect)
 {
     CDependencyObject* focusTargetOrChrome = focusTarget;
 
@@ -349,7 +349,7 @@ CFocusRectManager::DetermineRenderOptions(
 /*static*/void
 CFocusRectManager::GetDefaultFocusOptionsForLink(
     _In_ CCoreServices* core,
-    _Out_ FocusRectangleOptions* newOptions)
+    _Inout_ FocusRectangleOptions* newOptions)
 {
     CDependencyObject* baseHighBrush = nullptr;
     CDependencyObject* altHighBrush = nullptr;
@@ -392,7 +392,7 @@ CFocusRectManager::GetDefaultFocusOptionsForLink(
 /*static*/void
 CFocusRectManager::GetDefaultFocusOptions(
     _In_ CCoreServices* core,
-    _Out_ FocusRectangleOptions* newOptions)
+    _Inout_ FocusRectangleOptions* newOptions)
 {
     CValue blackColorValue;
     blackColorValue.SetColor(0xFF000000);
@@ -414,7 +414,7 @@ CFocusRectManager::GetDefaultFocusOptions(
 /*static*/ bool
 CFocusRectManager::SetLegacyRenderOptions(
     _In_ const Focusable& focusTarget,
-    _Out_ FocusRectangleOptions* options)
+    _Inout_ FocusRectangleOptions* options)
 {
     GetDefaultFocusOptions(focusTarget.Object->GetContext(), options);
 
@@ -939,7 +939,7 @@ void CFocusRectManager::UpdateFocusRect(
     }
 
     // Apply or remove clip to m_transitionRoot as needed.
-    // It seems a little hacky to put a clip on the transition root, since this transition root coule theoretically have
+    // It seems a little hacky to put a clip on the transition root, since this transition root could theoretically have
     // another unrelated LTE on it, and that LTE would get clipped by this clip as well.  But this is such a specific element
     // in a specific place in the tree, it should be super unlikely that would happen.  LTEs are typically attached to
     // specific elements in a control's template.
@@ -950,7 +950,7 @@ void CFocusRectManager::UpdateFocusRect(
         {
             CUIElement::NWSetContentDirty(m_transitionRoot, DirtyFlags::Render);
         }
-        m_transitionRoot->SetClip(nullptr);
+        IFCFAILFAST(m_transitionRoot->SetClip(nullptr));
     }
     else if (!existingClipRect || existingClipRect->m_rc != newClipRect)
     {
@@ -961,7 +961,7 @@ void CFocusRectManager::UpdateFocusRect(
         svClipRect.attach(static_cast<CRectangleGeometry*>(obj));
 
         svClipRect->m_rc = newClipRect;
-        m_transitionRoot->SetClip(svClipRect);
+        IFCFAILFAST(m_transitionRoot->SetClip(svClipRect));
         CUIElement::NWSetContentDirty(m_transitionRoot, DirtyFlags::Render);
     }
 }
diff --git a/src/dxaml/xcp/components/FocusRect/RevealFocusAnimator.cpp b/src/dxaml/xcp/components/FocusRect/RevealFocusAnimator.cpp
index 1f478c4443..c9bd8ae5c6 100644
--- a/src/dxaml/xcp/components/FocusRect/RevealFocusAnimator.cpp
+++ b/src/dxaml/xcp/components/FocusRect/RevealFocusAnimator.cpp
@@ -527,7 +527,9 @@ wf::TimeSpan RevealFocusAnimator::GetPulsingAnimationDelay()
 wf::TimeSpan RevealFocusAnimator::GetIntensityDuration(const RevealFocusSource& source, DirectUI::FocusNavigationDirection direction)
 {
     const auto spotlightDuration = source.GetSpotLightDuration(direction);
-    return wf::TimeSpan { static_cast<int64_t>(spotlightDuration.Duration * GetDefaultValue(DefaultValue::SpotLightIntensityDurationFactor))};
+    return wf::TimeSpan { static_cast<int64_t>(
+        static_cast<float>(spotlightDuration.Duration) * GetDefaultValue(DefaultValue::SpotLightIntensityDurationFactor)
+        )};
 }
 
 void RevealFocusAnimator::OnFocusedElementKeyPressed(_In_ const RevealFocusSource& source)
diff --git a/src/dxaml/xcp/components/FocusRect/RevealFocusSource.cpp b/src/dxaml/xcp/components/FocusRect/RevealFocusSource.cpp
index e5151678ac..e249eaaf3e 100644
--- a/src/dxaml/xcp/components/FocusRect/RevealFocusSource.cpp
+++ b/src/dxaml/xcp/components/FocusRect/RevealFocusSource.cpp
@@ -488,7 +488,7 @@ bool RevealFocusSource::IsTravelingFocusEnabled(_In_ DirectUI::FocusNavigationDi
 wf::TimeSpan RevealFocusSource::GetSpotLightDuration(_In_ DirectUI::FocusNavigationDirection direction) const
 {
     const float spotLightSpeed = GetTravelingDistance(direction) / GetDefaultValue(DefaultValue::SpotLightSpeed);
-    return wf::TimeSpan { static_cast<int64_t>(HNS_FROM_SECOND(spotLightSpeed)) };
+    return wf::TimeSpan { HNS_FROM_SECOND(static_cast<int64_t>(spotLightSpeed)) };
 }
 
 float RevealFocusSource::GetTravelingDistance(_In_ DirectUI::FocusNavigationDirection direction) const
diff --git a/src/dxaml/xcp/components/FocusRect/inc/FocusRectHelper.h b/src/dxaml/xcp/components/FocusRect/inc/FocusRectHelper.h
index 7de8d8debb..357fe8fadd 100644
--- a/src/dxaml/xcp/components/FocusRect/inc/FocusRectHelper.h
+++ b/src/dxaml/xcp/components/FocusRect/inc/FocusRectHelper.h
@@ -11,7 +11,7 @@ void
 CallCustomizationFunctionIfExists(
     _In_ CDependencyObject* element,
     _Inout_ FocusRectangleOptions& options,
-    _Out_ bool* shouldDrawFocusRect)
+    _Inout_ bool* shouldDrawFocusRect)
 {
     // Give ListViewBaseItemChrome a chance to tweak the render options if it wants
     if (element->OfTypeByIndex<DependencyObjectTraits<T>::Index>())
@@ -111,7 +111,7 @@ xref_ptr<CBorder> EnsureFocusRectBorderAtPosition(
     hitTestVisible.SetBool(FALSE);
     IFCFAILFAST(newBorder->SetValueByKnownIndex(KnownPropertyIndex::UIElement_IsHitTestVisible, hitTestVisible));
 
-    parent->AddChild(newBorder.get());
+    IFCFAILFAST(parent->AddChild(newBorder.get()));
     return newBorder;
 }
 
diff --git a/src/dxaml/xcp/components/FocusRect/inc/FocusRectManager.h b/src/dxaml/xcp/components/FocusRect/inc/FocusRectManager.h
index cdba42ccaa..93794a6427 100644
--- a/src/dxaml/xcp/components/FocusRect/inc/FocusRectManager.h
+++ b/src/dxaml/xcp/components/FocusRect/inc/FocusRectManager.h
@@ -66,7 +66,7 @@ class CFocusRectManager
     static void CallCustomizationFunction(
         _In_ CDependencyObject* focusTarget,
         _Inout_ FocusRectangleOptions& options,
-        _Out_ bool* shouldDrawFocusRect);
+        _Inout_ bool* shouldDrawFocusRect);
 
     static void DetermineRenderOptions(
         _In_ const Focusable& focusedElement,
@@ -79,7 +79,7 @@ class CFocusRectManager
 
     static bool SetLegacyRenderOptions(
         _In_ const Focusable& focusTarget,
-        _Out_ FocusRectangleOptions* options);
+        _Inout_ FocusRectangleOptions* options);
 
     static void GetFocusOptionsForElement(
         _In_ const Focusable& element,
@@ -91,11 +91,11 @@ class CFocusRectManager
 
     static void GetDefaultFocusOptions(
         _In_ CCoreServices* core,
-        _Out_ FocusRectangleOptions* options);
+        _Inout_ FocusRectangleOptions* options);
 
     static void GetDefaultFocusOptionsForLink(
         _In_ CCoreServices* core,
-        _Out_ FocusRectangleOptions* options);
+        _Inout_ FocusRectangleOptions* options);
 
     static void AddRevealFocusOptions(
         FocusRectangleOptions& options,
diff --git a/src/dxaml/xcp/components/FocusRect/inc/FocusRectNudging.h b/src/dxaml/xcp/components/FocusRect/inc/FocusRectNudging.h
index 5c9a9b31aa..c14965ec36 100644
--- a/src/dxaml/xcp/components/FocusRect/inc/FocusRectNudging.h
+++ b/src/dxaml/xcp/components/FocusRect/inc/FocusRectNudging.h
@@ -388,7 +388,7 @@ _Check_return_ HRESULT GetFocusRectWithNudging(
 
     const XRECTF focusRectBounds = ShrinkRectByThickness(elementBounds, focusRectMargin);
 
-    element->TransformToVisual(nullptr, &elementToClientTransform);
+    IFC_RETURN(element->TransformToVisual(nullptr, &elementToClientTransform));
 
     XRECTF elementBoundsInClientSpace = {};
     IFC_RETURN(elementToClientTransform->TransformRect(elementBounds, &elementBoundsInClientSpace));
diff --git a/src/dxaml/xcp/components/FocusRect/inc/RevealFocusAnimator.h b/src/dxaml/xcp/components/FocusRect/inc/RevealFocusAnimator.h
index 5ba1f40299..19cfe78e61 100644
--- a/src/dxaml/xcp/components/FocusRect/inc/RevealFocusAnimator.h
+++ b/src/dxaml/xcp/components/FocusRect/inc/RevealFocusAnimator.h
@@ -183,7 +183,7 @@ class RevealFocusAnimator final
         int IterationCount = 0;
 
         bool HasStopBehavior = false;
-        WUComp::AnimationStopBehavior StopBehavior;
+        WUComp::AnimationStopBehavior StopBehavior{};
 
     private:
         AnimationBehavior() = default;
diff --git a/src/dxaml/xcp/components/FocusRect/inc/RevealFocusSource.h b/src/dxaml/xcp/components/FocusRect/inc/RevealFocusSource.h
index 8216c5dcab..231089d114 100644
--- a/src/dxaml/xcp/components/FocusRect/inc/RevealFocusSource.h
+++ b/src/dxaml/xcp/components/FocusRect/inc/RevealFocusSource.h
@@ -69,6 +69,7 @@ namespace FocusRect {
         // Returns the size of the insets to be applied to the nine grid brush based on the FocusVisualPrimaryThickness
         XTHICKNESS GetInsetsFromThickness(_In_ const XTHICKNESS& primaryThickness) const;
 
+#pragma warning(suppress: 6506) // non-pointer when expanding to class actual parameter.
         template <typename InterfaceType>
         bool TryGetLight(RevealFocusLight lightType, _Out_ Microsoft::WRL::Details::ComPtrRef<Microsoft::WRL::ComPtr<InterfaceType>> light) const
         {
diff --git a/src/dxaml/xcp/components/SatelliteBase/inc/BindableToObservableVectorWrapper.h b/src/dxaml/xcp/components/SatelliteBase/inc/BindableToObservableVectorWrapper.h
index 0392efb1f1..05b6af253d 100644
--- a/src/dxaml/xcp/components/SatelliteBase/inc/BindableToObservableVectorWrapper.h
+++ b/src/dxaml/xcp/components/SatelliteBase/inc/BindableToObservableVectorWrapper.h
@@ -48,13 +48,13 @@ namespace Private
 
         Private::TrackerPtr<xaml_interop::IBindableVector> _tpItemSourceAsBindable;
         Private::TrackerPtr<xaml_interop::INotifyCollectionChanged> _tpItemsSourceAsNotify;
-        EventRegistrationToken _tokenCollectionChanged;
+        EventRegistrationToken _tokenCollectionChanged{};
 
         Private::TrackerEventSource<wfc::VectorChangedEventHandler<IInspectable*>> _tpEvent;
         wrl::ComPtr<VectorChangedEventArgs> _spVectorChangedArgs;
 
         Private::TrackerPtr<xaml_interop::IBindableObservableVector> _tpObservableVector;
-        EventRegistrationToken _tokenVectorChanged;
+        EventRegistrationToken _tokenVectorChanged{};
     };
 
 }
diff --git a/src/dxaml/xcp/components/SatelliteBase/inc/ComTemplateLibrary.h b/src/dxaml/xcp/components/SatelliteBase/inc/ComTemplateLibrary.h
index 597451e873..d206ef937d 100644
--- a/src/dxaml/xcp/components/SatelliteBase/inc/ComTemplateLibrary.h
+++ b/src/dxaml/xcp/components/SatelliteBase/inc/ComTemplateLibrary.h
@@ -286,8 +286,8 @@ namespace pctl
 
     private:
 
-        IInspectable* m_pControllingUnknown;
-        bool m_isComposed;
+        IInspectable* m_pControllingUnknown{};
+        bool m_isComposed{};
     };
 
 
diff --git a/src/dxaml/xcp/components/SatelliteBase/inc/SatMacros.h b/src/dxaml/xcp/components/SatelliteBase/inc/SatMacros.h
index 49e6c5b1e0..5759b6c936 100644
--- a/src/dxaml/xcp/components/SatelliteBase/inc/SatMacros.h
+++ b/src/dxaml/xcp/components/SatelliteBase/inc/SatMacros.h
@@ -37,7 +37,7 @@
 // except AddRef/Release call the base class instead of RuntimeClassT directly and GetIids is not implemented
 #define WuxpInspectableClassNoGetIids(runtimeClassName, trustLevel) \
     public: \
-        static const wchar_t* STDMETHODCALLTYPE InternalGetRuntimeClassName() throw() \
+        static const wchar_t* STDMETHODCALLTYPE InternalGetRuntimeClassName() noexcept \
         { \
             static_assert((RuntimeClassT::ClassFlags::value & ::Microsoft::WRL::WinRtClassicComMix) == ::Microsoft::WRL::WinRt || \
                 (RuntimeClassT::ClassFlags::value & ::Microsoft::WRL::WinRtClassicComMix) == ::Microsoft::WRL::WinRtClassicComMix, \
@@ -46,7 +46,7 @@
             static_assert(!__is_base_of(IActivationFactory, RuntimeClassT), "Incorrect usage of IActivationFactory interface. Make sure that your RuntimeClass doesn't implement IActivationFactory interface use ::Windows::WRL::ActivationFactory instead or 'InspectableClass' macro is not used on ::Windows::WRL::ActivationFactory"); \
             return runtimeClassName; \
         } \
-        static TrustLevel STDMETHODCALLTYPE InternalGetTrustLevel() throw() \
+        static TrustLevel STDMETHODCALLTYPE InternalGetTrustLevel() noexcept \
         { \
             return trustLevel; \
         } \
diff --git a/src/dxaml/xcp/components/SatelliteBase/inc/TrackerPtrFamily.h b/src/dxaml/xcp/components/SatelliteBase/inc/TrackerPtrFamily.h
index 232f713760..f0c1bd2869 100644
--- a/src/dxaml/xcp/components/SatelliteBase/inc/TrackerPtrFamily.h
+++ b/src/dxaml/xcp/components/SatelliteBase/inc/TrackerPtrFamily.h
@@ -62,7 +62,7 @@ namespace Private
             other.m_pOwnerNoRef = nullptr;
         }
 
-        ReferenceTrackerBase& operator=(ReferenceTrackerBase&& other)
+        ReferenceTrackerBase& operator=(ReferenceTrackerBase&& other) noexcept
         {
             if (this != std::addressof(other))
             {
diff --git a/src/dxaml/xcp/components/SatelliteBase/inc/ValueBoxer.h b/src/dxaml/xcp/components/SatelliteBase/inc/ValueBoxer.h
index 34f73e524d..fd90d59a5b 100644
--- a/src/dxaml/xcp/components/SatelliteBase/inc/ValueBoxer.h
+++ b/src/dxaml/xcp/components/SatelliteBase/inc/ValueBoxer.h
@@ -123,7 +123,7 @@ class Reference :
     STDMETHODIMP GetRectArray(_Out_ UINT32* /* length */, _Outptr_result_maybenull_ wf::Rect ** /* value */) { return E_NOTIMPL; }
 
 private:
-    T m_val;
+    T m_val{};
 
 }; // class Reference
 
diff --git a/src/dxaml/xcp/components/Telemetry/inc/GCInstrumentationAggregator.h b/src/dxaml/xcp/components/Telemetry/inc/GCInstrumentationAggregator.h
index 19b9a9f73f..9a6958b822 100644
--- a/src/dxaml/xcp/components/Telemetry/inc/GCInstrumentationAggregator.h
+++ b/src/dxaml/xcp/components/Telemetry/inc/GCInstrumentationAggregator.h
@@ -58,8 +58,8 @@ namespace Instrumentation {
         LONGLONG m_nTreeWalkStart;
         LONGLONG m_nUIFinalizerStart;
 
-        bool m_bInTreeWalkGCLock;
-        bool m_bInFinalizerLock;
+        bool m_bInTreeWalkGCLock{};
+        bool m_bInFinalizerLock{};
 
         LONGLONG m_nPeriod = 300; //initial period is equal to 5 mins ( 5*60 sec)
         LONGLONG m_nStartPeriod = 60; // at startup log at 1 min ( 60 sec)
diff --git a/src/dxaml/xcp/components/Telemetry/inc/XamlTraceSession.h b/src/dxaml/xcp/components/Telemetry/inc/XamlTraceSession.h
index bdec5f9a09..fe2306dc86 100644
--- a/src/dxaml/xcp/components/Telemetry/inc/XamlTraceSession.h
+++ b/src/dxaml/xcp/components/Telemetry/inc/XamlTraceSession.h
@@ -17,7 +17,7 @@ namespace Instrumentation {
     private:
         std::wstring m_appId;
         std::wstring m_sessionId;
-        DWORD m_processId;
+        DWORD m_processId{};
 
         std::mutex m_mutex;
     };
diff --git a/src/dxaml/xcp/components/UIBridgeFocus/FocusController.cpp b/src/dxaml/xcp/components/UIBridgeFocus/FocusController.cpp
index 5818f69764..739bc50b74 100644
--- a/src/dxaml/xcp/components/UIBridgeFocus/FocusController.cpp
+++ b/src/dxaml/xcp/components/UIBridgeFocus/FocusController.cpp
@@ -230,7 +230,7 @@ HRESULT FocusController::DepartFocus(
 }
 
 template<typename TDelegateInterface, typename TCallback>
-::Microsoft::WRL::ComPtr<TDelegateInterface> MakeAgileCallback(TCallback callback) throw()
+::Microsoft::WRL::ComPtr<TDelegateInterface> MakeAgileCallback(TCallback callback) noexcept
 {
     return ::Microsoft::WRL::Callback<
         ::Microsoft::WRL::Implements<
diff --git a/src/dxaml/xcp/components/WindowChrome/CWindowChrome.cpp b/src/dxaml/xcp/components/WindowChrome/CWindowChrome.cpp
index fe3dcd7da4..618f326deb 100644
--- a/src/dxaml/xcp/components/WindowChrome/CWindowChrome.cpp
+++ b/src/dxaml/xcp/components/WindowChrome/CWindowChrome.cpp
@@ -73,7 +73,7 @@ _Check_return_ HRESULT CWindowChrome::ConfigureWindowChrome()
     // Better default setting - Applying Transparent value as the default button bg color for caption buttons
     // This will be applied every time titlebar is enabled - whether first time or other times
     // this is the most common use of titlebar and this default setting makes it easier for customers to use it
-    if (!m_isDefaultCaptionButtonStyleSet)
+    if (m_bIsActive && !m_isDefaultCaptionButtonStyleSet)
     {
         // only do it the first time in the lifetime of WindowChrome
         // so that if customer code changes caption button bg color to something
@@ -87,6 +87,12 @@ _Check_return_ HRESULT CWindowChrome::ConfigureWindowChrome()
 
     }
 
+    IFC_RETURN(SetFocusIfNeeded());
+    return S_OK;
+}
+
+_Check_return_ HRESULT CWindowChrome::SetFocusIfNeeded()
+{
     // WindowActivate for island/ win32 window has already had happened even before content of WindowChrome is loaded.
     // Due to this, SetWindowFocus which gets called on launch while handling WindowActivation has nothing to set focus on
     // and ends up in focusing nothing at all. This leads to launch an app without focus.
@@ -102,6 +108,7 @@ _Check_return_ HRESULT CWindowChrome::ConfigureWindowChrome()
     return S_OK;
 }
 
+
 _Check_return_ HRESULT CWindowChrome::SetIsChromeActive(bool isActive)
 {
     auto guard = wil::scope_exit([&, this]()
@@ -138,8 +145,6 @@ bool CWindowChrome::HandleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam, _Out_
     {
         case WM_CREATE:
             return !!OnCreate();
-        case WM_PAINT :
-            return !!OnPaint();
     }
 
     return false;
@@ -187,33 +192,6 @@ bool CWindowChrome::IsTitlebarVisible() const
     return IsChromeActive();
 }
 
-
-LRESULT CWindowChrome::OnPaint()
-{
-    PAINTSTRUCT ps{ 0 };
-    const auto hdc = wil::BeginPaint(m_topLevelWindow, &ps);
-    if (!hdc)
-    {
-        return 0;
-    }
-
-    const auto topBorderHeight = GetTopBorderHeight();
-
-    if (ps.rcPaint.top < topBorderHeight)
-    {
-        RECT rcTopBorder = ps.rcPaint;
-        rcTopBorder.bottom = topBorderHeight;
-
-        // To show the original top border, we have to paint on top of it with
-        // the alpha component set to 0. This page recommends to paint the area
-        // in black using the stock BLACK_BRUSH to do this:
-        // https://docs.microsoft.com/en-us/windows/win32/dwm/customframe#extending-the-client-frame
-        ::FillRect(hdc.get(), &rcTopBorder, GetStockBrush(BLACK_BRUSH));
-    }
-
-    return 0;
-}
-
 void CWindowChrome::UpdateContainerSize(WPARAM wParam, LPARAM lParam)
 {
     
@@ -288,10 +266,9 @@ _Check_return_ HRESULT CWindowChrome::OnTitleBarSizeChanged()
     if (!IsChromeActive())
     {
         RECT empty = {0, 0, 0, 0};
-        if (!::EqualRect(&m_dragRegionCached, &empty))
+        if (m_enabledDrag != m_enabledDragCached || !::EqualRect(&m_dragRegionCached, &empty))
         {
             didRectChange = true;
-            m_dragRegionCached = empty;
             IFC_RETURN(SetDragRegion(empty));
         }
     }
@@ -309,10 +286,9 @@ _Check_return_ HRESULT CWindowChrome::OnTitleBarSizeChanged()
             }
             
             RECT dragBarRect = WindowHelpers::GetClientAreaLogicalRectForUIElement(userTitlebar);
-            if (!::EqualRect(&m_dragRegionCached, &dragBarRect))
+            if (m_enabledDrag != m_enabledDragCached || !::EqualRect(&m_dragRegionCached, &dragBarRect))
             {
                 didRectChange = true;
-                m_dragRegionCached = dragBarRect;
                 IFC_RETURN(SetDragRegion(dragBarRect));
             }
         }
@@ -369,37 +345,52 @@ void CWindowChrome::UpdateCanDragStatus(bool enabled)
 
 _Check_return_ HRESULT CWindowChrome::SetDragRegion(RECT rf)
 {
+    UINT32 captionRectLength;
+    wil::unique_cotaskmem_ptr<wgr::RectInt32[]> captionRects;
+
+    IFC_RETURN(GetPeer()->GetNonClientInputPtrSrc()->GetRegionRects(mui::NonClientRegionKind_Caption, &captionRectLength, wil::out_param(captionRects)));
+
+    std::vector<wgr::RectInt32> captionRegions{ captionRects.get(), captionRects.get() + captionRectLength };
+
+    // We'll remove the region rect we previously added. We'll add the new one later, if we need to.
+    captionRegions.erase(
+        std::remove_if(
+            captionRegions.begin(),
+            captionRegions.end(),
+            [&](wgr::RectInt32 const& rect)
+            {
+                return rect.X == m_scaledDragRegionCached.X &&
+                    rect.Y == m_scaledDragRegionCached.Y &&
+                    rect.Width == m_scaledDragRegionCached.Width &&
+                    rect.Height == m_scaledDragRegionCached.Height;
+            }),
+        captionRegions.end());
+
     // sometimes dragging needs to be disabled temporarily
     // for example : when content dialog's smoke screen is displayed
-    wgr::RectInt32 rect = { 0, 0, 0, 0 };
-    if (m_enabledDrag)
-    {
-        rect = { rf.left, rf.top, RectHelpers::rectWidth(rf), RectHelpers::rectHeight(rf) };
-    }
-
-    
-    if (rect.Width == 0 || rect.Height == 0)
-    {
-        // clear out every drag region if user titlebar is defined as null
-        // it will result in default case of AppWindowTitlebar being applied where a 
-        // default drag region is covers the entire non client region
-        IFC_RETURN(GetPeer()->GetNonClientInputPtrSrc()->ClearRegionRects(mui::NonClientRegionKind_Caption));
-    }
-    else
+    if (m_enabledDrag && !IsRectEmpty(&rf))
     {
         // Xaml works with logical (dpi-applied) client coordinates
         // InputNonClientPointerSource apis take non-dpi client coordinates
         // physical client coordinates = dpi applied coordinates * dpi scale
         float scale = WindowHelpers::GetCurrentDpiScale(m_topLevelWindow);
-        rect = { 
-            static_cast<int>(std::round(rect.X * scale)),
-            static_cast<int>(std::round(rect.Y * scale)),
-            static_cast<int>(std::round(rect.Width * scale)),
-            static_cast<int>(std::round(rect.Height * scale))
+        m_scaledDragRegionCached = { 
+            static_cast<int>(std::round(rf.left * scale)),
+            static_cast<int>(std::round(rf.top * scale)),
+            static_cast<int>(std::round(RectHelpers::rectWidth(rf) * scale)),
+            static_cast<int>(std::round(RectHelpers::rectHeight(rf)* scale))
         };
-        wgr::RectInt32 rects[]{ rect };
-        IFC_RETURN(GetPeer()->GetNonClientInputPtrSrc()->SetRegionRects(mui::NonClientRegionKind_Caption, 1, rects));
     }
+    else
+    {
+        m_scaledDragRegionCached = { 0, 0, 0, 0 };
+    }
+
+    captionRegions.push_back(m_scaledDragRegionCached);
+
+    IFC_RETURN(GetPeer()->GetNonClientInputPtrSrc()->SetRegionRects(mui::NonClientRegionKind_Caption, captionRegions.size(), captionRegions.data()));
     
+    m_dragRegionCached = rf;
+    m_enabledDragCached = m_enabledDrag;
     return S_OK;
 }
diff --git a/src/dxaml/xcp/components/WindowChrome/inc/CWindowChrome.h b/src/dxaml/xcp/components/WindowChrome/inc/CWindowChrome.h
index 1b8e7db364..8c0045e83b 100644
--- a/src/dxaml/xcp/components/WindowChrome/inc/CWindowChrome.h
+++ b/src/dxaml/xcp/components/WindowChrome/inc/CWindowChrome.h
@@ -68,7 +68,7 @@ class CWindowChrome : public CContentControl
     int GetTopBorderHeight() const noexcept;
     _Check_return_ HRESULT ConfigureWindowChrome();
     _Check_return_ HRESULT ApplyStyling();
-    [[nodiscard]] LRESULT OnNcHitTest(const POINT ptMouse);
+    _Check_return_ HRESULT SetFocusIfNeeded();
     
     // sometimes when you need to temporarily disable dragging like in case when Content Dialog is shown
     // these apis control whether a drag region gets created or not.
@@ -79,7 +79,6 @@ class CWindowChrome : public CContentControl
     enum class CaptionButtonState {Normal, Hover, Pressed};
 
     [[nodiscard]] LRESULT OnCreate();
-    [[nodiscard]] LRESULT OnPaint();
     
     
     // Repositions the Visual Studio in-app toolbar below the custom titlebar if necessary,
@@ -88,8 +87,10 @@ class CWindowChrome : public CContentControl
     
     bool m_bIsActive = false;
     HWND m_topLevelWindow = NULL;
-    bool m_enabledDrag =  true;
+    bool m_enabledDrag = true;
+    bool m_enabledDragCached = true;
     RECT m_dragRegionCached{};
+    wgr::RectInt32 m_scaledDragRegionCached{};
     bool m_isDefaultCaptionButtonStyleSet = false; // do it only the first time window chrome is created
     
 };
diff --git a/src/dxaml/xcp/components/allocation/inc/XcpAllocation.h b/src/dxaml/xcp/components/allocation/inc/XcpAllocation.h
index f876333daa..de42b9430b 100644
--- a/src/dxaml/xcp/components/allocation/inc/XcpAllocation.h
+++ b/src/dxaml/xcp/components/allocation/inc/XcpAllocation.h
@@ -15,11 +15,11 @@ enum ZeroMemAllocationPolicy
     ZERO_MEM_FAIL_FAST
 };
 
-__declspec(allocator) void * __cdecl operator new(size_t cSize, NoFailFastAllocationPolicy);
-__bcount(cSize) XCP_FORCEINLINE __declspec(allocator) void * __cdecl operator new[](size_t cSize, NoFailFastAllocationPolicy);
+_Ret_notnull_ _Post_writable_byte_size_(cSize) __declspec(allocator) void * __cdecl operator new(size_t cSize, NoFailFastAllocationPolicy);
+_Ret_notnull_ _Post_writable_byte_size_(cSize) XCP_FORCEINLINE __declspec(allocator) void * __cdecl operator new[](size_t cSize, NoFailFastAllocationPolicy);
 
-__declspec(allocator) void * __cdecl operator new(size_t cSize, ZeroMemAllocationPolicy);
-__bcount(cSize) XCP_FORCEINLINE __declspec(allocator) void * __cdecl operator new[](size_t cSize, ZeroMemAllocationPolicy);
+_Ret_notnull_ _Post_writable_byte_size_(cSize) __declspec(allocator) void * __cdecl operator new(size_t cSize, ZeroMemAllocationPolicy);
+_Ret_notnull_ _Post_writable_byte_size_(cSize) XCP_FORCEINLINE __declspec(allocator) void * __cdecl operator new[](size_t cSize, ZeroMemAllocationPolicy);
 
 namespace XcpAllocation {
     
diff --git a/src/dxaml/xcp/components/animation/ConnectedAnimation.cpp b/src/dxaml/xcp/components/animation/ConnectedAnimation.cpp
index 8ae729a459..fef10d2055 100644
--- a/src/dxaml/xcp/components/animation/ConnectedAnimation.cpp
+++ b/src/dxaml/xcp/components/animation/ConnectedAnimation.cpp
@@ -754,7 +754,7 @@ void CConnectedAnimation::ComputeAnimationOffset(_In_ ConnectedAnimationElementI
     offset.Y += (m_baseAnimation->m_source.clippedRect.Height - m_baseAnimation->m_destination.clippedRect.Height) / 2;
 }
 
-_Check_return_ void CConnectedAnimation::GetBaseAnimationSourceInfo()
+void CConnectedAnimation::GetBaseAnimationSourceInfo()
 {
     // Coordinated connected animations don't have a souce snapshot, so we create a rectangle for the source
     // that is basically, "compute where a source element would be if it had the same layout relationship to
diff --git a/src/dxaml/xcp/components/animation/TimeManager.cpp b/src/dxaml/xcp/components/animation/TimeManager.cpp
index 115ca16084..5997cf441c 100644
--- a/src/dxaml/xcp/components/animation/TimeManager.cpp
+++ b/src/dxaml/xcp/components/animation/TimeManager.cpp
@@ -13,6 +13,7 @@
 #include <DependencyLocator.h>
 #include <FeatureFlags.h>
 #include <DesignMode.h>
+#include "RefreshAlignedClock.h"
 
 bool CTimeManager::s_slowDownAnimations = false;
 bool CTimeManager::s_slowDownAnimationsLoaded = false;
diff --git a/src/dxaml/xcp/components/animation/inc/ConnectedAnimation.h b/src/dxaml/xcp/components/animation/inc/ConnectedAnimation.h
index b72c666c56..72ee2d34c4 100644
--- a/src/dxaml/xcp/components/animation/inc/ConnectedAnimation.h
+++ b/src/dxaml/xcp/components/animation/inc/ConnectedAnimation.h
@@ -34,8 +34,8 @@ struct ConnectedAnimationElementInfo
     xref_ptr<CUIElement> element;
     Microsoft::WRL::ComPtr<WUComp::IVisual> visual;
     Microsoft::WRL::ComPtr<WUComp::ICompositionBrush> surfaceBrush;
-    XRECTF_WH clippedRect;
-    XRECTF_WH unclippedRect;
+    XRECTF_WH clippedRect{};
+    XRECTF_WH unclippedRect{};
     CMILMatrix transform;
  };
 
@@ -157,7 +157,7 @@ class CConnectedAnimation : public CDependencyObject
     Microsoft::WRL::ComPtr<WUComp::IVisual> m_hostVisual;
     Microsoft::WRL::ComPtr<WUComp::IInsetClip> m_insetClip;
     wrl::ComPtr<WUComp::ICompositionScopedBatch> m_scopedAnimationBatch;
-    EventRegistrationToken m_scopedAnimationBatchCompletedToken;
+    EventRegistrationToken m_scopedAnimationBatchCompletedToken{};
     xref_ptr<CConnectedAnimation> m_baseAnimation;
     xstring_ptr m_key;
 
diff --git a/src/dxaml/xcp/components/base/bit_vector.cpp b/src/dxaml/xcp/components/base/bit_vector.cpp
index b07f007078..7fdf168c60 100644
--- a/src/dxaml/xcp/components/base/bit_vector.cpp
+++ b/src/dxaml/xcp/components/base/bit_vector.cpp
@@ -22,7 +22,7 @@ namespace containers
         copy_from(other);
     }
 
-    bit_vector::bit_vector(bit_vector&& other)
+    bit_vector::bit_vector(bit_vector&& other) noexcept
     {
         m_state = other.m_state;
         other.init();
@@ -44,7 +44,7 @@ namespace containers
         return *this;
     }
 
-    bit_vector& bit_vector::operator=(bit_vector&& other)
+    bit_vector& bit_vector::operator=(bit_vector&& other) noexcept
     {
         if (this != &other)
         {
diff --git a/src/dxaml/xcp/components/base/inc/AssertMacros.h b/src/dxaml/xcp/components/base/inc/AssertMacros.h
index bc7ef913f9..49dc58e18e 100644
--- a/src/dxaml/xcp/components/base/inc/AssertMacros.h
+++ b/src/dxaml/xcp/components/base/inc/AssertMacros.h
@@ -131,8 +131,8 @@
 // so the comma operator is not valid.
 #if defined(_PREFAST_)
 #define VERIFY(cond, ...) (_Analysis_assume_(!!cond), ((cond) ? TRUE : FALSE))
-#define VERIFYHR(hr, ...) (_Analysis_assume_(SUCCEEDED(hr)), ((hr) ? TRUE : FALSE))
-#define ASSERT(cond, ...) _Analysis_assume_(!!(cond))
+#define VERIFYHR(hr, ...) (_Analysis_assume_(SUCCEEDED(hr)), (SUCCEEDED(hr) ? TRUE : FALSE))
+#define ASSERT(cond, ...) (_Analysis_assume_(!!(cond)))
 #else
 #define VERIFY(cond, ...) (!!(cond) ? TRUE : FALSE)
 #define VERIFYHR(hr, ...) (SUCCEEDED(hr) ? TRUE : FALSE)
diff --git a/src/dxaml/xcp/components/base/inc/bit_vector.h b/src/dxaml/xcp/components/base/inc/bit_vector.h
index 0f594a8c57..861effac8a 100644
--- a/src/dxaml/xcp/components/base/inc/bit_vector.h
+++ b/src/dxaml/xcp/components/base/inc/bit_vector.h
@@ -20,10 +20,10 @@ namespace containers
         bit_vector();
         bit_vector(bit_count_t bit_count);
         bit_vector(const bit_vector& other);
-        bit_vector(bit_vector&& other);
+        bit_vector(bit_vector&& other) noexcept;
 
         bit_vector& operator=(const bit_vector& other);
-        bit_vector& operator=(bit_vector&& other);
+        bit_vector& operator=(bit_vector&& other) noexcept;
 
         ~bit_vector();
 
diff --git a/src/dxaml/xcp/components/base/inc/ext/ptr_base.h b/src/dxaml/xcp/components/base/inc/ext/ptr_base.h
index b9053de1ac..3f3de74137 100644
--- a/src/dxaml/xcp/components/base/inc/ext/ptr_base.h
+++ b/src/dxaml/xcp/components/base/inc/ext/ptr_base.h
@@ -359,7 +359,7 @@ namespace ext
             }
 
             // does not assign extra bits
-            raw_ptr& operator=(raw_ptr&& other)
+            raw_ptr& operator=(raw_ptr&& other) noexcept
             {
                 if (&other != this)
                 {
diff --git a/src/dxaml/xcp/components/base/inc/minerror.h b/src/dxaml/xcp/components/base/inc/minerror.h
index 32c5c6c1d4..6a2387d435 100644
--- a/src/dxaml/xcp/components/base/inc/minerror.h
+++ b/src/dxaml/xcp/components/base/inc/minerror.h
@@ -294,26 +294,6 @@ namespace Details
     } \
     CHECK_MISMATCH_RETURN
 
-// Like IFC_RETURN but also calls Stop() on the given activity on failure, passing the failure HRESULT.
-// Used in conjunction with WIL's TraceLogging activity macros.
-#define IFC_RETURN_STOPACTIVITY(x, activity) \
-    { \
-        const HRESULT _hr_ = (x); \
-        wil::verify_hresult(_hr_); \
-        __pragma(warning(suppress:4127)) \
-        if (SUCCEEDED(_hr_)) \
-        { \
-        } \
-        else \
-        { \
-            OnFailure<__COUNTER__>(_hr_); \
-            DISPLAY_DEBUG(_hr_, #x) \
-            if (activity) { activity.Stop(_hr_); } \
-            return _hr_; \
-        } \
-    } \
-    CHECK_MISMATCH_RETURN
-
 #define IFC_RETURN_EXTRA_INFO(x, extraInfo) \
     { \
         const HRESULT _hr_ = (x); \
@@ -393,7 +373,7 @@ namespace Details
     } \
     else \
     { \
-        HRESULT _hr_ = E_OUTOFMEMORY; \
+        constexpr HRESULT _hr_ = E_OUTOFMEMORY; \
         OnNewFailure<__COUNTER__>(_hr_); \
         DISPLAY_DEBUG(_hr_, #x) \
         return _hr_; \
@@ -422,7 +402,7 @@ namespace Details
     } \
     else \
     { \
-        HRESULT _hr_ = E_POINTER; \
+        constexpr HRESULT _hr_ = E_POINTER; \
         OnNewFailure<__COUNTER__>(_hr_); \
         DISPLAY_DEBUG(_hr_, #x) \
         return _hr_; \
@@ -451,7 +431,7 @@ namespace Details
     } \
     else \
     { \
-        HRESULT _hr_ = E_HANDLE; \
+        constexpr HRESULT _hr_ = E_HANDLE; \
         OnNewFailure<__COUNTER__>(_hr_); \
         DISPLAY_DEBUG(_hr_, #x) \
         return _hr_; \
@@ -480,7 +460,7 @@ namespace Details
     } \
     else \
     { \
-        HRESULT _hr_ = E_FAIL; \
+        constexpr HRESULT _hr_ = E_FAIL; \
         OnNewFailure<__COUNTER__>(_hr_); \
         DISPLAY_DEBUG(_hr_, #x) \
         return _hr_; \
@@ -511,7 +491,7 @@ namespace Details
     else \
     { \
         ASSERT(!"Internal Error"); \
-        HRESULT _hr_ = E_UNEXPECTED; \
+        constexpr HRESULT _hr_ = E_UNEXPECTED; \
         OnNewFailure<__COUNTER__>(_hr_); \
         DISPLAY_DEBUG(_hr_, #x) \
         return _hr_; \
@@ -540,7 +520,7 @@ namespace Details
     } \
     else \
     { \
-        HRESULT _hr_ = E_UNEXPECTED; \
+        constexpr HRESULT _hr_ = E_UNEXPECTED; \
         OnNewFailure<__COUNTER__>(_hr_); \
         DISPLAY_DEBUG(_hr_, #x) \
         return _hr_; \
@@ -568,7 +548,7 @@ namespace Details
     } \
     else \
     { \
-        HRESULT _hr_ = y; \
+        const HRESULT _hr_ = y; \
         OnNewFailure<__COUNTER__>(_hr_); \
         DISPLAY_DEBUG(_hr_, #x) \
         return _hr_; \
@@ -597,7 +577,7 @@ namespace Details
     } \
     else \
     { \
-        HRESULT _hr_ = y; \
+        const HRESULT _hr_ = y; \
         OnNewFailure<__COUNTER__>(_hr_); \
         DISPLAY_DEBUG(_hr_, #x) \
         return _hr_; \
@@ -675,6 +655,7 @@ namespace Details
 
 #define IFCFAILFAST(x) \
     { \
+        __pragma(warning(suppress:26498)) \
         const HRESULT __HR = (x); \
         wil::verify_hresult(__HR); \
         __pragma(warning(suppress:4127)) \
@@ -847,7 +828,7 @@ namespace Details
 // it will turn success into failure.
 inline HRESULT HResultFromKnownLastError()
 {
-    HRESULT hr = HRESULT_FROM_WIN32(GetLastError());
+    const HRESULT hr = HRESULT_FROM_WIN32(GetLastError());
     return (SUCCEEDED(hr) ? E_FAIL : hr);
 }
 
diff --git a/src/dxaml/xcp/components/base/inc/stack_allocator.h b/src/dxaml/xcp/components/base/inc/stack_allocator.h
index 50cbc960e1..51a9cdeb8e 100644
--- a/src/dxaml/xcp/components/base/inc/stack_allocator.h
+++ b/src/dxaml/xcp/components/base/inc/stack_allocator.h
@@ -28,7 +28,7 @@ namespace Jupiter {
     template<std::size_t N, std::size_t alignment = alignof(std::max_align_t)>
     class arena
     {
-        alignas(alignment) char m_buf[N];
+        alignas(alignment) char m_buf[N]{};
         char* m_ptr;
 
         bool pointer_in_buffer(char* p) WI_NOEXCEPT
diff --git a/src/dxaml/xcp/components/base/inc/weakref_count.h b/src/dxaml/xcp/components/base/inc/weakref_count.h
index 4e277f1fa1..3d9cd9bf7a 100644
--- a/src/dxaml/xcp/components/base/inc/weakref_count.h
+++ b/src/dxaml/xcp/components/base/inc/weakref_count.h
@@ -258,7 +258,8 @@ namespace xref
                 }
                 else
                 {
-                    auto inc = -1 << flag_width;
+#pragma warning (suppress : 26450) // Arithmetic overflow: '<<' operation causes overflow at compile time. Use a wider type to store the operands (io.1).
+                    constexpr unsigned int inc = ~0u << flag_width;
                     auto temp = ::_InterlockedExchangeAdd(&m_count_and_flag, inc);
                     return (temp >> flag_width) - 1;
                 }
@@ -311,9 +312,9 @@ namespace xref
                 control_block_type* m_control_block;
                 uintptr_t m_ptr_as_int; // For bit-masking trickery
             };
-            static const uintptr_t flag_width = 1;
-            static const uintptr_t flag_mask = (1 << flag_width) - 1;
-            static const uintptr_t count_mask = ~flag_mask;
+            static constexpr uintptr_t flag_width = 1;
+            static constexpr uintptr_t flag_mask = (1 << flag_width) - 1;
+            static constexpr uintptr_t count_mask = ~flag_mask;
             static_assert(std::alignment_of<control_block>::value >= (1 << flag_width), "Violated alignment assumption for safely packing control_block<T>*");
         };
     }
diff --git a/src/dxaml/xcp/components/base/inc/windowscollections.h b/src/dxaml/xcp/components/base/inc/windowscollections.h
index c29e549884..a9a32c39e1 100644
--- a/src/dxaml/xcp/components/base/inc/windowscollections.h
+++ b/src/dxaml/xcp/components/base/inc/windowscollections.h
@@ -519,7 +519,7 @@ namespace XWinRT
             : _pLock(nullptr)
             {
             }
-            LockHolder(LockHolder&& other)
+            LockHolder(LockHolder&& other) noexcept
             : _pLock(nullptr)
             {
                 using XWinRT::FakeStl::swap;
diff --git a/src/dxaml/xcp/components/base/inc/wrlhelper.h b/src/dxaml/xcp/components/base/inc/wrlhelper.h
index 8d461f98aa..ecf2d527f4 100644
--- a/src/dxaml/xcp/components/base/inc/wrlhelper.h
+++ b/src/dxaml/xcp/components/base/inc/wrlhelper.h
@@ -10,7 +10,7 @@ namespace WRLHelper
     // to remember that the default behavior for the callback template is to create
     // a proxied callback which must execute on the originating thread.
     template<typename TDelegateInterface, typename TCallback>
-    ::Microsoft::WRL::ComPtr<TDelegateInterface> MakeAgileCallback(TCallback callback) throw()
+    ::Microsoft::WRL::ComPtr<TDelegateInterface> MakeAgileCallback(TCallback callback) noexcept
     {
         return ::Microsoft::WRL::Callback <
             ::Microsoft::WRL::Implements <
@@ -22,7 +22,7 @@ namespace WRLHelper
     // Creates an regular callback function. This means that the completion callback is
     // called on the originating thread. 
     template<typename TDelegateInterface, typename TCallback>
-    ::Microsoft::WRL::ComPtr<TDelegateInterface> MakeCallback(TCallback callback) throw()
+    ::Microsoft::WRL::ComPtr<TDelegateInterface> MakeCallback(TCallback callback) noexcept
     {
         return ::Microsoft::WRL::Callback <
             ::Microsoft::WRL::Implements <
@@ -33,7 +33,7 @@ namespace WRLHelper
     // Creates an regular callback function. This means that the completion callback is
     // called on the originating thread. 
     template<typename TDelegateInterface, typename TCallbackObject>
-    ::Microsoft::WRL::ComPtr<TDelegateInterface> MakeCallback2(TCallbackObject* object, HRESULT (TCallbackObject::* callback)()) throw()
+    ::Microsoft::WRL::ComPtr<TDelegateInterface> MakeCallback2(TCallbackObject* object, HRESULT (TCallbackObject::* callback)()) noexcept
     {
         return ::Microsoft::WRL::Callback <
             ::Microsoft::WRL::Implements <
diff --git a/src/dxaml/xcp/components/base/inc/xhashmap.h b/src/dxaml/xcp/components/base/inc/xhashmap.h
index d68c36c988..9bac991938 100644
--- a/src/dxaml/xcp/components/base/inc/xhashmap.h
+++ b/src/dxaml/xcp/components/base/inc/xhashmap.h
@@ -219,7 +219,7 @@ template< typename T >
 class CDefaultHashTraits
 {
 public:
-    static HRESULT Hash(_In_ void * /*pOwner*/, _In_ const T& element, UINT32 *puHash) throw()
+    static HRESULT Hash(_In_ void * /*pOwner*/, _In_ const T& element, UINT32 *puHash) noexcept
     {
         *puHash = ( ULONG( ULONG_PTR( element ) ) );
         return S_OK;
@@ -359,7 +359,7 @@ class XHashMap
         }
 
     public:
-        UINT GetHash() const throw()
+        UINT GetHash() const noexcept
         {
             return( m_nHash );
         }
@@ -379,20 +379,20 @@ class XHashMap
         _In_ float fOptimalLoad = 0.75f,
         _In_ float fLoThreshold = 0.25f,
         _In_ float fHiThreshold = 2.25f,
-        _In_ UINT nBlockSize = 10) throw();
+        _In_ UINT nBlockSize = 10) noexcept;
 
-    XHashMap(XHashMap&& src) throw();
-    XHashMap& operator=(XHashMap&& src) throw();
+    XHashMap(XHashMap&& src) noexcept;
+    XHashMap& operator=(XHashMap&& src) noexcept;
 
-    size_t GetCount() const throw();
-    bool IsEmpty() const throw();
+    size_t GetCount() const noexcept;
+    bool IsEmpty() const noexcept;
 
     HRESULT Lookup(
         /* _In_ */ KINARGTYPE key,
         _Out_ VOUTARGTYPE value,
         _Out_ bool* retval) const;
-    HRESULT Lookup(/* _In_ */ KINARGTYPE key, _Out_ const CPair** retval) const throw();
-    HRESULT Lookup(/* _In_ */ KINARGTYPE key, _Out_ CPair** retval) throw();
+    HRESULT Lookup(/* _In_ */ KINARGTYPE key, _Out_ const CPair** retval) const noexcept;
+    HRESULT Lookup(/* _In_ */ KINARGTYPE key, _Out_ CPair** retval) noexcept;
     // V& operator[](/* _In_ */ KINARGTYPE key) throw(...);
 
     HRESULT SetAt(
@@ -403,17 +403,17 @@ class XHashMap
         _In_ XPOSITION pos,
         /* _In_ */ VINARGTYPE value);
 
-    HRESULT RemoveKey(/* _In_ */ KINARGTYPE key, _Out_  bool* retval) throw();
+    HRESULT RemoveKey(/* _In_ */ KINARGTYPE key, _Out_  bool* retval) noexcept;
     HRESULT RemoveAll();
     HRESULT RemoveAtPos(_In_ XPOSITION pos) noexcept;
 
-    XPOSITION GetStartPosition() const throw();
+    XPOSITION GetStartPosition() const noexcept;
     void GetNextAssoc(
         _Inout_ XPOSITION& pos,
         _Out_ KOUTARGTYPE key,
         _Out_ VOUTARGTYPE value) const;
-    const CPair* GetNext(_Inout_ XPOSITION& pos) const throw();
-    CPair* GetNext(_Inout_ XPOSITION& pos) throw();
+    const CPair* GetNext(_Inout_ XPOSITION& pos) const noexcept;
+    CPair* GetNext(_Inout_ XPOSITION& pos) noexcept;
     const K& GetNextKey(_Inout_ XPOSITION& pos) const;
     const V& GetNextValue(_Inout_ XPOSITION& pos) const;
     V& GetNextValue(_Inout_ XPOSITION& pos);
@@ -421,20 +421,20 @@ class XHashMap
         _In_ XPOSITION pos,
         _Out_ KOUTARGTYPE key,
         _Out_ VOUTARGTYPE value) const;
-    CPair* GetAt(_In_ XPOSITION pos) throw();
-    const CPair* GetAt(_In_ XPOSITION pos) const throw();
+    CPair* GetAt(_In_ XPOSITION pos) noexcept;
+    const CPair* GetAt(_In_ XPOSITION pos) const noexcept;
     const K& GetKeyAt(_In_ XPOSITION pos) const;
     const V& GetValueAt(_In_ XPOSITION pos) const;
     V& GetValueAt(_In_ XPOSITION pos);
 
-    UINT GetHashTableSize() const throw();
+    UINT GetHashTableSize() const noexcept;
     HRESULT InitHashTable(
         _In_ UINT nBins,
         _In_ bool bAllocNow, // default value: true
         _Out_ bool *retval);
 
-    void EnableAutoRehash() throw();
-    void DisableAutoRehash() throw();
+    void EnableAutoRehash() noexcept;
+    void DisableAutoRehash() noexcept;
     HRESULT Rehash(_In_ UINT nBins = 0);
     HRESULT SetOptimalLoad(
         _In_ float fOptimalLoad,
@@ -459,49 +459,49 @@ class XHashMap
     CNode* m_pFree;
 
 private:
-    bool IsLocked() const throw();
-    UINT PickSize(_In_ size_t nElements) const throw();
+    bool IsLocked() const noexcept;
+    UINT PickSize(_In_ size_t nElements) const noexcept;
     HRESULT NewNode(
         /* _In_ */ KINARGTYPE key,
         _In_ UINT iBin,
         _In_ UINT nHash,
         _Out_ CNode** retval);
     HRESULT FreeNode(_Inout_ CNode* pNode);
-    void FreePlexes() throw();
+    void FreePlexes() noexcept;
     HRESULT GetNode(
         /* _In_ */ KINARGTYPE key,
         _Out_ UINT& iBin,
         _Out_ UINT& nHash,
         _Out_opt_ CNode*& pPrev,
-        _Out_ CNode** ppNode) const throw();
+        _Out_ CNode** ppNode) const noexcept;
     HRESULT CreateNode(
         /* _In_ */ KINARGTYPE key,
         _In_ UINT iBin,
         _In_ UINT nHash,
-        _Out_ CNode** retval) throw() /*was throw(...) in ATL*/;
+        _Out_ CNode** retval) noexcept /*was throw(...) in ATL*/;
     void RemoveNode(
         _In_ CNode* pNode,
         _In_opt_ CNode* pPrev) noexcept;
-    CNode* FindNextNode(_In_ CNode* pNode) const throw();
-    void UpdateRehashThresholds() throw();
+    CNode* FindNextNode(_In_ CNode* pNode) const noexcept;
+    void UpdateRehashThresholds() noexcept;
 
 public:
-    ~XHashMap() throw();
+    ~XHashMap() noexcept;
 
 private:
     // Private to prevent use
-    XHashMap(_In_ const XHashMap&) throw();
-    XHashMap& operator=(_In_ const XHashMap&) throw();
+    XHashMap(_In_ const XHashMap&) noexcept;
+    XHashMap& operator=(_In_ const XHashMap&) noexcept;
 };
 
 template< typename K, typename V, class KTraits, class VTraits >
-inline size_t XHashMap< K, V, KTraits, VTraits >::GetCount() const throw()
+inline size_t XHashMap< K, V, KTraits, VTraits >::GetCount() const noexcept
 {
     return( m_nElements );
 }
 
 template< typename K, typename V, class KTraits, class VTraits >
-inline bool XHashMap< K, V, KTraits, VTraits >::IsEmpty() const throw()
+inline bool XHashMap< K, V, KTraits, VTraits >::IsEmpty() const noexcept
 {
     return( m_nElements == 0 );
 }
@@ -527,7 +527,7 @@ inline bool XHashMap< K, V, KTraits, VTraits >::IsEmpty() const throw()
 //}
 
 template< typename K, typename V, class KTraits, class VTraits >
-inline UINT XHashMap< K, V, KTraits, VTraits >::GetHashTableSize() const throw()
+inline UINT XHashMap< K, V, KTraits, VTraits >::GetHashTableSize() const noexcept
 {
     return( m_nBins );
 }
@@ -548,14 +548,14 @@ inline void XHashMap< K, V, KTraits, VTraits >::GetAt(
 
 template< typename K, typename V, class KTraits, class VTraits >
 inline typename XHashMap< K, V, KTraits, VTraits >::CPair* XHashMap< K, V, KTraits, VTraits >::GetAt(
-    _In_ XPOSITION pos) throw()
+    _In_ XPOSITION pos) noexcept
 {
     return( static_cast< CPair* >( pos ) );
 }
 
 template< typename K, typename V, class KTraits, class VTraits >
 inline const typename XHashMap< K, V, KTraits, VTraits >::CPair* XHashMap< K, V, KTraits, VTraits >::GetAt(
-    _In_ XPOSITION pos) const throw()
+    _In_ XPOSITION pos) const noexcept
 {
     return( static_cast< const CPair* >( pos ) );
 }
@@ -591,26 +591,26 @@ inline V& XHashMap< K, V, KTraits, VTraits >::GetValueAt(_In_ XPOSITION pos)
 }
 
 template< typename K, typename V, class KTraits, class VTraits >
-inline void XHashMap< K, V, KTraits, VTraits >::DisableAutoRehash() throw()
+inline void XHashMap< K, V, KTraits, VTraits >::DisableAutoRehash() noexcept
 {
     m_nLockCount++;
 }
 
 template< typename K, typename V, class KTraits, class VTraits >
-inline void XHashMap< K, V, KTraits, VTraits >::EnableAutoRehash() throw()
+inline void XHashMap< K, V, KTraits, VTraits >::EnableAutoRehash() noexcept
 {
     XWINRT_ASSUME( m_nLockCount > 0 );
     m_nLockCount--;
 }
 
 template< typename K, typename V, class KTraits, class VTraits >
-inline bool XHashMap< K, V, KTraits, VTraits >::IsLocked() const throw()
+inline bool XHashMap< K, V, KTraits, VTraits >::IsLocked() const noexcept
 {
     return( m_nLockCount != 0 );
 }
 
 template< typename K, typename V, class KTraits, class VTraits >
-UINT XHashMap< K, V, KTraits, VTraits >::PickSize(_In_ size_t nElements) const throw()
+UINT XHashMap< K, V, KTraits, VTraits >::PickSize(_In_ size_t nElements) const noexcept
 {
     // List of primes such that s_anPrimes[i] is the smallest prime greater than 2^(5+i/3)
     static const UINT s_anPrimes[] =
@@ -648,7 +648,7 @@ HRESULT XHashMap< K, V, KTraits, VTraits >::CreateNode(
     /* _In_ */ KINARGTYPE key,
     _In_ UINT iBin,
     _In_ UINT nHash,
-    _Out_ CNode** retval) throw() /*was throw(...) in ATL*/
+    _Out_ CNode** retval) noexcept /*was throw(...) in ATL*/
 {
     CNode* pNode;
 
@@ -669,7 +669,7 @@ HRESULT XHashMap< K, V, KTraits, VTraits >::CreateNode(
 }
 
 template< typename K, typename V, class KTraits, class VTraits >
-XPOSITION XHashMap< K, V, KTraits, VTraits >::GetStartPosition() const throw()
+XPOSITION XHashMap< K, V, KTraits, VTraits >::GetStartPosition() const noexcept
 {
     if( IsEmpty() )
     {
@@ -742,7 +742,7 @@ XHashMap< K, V, KTraits, VTraits >::XHashMap(
         _In_ float fOptimalLoad,
         _In_ float fLoThreshold,
         _In_ float fHiThreshold,
-        _In_ UINT nBlockSize) throw() :
+        _In_ UINT nBlockSize) noexcept :
     m_pOwner( pOwner ),
     m_ppBins( NULL ),
     m_nBins( nBins ),
@@ -769,7 +769,7 @@ XHashMap< K, V, KTraits, VTraits >::XHashMap(
 
 template< typename K, typename V, class KTraits, class VTraits >
 XHashMap< K, V, KTraits, VTraits>::XHashMap(
-    _In_ XHashMap&& src) throw()
+    _In_ XHashMap&& src) noexcept
 {
     m_pOwner = src.m_pOwner;
     m_ppBins = src.m_ppBins;
@@ -793,7 +793,7 @@ XHashMap< K, V, KTraits, VTraits>::XHashMap(
 
 template< typename K, typename V, class KTraits, class VTraits >
 XHashMap< K, V, KTraits, VTraits> &XHashMap< K, V, KTraits, VTraits>::operator=(
-    _In_ XHashMap&& src) throw()
+    _In_ XHashMap&& src) noexcept
 {
     RemoveAll();
 
@@ -845,7 +845,7 @@ HRESULT XHashMap< K, V, KTraits, VTraits >::SetOptimalLoad(
 }
 
 template< typename K, typename V, class KTraits, class VTraits >
-void XHashMap< K, V, KTraits, VTraits >::UpdateRehashThresholds() throw()
+void XHashMap< K, V, KTraits, VTraits >::UpdateRehashThresholds() noexcept
 {
     m_nHiRehashThreshold = size_t( m_fHiThreshold*m_nBins );
     m_nLoRehashThreshold = size_t( m_fLoThreshold*m_nBins );
@@ -924,7 +924,7 @@ HRESULT XHashMap< K, V, KTraits, VTraits >::RemoveAll()
 }
 
 template< typename K, typename V, class KTraits, class VTraits >
-XHashMap< K, V, KTraits, VTraits >::~XHashMap() throw()
+XHashMap< K, V, KTraits, VTraits >::~XHashMap() noexcept
 {
     //_ATLTRY
     //{
@@ -1022,7 +1022,7 @@ HRESULT XHashMap< K, V, KTraits, VTraits >::FreeNode(_Inout_ CNode* pNode)
 }
 
 template< typename K, typename V, class KTraits, class VTraits >
-void XHashMap< K, V, KTraits, VTraits >::FreePlexes() throw()
+void XHashMap< K, V, KTraits, VTraits >::FreePlexes() noexcept
 {
     m_pFree = NULL;
     if( m_pBlocks != NULL )
@@ -1038,7 +1038,7 @@ HRESULT XHashMap< K, V, KTraits, VTraits >::GetNode(
     _Out_ UINT& iBin,
     _Out_ UINT& nHash,
     _Out_opt_ CNode*& pPrev,
-    _Out_ CNode** retval) const throw()
+    _Out_ CNode** retval) const noexcept
 {
     CNode* pFollow;
 
@@ -1095,7 +1095,7 @@ HRESULT XHashMap< K, V, KTraits, VTraits >::Lookup(
 template< typename K, typename V, class KTraits, class VTraits >
 HRESULT XHashMap< K, V, KTraits, VTraits >::Lookup(
     /* _In_ */ KINARGTYPE key,
-    _Out_ const CPair** retval) const throw()
+    _Out_ const CPair** retval) const noexcept
 {
     UINT iBin;
     UINT nHash;
@@ -1110,7 +1110,7 @@ HRESULT XHashMap< K, V, KTraits, VTraits >::Lookup(
 template< typename K, typename V, class KTraits, class VTraits >
 HRESULT XHashMap< K, V, KTraits, VTraits >::Lookup(
     /* _In_ */ KINARGTYPE key,
-    _Out_ CPair** retval) throw()
+    _Out_ CPair** retval) noexcept
 {
     UINT iBin;
     UINT nHash;
@@ -1123,7 +1123,7 @@ HRESULT XHashMap< K, V, KTraits, VTraits >::Lookup(
 }
 
 template< typename K, typename V, class KTraits, class VTraits >
-HRESULT XHashMap< K, V, KTraits, VTraits >::RemoveKey(/* _In_ */ KINARGTYPE key, _Out_ bool* retval) throw()
+HRESULT XHashMap< K, V, KTraits, VTraits >::RemoveKey(/* _In_ */ KINARGTYPE key, _Out_ bool* retval) noexcept
 {
     CNode* pNode;
     UINT iBin;
@@ -1276,7 +1276,7 @@ void XHashMap< K, V, KTraits, VTraits >::GetNextAssoc(
 
 template< typename K, typename V, class KTraits, class VTraits >
 const typename XHashMap< K, V, KTraits, VTraits >::CPair* XHashMap< K, V, KTraits, VTraits >::GetNext(
-    _Inout_ XPOSITION& pos) const throw()
+    _Inout_ XPOSITION& pos) const noexcept
 {
     CNode* pNode;
     CNode* pNext;
@@ -1294,7 +1294,7 @@ const typename XHashMap< K, V, KTraits, VTraits >::CPair* XHashMap< K, V, KTrait
 
 template< typename K, typename V, class KTraits, class VTraits >
 typename XHashMap< K, V, KTraits, VTraits >::CPair* XHashMap< K, V, KTraits, VTraits >::GetNext(
-    _Inout_ XPOSITION& pos) throw()
+    _Inout_ XPOSITION& pos) noexcept
 {
     XWINRT_ASSUME( m_ppBins != NULL );
     XWINRT_ASSERT( pos != NULL );
@@ -1363,7 +1363,7 @@ V& XHashMap< K, V, KTraits, VTraits >::GetNextValue(
 
 template< typename K, typename V, class KTraits, class VTraits >
 typename XHashMap< K, V, KTraits, VTraits >::CNode* XHashMap< K, V, KTraits, VTraits >::FindNextNode(
-    _In_ CNode* pNode) const throw()
+    _In_ CNode* pNode) const noexcept
 {
     CNode* pNext;
 
diff --git a/src/dxaml/xcp/components/base/inc/xref_ptr.h b/src/dxaml/xcp/components/base/inc/xref_ptr.h
index 8a9a3bc895..3186e881cd 100644
--- a/src/dxaml/xcp/components/base/inc/xref_ptr.h
+++ b/src/dxaml/xcp/components/base/inc/xref_ptr.h
@@ -31,7 +31,7 @@ template<typename Ty> class xref_ptr
         : m_ptr(nullptr)
     {}
 
-    template<typename Other> explicit xref_ptr(_In_ Other* ptr)
+    template<typename Other> explicit xref_ptr(_In_opt_ Other* ptr)
         : m_ptr(ptr)
     {
         IncrementRefCount();
@@ -80,7 +80,7 @@ template<typename Ty> class xref_ptr
         return *this;
     }
 
-    xref_ptr<Ty>& operator=(_In_ Ty* ptr)
+    xref_ptr<Ty>& operator=(_In_opt_ Ty* ptr)
     {
         if (m_ptr != ptr)
         {
@@ -96,7 +96,7 @@ template<typename Ty> class xref_ptr
         return *this;
     }
 
-    xref_ptr<Ty>& operator=(xref_ptr<Ty>&& rhs)
+    xref_ptr<Ty>& operator=(xref_ptr<Ty>&& rhs) noexcept
     {
         if (this != &rhs)
         {
@@ -127,7 +127,7 @@ template<typename Ty> class xref_ptr
         this->m_ptr = nullptr;
     }
 
-    template<class Other> HRESULT reset(_In_ Other* ptr)
+    template<class Other> HRESULT reset(_In_opt_ Other* ptr)
     {
         Ty* temp = this->m_ptr;
         this->m_ptr = ptr;
@@ -143,7 +143,7 @@ template<typename Ty> class xref_ptr
     // FUTURE: This function is completely pointless now (because failed 'new' operations
     // are going to result in a failfast), so it should be removed and all callsites replaced with
     // attach()
-    template<class Other> HRESULT init(_In_ Other* ptr)
+    template<class Other> HRESULT init(_In_opt_ Other* ptr)
     {
         // This is a special function not on the original interface
         // It's the same as attach, except won't take NULL.
diff --git a/src/dxaml/xcp/components/brushes/XamlCompositionBrush.cpp b/src/dxaml/xcp/components/brushes/XamlCompositionBrush.cpp
index d14b1a8d4a..c3e4b14e05 100644
--- a/src/dxaml/xcp/components/brushes/XamlCompositionBrush.cpp
+++ b/src/dxaml/xcp/components/brushes/XamlCompositionBrush.cpp
@@ -50,7 +50,7 @@ void CXamlCompositionBrush::SetCompositionBrush(_In_opt_ WUComp::ICompositionBru
     CDependencyObject::NWSetRenderDirty(this, DirtyFlags::Render);
 }
 
-WUComp::ICompositionBrush* CXamlCompositionBrush::GetBrushForContentRootNoRef(_In_ CContentRoot* contentRoot)
+_Ret_maybenull_ WUComp::ICompositionBrush* CXamlCompositionBrush::GetBrushForContentRootNoRef(_In_ CContentRoot* contentRoot)
 {
     auto iter = m_brushMap.find(xref::get_weakref(contentRoot));
     if (iter != m_brushMap.end())
diff --git a/src/dxaml/xcp/components/brushes/inc/BrushParams.h b/src/dxaml/xcp/components/brushes/inc/BrushParams.h
index c4332a221c..860a169a3c 100644
--- a/src/dxaml/xcp/components/brushes/inc/BrushParams.h
+++ b/src/dxaml/xcp/components/brushes/inc/BrushParams.h
@@ -16,5 +16,5 @@ struct BrushParams
 {
     // Identifies SolidColorBrush usage. Used to pick the correct transitioning brush.
     const CUIElement* m_element = nullptr;
-    ElementBrushProperty m_brushProperty;
+    ElementBrushProperty m_brushProperty{};
 };
diff --git a/src/dxaml/xcp/components/brushes/inc/WUCBrushManager.h b/src/dxaml/xcp/components/brushes/inc/WUCBrushManager.h
index 0e32fae0d8..e3b03132f9 100644
--- a/src/dxaml/xcp/components/brushes/inc/WUCBrushManager.h
+++ b/src/dxaml/xcp/components/brushes/inc/WUCBrushManager.h
@@ -270,7 +270,7 @@ class WUCBrushManager
     wrl::ComPtr<WUComp::ICompositor4> m_compositor4;
     wrl::ComPtr<WUComp::ICompositionGraphicsDevice> m_compositionGraphicsDevice;
 
-    SharedTransitionAnimations* m_sharedTransitionAnimationsNoRef;
+    SharedTransitionAnimations* m_sharedTransitionAnimationsNoRef{};
 
     containers::vector_map<DropShadowRecipe, wrl::ComPtr<WUComp::ICompositionBrush>> m_dropShadowBrushCache;
     wrl::ComPtr<ID2D1Factory1> m_dropShadowD2DFactory;
diff --git a/src/dxaml/xcp/components/com/inc/ComEventHandler.h b/src/dxaml/xcp/components/com/inc/ComEventHandler.h
index 926cbd552a..d1fb3c4fd8 100644
--- a/src/dxaml/xcp/components/com/inc/ComEventHandler.h
+++ b/src/dxaml/xcp/components/com/inc/ComEventHandler.h
@@ -209,7 +209,7 @@ class EventPtrBase
         other.m_pHandler = nullptr;
     }
 
-    EventPtrBase& operator=(_Inout_ EventPtrBase&& other)
+    EventPtrBase& operator=(_Inout_ EventPtrBase&& other) noexcept
     {
         if (this != &other)
         {
diff --git a/src/dxaml/xcp/components/com/inc/ComPtr.h b/src/dxaml/xcp/components/com/inc/ComPtr.h
index 2bfba1d356..5825911201 100644
--- a/src/dxaml/xcp/components/com/inc/ComPtr.h
+++ b/src/dxaml/xcp/components/com/inc/ComPtr.h
@@ -14,7 +14,6 @@
 #include <ComUtils.h>
 #include <corerror.h>
 #include <mindebug.h>
-#define XNOTHROW __declspec(nothrow)
 
 namespace ctl
 {
@@ -76,16 +75,16 @@ namespace ctl
         };
 
         template<class T>
-        XNOTHROW inline typename RemoveReference<T>::Type&& Move(
-            _Inout_ T&& arg)
+        inline typename RemoveReference<T>::Type&& Move(
+            _Inout_ T&& arg) noexcept
         {
             return ((typename RemoveReference<T>::Type&&)arg);
         }
 
         template<class T>
-        XNOTHROW inline void Swap(
+        inline void Swap(
             _Inout_ T& left,
-            _Inout_ T& right)
+            _Inout_ T& right) noexcept
         {
             T tmp = Move(left);
             left = Move(right);
@@ -242,7 +241,7 @@ namespace ctl
             InterfaceType *ptr_;
             template<class U> friend class ComPtr;
 
-            XNOTHROW void InternalAddRef()
+            void InternalAddRef() noexcept
             {
                 if (ptr_ != nullptr)
                 {
@@ -250,7 +249,7 @@ namespace ctl
                 }
             }
 
-            XNOTHROW void InternalRelease()
+            void InternalRelease() noexcept
             {
                 T* temp = ptr_;
                 if (temp != nullptr)
@@ -261,30 +260,30 @@ namespace ctl
             }
 
         public:
-            XNOTHROW ComPtr()
+            ComPtr() noexcept
                 : ptr_(nullptr)
             {
                 XCP_STRONG(&ptr_);
             }
 
-            XNOTHROW ComPtr(
-                decltype(__nullptr))
+            ComPtr(
+                decltype(__nullptr)) noexcept
                 : ptr_(nullptr)
             {
                 XCP_STRONG(&ptr_);
             }
 
             template<class U>
-            XNOTHROW ComPtr(
-                _In_opt_ U *other)
+            ComPtr(
+                _In_opt_ U *other) noexcept
                 : ptr_(other)
             {
                 XCP_STRONG(&ptr_);
                 InternalAddRef();
             }
 
-            XNOTHROW ComPtr(
-                const ComPtr& other)
+            ComPtr(
+                const ComPtr& other) noexcept
                 : ptr_(other.ptr_)
             {
                 XCP_STRONG(&ptr_);
@@ -294,17 +293,17 @@ namespace ctl
             // Copy ctor that allows to instanatiate class when U* is
             // convertible to T*
             template<class U>
-            XNOTHROW ComPtr(
+            ComPtr(
                 const ComPtr<U> &other,
-                typename Internal::EnableIf<__is_convertible_to(U*, T*), void *>::type * = 0)
+                typename Internal::EnableIf<__is_convertible_to(U*, T*), void *>::type * = 0) noexcept
                 : ptr_(other.ptr_)
             {
                 XCP_STRONG(&ptr_);
                 InternalAddRef();
             }
 
-            XNOTHROW ComPtr(
-                _Inout_ ComPtr &&other)
+            ComPtr(
+                _Inout_ ComPtr &&other) noexcept
                 : ptr_(nullptr)
             {
                 XCP_STRONG(&ptr_);
@@ -316,29 +315,29 @@ namespace ctl
 
             // Move ctor that allows instantiation of a class when U* is convertible to T*
             template<class U>
-            XNOTHROW ComPtr(
+            ComPtr(
                 _Inout_ ComPtr<U>&& other,
-                typename Internal::EnableIf<__is_convertible_to(U*, T*), void *>::type * = 0)
+                typename Internal::EnableIf<__is_convertible_to(U*, T*), void *>::type * = 0) noexcept
                 : ptr_(other.ptr_)
             {
                 XCP_STRONG(&ptr_);
                 other.ptr_ = nullptr;
             }
 
-            XNOTHROW ~ComPtr()
+            ~ComPtr() noexcept
             {
                 InternalRelease();
             }
 
-            XNOTHROW ComPtr& operator=(
-                decltype(__nullptr))
+            ComPtr& operator=(
+                decltype(__nullptr)) noexcept
             {
                 InternalRelease();
                 return *this;
             }
 
-            XNOTHROW ComPtr& operator=(
-                _In_opt_ T *other)
+            ComPtr& operator=(
+                _In_opt_ T *other) noexcept
             {
                 if (ptr_ != other)
                 {
@@ -348,15 +347,15 @@ namespace ctl
             }
 
             template <typename U>
-            XNOTHROW ComPtr& operator=(
-                _In_opt_ U *other)
+            ComPtr& operator=(
+                _In_opt_ U *other) noexcept
             {
                 ComPtr(other).Swap(*this);
                 return *this;
             }
 
-            XNOTHROW ComPtr& operator=(
-                const ComPtr &other)
+            ComPtr& operator=(
+                const ComPtr &other) noexcept
             {
                 if (ptr_ != other.ptr_)
                 {
@@ -366,52 +365,52 @@ namespace ctl
             }
 
             template<class U>
-            XNOTHROW ComPtr& operator=(
-                const ComPtr<U>& other)
+            ComPtr& operator=(
+                const ComPtr<U>& other) noexcept
             {
                 ComPtr(other).Swap(*this);
                 return *this;
             }
 
-            XNOTHROW ComPtr& operator=(
-                _Inout_ ComPtr &&other)
+            ComPtr& operator=(
+                _Inout_ ComPtr &&other) noexcept
             {
                 ComPtr(static_cast<ComPtr&&>(other)).Swap(*this);
                 return *this;
             }
 
             template<class U>
-            XNOTHROW ComPtr& operator=(
-                _Inout_ ComPtr<U>&& other)
+            ComPtr& operator=(
+                _Inout_ ComPtr<U>&& other) noexcept
             {
                 ComPtr(static_cast<ComPtr<U>&&>(other)).Swap(*this);
                 return *this;
             }
 
-            XNOTHROW void Swap(
-                _Inout_ ComPtr&& r)
+            void Swap(
+                _Inout_ ComPtr&& r) noexcept
             {
                 T* tmp = ptr_;
                 ptr_ = r.ptr_;
                 r.ptr_ = tmp;
             }
 
-            XNOTHROW void Swap(
-                _Inout_ ComPtr& r)
+            void Swap(
+                _Inout_ ComPtr& r) noexcept
             {
                 T* tmp = ptr_;
                 ptr_ = r.ptr_;
                 r.ptr_ = tmp;
             }
 
-            XNOTHROW operator Internal::BoolType() const
+            operator Internal::BoolType() const noexcept
             {
                 return Get() != nullptr ?
                     &Internal::BoolStruct::Member :
                     nullptr;
             }
 
-            XNOTHROW T* Get() const
+            T* Get() const noexcept
             {
                 static_assert(!ctl::IsEventPtrCompatible<T>::value, "ComPtr cannot be used to keep references to event handlers, use EventPtr");
                 static_assert(!ctl::IsWeakEventPtrCompatible<T>::value, "ComPtr cannot be used to keep references to weak event handlers, use WeakEventPtr");
@@ -419,18 +418,18 @@ namespace ctl
             }
 
             template<typename U>
-            XNOTHROW U* Cast() const
+            U* Cast() const noexcept
             {
                 return static_cast<U*>(Get());
             }
 
             template <typename U>
-            XNOTHROW void CastTo(U** casted) const
+            void CastTo(U** casted) const noexcept
             {
                 *casted = static_cast<U *>(Get());
             }
 
-            XNOTHROW typename Internal::RemoveIUnknown<InterfaceType>::ReturnType* operator->() const
+            typename Internal::RemoveIUnknown<InterfaceType>::ReturnType* operator->() const noexcept
             {
                 return static_cast<typename Internal::RemoveIUnknown<InterfaceType>::ReturnType*>(ptr_);
             }
@@ -450,31 +449,31 @@ namespace ctl
                 return Internal::ComPtrRef<const ComPtr<T>>(this);
             }
 
-            XNOTHROW T* const* GetAddressOf() const
+            T* const* GetAddressOf() const noexcept
             {
                 return &ptr_;
             }
 
-            XNOTHROW T** GetAddressOf()
+            T** GetAddressOf() noexcept
             {
                 return &ptr_;
             }
 
-            XNOTHROW T** ReleaseAndGetAddressOf()
+            T** ReleaseAndGetAddressOf() noexcept
             {
                 InternalRelease();
                 return &ptr_;
             }
 
-            XNOTHROW T* Detach()
+            T* Detach() noexcept
             {
                 T* ptr = ptr_;
                 ptr_ = nullptr;
                 return ptr;
             }
 
-            XNOTHROW void Attach(
-                _In_opt_ InterfaceType* other)
+            void Attach(
+                _In_opt_ InterfaceType* other) noexcept
             {
                 if (ptr_ != other)
                 {
@@ -483,15 +482,15 @@ namespace ctl
                 }
             }
 
-            XNOTHROW void Reset()
+            void Reset() noexcept
             {
                 InternalRelease();
             }
 
             // Copy to pointer of same type as this - simple addref and copy
             template<typename U>
-            XNOTHROW _Check_return_ typename std::enable_if<std::is_same<T, U>::value, HRESULT>::type
-                CopyTo(_Outptr_ U** ptr)
+            _Check_return_ typename std::enable_if<std::is_same<T, U>::value, HRESULT>::type
+                CopyTo(_Outptr_ U** ptr) noexcept
             {
                 InternalAddRef();
                 *ptr = ptr_;
@@ -500,8 +499,8 @@ namespace ctl
 
             // Move to pointer of same type as this - simple copy and detach
             template<typename U>
-            XNOTHROW _Check_return_ typename std::enable_if<std::is_same<T, U>::value, HRESULT>::type
-                MoveTo(_Outptr_ U** ptr)
+            _Check_return_ typename std::enable_if<std::is_same<T, U>::value, HRESULT>::type
+                MoveTo(_Outptr_ U** ptr) noexcept
             {
                 *ptr = Detach();
                 return S_OK;
@@ -509,8 +508,8 @@ namespace ctl
 
             // Copy to pointer to IInspectable - simple addref and copy with a cast to IInspectable (to disambiguate diamond inheritance)
             template<typename U>
-            XNOTHROW _Check_return_ typename std::enable_if<!std::is_same<T, U>::value && std::is_same<IInspectable, U>::value, HRESULT>::type
-                CopyTo(_Outptr_ U** ptr)
+            _Check_return_ typename std::enable_if<!std::is_same<T, U>::value && std::is_same<IInspectable, U>::value, HRESULT>::type
+                CopyTo(_Outptr_ U** ptr) noexcept
             {
                 InternalAddRef();
                 *ptr = iinspectable_cast(ptr_);
@@ -519,8 +518,8 @@ namespace ctl
 
             // Move to pointer to IInspectable - simple copy and detach with a cast to IInspectable (to disambiguate diamond inheritance)
             template<typename U>
-            XNOTHROW _Check_return_ typename std::enable_if<!std::is_same<T, U>::value && std::is_same<IInspectable, U>::value, HRESULT>::type
-                MoveTo(_Outptr_ U** ptr)
+            _Check_return_ typename std::enable_if<!std::is_same<T, U>::value && std::is_same<IInspectable, U>::value, HRESULT>::type
+                MoveTo(_Outptr_ U** ptr) noexcept
             {
                 *ptr = iinspectable_cast(Detach());
                 return S_OK;
@@ -528,8 +527,8 @@ namespace ctl
 
             // Copy to pointer of parent (implicitly convertible) type - simple addref and copy
             template<typename U>
-            XNOTHROW _Check_return_ typename std::enable_if<!std::is_same<T, U>::value && !std::is_same<IInspectable, U>::value && __is_convertible_to(T*, U*), HRESULT>::type
-                CopyTo(_Outptr_ U** ptr)
+            _Check_return_ typename std::enable_if<!std::is_same<T, U>::value && !std::is_same<IInspectable, U>::value && __is_convertible_to(T*, U*), HRESULT>::type
+                CopyTo(_Outptr_ U** ptr) noexcept
             {
                 InternalAddRef();
                 *ptr = ptr_;
@@ -538,8 +537,8 @@ namespace ctl
 
             // Move to pointer of parent (implicitly convertible) type - simple copy and detach
             template<typename U>
-            XNOTHROW _Check_return_ typename std::enable_if<!std::is_same<T, U>::value && !std::is_same<IInspectable, U>::value && __is_convertible_to(T*, U*), HRESULT>::type
-                MoveTo(_Outptr_ U** ptr)
+            _Check_return_ typename std::enable_if<!std::is_same<T, U>::value && !std::is_same<IInspectable, U>::value && __is_convertible_to(T*, U*), HRESULT>::type
+                MoveTo(_Outptr_ U** ptr) noexcept
             {
                 *ptr = Detach();
                 return S_OK;
@@ -547,8 +546,8 @@ namespace ctl
 
             // Copy to other, possibly incompatible type - perform QI
             template<typename U>
-            XNOTHROW _Check_return_ typename std::enable_if<!std::is_same<T, U>::value && !std::is_same<IInspectable, U>::value && !__is_convertible_to(T*, U*), HRESULT>::type
-                CopyTo(_Outptr_ U** ptr) const
+            _Check_return_ typename std::enable_if<!std::is_same<T, U>::value && !std::is_same<IInspectable, U>::value && !__is_convertible_to(T*, U*), HRESULT>::type
+                CopyTo(_Outptr_ U** ptr) const noexcept
             {
                 return ctl::do_query_interface(*ptr, iunknown_cast(ptr_));
             }
@@ -556,22 +555,22 @@ namespace ctl
             // Move to other, possibly incompatible type - perform QI
             // DELIBERATELY UNSUPPORTED!
             template<typename U>
-            XNOTHROW _Check_return_ typename std::enable_if<!std::is_same<T, U>::value && !std::is_same<IInspectable, U>::value && !__is_convertible_to(T*, U*), HRESULT>::type
-                MoveTo(_Outptr_ U** ptr)
+            _Check_return_ typename std::enable_if<!std::is_same<T, U>::value && !std::is_same<IInspectable, U>::value && !__is_convertible_to(T*, U*), HRESULT>::type
+                MoveTo(_Outptr_ U** ptr) noexcept
             {
                 static_assert_false("ComPtr::MoveTo() is not supported when QueryInterface is required. Use CopyTo() instead.");
             }
 
-            _Check_return_ HRESULT CopyTo(REFIID riid, _Outptr_result_nullonfailure_ void** ptr) const throw()
+            _Check_return_ HRESULT CopyTo(REFIID riid, _Outptr_result_nullonfailure_ void** ptr) const noexcept
             {
                 return iunknown_cast(ptr_)->QueryInterface(riid, ptr);
             }
 
             // query for U interface
             template<typename U>
-            XNOTHROW _Check_return_ HRESULT As(
+            _Check_return_ HRESULT As(
                 Internal::ComPtrRef<ComPtr<U>> p)
-                const
+                const noexcept
             {
                 U **ppInterface = p.ReleaseAndGetAddressOf();
 
@@ -580,25 +579,25 @@ namespace ctl
 
             // query for U interface
             template<typename U>
-            XNOTHROW _Check_return_ HRESULT As(
+            _Check_return_ HRESULT As(
                 _Out_ ComPtr<U>* p)
-                const
+                const noexcept
             {
                 return ctl::do_query_interface<U>(*p->ReleaseAndGetAddressOf(), iunknown_cast(ptr_));
             }
 
             // query for U interface
             template<typename U>
-            XNOTHROW ComPtr<U> AsOrNull()
-                const
+            ComPtr<U> AsOrNull()
+                const noexcept
             {
                 ComPtr<U> result = nullptr;
                 IGNOREHR(As(&result));
                 return result;
             }
 
-            XNOTHROW _Check_return_ HRESULT AsWeak(
-                _Out_ WeakRefPtr* pWeakRef)
+            _Check_return_ HRESULT AsWeak(
+                _Out_ WeakRefPtr* pWeakRef) noexcept
             {
                 return ctl::AsWeak(ptr_, pWeakRef);
             }
@@ -610,7 +609,7 @@ namespace ctl
         protected:
             _Check_return_ HRESULT InternalResolve(
                 _In_ REFIID riid,
-                _Outptr_ IInspectable** inspectable)
+                _Outptr_result_maybenull_ IInspectable** inspectable)
             {
                 HRESULT hr = S_OK;
                 *inspectable = nullptr;
@@ -624,8 +623,10 @@ namespace ctl
                 // Resolve weak reference.
                 // CLR WeakReference's Resolve currently fails with COR_E_INVALIDCOMOBJECT
                 // if the weak reference target has been deleted, so handle that failure
+                // E_NOINTERFACE can also be returned if we're in the process of shutting down
+                // and have cleared our type table.
                 hr = ptr_->Resolve(riid, inspectable);
-                ASSERT(SUCCEEDED(hr) || hr == COR_E_INVALIDCOMOBJECT);
+                ASSERT(SUCCEEDED(hr) || hr == COR_E_INVALIDCOMOBJECT || hr == E_NOINTERFACE);
                 if (FAILED(hr) || *inspectable == nullptr)
                 {
                     // Release weak reference because it will not succeed ever
@@ -647,60 +648,60 @@ namespace ctl
                 return Internal::ComPtrRef<const WeakRefPtr>(this);
             }
 
-            XNOTHROW WeakRefPtr()
-                : ComPtr(nullptr)
+            WeakRefPtr() noexcept
+                : ComPtr(nullptr) 
             {
             }
 
-            XNOTHROW WeakRefPtr(
-                decltype(__nullptr))
+            WeakRefPtr(
+                decltype(__nullptr)) noexcept
                 : ComPtr(nullptr)
             {
             }
 
-            XNOTHROW WeakRefPtr(
-                _In_opt_ IWeakReference* ptr)
+            WeakRefPtr(
+                _In_opt_ IWeakReference* ptr) noexcept
                 : ComPtr(ptr)
             {
             }
 
-            XNOTHROW WeakRefPtr(
-                const ComPtr<IWeakReference>& ptr)
+            WeakRefPtr(
+                const ComPtr<IWeakReference>& ptr) noexcept
                 : ComPtr(ptr)
             {
             }
 
-            XNOTHROW WeakRefPtr(
-                const WeakRefPtr& ptr)
+            WeakRefPtr(
+                const WeakRefPtr& ptr) noexcept
                 : ComPtr(ptr)
             {
             }
 
-            XNOTHROW WeakRefPtr(
-                _Inout_ WeakRefPtr&& ptr)
+            WeakRefPtr(
+                _Inout_ WeakRefPtr&& ptr) noexcept
                 : ComPtr(static_cast<ComPtr<IWeakReference>&&>(ptr))
             {
             }
 
-            XNOTHROW WeakRefPtr &operator=(const WeakRefPtr&) = default;
+            WeakRefPtr &operator=(const WeakRefPtr&) noexcept = default;
 
 #if _MSC_VER >= 1900
-            XNOTHROW WeakRefPtr &operator=(_Inout_ WeakRefPtr&&) = default;
+            WeakRefPtr &operator=(_Inout_ WeakRefPtr&&) noexcept = default;
 #endif
 
-            XNOTHROW ~WeakRefPtr()
+            ~WeakRefPtr() noexcept
             {
             }
 
-            XNOTHROW Internal::WeakReferenceInterface<InterfaceType>* operator->() const
+            Internal::WeakReferenceInterface<InterfaceType>* operator->() const noexcept
             {
                 return reinterpret_cast<Internal::WeakReferenceInterface<InterfaceType>*>(ptr_);
             }
 
             // resolve U interface
             template<typename U>
-            XNOTHROW _Check_return_ HRESULT As(
-                Internal::ComPtrRef<ComPtr<U>> ptr)
+            _Check_return_ HRESULT As(
+                Internal::ComPtrRef<ComPtr<U>> ptr) noexcept
             {
                 static_assert(!Internal::IsSame<IWeakReference, U>::value, "IWeakReference cannot resolve IWeakReference object.");
                 static_assert(__is_base_of(IInspectable, U), "WeakRefPtr::As() can only be used on types derived from IInspectable");
@@ -709,8 +710,8 @@ namespace ctl
             }
 
             template<typename U>
-            XNOTHROW _Check_return_ HRESULT As(
-                _Out_ ComPtr<U>* ptr)
+            _Check_return_ HRESULT As(
+                _Out_ ComPtr<U>* ptr) noexcept
             {
                 static_assert(!Internal::IsSame<IWeakReference, U>::value, "IWeakReference cannot resolve IWeakReference object.");
                 static_assert(__is_base_of(IInspectable, U), "WeakRefPtr::As() can only be used on types derived from IInspectable");
@@ -719,25 +720,25 @@ namespace ctl
             }
 
             template<typename U>
-            XNOTHROW ComPtr<U> AsOrNull()
+            ComPtr<U> AsOrNull() noexcept
             {
                 ctl::ComPtr<U> result;
                 IGNOREHR(As(&result));
                 return result;
             }
 
-            XNOTHROW _Check_return_ HRESULT AsIID(
+            _Check_return_ HRESULT AsIID(
                 _In_ REFIID riid,
-                _Out_ ComPtr<IInspectable>* ptr)
+                _Out_ ComPtr<IInspectable>* ptr) noexcept
             {
                 ASSERT(riid != __uuidof(IWeakReference));
 
                 return InternalResolve(riid, ptr->ReleaseAndGetAddressOf());
             }
 
-            XNOTHROW _Check_return_ HRESULT CopyTo(
+            _Check_return_ HRESULT CopyTo(
                 _In_ REFIID riid,
-                _Outptr_ IInspectable** ptr)
+                _Outptr_ IInspectable** ptr) noexcept
             {
                 ASSERT(riid != __uuidof(IWeakReference));
 
@@ -745,15 +746,15 @@ namespace ctl
             }
 
             template<typename U>
-            XNOTHROW _Check_return_ HRESULT CopyTo(
-                _Outptr_ U** ptr)
+            _Check_return_ HRESULT CopyTo(
+                _Outptr_ U** ptr) noexcept
             {
                 static_assert(__is_base_of(IInspectable, U), "WeakRefPtr::CopyTo() can only be used on types derived from IInspectable");
                 return InternalResolve(__uuidof(U), reinterpret_cast<IInspectable**>(ptr));
             }
 
-            XNOTHROW _Check_return_ HRESULT CopyTo(
-                _Outptr_ IWeakReference** ptr)
+            _Check_return_ HRESULT CopyTo(
+                _Outptr_ IWeakReference** ptr) noexcept
             {
                 InternalAddRef();
                 *ptr = ptr_;
@@ -803,10 +804,10 @@ namespace ctl
     // If pointer types are convertible, let the compiler calculate the correct offsets
     // This is really just a general case of identical types, but it's easier to read this way
     template<class T, class U>
-    XNOTHROW typename std::enable_if<std::is_convertible<T*, U*>::value || std::is_convertible<U*, T*>::value, bool>::type
+    typename std::enable_if<std::is_convertible<T*, U*>::value || std::is_convertible<U*, T*>::value, bool>::type
         operator==(
         const ComPtr<T>& a,
-        const ComPtr<U>& b)
+        const ComPtr<U>& b) noexcept
     {
         return a.Get() == b.Get();
     }
@@ -814,10 +815,10 @@ namespace ctl
     // If they're not convertible, then either somebody is comparing interface pointers (use ctl::are_equal),
     // or comparing unrelated pointer types (let the compiler complain)
     template<class T, class U>
-    XNOTHROW typename std::enable_if<!std::is_convertible<T*, U*>::value && !std::is_convertible<U*, T*>::value, bool>::type
+    typename std::enable_if<!std::is_convertible<T*, U*>::value && !std::is_convertible<U*, T*>::value, bool>::type
         operator==(
         const ComPtr<T>& a,
-        const ComPtr<U>& b)
+        const ComPtr<U>& b) noexcept
     {
         bool result = false;
         IGNOREHR(ctl::are_equal(a.Get(), b.Get(), &result));
@@ -825,42 +826,42 @@ namespace ctl
     }
 
     template<class T>
-    XNOTHROW bool operator==(
+    bool operator==(
         const ComPtr<T>& a,
-        decltype(__nullptr))
+        decltype(__nullptr)) noexcept
     {
         return a.Get() == nullptr;
     }
 
     template<class T>
-    XNOTHROW bool operator==(
+    bool operator==(
         decltype(__nullptr),
-        const ComPtr<T>& a)
+        const ComPtr<T>& a) noexcept
     {
         return a.Get() == nullptr;
     }
 
     // Just define this in terms of operator== and let this funnel into the correct operator== overload
     template<class T, class U>
-    inline XNOTHROW bool operator!=(
+    inline bool operator!=(
         const ComPtr<T>& a,
-        const ComPtr<U>& b)
+        const ComPtr<U>& b) noexcept
     {
         return !(a == b);
     }
 
     template<class T>
-    XNOTHROW bool operator!=(
+    bool operator!=(
         const ComPtr<T>& a,
-        decltype(__nullptr))
+        decltype(__nullptr)) noexcept
     {
         return a.Get() != nullptr;
     }
 
     template<class T>
-    XNOTHROW bool operator!=(
+    bool operator!=(
         decltype(__nullptr),
-        const ComPtr<T>& a)
+        const ComPtr<T>& a) noexcept
     {
         return a.Get() != nullptr;
     }
@@ -868,9 +869,9 @@ namespace ctl
     // If pointer types are convertible, let the compiler calculate the correct offsets
     // This is really just a general case of identical types, but it's easier to read this way
     template<class T, class U>
-    XNOTHROW bool operator<(
+    bool operator<(
         const ComPtr<T>& a,
-        const ComPtr<U>& b)
+        const ComPtr<U>& b) noexcept
     {
         static_assert(std::is_convertible<T*, U*>::value || std::is_convertible<U*, T*>::value, "'T' and 'U' pointers must be comparable");
         return a.Get() < b.Get();
@@ -880,91 +881,91 @@ namespace ctl
 
     // Don't bother with QI-ing to IInspectable on these. Just assert on convertibility of pointer types
     template<class T, class U>
-    XNOTHROW bool operator==(
+    bool operator==(
         const Internal::ComPtrRef<ComPtr<T>>& a,
-        const Internal::ComPtrRef<ComPtr<U>>& b)
+        const Internal::ComPtrRef<ComPtr<U>>& b) noexcept
     {
         static_assert(std::is_convertible<T*, U*>::value || std::is_convertible<U*, T*>::value, "'T' and 'U' pointers must be comparable");
         return a.GetAddressOf() == b.GetAddressOf();
     }
 
     template<class T>
-    XNOTHROW bool operator==(
+    bool operator==(
         const Internal::ComPtrRef<ComPtr<T>>& a,
-        decltype(__nullptr))
+        decltype(__nullptr)) noexcept
     {
         return a.GetAddressOf() == nullptr;
     }
 
     template<class T>
-    XNOTHROW bool operator==(
+    bool operator==(
         decltype(__nullptr),
-        const Internal::ComPtrRef<ComPtr<T>>& a)
+        const Internal::ComPtrRef<ComPtr<T>>& a) noexcept
     {
         return a.GetAddressOf() == nullptr;
     }
 
     template<class T>
-    XNOTHROW bool operator==(
+    bool operator==(
         const Internal::ComPtrRef<ComPtr<T>>& a,
-        void* b)
+        void* b) noexcept
     {
         return a.GetAddressOf() == b;
     }
 
     template<class T>
-    XNOTHROW bool operator==(
+    bool operator==(
         void* b,
-        const Internal::ComPtrRef<ComPtr<T>>& a)
+        const Internal::ComPtrRef<ComPtr<T>>& a) noexcept
     {
         return a.GetAddressOf() == b;
     }
 
     template<class T, class U>
-    XNOTHROW bool operator!=(
+    bool operator!=(
         const Internal::ComPtrRef<ComPtr<T>>& a,
-        const Internal::ComPtrRef<ComPtr<U>>& b)
+        const Internal::ComPtrRef<ComPtr<U>>& b) noexcept
     {
         return !(a == b);
     }
 
     template<class T>
-    XNOTHROW bool operator!=(
+    bool operator!=(
         const Internal::ComPtrRef<ComPtr<T>>& a,
-        decltype(__nullptr))
+        decltype(__nullptr)) noexcept
     {
         return a.GetAddressOf() != nullptr;
     }
 
     template<class T>
-    XNOTHROW bool operator!=(
+    bool operator!=(
         decltype(__nullptr),
-        const Internal::ComPtrRef<ComPtr<T>>& a)
+        const Internal::ComPtrRef<ComPtr<T>>& a) noexcept
     {
         return a.GetAddressOf() != nullptr;
     }
 
     template<class T>
-    XNOTHROW bool operator!=(
+    bool operator!=(
         const Internal::ComPtrRef<ComPtr<T>>& a,
-        void* b)
+        void* b) noexcept
     {
         return a.GetAddressOf() != b;
     }
 
     template<class T>
-    XNOTHROW bool operator!=(
+    bool operator!=(
         void* b,
-        const Internal::ComPtrRef<ComPtr<T>>& a)
+        const Internal::ComPtrRef<ComPtr<T>>& a) noexcept
     {
         return a.GetAddressOf() != b;
     }
 
     // Don't bother with QI-ing to IInspectable on these. Just assert on convertibility of pointer types
     template<class T, class U>
-    XNOTHROW bool operator<(
+    bool operator<(
         const Internal::ComPtrRef<ComPtr<T>>& a,
-        const Internal::ComPtrRef<ComPtr<U>>& b)
+        const Internal::ComPtrRef<ComPtr<U>>& b) noexcept
     {
         static_assert(std::is_convertible<T*, U*>::value || std::is_convertible<U*, T*>::value, "'T' and 'U' pointers must be comparable");
         return a.GetAddressOf() < b.GetAddressOf();
diff --git a/src/dxaml/xcp/components/comptree/DCompTreeHost.cpp b/src/dxaml/xcp/components/comptree/DCompTreeHost.cpp
index 0a13a939e4..e43e77a24d 100644
--- a/src/dxaml/xcp/components/comptree/DCompTreeHost.cpp
+++ b/src/dxaml/xcp/components/comptree/DCompTreeHost.cpp
@@ -29,6 +29,7 @@
 #include <Popup.h>
 #include <WindowRenderTarget.h>
 #include <OfferTracker.h>
+#include "RefreshRateInfo.h"
 
 #include <FxCallbacks.h>
 #include "CoreWindowIslandAdapter.h"
@@ -162,6 +163,7 @@ DCompTreeHost::DCompTreeHost(
     EmptyRectF(&m_backgroundRect);
     m_offerTracker = make_xref<OfferTracker>();
     m_projectedShadowManager = std::make_shared<ProjectedShadowManager>(this);
+    m_refreshRateInfo = m_pGraphicsDeviceManagerNoRef->GetRefreshRateInfo();
 }
 
 //----------------------------------------------------------------------------
@@ -317,6 +319,7 @@ DCompTreeHost::ReleaseResources(bool shouldDeferClosingInteropCompostior)
     m_spCompositor6 = nullptr;
     m_spCompositorPrivate = nullptr;
     m_spCompositorInterop = nullptr;
+    m_dcompDevice = nullptr;
 
     m_contentBridgeCW = nullptr;
     m_inprocIslandRootVisual = nullptr;
@@ -1177,11 +1180,44 @@ _Check_return_ HRESULT DCompTreeHost::CommitMainDevice()
         IFC_RETURN(m_spMainDevice->Commit());
 
         TraceCommitMainDeviceEnd();
+
+        UpdateRefreshRate();
     }
 
     return S_OK;
 }
 
+void DCompTreeHost::UpdateRefreshRate()
+{
+    ASSERT(m_refreshRateInfo);
+
+    if (!m_dcompDevice)
+    {
+        // Note: This requires an InteropCompositor.
+        IFCFAILFAST(m_spMainDevice.As(&m_dcompDevice));
+    }
+
+    DCOMPOSITION_FRAME_STATISTICS frameStatistics;
+    HRESULT hr = m_dcompDevice->GetFrameStatistics(&frameStatistics);
+    if (SUCCEEDED(hr))
+    {
+        if (frameStatistics.currentCompositionRate.Numerator != 0)
+        {
+            //
+            // The refresh rate is currentCompositionRate.Numerator/currentCompositionRate.Denominator [refreshes/sec],
+            // so the interval is D/N [seconds/refresh], or 1000D/N [ms/refresh].
+            //
+            float refreshIntervalInMilliseconds =
+                1000.0f * static_cast<float>(frameStatistics.currentCompositionRate.Denominator) / static_cast<float>(frameStatistics.currentCompositionRate.Numerator);
+            m_refreshRateInfo->SetRefreshIntervalInMilliseconds(refreshIntervalInMilliseconds);
+        }
+    }
+    else if (hr != RO_E_CLOSED)
+    {
+        IFCFAILFAST(hr);
+    }
+}
+
 uint32_t DCompTreeHost::GetMaxTextureSize() const
 {
     // Pad all allocations with 2 pixels for gutters, and 1 pixel for the "white pixel".
@@ -2729,7 +2765,7 @@ void DCompTreeHost::RemoveXamlIslandTarget(_In_ CXamlIslandRoot* xamlIslandRoot)
     {
         HideUIThreadCounters();
     }
-    
+
     m_islandRenderData.erase(islandData);
 
     if (refreshFrameRateVisual)
diff --git a/src/dxaml/xcp/components/comptree/HWCompNodeWinRT.cpp b/src/dxaml/xcp/components/comptree/HWCompNodeWinRT.cpp
index 2df5461f50..e51adfb453 100644
--- a/src/dxaml/xcp/components/comptree/HWCompNodeWinRT.cpp
+++ b/src/dxaml/xcp/components/comptree/HWCompNodeWinRT.cpp
@@ -697,8 +697,8 @@ _Check_return_ HRESULT HWCompTreeNodeWinRT::PushProperties(
 
         if (m_pUIElementNoRef->OfTypeByIndex<KnownTypeIndex::Popup>())
         {
-            // 19H1 Bug #19618232:  If the position or size of a windowed popup changes after it's already open,
-            // we must update the bounds of the popup's HWND.
+            // If the position or size of a windowed popup changes after it's already open, we must update the bounds of
+            // the popup's island.
             CPopup* popup = static_cast<CPopup*>(m_pUIElementNoRef);
             IFCFAILFAST(popup->Reposition());
         }
diff --git a/src/dxaml/xcp/components/comptree/HWRedirectedCompTreeNodeWinRT.cpp b/src/dxaml/xcp/components/comptree/HWRedirectedCompTreeNodeWinRT.cpp
index 648ae94e7c..a0a5a1ab72 100644
--- a/src/dxaml/xcp/components/comptree/HWRedirectedCompTreeNodeWinRT.cpp
+++ b/src/dxaml/xcp/components/comptree/HWRedirectedCompTreeNodeWinRT.cpp
@@ -112,7 +112,7 @@ void HWRedirectedCompTreeNodeWinRT::SetUsesPlaceholderVisual(bool value)
 }
 
 // Ensure that the placeholder visual has been created and return it.
-// Since Windowed Popups create their own HWND and DComp target, we do something special
+// Since Windowed Popups create their own islands and DComp target, we do something special
 // create the illusion of there being only one DComp visual tree.
 // A picture of the visual tree(s) is helpful here:
 //
@@ -131,7 +131,7 @@ void HWRedirectedCompTreeNodeWinRT::SetUsesPlaceholderVisual(bool value)
 // Popup Placeholder Visual
 //
 // The Popup creates its own Window, target, root visual, and underneath this visual, we put the "normal" visuals for the CompNode
-// (eg the Prepend Visual, Primary Visual, etc).  This is how the Popup content is displayed under another HWND.
+// (eg the Prepend Visual, Primary Visual, etc).  This is how the Popup content is displayed under another window.
 // However we also create a Placeholder visual which goes into the "mainline" visual tree, whose purpose
 // is only to make the CompNode tree updating code happy, it doesn't actually carry any properties or content.
 wrl::ComPtr<ixp::IVisual> HWRedirectedCompTreeNodeWinRT::EnsurePlaceholderVisual(_In_ DCompTreeHost* dcompTreeHost)
@@ -158,7 +158,7 @@ xref_ptr<WUComp::IVisual> HWRedirectedCompTreeNodeWinRT::GetWUCVisualInMainTree(
 
 //
 // This method returns a visual used in incremental rendering. New visuals will be inserted after this reference visual.
-// For a popup using placeholder visuals, most of the content lives in a separate visual tree in a separate hwnd, and we
+// For a popup using placeholder visuals, most of the content lives in a separate visual tree in a separate island, and we
 // insert a placeholder visual into the main visual tree. That placeholder visual should be used when incrementally
 // rendering the main visual tree.
 //
diff --git a/src/dxaml/xcp/components/comptree/HWWindowedPopupCompTreeNodeWinRT.cpp b/src/dxaml/xcp/components/comptree/HWWindowedPopupCompTreeNodeWinRT.cpp
index 93512e1b8f..52d5927d1a 100644
--- a/src/dxaml/xcp/components/comptree/HWWindowedPopupCompTreeNodeWinRT.cpp
+++ b/src/dxaml/xcp/components/comptree/HWWindowedPopupCompTreeNodeWinRT.cpp
@@ -36,7 +36,7 @@ bool HWWindowedPopupCompTreeNodeWinRT::GetRedirectionTransformInfo(_In_ Redirect
     // but for parented windowed popups, there could be a transform present which we need to avoid applying.
     // The reason for this is that the windowed popup has its own visual tree which isn't parented to the main tree.
     // We compute this same transform information in CPopup::PositionAndSizeWindowForWindowedPopup and apply this
-    // to the HWND bounds rather than the visuals.
+    // to the island bounds rather than the visuals.
 
     return false;
 }
diff --git a/src/dxaml/xcp/components/comptree/inc/DCompTreeHost.h b/src/dxaml/xcp/components/comptree/inc/DCompTreeHost.h
index aa53397f88..b0ef875823 100644
--- a/src/dxaml/xcp/components/comptree/inc/DCompTreeHost.h
+++ b/src/dxaml/xcp/components/comptree/inc/DCompTreeHost.h
@@ -67,6 +67,7 @@ class CUIElement;
 class CXamlIslandRoot;
 class CoreWindowIslandAdapter;
 class ProjectedShadowManager;
+class RefreshRateInfo;
 
 const XFLOAT c_FrameRateWhiteSpaceWidth = 20.0f;
 const XFLOAT c_FrameRateHeight = 24.0f;
@@ -378,6 +379,8 @@ class DCompTreeHost : public CXcpObjectBase<IObject>
 
     ixp::ICoreWindowSiteBridge* GetCoreWindowBridgeNoRef() { return m_contentBridgeCW.Get(); }
 
+    RefreshRateInfo* GetRefreshRateInfo() { return m_refreshRateInfo.Get(); }
+
 private:
     XamlIslandRenderDataMap m_islandRenderData;
 
@@ -418,6 +421,8 @@ class DCompTreeHost : public CXcpObjectBase<IObject>
 
     bool IsElementInKeepAliveVector(_In_ CUIElement* element);
 
+    void UpdateRefreshRate();
+
 private:
     // Storage for references to handin and handoff visuals that, once created, persist throughout UIElement's lifetime.
     // When app calls ElementCompositionPreview::GetElementVisual / GetElementChildVisual / SetElementChildVisual API
@@ -468,17 +473,21 @@ class DCompTreeHost : public CXcpObjectBase<IObject>
 #pragma region ::Windows::UI::Composition
 
     // WinRT composition objects
-    _Maybenull_ Microsoft::WRL::ComPtr<WUComp::ICompositor> m_spCompositor;
+    _Maybenull_ Microsoft::WRL::ComPtr<ixp::ICompositor> m_spCompositor;
     _Maybenull_ Microsoft::WRL::ComPtr<ixp::ICompositor2> m_spCompositor2;
-    _Maybenull_ Microsoft::WRL::ComPtr<WUComp::ICompositor5> m_spCompositor5;
-    _Maybenull_ Microsoft::WRL::ComPtr<WUComp::ICompositor6> m_spCompositor6;
-    _Maybenull_ Microsoft::WRL::ComPtr<WUComp::ICompositorPrivate> m_spCompositorPrivate;
-    _Maybenull_ Microsoft::WRL::ComPtr<WUComp::ICompositorInterop> m_spCompositorInterop;
-    _Maybenull_ Microsoft::WRL::ComPtr<WUComp::IInteropCompositorPartner> m_spInteropCompositorPartner;
+    _Maybenull_ Microsoft::WRL::ComPtr<ixp::ICompositor5> m_spCompositor5;
+    _Maybenull_ Microsoft::WRL::ComPtr<ixp::ICompositor6> m_spCompositor6;
+    _Maybenull_ Microsoft::WRL::ComPtr<ixp::ICompositorPrivate> m_spCompositorPrivate;
+    _Maybenull_ Microsoft::WRL::ComPtr<ixp::ICompositorInterop> m_spCompositorInterop;
+    _Maybenull_ Microsoft::WRL::ComPtr<ixp::IInteropCompositorPartner> m_spInteropCompositorPartner;
     _Maybenull_ Microsoft::WRL::ComPtr<ABI::Windows::UI::Composition::ICompositionBrush> m_systemBackdropBrush; // Note: This is a system compositor brush!
-    wrl::ComPtr<WUComp::ICompositionGraphicsDevice> m_compositionGraphicsDevice;
+    wrl::ComPtr<ixp::ICompositionGraphicsDevice> m_compositionGraphicsDevice;
     wrl::ComPtr<ixp::ICompositionEasingFunctionStatics> m_easingFunctionStatics;
 
+    // For updating the refresh rate with GetFrameStatistics
+    wrl::ComPtr<IDCompositionDevice> m_dcompDevice;
+    wrl::ComPtr<RefreshRateInfo> m_refreshRateInfo;
+
 #pragma endregion
 
     // Application ID saved for animation/touch tracking.
diff --git a/src/dxaml/xcp/components/comptree/inc/HandOffVisualData.h b/src/dxaml/xcp/components/comptree/inc/HandOffVisualData.h
index 3665c0cacd..5145d5fbe1 100644
--- a/src/dxaml/xcp/components/comptree/inc/HandOffVisualData.h
+++ b/src/dxaml/xcp/components/comptree/inc/HandOffVisualData.h
@@ -28,7 +28,7 @@ class HandOffVisualData
     WUComp::CompositionCompositeMode previousWUCCompositeMode;
     wfn::Matrix4x4 previousWUCTransformMatrix;
     XRECTF_RB previousWUCInsetClip;
-    wfn::Matrix3x2 previousWUCClipTransformMatrix;
+    wfn::Matrix3x2 previousWUCClipTransformMatrix{};
 };
 
 typedef containers::vector_map<CUIElement*, HandOffVisualData> HandOffVisualDataMap;
\ No newline at end of file
diff --git a/src/dxaml/xcp/components/comptree/inc/ImplicitAnimations.h b/src/dxaml/xcp/components/comptree/inc/ImplicitAnimations.h
index 4d9f205b73..6b189334fc 100644
--- a/src/dxaml/xcp/components/comptree/inc/ImplicitAnimations.h
+++ b/src/dxaml/xcp/components/comptree/inc/ImplicitAnimations.h
@@ -55,7 +55,7 @@ struct ImplicitAnimationInfo
     // the animation target explicitly.
     wrl::ComPtr<WUComp::ICompositionObject2> animationTarget;
 
-    EventRegistrationToken token;                                       // Registration token for scopedBatch.  Only valid while the animation is playing.
+    EventRegistrationToken token{};                                     // Registration token for scopedBatch.  Only valid while the animation is playing.
 
     bool pendingChange = false;                                         // true iff implicit animation is set to a new value while animation is playing.
     wrl::ComPtr<WUComp::ICompositionAnimationBase> pendingAnimation;    // If pendingChange == true, the animation to update to when current animation finishes.
diff --git a/src/dxaml/xcp/components/deferral/NameDirectiveCapturingWriter.h b/src/dxaml/xcp/components/deferral/NameDirectiveCapturingWriter.h
index dd193435f9..325bdcfc93 100644
--- a/src/dxaml/xcp/components/deferral/NameDirectiveCapturingWriter.h
+++ b/src/dxaml/xcp/components/deferral/NameDirectiveCapturingWriter.h
@@ -23,7 +23,7 @@ namespace Jupiter {
             std::vector<xstring_ptr>& GetCapturedNameList();
 
         private:
-            bool m_withinXNameMember;
+            bool m_withinXNameMember{};
             std::vector<xstring_ptr> m_nameList;
             XamlSchemaContext* m_context;
         };
diff --git a/src/dxaml/xcp/components/deferral/StyleCustomWriter.h b/src/dxaml/xcp/components/deferral/StyleCustomWriter.h
index c0fcca3670..cd997775da 100644
--- a/src/dxaml/xcp/components/deferral/StyleCustomWriter.h
+++ b/src/dxaml/xcp/components/deferral/StyleCustomWriter.h
@@ -86,7 +86,7 @@ class StyleCustomWriter final
     std::unique_ptr<StyleCustomRuntimeData> m_runtimeData;
     std::shared_ptr<XamlSchemaContext> m_context;
     std::shared_ptr<ObjectWriterContext> m_objectWriterContext;
-    CCoreServices* m_core;
+    CCoreServices* m_core{};
     bool m_allowNewCustomWriter;
 
     std::shared_ptr<XamlType> m_targetXamlType;
diff --git a/src/dxaml/xcp/components/deferral/inc/VisualStateGroupCollectionCustomRuntimeData.h b/src/dxaml/xcp/components/deferral/inc/VisualStateGroupCollectionCustomRuntimeData.h
index 166cec0fea..ccdf1949af 100644
--- a/src/dxaml/xcp/components/deferral/inc/VisualStateGroupCollectionCustomRuntimeData.h
+++ b/src/dxaml/xcp/components/deferral/inc/VisualStateGroupCollectionCustomRuntimeData.h
@@ -35,8 +35,8 @@ class VisualStateGroupEssence
     VisualStateGroupEssence(VisualStateGroupEssence&& other) = default;
     VisualStateGroupEssence& operator=(VisualStateGroupEssence&& other) = default;
 
-    const xstring_ptr& GetName() const throw() { return m_name; }
-    bool HasDynamicTimelines() const throw() { return m_hasDynamicTimelines; }
+    const xstring_ptr& GetName() const noexcept { return m_name; }
+    bool HasDynamicTimelines() const noexcept { return m_hasDynamicTimelines; }
 
 private:
     xstring_ptr m_name;
@@ -66,22 +66,22 @@ class VisualStateEssence
     VisualStateEssence& operator=(VisualStateEssence&& other) = default;
 
 
-    const xstring_ptr& GetName() const throw() { return m_name; }
-    StreamOffsetToken GetStoryboardToken() const throw() { return m_deferredStoryboardToken; }
+    const xstring_ptr& GetName() const noexcept { return m_name; }
+    StreamOffsetToken GetStoryboardToken() const noexcept { return m_deferredStoryboardToken; }
     const std::vector<StreamOffsetToken>& GetPropertySetterTokens() const WI_NOEXCEPT { return m_deferredPropertySetterTokens; }
-    bool HasStoryboard() const throw() { return m_hasStoryboard; }
-    bool HasPropertySetters() const throw() { return !m_deferredPropertySetterTokens.empty(); }
-    const std::vector<std::vector<int>>& GetStateTriggerValues() const throw() { return m_stateTriggerValues; }
-    bool HasStateTriggers() const throw() { return (m_stateTriggerValues.size() > 0); }
+    bool HasStoryboard() const noexcept { return m_hasStoryboard; }
+    bool HasPropertySetters() const noexcept { return !m_deferredPropertySetterTokens.empty(); }
+    const std::vector<std::vector<int>>& GetStateTriggerValues() const noexcept { return m_stateTriggerValues; }
+    bool HasStateTriggers() const noexcept { return (m_stateTriggerValues.size() > 0); }
 
-    const std::vector<StreamOffsetToken>& GetExtensibleStateTriggerTokens() const throw() { return m_extensibleStateTriggerTokens; }
-    bool HasExtensibleStateTriggers() const throw() { return (m_extensibleStateTriggerTokens.size() > 0); }
+    const std::vector<StreamOffsetToken>& GetExtensibleStateTriggerTokens() const noexcept { return m_extensibleStateTriggerTokens; }
+    bool HasExtensibleStateTriggers() const noexcept { return (m_extensibleStateTriggerTokens.size() > 0); }
 
-    const std::vector<StreamOffsetToken>& GetStateTriggerCollectionTokens() const throw() { return m_stateTriggerCollectionTokens; }
-    bool HasStateTriggerCollectionTokens() const throw() { return (m_stateTriggerCollectionTokens.size() > 0); }
+    const std::vector<StreamOffsetToken>& GetStateTriggerCollectionTokens() const noexcept { return m_stateTriggerCollectionTokens; }
+    bool HasStateTriggerCollectionTokens() const noexcept { return (m_stateTriggerCollectionTokens.size() > 0); }
 
-    const std::vector<StreamOffsetToken>& GetStaticResourceTriggerTokens() const throw() { return m_staticResourceTriggerTokens; }
-    bool HasStaticResourceTriggerTokens() const throw() { return (m_stateTriggerCollectionTokens.size() > 0); }
+    const std::vector<StreamOffsetToken>& GetStaticResourceTriggerTokens() const noexcept { return m_staticResourceTriggerTokens; }
+    bool HasStaticResourceTriggerTokens() const noexcept { return (m_stateTriggerCollectionTokens.size() > 0); }
 
 private:
     xstring_ptr m_name;
@@ -126,9 +126,9 @@ class VisualTransitionEssence
     VisualTransitionEssence(VisualTransitionEssence&& other) = default;
     VisualTransitionEssence& operator=(VisualTransitionEssence&& other) = default;
 
-    const xstring_ptr& GetToState() const throw() { return m_toState; }
-    const xstring_ptr& GetFromState() const throw() { return m_fromState; }
-    StreamOffsetToken GetVisualTransitionToken() const throw() { return m_deferredTransitionToken; }
+    const xstring_ptr& GetToState() const noexcept { return m_toState; }
+    const xstring_ptr& GetFromState() const noexcept { return m_fromState; }
+    StreamOffsetToken GetVisualTransitionToken() const noexcept { return m_deferredTransitionToken; }
 
 private:
     xstring_ptr m_toState;
diff --git a/src/dxaml/xcp/components/dependencyLocator/inc/DependencyLocator.h b/src/dxaml/xcp/components/dependencyLocator/inc/DependencyLocator.h
index 1c0848861a..4889f6de24 100644
--- a/src/dxaml/xcp/components/dependencyLocator/inc/DependencyLocator.h
+++ b/src/dxaml/xcp/components/dependencyLocator/inc/DependencyLocator.h
@@ -448,7 +448,7 @@ namespace DependencyLocator
             return GetInternal(create);
         }
 
-        T* operator->() const throw()
+        T* operator->() const noexcept
         {
             return GetInternal().operator->();
         }
diff --git a/src/dxaml/xcp/components/diagnosticsInterop/PropertyChainEvaluator.cpp b/src/dxaml/xcp/components/diagnosticsInterop/PropertyChainEvaluator.cpp
index 1b70dafac6..5a11076f87 100644
--- a/src/dxaml/xcp/components/diagnosticsInterop/PropertyChainEvaluator.cpp
+++ b/src/dxaml/xcp/components/diagnosticsInterop/PropertyChainEvaluator.cpp
@@ -613,7 +613,7 @@ namespace Diagnostics {
                     // The only case we shouldn't get a peer is if depObj is really a CApplication object.
                     ASSERT((depObj->OfTypeByIndex<KnownTypeIndex::Application>()));
                     CValue cVal;
-                    depObj->GetValue(depProp, &cVal);
+                    IFC_RETURN(depObj->GetValue(depProp, &cVal));
                     IFC_RETURN(CValueBoxer::UnboxObjectValue(&cVal, depProp->GetPropertyType(), &value));
                 }
             }
diff --git a/src/dxaml/xcp/components/diagnosticsInterop/Unsealer.cpp b/src/dxaml/xcp/components/diagnosticsInterop/Unsealer.cpp
index e91ae07be4..af52aaa19b 100644
--- a/src/dxaml/xcp/components/diagnosticsInterop/Unsealer.cpp
+++ b/src/dxaml/xcp/components/diagnosticsInterop/Unsealer.cpp
@@ -64,7 +64,7 @@ namespace Diagnostics
         auto style = do_pointer_cast<CStyle>(m_owner.lock_noref());
         if (style && m_wasSealed)
         {
-            style->Seal();
+            VERIFYHR(style->Seal());
         }
     }
 
diff --git a/src/dxaml/xcp/components/elements/UIElement.cpp b/src/dxaml/xcp/components/elements/UIElement.cpp
index c7227b15b3..1d2d4e8a42 100644
--- a/src/dxaml/xcp/components/elements/UIElement.cpp
+++ b/src/dxaml/xcp/components/elements/UIElement.cpp
@@ -562,30 +562,27 @@ CUIElementCollectionWrapper CUIElement::GetUnsortedChildren()
     return CUIElementCollectionWrapper(GetChildren());
 }
 
-void CUIElement::LockParent()
+wil::details::lambda_call<std::function<void()>> CUIElement::LockParent()
 {
+    xref_ptr<CCollection> pCollection;
     CUIElement* pParent = GetUIElementParentInternal();
     if (pParent)
     {
-        CCollection *pCollection = pParent->GetChildren();
+        pCollection = pParent->GetChildren();
         if (pCollection)
         {
             pCollection->Lock();
         }
     }
-}
 
-void CUIElement::UnlockParent()
-{
-    CUIElement* pParent = GetUIElementParentInternal();
-    if (pParent)
-    {
-        CCollection *pCollection = pParent->GetChildren();
-        if (pCollection)
+    // make sure we unlock when we are done.
+    return wil::scope_exit<std::function<void()>>([pCollection]
         {
-            pCollection->Unlock();
-        }
-    }
+            if (pCollection)
+            {
+                pCollection->Unlock();
+            }
+        });
 }
 
 bool CUIElement::HasDepthLegacy() const
@@ -2538,12 +2535,12 @@ double CUIElement::GetRasterizationScaleIncludingAncestors()
     {
         rasterizationScale *= element->GetRasterizationScale();
 
-        // Note: This walks through windowed popups, as well. It's expected that windowed popups are treated the same way as
-        // normal popups as far as RasterizationScale goes - i.e. the child of a popup will inherit all RasterizationScales
-        // above it, regardless of whether the popup is windowed. This means whatever is hosting the windowed popup (hwnd or
-        // an island) should be scaled by the system the same way as whatever is hosting the main tree (CoreWindow or an
-        // island). Otherwise, we end up with inconsistent behavior where the popup's content can be sharp or blurry/grainy
-        // depending on whether that popup is windowed.
+        // Note: This walks through windowed popups, as well. It's expected that windowed popups are treated the same
+        // way as normal popups as far as RasterizationScale goes - i.e. the child of a popup will inherit all
+        // RasterizationScales above it, regardless of whether the popup is windowed. This means the island hosting the
+        // windowed popup should be scaled by the system the same way as whatever is hosting the main tree (an island,
+        // or a CoreWindow for some tests). Otherwise, we end up with inconsistent behavior where the popup's content
+        // can be sharp or blurry/grainy depending on whether that popup is windowed.
         CDependencyObject* elementAncestor = element->GetParentFollowPopups();
         ASSERT(!elementAncestor || elementAncestor->OfTypeByIndex(KnownTypeIndex::UIElement));  // The parent of a UIElement must be a UIElement
         element = static_cast<CUIElement*>(elementAncestor);
diff --git a/src/dxaml/xcp/components/elements/UIElementLayout.cpp b/src/dxaml/xcp/components/elements/UIElementLayout.cpp
index 002dd42db4..442e0ec71a 100644
--- a/src/dxaml/xcp/components/elements/UIElementLayout.cpp
+++ b/src/dxaml/xcp/components/elements/UIElementLayout.cpp
@@ -10,10 +10,6 @@
 #include <uielementcollection.h>
 #include <LayoutManager.h>
 #include "LayoutCycleDebugSettings.h"
-#include <FrameworkUdk/Containment.h>
-
-// Bug 50119529: [1.5 servicing] BreadcrumbBar ellipsis flyout doesn't render all items if the window is small
-#define WINAPPSDK_CHANGEID_50119529 50119529
 
 void ComputeUnidimensionalEffectiveViewport(
     _In_ const std::vector<CUIElement::UnidimensionalViewportInformation>& viewports,
@@ -394,11 +390,7 @@ _Check_return_ HRESULT CUIElement::EffectiveViewportWalk(
     }
 
     // Prevent the tree from changing while we're walking it.
-    LockParent();
-    auto scopeGuard = wil::scope_exit([&]
-    {
-        UnlockParent();
-    });
+    auto scopedParentLock = LockParent();
 
     if (dirtyFound && GetWantsViewport())
     {
@@ -442,23 +434,12 @@ _Check_return_ HRESULT CUIElement::EffectiveViewportWalk(
             if (currentChild->GetIsViewportDirtyOrOnViewportDirtyPath()
                 || (newDirtyFound && currentChild->GetWantsViewportOrContributesToViewport()))
             {
-                if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_50119529>())
-                {
-                    IFC_RETURN(EffectiveViewportWalkToChild(
-                        currentChild,
-                        newDirtyFound,
-                        transformsToViewports,
-                        horizontalViewports,
-                        verticalViewports));
-                }
-                else
-                {
-                    IFC_RETURN(currentChild->EffectiveViewportWalk(
-                        newDirtyFound,
-                        transformsToViewports,
-                        horizontalViewports,
-                        verticalViewports));
-                }
+                IFC_RETURN(EffectiveViewportWalkToChild(
+                    currentChild,
+                    newDirtyFound,
+                    transformsToViewports,
+                    horizontalViewports,
+                    verticalViewports));
             }
 
             // If at least one of the children still has the viewport
diff --git a/src/dxaml/xcp/components/flyweight/inc/ValueObjectBase.h b/src/dxaml/xcp/components/flyweight/inc/ValueObjectBase.h
index 62eb71292c..bb0acb32a1 100644
--- a/src/dxaml/xcp/components/flyweight/inc/ValueObjectBase.h
+++ b/src/dxaml/xcp/components/flyweight/inc/ValueObjectBase.h
@@ -122,19 +122,19 @@ namespace Flyweight
         }
 
         template <typename T>
-        bool equal(_In_ const T&, _In_ const T&)
+        bool equal(const T&, const T&)
         {
             static_assert_false("Specialize equal() for your value object type.");
         }
 
         template <typename T>
-        bool less(_In_ const T&, _In_ const T&)
+        bool less(const T&, const T&)
         {
             static_assert_false("Specialize less() for your value object type.");
         }
 
         template <typename T>
-        std::size_t hash(_In_ const T&)
+        std::size_t hash(const T&)
         {
             static_assert_false("Specialize hash() for your value object type.");
         }
diff --git a/src/dxaml/xcp/components/focus/FocusProperties/DefaultFocusChildrenIterator.cpp b/src/dxaml/xcp/components/focus/FocusProperties/DefaultFocusChildrenIterator.cpp
index b3f61112c8..cca4f7e18f 100644
--- a/src/dxaml/xcp/components/focus/FocusProperties/DefaultFocusChildrenIterator.cpp
+++ b/src/dxaml/xcp/components/focus/FocusProperties/DefaultFocusChildrenIterator.cpp
@@ -94,7 +94,7 @@ unsigned DefaultFocusChildrenIterator::GetCount()
 }
 
 _Check_return_ HRESULT
-DefaultFocusChildrenIterator::GetAt(unsigned index, _Outptr_ xaml::IDependencyObject** value)
+DefaultFocusChildrenIterator::GetAt(_In_ unsigned index, _Outptr_ xaml::IDependencyObject** value)
 {
     auto parent = DependencyObjectAbstractionHelpers::GetHandle(DependencyObjectAbstractionHelpers::IDOtoDO(m_parent.Get()));
     auto children = FocusProperties::GetFocusChildren<CDOCollection>(parent);
diff --git a/src/dxaml/xcp/components/focus/FocusProperties/FocusProperties.cpp b/src/dxaml/xcp/components/focus/FocusProperties/FocusProperties.cpp
index 1107cf7910..8bd0bdc7ac 100644
--- a/src/dxaml/xcp/components/focus/FocusProperties/FocusProperties.cpp
+++ b/src/dxaml/xcp/components/focus/FocusProperties/FocusProperties.cpp
@@ -276,8 +276,10 @@ bool IsGamepadFocusCandidate<CDependencyObject>(_In_ CDependencyObject* const ob
     if (object->OfTypeByIndex<KnownTypeIndex::UIElement>())
     {
         CValue val;
-        object->GetValueByIndex(KnownPropertyIndex::UIElement_IsGamepadFocusCandidate, &val);
-        isGamepadFocusCandidate = (val.AsBool() == TRUE);
+        if (SUCCEEDED(object->GetValueByIndex(KnownPropertyIndex::UIElement_IsGamepadFocusCandidate, &val)))
+        {
+            isGamepadFocusCandidate = (val.AsBool() == TRUE);
+        }
     }
 
     return isGamepadFocusCandidate;
diff --git a/src/dxaml/xcp/components/focus/Movement/FocusMovement.cpp b/src/dxaml/xcp/components/focus/Movement/FocusMovement.cpp
index 1608fcbda7..f5d82e4de8 100644
--- a/src/dxaml/xcp/components/focus/Movement/FocusMovement.cpp
+++ b/src/dxaml/xcp/components/focus/Movement/FocusMovement.cpp
@@ -31,10 +31,10 @@ FocusMovement::FocusMovement(
     _In_opt_ CDependencyObject* pTarget)
     : xyFocusOptions(&xyFocusOptions),
     direction(direction),
-    pTarget(pTarget)
+    pTarget(pTarget),
+    correlationId(Focus::CreateCorrelationId())
 {
     forceBringIntoView = true;
-    UuidCreate(&correlationId);
     focusState = DirectUI::FocusState::Programmatic;
     if (direction == DirectUI::FocusNavigationDirection::Down ||
         direction == DirectUI::FocusNavigationDirection::Left ||
@@ -45,3 +45,12 @@ FocusMovement::FocusMovement(
     }
 }
 
+GUID Focus::CreateCorrelationId()
+{
+    GUID uuid {};
+    if (UuidCreate(&uuid) != RPC_S_OK)
+    {
+        IFCFAILFAST(E_UNEXPECTED);
+    }
+    return uuid;
+}
\ No newline at end of file
diff --git a/src/dxaml/xcp/components/focus/inc/FocusMovement.h b/src/dxaml/xcp/components/focus/inc/FocusMovement.h
index bea3bf5980..c889f00b85 100644
--- a/src/dxaml/xcp/components/focus/inc/FocusMovement.h
+++ b/src/dxaml/xcp/components/focus/inc/FocusMovement.h
@@ -12,6 +12,8 @@ namespace Focus {
     struct XYFocusOptions;
     class FocusMovementResult;
 
+    GUID CreateCorrelationId();
+
     class FocusMovement
     {
     public:
diff --git a/src/dxaml/xcp/components/focus/inc/XYFocus.h b/src/dxaml/xcp/components/focus/inc/XYFocus.h
index d818b415a7..f113408145 100644
--- a/src/dxaml/xcp/components/focus/inc/XYFocus.h
+++ b/src/dxaml/xcp/components/focus/inc/XYFocus.h
@@ -181,7 +181,7 @@ namespace Focus {
 
         static std::size_t ExploredListHash(
             _In_ DirectUI::FocusNavigationDirection direction,
-            _In_ CDependencyObject* element,
+            _In_opt_ CDependencyObject* element,
             _In_opt_ CDependencyObject* engagedControl,
             _In_ const XYFocusOptions& xyFocusOptions);
 
diff --git a/src/dxaml/xcp/components/gestures/export/ElementGestureTracker.cpp b/src/dxaml/xcp/components/gestures/export/ElementGestureTracker.cpp
index 27cb226480..1df94a5784 100644
--- a/src/dxaml/xcp/components/gestures/export/ElementGestureTracker.cpp
+++ b/src/dxaml/xcp/components/gestures/export/ElementGestureTracker.cpp
@@ -509,7 +509,19 @@ ElementGestureTracker::ProcessPointerInformation(_In_ const InputMessage& msg)
     {
         wrl::ComPtr<wfc::IVector<ixp::PointerPoint*>> pointerPoints;
 
-        IFC_RETURN(msg.m_pPointerEventArgsNoRef->GetIntermediatePoints(&pointerPoints));
+        if (msg.m_pPointerEventArgsNoRef)
+        {
+            IFC_RETURN(msg.m_pPointerEventArgsNoRef->GetIntermediatePoints(&pointerPoints));
+        }
+        else
+        {
+            if (!m_expPointerPointStatics)
+            {
+                IFC_RETURN(wf::GetActivationFactory(Microsoft::WRL::Wrappers::HStringReference(RuntimeClass_Microsoft_UI_Input_Experimental_ExpPointerPoint).Get(), &m_expPointerPointStatics));
+            }
+
+            IFC_RETURN(m_expPointerPointStatics->GetIntermediatePoints(pointerId, pointerPoints.ReleaseAndGetAddressOf()));
+        }
 
         // SYNC_CALL_TO_APP
         // Allow the out-of-order error for now.  Tracking this with http://osgvsowi/15831453
diff --git a/src/dxaml/xcp/components/gestures/inc/ElementGestureTracker.h b/src/dxaml/xcp/components/gestures/inc/ElementGestureTracker.h
index ae6f2e1dcb..098fd1902d 100644
--- a/src/dxaml/xcp/components/gestures/inc/ElementGestureTracker.h
+++ b/src/dxaml/xcp/components/gestures/inc/ElementGestureTracker.h
@@ -142,4 +142,5 @@ class ElementGestureTracker final
 
     GestureRecognizerAdapter m_gestureRecognizerAdapter;
     GestureOutputMapper* m_gestureOutputMapper;
+    wrl::ComPtr<ixp::IExpPointerPointStatics> m_expPointerPointStatics;
 };
\ No newline at end of file
diff --git a/src/dxaml/xcp/components/graphics/Scheduler.cpp b/src/dxaml/xcp/components/graphics/Scheduler.cpp
new file mode 100644
index 0000000000..75cfaba358
--- /dev/null
+++ b/src/dxaml/xcp/components/graphics/Scheduler.cpp
@@ -0,0 +1,56 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+#include "precomp.h"
+#include "Scheduler.h"
+#include "RefreshAlignedClock.h"
+#include "RefreshRateInfo.h"
+
+Scheduler::Scheduler(_In_ RefreshRateInfo* refreshRateInfo, _In_ RefreshAlignedClock* clock)
+    : m_refreshRateInfo(refreshRateInfo)
+    , m_clock(clock)
+{
+}
+
+Scheduler::~Scheduler()
+{
+}
+
+bool Scheduler::ShouldWaitForVBlank(float currentTimeInMilliseconds, float previousFrameTimeInMilliseconds, float refreshIntervalInMilliseconds)
+{
+    return (currentTimeInMilliseconds - previousFrameTimeInMilliseconds) < refreshIntervalInMilliseconds;
+}
+
+_Check_return_ HRESULT Scheduler::OnImmediateUIThreadFrame()
+{
+    //
+    // We need a frame immediately. We'll also throttle the UI thread here. Generally, there's no reason
+    // to tick or render faster than the screen can display the results. The correct way to do this is
+    // to throttle to the refresh rate, but that comes at a performance cost. Calling WaitForVBlank (in
+    // our case, via WaitForCompositorClock) prevents the display from going into a low-power state, so
+    // it's even more expensive than just keeping the CPU busy. We try to not call WaitForVBlank if we
+    // don't have to.
+    //
+    // We'll compare QPC times first. If it's been more than a whole vblank since the previous frame,
+    // let the UI thread go now. Otherwise we'll take the battery life hit and go through WaitForVBlank.
+    // This handles scenarios like (reasonable) DispatcherTimers nicely - they'll schedule UI thread
+    // frames more than a vblank apart, so we can skip WaitForVBlank in cases where the UI thread wakes
+    // up just to call out to the app for a DispatcherTimer. This should also handle the case of sparse
+    // UI tree updates from the user moving the pointer around or typing text. We should only be using
+    // WaitForVBlank in cases like CompositionTarget.Rendering or a degenerate 0ms timer where the UI
+    // thread requests frames immediately and nonstop.
+    //
+    float currentTimeInMilliseconds = m_clock->GetAbsoluteTimeInMilliseconds();
+    float refreshIntervalInMilliseconds = m_refreshRateInfo->GetRefreshIntervalInMilliseconds();
+    if (Scheduler::ShouldWaitForVBlank(currentTimeInMilliseconds, m_previousFrameTimeInMilliseconds, refreshIntervalInMilliseconds))
+    {
+        IFC_RETURN(m_refreshRateInfo->WaitForRefreshInterval());
+        m_previousFrameTimeInMilliseconds = m_clock->GetAbsoluteTimeInMilliseconds();
+    }
+    else
+    {
+        m_previousFrameTimeInMilliseconds = currentTimeInMilliseconds;
+    }
+
+    return S_OK;
+}
diff --git a/src/dxaml/xcp/components/graphics/ThemeShadow.cpp b/src/dxaml/xcp/components/graphics/ThemeShadow.cpp
index 75c634b116..965e622c9d 100644
--- a/src/dxaml/xcp/components/graphics/ThemeShadow.cpp
+++ b/src/dxaml/xcp/components/graphics/ThemeShadow.cpp
@@ -189,7 +189,7 @@ bool CThemeShadow::HasCustomReceivers()
 
 XTHICKNESS CThemeShadow::GetInsetsForWindowedPopup(DropShadowDepthClass depthClass)
 {
-    // Windowed Popups add their own insets to the HWND bounds.
+    // Windowed Popups add their own insets to the popup island bounds.
     // These insets are kept to a minimal size which tightly bounds around the visible shadow.
     // These "tight" insets were generated by manual inspection and must be kept in
     // sync with any future changes we might make to the shadow recipe.
diff --git a/src/dxaml/xcp/components/graphics/inc/Scheduler.h b/src/dxaml/xcp/components/graphics/inc/Scheduler.h
new file mode 100644
index 0000000000..8684430240
--- /dev/null
+++ b/src/dxaml/xcp/components/graphics/inc/Scheduler.h
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+#pragma once
+
+class RefreshRateInfo;
+class RefreshAlignedClock;
+
+//
+// Contains algorithms for the scheduling thread. Covered by unit tests.
+// Code from CompositorScheduler should move into this class.
+//
+class Scheduler : public CXcpObjectBase<>
+{
+public:
+    static bool ShouldWaitForVBlank(float currentTimeInMilliseconds, float previousFrameTimeInMilliseconds, float refreshIntervalInMilliseconds);
+
+    Scheduler(_In_ RefreshRateInfo* refreshRateInfo, _In_ RefreshAlignedClock* clock);
+    ~Scheduler();
+
+    _Check_return_ HRESULT OnImmediateUIThreadFrame();
+
+private:
+    // Used to avoid WaitForVBlank when the previous frame was more than a vblank ago.
+    float m_previousFrameTimeInMilliseconds {0.0f};
+
+    wrl::ComPtr<RefreshRateInfo> m_refreshRateInfo;
+    wrl::ComPtr<RefreshAlignedClock> m_clock;
+};
diff --git a/src/dxaml/xcp/components/graphics/lib/Microsoft.UI.Xaml.GraphicsUtility.vcxproj b/src/dxaml/xcp/components/graphics/lib/Microsoft.UI.Xaml.GraphicsUtility.vcxproj
index 430d9e2fe6..678e59f65d 100644
--- a/src/dxaml/xcp/components/graphics/lib/Microsoft.UI.Xaml.GraphicsUtility.vcxproj
+++ b/src/dxaml/xcp/components/graphics/lib/Microsoft.UI.Xaml.GraphicsUtility.vcxproj
@@ -44,6 +44,7 @@
         <ClCompile Include="..\ProjectedShadowManager.cpp"/>
         <ClCompile Include="..\EffectPolicyHelper.cpp"/>
         <ClCompile Include="..\SystemBackdrop.cpp"/>
+        <ClCompile Include="..\Scheduler.cpp"/>
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/dxaml/xcp/components/imaging/AsyncCopyToSurfaceTask.cpp b/src/dxaml/xcp/components/imaging/AsyncCopyToSurfaceTask.cpp
index da7c364b62..ebd2632b7f 100644
--- a/src/dxaml/xcp/components/imaging/AsyncCopyToSurfaceTask.cpp
+++ b/src/dxaml/xcp/components/imaging/AsyncCopyToSurfaceTask.cpp
@@ -117,7 +117,7 @@ _Check_return_ HRESULT
 AsyncCopyToSurfaceTask::CopyOperation(
     unsigned int width,
     unsigned int height,
-    _Outref_ xref_ptr<OfferableSoftwareBitmap>& spOutputSurface
+    _Out_ xref_ptr<OfferableSoftwareBitmap>& spOutputSurface
     )
 {
     wgri::BitmapAlphaMode bitmapAlphaMode;
diff --git a/src/dxaml/xcp/components/imaging/AsyncImageDecoder.cpp b/src/dxaml/xcp/components/imaging/AsyncImageDecoder.cpp
index 07c0a58bb0..dabb465bac 100644
--- a/src/dxaml/xcp/components/imaging/AsyncImageDecoder.cpp
+++ b/src/dxaml/xcp/components/imaging/AsyncImageDecoder.cpp
@@ -97,13 +97,8 @@ void AsyncImageDecoder::SharedState::CancelPresent()
 // static
 HRESULT AsyncImageDecoder::SetupDecodeCurrentFrame(std::shared_ptr<SharedState> sharedState)
 {
-    const std::shared_ptr<ImagingTelemetry::ImageDecodeActivity>& decodeActivity = sharedState->m_spDecodeParams->GetDecodeActivity();
-
-    if (decodeActivity)
-    {
-        uint64_t imageSourceId = sharedState->m_spDecodeParams->GetImageId();
-        decodeActivity->QueueOffThreadDecode(imageSourceId);
-    }
+    uint64_t imageSourceId = sharedState->m_spDecodeParams->GetImageId();
+    ImagingTelemetry::QueueOffThreadDecode(imageSourceId);
 
     ASSERT(!sharedState->m_decodeInProgress);
     sharedState->m_decodeInProgress = true;
diff --git a/src/dxaml/xcp/components/imaging/EncodedImageData.cpp b/src/dxaml/xcp/components/imaging/EncodedImageData.cpp
index ea7f67da95..dac1b774e5 100644
--- a/src/dxaml/xcp/components/imaging/EncodedImageData.cpp
+++ b/src/dxaml/xcp/components/imaging/EncodedImageData.cpp
@@ -238,7 +238,7 @@ const ImageMetadata& EncodedImageData::GetMetadata() const
 }
 
 _Check_return_ HRESULT EncodedImageData::CreateWicBitmapDecoder(
-    _Outref_ wrl::ComPtr<IWICBitmapDecoder>& spWicBitmapDecoder
+    _Out_ wrl::ComPtr<IWICBitmapDecoder>& spWicBitmapDecoder
     )
 {
     std::lock_guard<std::mutex> lock(m_mutex);
@@ -264,7 +264,7 @@ bool EncodedImageData::IsAnimatedImage() const
     return GetMetadata().frameCount > 1;
 }
 
-_Check_return_ HRESULT EncodedImageData::CreateIStream(_Outref_ wrl::ComPtr<IStream>& spIStream)
+_Check_return_ HRESULT EncodedImageData::CreateIStream(_Out_ wrl::ComPtr<IStream>& spIStream)
 {
     std::lock_guard<std::mutex> lock(m_mutex);
 
diff --git a/src/dxaml/xcp/components/imaging/ImageCache.cpp b/src/dxaml/xcp/components/imaging/ImageCache.cpp
index aaa457bc79..2e3f543b7a 100644
--- a/src/dxaml/xcp/components/imaging/ImageCache.cpp
+++ b/src/dxaml/xcp/components/imaging/ImageCache.cpp
@@ -26,11 +26,6 @@
 #include <MUX-ETWEvents.h>
 #include <palnetwork.h>
 #include <PalResourceManager.h>
-#include <FrameworkUdk/Containment.h>
-
-// Telemetry: Image Decoding Activity is skipped in WinAppSDK 1.5.5+ Servicing releases to avoid crashing
-// Bug 44612834: [1.5 servicing] [Watson Failure] caused by FAIL_FAST_FATAL_APP_EXIT_c0000409_Microsoft.UI.Xaml.dll!ImagingTelemetry::ImageDecodeActivity::Split
-#define WINAPPSDK_CHANGEID_44612834 44612834
 
 typedef ImageAsyncCallback<ImageCache> ImageCacheAsyncTask;
 
@@ -120,9 +115,6 @@ _Check_return_ HRESULT ImageCache::Download()
 
     IFCEXPECT_RETURN(m_State == ImageCacheState::NotDownloaded);
 
-    // TODO: This can be updated to go in ImageDecodeActivity, but we need a trail of breadcrumbs back to the
-    // ImageSource/LoadedImageSurface that triggered the download. There may be others that are waiting for this
-    // download as well. Do they get events too?
     TraceImageCacheDownloadBegin(m_strUri.GetBuffer());
 
     m_State = ImageCacheState::Downloading;
@@ -152,17 +144,14 @@ _Check_return_ HRESULT ImageCache::Download()
     return S_OK;
 }
 
-std::shared_ptr<ImageMetadataView> ImageCache::GetMetadataView(_In_opt_ const std::shared_ptr<ImagingTelemetry::ImageDecodeActivity>& decodeActivity, uint64_t imageId)
+std::shared_ptr<ImageMetadataView> ImageCache::GetMetadataView(uint64_t imageId)
 {
     if (!m_metadataViewImpl)
     {
         if (m_State == ImageCacheState::NotDownloaded &&
             !m_hasProcessDecodeRequestsTask)
         {
-            if (decodeActivity) // Will be null in unit tests
-            {
-                decodeActivity->QueueProcessDownload(imageId, m_strUri.GetBuffer());
-            }
+            ImagingTelemetry::QueueProcessDownload(imageId, m_strUri.GetBuffer());
             m_downloadError = TriggerProcessDecodeRequests();
         }
 
@@ -177,7 +166,7 @@ std::shared_ptr<ImageMetadataView> ImageCache::GetMetadataView(_In_opt_ const st
 _Check_return_ HRESULT ImageCache::GetImage(
     _In_ xref_ptr<ImageDecodeParams>& decodeParams,
     _In_ const xref_ptr<IImageAvailableCallback>& imageAvailableCallback,
-    _Outref_ xref_ptr<IAbortableImageOperation>& abortableImageOperation
+    _Out_ xref_ptr<IAbortableImageOperation>& abortableImageOperation
     )
 {
     //
@@ -346,20 +335,14 @@ _Check_return_ HRESULT ImageCache::TriggerProcessDecodeRequests()
 {
     if (!m_hasProcessDecodeRequestsTask)
     {
-        if (!WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_44612834>())
+        // This ImageCache may be associated with multiple ImageSources (i.e. the same image decoding to multiple
+        // different sizes). Telemetry is associated with the decoded image, so report telemetry for all the
+        // decodes that will be triggered by this ImageCache.
+        for (ImageDecodeRequest* decodeRequest : m_decodeRequests)
         {
-            // This ImageCache may be associated with multiple ImageSources (i.e. the same image decoding to multiple
-            // different sizes). Telemetry is associated with the decoded image, so report telemetry for all the
-            // decodes that will be triggered by this ImageCache.
-            for (ImageDecodeRequest* decodeRequest : m_decodeRequests)
-            {
-                const auto& decodeParams = decodeRequest->GetDecodeParams();
+            const auto& decodeParams = decodeRequest->GetDecodeParams();
 
-                // The call below won't actually AV if there's nothing logging an ETW trace. Assert it explicitly so we
-                // crash consistently if it's null.
-                ASSERT(decodeParams->GetDecodeActivity());
-                decodeParams->GetDecodeActivity()->QueueProcessDecodeRequests(decodeParams->GetImageId(), decodeParams->GetStrSource().GetBuffer());
-            }
+            ImagingTelemetry::QueueProcessDecodeRequests(decodeParams->GetImageId(), decodeParams->GetStrSource().GetBuffer());
         }
 
         auto task = make_xref<ImageCacheAsyncTask>(this, &ImageCache::ProcessDecodeRequests);
@@ -380,13 +363,10 @@ _Check_return_ HRESULT ImageCache::ProcessDecodeRequests()
 {
     m_hasProcessDecodeRequestsTask = FALSE;
 
-    if (!WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_44612834>())
+    for (ImageDecodeRequest* decodeRequest : m_decodeRequests)
     {
-        for (ImageDecodeRequest* decodeRequest : m_decodeRequests)
-        {
-            const auto& decodeParams = decodeRequest->GetDecodeParams();
-            decodeParams->GetDecodeActivity()->ProcessDecodeRequests(decodeParams->GetImageId(), decodeParams->GetStrSource().GetBuffer(), m_State);
-        }
+        const auto& decodeParams = decodeRequest->GetDecodeParams();
+        ImagingTelemetry::ProcessDecodeRequests(decodeParams->GetImageId(), decodeParams->GetStrSource().GetBuffer(), m_State);
     }
 
     //
@@ -496,13 +476,8 @@ _Check_return_ HRESULT ImageCache::BeginDecode(
         if (!decodeInProgress || decodeRequest->GetDecodeParams()->IsLoadedImageSurface())
         {
             const auto& decodeParams = decodeRequest->GetDecodeParams();
-            const std::shared_ptr<ImagingTelemetry::ImageDecodeActivity>& decodeActivity = decodeParams->GetDecodeActivity();
-
-            if (decodeActivity)
-            {
-                decodeActivity->QueueDecodeFromImageCache(decodeParams->GetImageId(), decodeParams->GetStrSource().GetBuffer());
-            }
 
+            ImagingTelemetry::QueueDecodeFromImageCache(decodeParams->GetImageId(), decodeParams->GetStrSource().GetBuffer());
             auto parseHR = m_encodedImageData->Parse(m_core->GetGraphicsDevice(), m_core->GetContentRootMaxSize());
 
             if (FAILED(parseHR))
diff --git a/src/dxaml/xcp/components/imaging/ImageMetadataViewImpl.cpp b/src/dxaml/xcp/components/imaging/ImageMetadataViewImpl.cpp
index e0d669aea3..85101fa984 100644
--- a/src/dxaml/xcp/components/imaging/ImageMetadataViewImpl.cpp
+++ b/src/dxaml/xcp/components/imaging/ImageMetadataViewImpl.cpp
@@ -36,7 +36,7 @@ const ImageMetadata* ImageMetadataViewImpl::GetImageMetadata() const
     {
         // TODO: image metadata is usually parsed when we call GetHR. GetImageMetadata is called in a lot more places,
         // so to limit code churn it hasn't been updated to trace an event.
-        ParseImageMetadata(nullptr, 0);
+        ParseImageMetadata(0);
         return m_encodedImageData->IsMetadataAvailable() ? &m_encodedImageData->GetMetadata() : nullptr;
     }
 
@@ -73,30 +73,24 @@ void ImageMetadataViewImpl::SetMaxRootSize(wf::Size maxRootSize)
     }
 }
 
-HRESULT ImageMetadataViewImpl::GetHR(_In_ const std::shared_ptr<ImagingTelemetry::ImageDecodeActivity>& decodeActivity, uint64_t imageId) const
+HRESULT ImageMetadataViewImpl::GetHR(uint64_t imageId) const
 {
-    ParseImageMetadata(decodeActivity, imageId);
+    ParseImageMetadata(imageId);
     return m_downloadParseResult;
 }
 
-void ImageMetadataViewImpl::ParseImageMetadata(_In_opt_ const std::shared_ptr<ImagingTelemetry::ImageDecodeActivity>& decodeActivity, uint64_t imageId) const
+void ImageMetadataViewImpl::ParseImageMetadata(uint64_t imageId) const
 {
     if (m_needParse)
     {
         CD3D11Device* graphicsDevice = m_graphicsDevice.lock().get();
-        if (decodeActivity)
-        {
-            decodeActivity->ParseImageMetadataStart(imageId);
-        }
+        ImagingTelemetry::ParseImageMetadataStart(imageId);
 
         // Note: graphicsDevice is allowed to be null if we're not working with a SVG file. LoadedImageSurface doesn't
         // even set a graphics device in this ImageMetadataViewImpl.
         m_downloadParseResult = m_encodedImageData->Parse(graphicsDevice, m_maxRootSize);
         m_needParse = false;
 
-        if (decodeActivity)
-        {
-            decodeActivity->ParseImageMetadataStop(imageId, m_downloadParseResult);
-        }
+        ImagingTelemetry::ParseImageMetadataStop(imageId, m_downloadParseResult);
     }
 }
\ No newline at end of file
diff --git a/src/dxaml/xcp/components/imaging/ImageMetadataViewImpl.h b/src/dxaml/xcp/components/imaging/ImageMetadataViewImpl.h
index 021483eb89..158f4d84fc 100644
--- a/src/dxaml/xcp/components/imaging/ImageMetadataViewImpl.h
+++ b/src/dxaml/xcp/components/imaging/ImageMetadataViewImpl.h
@@ -25,10 +25,10 @@ class ImageMetadataViewImpl final : public ImageMetadataView
     void SetMaxRootSize(wf::Size maxRootSize) override;
 
     // ImageViewBase
-    HRESULT GetHR(_In_ const std::shared_ptr<ImagingTelemetry::ImageDecodeActivity>& decodeActivity, uint64_t imageId) const override;
+    HRESULT GetHR(uint64_t imageId) const override;
 
 private:
-    void ParseImageMetadata(_In_opt_ const std::shared_ptr<ImagingTelemetry::ImageDecodeActivity>& decodeActivity, uint64_t imageId) const;
+    void ParseImageMetadata(uint64_t imageId) const;
 
     std::shared_ptr<EncodedImageData> m_encodedImageData;
     float m_downloadProgress = 0;
diff --git a/src/dxaml/xcp/components/imaging/ImageProvider.cpp b/src/dxaml/xcp/components/imaging/ImageProvider.cpp
index dec2498297..0a7e38023b 100644
--- a/src/dxaml/xcp/components/imaging/ImageProvider.cpp
+++ b/src/dxaml/xcp/components/imaging/ImageProvider.cpp
@@ -14,11 +14,6 @@
 #include "ImageProvider.h"
 #include "ImageDecodeRequest.h"
 #include "ImageDecodeParams.h"
-#include <FrameworkUdk/Containment.h>
-
-// Telemetry: Image Decoding Activity is skipped in WinAppSDK 1.5.5+ Servicing releases to avoid crashing
-// Bug 44612834: [1.5 servicing] [Watson Failure] caused by FAIL_FAST_FATAL_APP_EXIT_c0000409_Microsoft.UI.Xaml.dll!ImagingTelemetry::ImageDecodeActivity::Split
-#define WINAPPSDK_CHANGEID_44612834 44612834
 
 _Check_return_ HRESULT
 ImageProvider::CopyImage(
@@ -38,25 +33,4 @@ ImageProvider::CopyImage(
     spAbortableImageOperation = spDecodeRequest;
 
     return S_OK;
-}
-
-std::shared_ptr<ImagingTelemetry::ImageDecodeActivity>& ImageProvider::GetDecodeActivity()
-{
-    if (!WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_44612834>())
-    {
-        EnsureDecodeActivity();
-    }
-
-    return m_decodeActivity;
-}
-
-void ImageProvider::EnsureDecodeActivity()
-{
-    // Telemetry: Image Decoding Activity is skipped in WinAppSDK 1.5.5+ Servicing releases to avoid crashing bug 44612834.
-    ASSERT(!WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_44612834>());
-
-    if (!m_decodeActivity)
-    {
-        m_decodeActivity = std::make_shared<ImagingTelemetry::ImageDecodeActivity>(ImagingTelemetry::ImageDecodeActivity::Start());
-    }
 }
\ No newline at end of file
diff --git a/src/dxaml/xcp/components/imaging/ImagingUtility.cpp b/src/dxaml/xcp/components/imaging/ImagingUtility.cpp
index d60280e9bf..d2e3da8b5e 100644
--- a/src/dxaml/xcp/components/imaging/ImagingUtility.cpp
+++ b/src/dxaml/xcp/components/imaging/ImagingUtility.cpp
@@ -234,7 +234,7 @@ _Check_return_ HRESULT ImagingUtility::IsHdrSource(
 
 _Check_return_ HRESULT ImagingUtility::DoesSourceSupportAlpha(
     _In_ const wrl::ComPtr<IWICBitmapSource>& spBitmapSource,
-    _Outref_ bool& supportsAlpha
+    _Out_ bool& supportsAlpha
     )
 {
     auto spWicFactory = WicService::GetInstance().GetFactory();
@@ -286,7 +286,7 @@ _Check_return_ HRESULT ImagingUtility::CreateDefaultScaler(
     uint32_t targetWidth,
     uint32_t targetHeight,
     _In_ const wrl::ComPtr<IWICBitmapSource>& spInputSource,
-    _Outref_ wrl::ComPtr<IWICBitmapScaler>& spBitmapScaler
+    _Out_ wrl::ComPtr<IWICBitmapScaler>& spBitmapScaler
     )
 {
     auto spWicFactory = WicService::GetInstance().GetFactory();
@@ -357,7 +357,7 @@ _Check_return_ HRESULT ImagingUtility::CreateDefaultScaler(
 _Check_return_ HRESULT ImagingUtility::CreateDefaultConverter(
     const WICPixelFormatGUID& targetFormat,
     _In_ const wrl::ComPtr<IWICBitmapSource>& spInputSource,
-    _Outref_ wrl::ComPtr<IWICFormatConverter>& spFormatConverter
+    _Out_ wrl::ComPtr<IWICFormatConverter>& spFormatConverter
     )
 {
     auto spWicFactory = WicService::GetInstance().GetFactory();
@@ -378,7 +378,7 @@ _Check_return_ HRESULT ImagingUtility::CreateDefaultColorTransform(
     _In_ const WICPixelFormatGUID& targetFormat,
     _In_ const wrl::ComPtr<IWICBitmapFrameDecode>& spBitmapFrameDecode,
     _In_ const wrl::ComPtr<IWICBitmapSource>& spInputSource,
-    _Outref_ wrl::ComPtr<IWICColorTransform>& spColorTransform
+    _Out_ wrl::ComPtr<IWICColorTransform>& spColorTransform
     )
 {
     spColorTransform = nullptr;
@@ -437,7 +437,7 @@ _Check_return_ HRESULT ImagingUtility::CreateDefaultColorTransform(
 _Check_return_ HRESULT ImagingUtility::CreateDefaultFlipRotator(
     WICBitmapTransformOptions transformOptions,
     _In_ const wrl::ComPtr<IWICBitmapSource>& spInputSource,
-    _Outref_ wrl::ComPtr<IWICBitmapFlipRotator>& spBitmapFlipRotator
+    _Out_ wrl::ComPtr<IWICBitmapFlipRotator>& spBitmapFlipRotator
     )
 {
     auto spWicFactory = WicService::GetInstance().GetFactory();
@@ -450,7 +450,7 @@ _Check_return_ HRESULT ImagingUtility::CreateDefaultFlipRotator(
 
 static _Check_return_ HRESULT CopyToSoftwareBitmap(
     _In_ IWICBitmapSource *bitmapSource,
-    _Outref_ xref_ptr<OfferableSoftwareBitmap>& spSoftwareBitmap
+    _Out_ xref_ptr<OfferableSoftwareBitmap>& spSoftwareBitmap
     )
 {
     // TODO: Consider doing a cancellable staged copy...
@@ -466,7 +466,7 @@ static _Check_return_ HRESULT CopyToSoftwareBitmap(
 static _Check_return_ HRESULT CopyToHardwareTiles(
     _In_ IWICBitmapSource *bitmapSource,
     _In_ const ImageMetadata& imageMetadata,
-    _Outref_ const SurfaceUpdateList& surfaceUpdateList
+    _Out_ const SurfaceUpdateList& surfaceUpdateList
     )
 {
     // TODO: Clean this up to be new style... use auto initialization and
@@ -756,7 +756,7 @@ _Check_return_ HRESULT ImagingUtility::RealizeBitmapSource(
     _In_ const ImageMetadata& imageMetadata,
     _In_ IWICBitmapSource* bitmapSource,
     _In_ const ImageDecodeParams& decodeParams,
-    _Outref_ xref_ptr<OfferableSoftwareBitmap>& spSoftwareBitmap)
+    _Out_ xref_ptr<OfferableSoftwareBitmap>& spSoftwareBitmap)
 {
     // If input tiles aren't provided, then create a single temporary tile for decoding and return
     // the newly created surface in the response.
@@ -785,19 +785,7 @@ _Check_return_ HRESULT ImagingUtility::RealizeBitmapSource(
 
     const bool isHardwareDecode = !surfaceUpdateList.empty();
 
-    // The activity taking telemetry is owned by the UI thread. If it's still running, then call Split to use it from
-    // this decode worker thread. If it's been stopped, then it means the ImageSource/LoadedImageSurface associated with
-    // the activity has a new encoded source set on it, and that this decode no longer matters. In that case don't bother
-    // tracing anything.
-    // Note: There's a bit of a race condition here - the activity can be stopped between us checking whether it's
-    // running and when we call Split. We minimize the gap in between to mitigate.
-    ImagingTelemetry::ImageDecodeActivity splitActivity;
-    const bool isActivityStillRunning = decodeParams.GetDecodeActivity() && static_cast<bool>(*decodeParams.GetDecodeActivity());   // operator bool() checks whether the activity is still running
-    if (isActivityStillRunning)
-    {
-        splitActivity = decodeParams.GetDecodeActivity()->Split();
-        splitActivity.OffThreadDecodeStart(decodeParams.GetImageId(), decodeParams.GetStrSource().GetBuffer(), isHardwareDecode);
-    }
+    ImagingTelemetry::OffThreadDecodeStart(decodeParams.GetImageId(), decodeParams.GetStrSource().GetBuffer(), isHardwareDecode);
 
     if (isHardwareDecode)
     {
@@ -805,13 +793,13 @@ _Check_return_ HRESULT ImagingUtility::RealizeBitmapSource(
         // and fails gracefully.
         SuspendFailFastOnStowedException suspender;
 
-        IFC_RETURN_STOPACTIVITY(CopyToHardwareTiles(bitmapSource, imageMetadata, surfaceUpdateList), splitActivity);
+        IFC_RETURN(CopyToHardwareTiles(bitmapSource, imageMetadata, surfaceUpdateList));
     }
     else
     {
         auto pipelineOutputWidth = 0u;
         auto pipelineOutputHeight = 0u;
-        IFC_RETURN_STOPACTIVITY(bitmapSource->GetSize(&pipelineOutputWidth, &pipelineOutputHeight), splitActivity);
+        IFC_RETURN(bitmapSource->GetSize(&pipelineOutputWidth, &pipelineOutputHeight));
 
         spSoftwareBitmap = make_xref<OfferableSoftwareBitmap>(
             decodeParams.GetFormat(),
@@ -820,14 +808,10 @@ _Check_return_ HRESULT ImagingUtility::RealizeBitmapSource(
             !imageMetadata.supportsAlpha);
 
         SuspendFailFastOnStowedException suspender(MF_E_TOPO_CODEC_NOT_FOUND);
-        IFC_RETURN_STOPACTIVITY(CopyToSoftwareBitmap(bitmapSource, spSoftwareBitmap), splitActivity);
+        IFC_RETURN(CopyToSoftwareBitmap(bitmapSource, spSoftwareBitmap));
     }
 
-    if (isActivityStillRunning)
-    {
-        splitActivity.OffThreadDecodeStop(decodeParams.GetImageId());
-        splitActivity.Stop();
-    }
+    ImagingTelemetry::OffThreadDecodeStop(decodeParams.GetImageId());
 
     return S_OK;
 }
diff --git a/src/dxaml/xcp/components/imaging/RenderTargetBitmapImplUsingSpriteVisuals.cpp b/src/dxaml/xcp/components/imaging/RenderTargetBitmapImplUsingSpriteVisuals.cpp
index bcf3199bfb..6065f91460 100644
--- a/src/dxaml/xcp/components/imaging/RenderTargetBitmapImplUsingSpriteVisuals.cpp
+++ b/src/dxaml/xcp/components/imaging/RenderTargetBitmapImplUsingSpriteVisuals.cpp
@@ -66,7 +66,7 @@ class CaptureAsyncCompletionState
 private:
     xref_ptr<HWTexture> m_hwTexture;
     wil::unique_handle m_completionEvent;
-    HRESULT m_asyncErrorCode;
+    HRESULT m_asyncErrorCode{};
 };
 
 RenderTargetBitmapImplUsingSpriteVisuals::RenderTargetBitmapImplUsingSpriteVisuals(
diff --git a/src/dxaml/xcp/components/imaging/SoftwareBitmapSource.cpp b/src/dxaml/xcp/components/imaging/SoftwareBitmapSource.cpp
index 0e94967cd7..536fe86b39 100644
--- a/src/dxaml/xcp/components/imaging/SoftwareBitmapSource.cpp
+++ b/src/dxaml/xcp/components/imaging/SoftwareBitmapSource.cpp
@@ -128,10 +128,7 @@ CSoftwareBitmapSource::SetBitmap(
     {
         ASSERT(m_spAbortableImageOperation == nullptr);
 
-        if (const auto& decodeActivity = GetContext()->GetImageProvider()->GetDecodeActivity())
-        {
-            decodeActivity->SetSoftwareBitmap(reinterpret_cast<uint64_t>(this));
-        }
+        ImagingTelemetry::SetSoftwareBitmap(reinterpret_cast<uint64_t>(this));
 
         IFC_RETURN(ReloadSource(false /* forceCopyToSoftwareSurface */));
     }
@@ -181,10 +178,7 @@ _Check_return_ HRESULT CSoftwareBitmapSource::OnSoftwareBitmapImageAvailable(_In
 
         attemptCopyToSoftwareSurfaceInstead = true;
 
-        if (const auto& decodeActivity = GetContext()->GetImageProvider()->GetDecodeActivity())
-        {
-            decodeActivity->SoftwareBitmapFallbackAfterUploadError(reinterpret_cast<uint64_t>(this), uploadHResult);
-        }
+        ImagingTelemetry::SoftwareBitmapFallbackAfterUploadError(reinterpret_cast<uint64_t>(this), uploadHResult);
 
         // Force a copy into a software surface, which will never hit a device lost error. We'll upload this into a
         // hardware surface later on a UI thread frame.
@@ -324,7 +318,7 @@ _Check_return_ HRESULT CSoftwareBitmapSource::PrepareCopyParams(
     {
         // There appear to be cases where we might get called prior to the first tick.  When this happens,
         // make sure that the hardware resources are ready for us.
-        core->GetBrowserHost()->GetGraphicsDeviceManager()->WaitForD3DDependentResourceCreation();
+        IFC(core->GetBrowserHost()->GetGraphicsDeviceManager()->WaitForD3DDependentResourceCreation());
 
         INT32 width = 0;
         INT32 height = 0;
diff --git a/src/dxaml/xcp/components/imaging/SoftwareBitmapUtility.cpp b/src/dxaml/xcp/components/imaging/SoftwareBitmapUtility.cpp
index b8e73ddb6f..f7ee993501 100644
--- a/src/dxaml/xcp/components/imaging/SoftwareBitmapUtility.cpp
+++ b/src/dxaml/xcp/components/imaging/SoftwareBitmapUtility.cpp
@@ -10,7 +10,7 @@
 HRESULT SoftwareBitmapUtility::CreateSoftwareBitmap(
     uint32_t width,
     uint32_t height,
-    _Outref_ wrl::ComPtr<wgri::ISoftwareBitmap>& spSoftwareBitmap
+    _Out_ wrl::ComPtr<wgri::ISoftwareBitmap>& spSoftwareBitmap
     )
 {
     return SoftwareBitmapUtility::CreateSoftwareBitmap(
@@ -26,7 +26,7 @@ HRESULT SoftwareBitmapUtility::CreateSoftwareBitmap(
     uint32_t height,
     wgri::BitmapPixelFormat pixelFormat,
     wgri::BitmapAlphaMode alphaMode,
-    _Outref_ wrl::ComPtr<wgri::ISoftwareBitmap>& spSoftwareBitmap
+    _Out_ wrl::ComPtr<wgri::ISoftwareBitmap>& spSoftwareBitmap
     )
 {
     wrl::ComPtr<wgri::ISoftwareBitmapFactory> spSoftwareBitmapFactory;
@@ -47,7 +47,7 @@ HRESULT SoftwareBitmapUtility::CreateSoftwareBitmap(
 _Check_return_ HRESULT SoftwareBitmapUtility::CreateSoftwareBitmap(
     _In_ const wrl::ComPtr<IWICBitmap>& spWicBitmap,
     bool readOnly,
-    _Outref_ wrl::ComPtr<wgri::ISoftwareBitmap>& spSoftwareBitmap
+    _Out_ wrl::ComPtr<wgri::ISoftwareBitmap>& spSoftwareBitmap
     )
 {
     wrl::ComPtr<ISoftwareBitmapNativeFactory> spSoftwareBitmapNativeFactory;
diff --git a/src/dxaml/xcp/components/imaging/SvgImageDecoder.cpp b/src/dxaml/xcp/components/imaging/SvgImageDecoder.cpp
index 015c3dad56..435073fcf8 100644
--- a/src/dxaml/xcp/components/imaging/SvgImageDecoder.cpp
+++ b/src/dxaml/xcp/components/imaging/SvgImageDecoder.cpp
@@ -20,10 +20,6 @@
 #include <Corep.h>
 #include <d2d1_3.h>
 #include <WicService.h>
-#include <FrameworkUdk/Containment.h>
-
-// Bug 50717750: [1.5 Servicing][WASDK] [GitHub] SVG not longer rendering
-#define WINAPPSDK_CHANGEID_50717750 50717750
 
 using namespace DirectUI;
 
@@ -40,8 +36,8 @@ _Check_return_ HRESULT SvgImageDecoder::DecodeFrame(
     _In_ EncodedImageData& encodedImageData,
     _In_ const ImageDecodeParams& decodeParams,
     int frameIndex,
-    _Outref_ wrl::ComPtr<IWICBitmapSource>& bitmapSource,
-    _Outref_ std::chrono::milliseconds& frameDelay
+    _Out_ wrl::ComPtr<IWICBitmapSource>& bitmapSource,
+    _Out_ std::chrono::milliseconds& frameDelay
     )
 {
     bitmapSource.Reset();
@@ -222,13 +218,10 @@ _Check_return_ HRESULT SvgImageDecoder::DecodeFrame(
                     // If neither width nor height was specified, then just match the viewBoxes...
                     containerViewBox = originalViewBox;
 
-                    if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_50717750>())
-                    {
-                        // ...but reset the origin of the view box for the outer SVG. The inner SVG will be positioned at
-                        // the origin when it's stretched (1:1) in the outer SVG.
-                        containerViewBox.x = 0;
-                        containerViewBox.y = 0;
-                    }
+                    // ...but reset the origin of the view box for the outer SVG. The inner SVG will be positioned at
+                    // the origin when it's stretched (1:1) in the outer SVG.
+                    containerViewBox.x = 0;
+                    containerViewBox.y = 0;
                 }
                 else
                 {
diff --git a/src/dxaml/xcp/components/imaging/WicAnimatedGifDecoder.cpp b/src/dxaml/xcp/components/imaging/WicAnimatedGifDecoder.cpp
index 3474b91745..90a527ed9e 100644
--- a/src/dxaml/xcp/components/imaging/WicAnimatedGifDecoder.cpp
+++ b/src/dxaml/xcp/components/imaging/WicAnimatedGifDecoder.cpp
@@ -62,8 +62,8 @@ _Check_return_ HRESULT WicAnimatedGifDecoder::DecodeFrame(
     _In_ EncodedImageData& encodedImageData,
     _In_ const ImageDecodeParams& decodeParams,
     int frameIndex,
-    _Outref_ wrl::ComPtr<IWICBitmapSource>& bitmapSource,
-    _Outref_ std::chrono::milliseconds& frameDelay
+    _Out_ wrl::ComPtr<IWICBitmapSource>& bitmapSource,
+    _Out_ std::chrono::milliseconds& frameDelay
     )
 {
     bitmapSource.Reset();
@@ -194,8 +194,8 @@ _Check_return_ HRESULT WicAnimatedGifDecoder::DecodeFrame(
 HRESULT WicAnimatedGifDecoder::CreateDeltaFrameSource(
     _In_ const wrl::ComPtr<IWICBitmapDecoder>& spBitmapDecoder,
     int frameIndex,
-    _Outref_ DeltaFrameInfo& deltaFrameInfo,
-    _Outref_ wrl::ComPtr<IWICBitmapSource>& spBitmapSource
+    _Out_ DeltaFrameInfo& deltaFrameInfo,
+    _Out_ wrl::ComPtr<IWICBitmapSource>& spBitmapSource
     )
 {
     wrl::ComPtr<IWICBitmapFrameDecode> spWicBitmapFrameDecode;
@@ -218,7 +218,7 @@ HRESULT WicAnimatedGifDecoder::CreateDeltaFrameSource(
 
 _Check_return_ HRESULT WicAnimatedGifDecoder::GetDeltaFrameInfo(
     _In_ const wrl::ComPtr<IWICBitmapFrameDecode>& spBitmapFrameDecode,
-    _Outref_ DeltaFrameInfo& deltaFrameInfo
+    _Out_ DeltaFrameInfo& deltaFrameInfo
     )
 {
     wrl::ComPtr<IWICMetadataQueryReader> spMetadataQueryReader;
diff --git a/src/dxaml/xcp/components/imaging/WicSingleImageDecoder.cpp b/src/dxaml/xcp/components/imaging/WicSingleImageDecoder.cpp
index a3c48ebae3..101f88a908 100644
--- a/src/dxaml/xcp/components/imaging/WicSingleImageDecoder.cpp
+++ b/src/dxaml/xcp/components/imaging/WicSingleImageDecoder.cpp
@@ -26,8 +26,8 @@ _Check_return_ HRESULT WicSingleImageDecoder::DecodeFrame(
     _In_ EncodedImageData& encodedImageData,
     _In_ const ImageDecodeParams& decodeParams,
     int frameIndex,
-    _Outref_ wrl::ComPtr<IWICBitmapSource>& bitmapSource,
-    _Outref_ std::chrono::milliseconds& frameDelay
+    _Out_ wrl::ComPtr<IWICBitmapSource>& bitmapSource,
+    _Out_ std::chrono::milliseconds& frameDelay
     )
 {
     bitmapSource.Reset();
diff --git a/src/dxaml/xcp/components/imaging/inc/AsyncCopyToSurfaceTask.h b/src/dxaml/xcp/components/imaging/inc/AsyncCopyToSurfaceTask.h
index cdb9d7489d..4ad0e3a869 100644
--- a/src/dxaml/xcp/components/imaging/inc/AsyncCopyToSurfaceTask.h
+++ b/src/dxaml/xcp/components/imaging/inc/AsyncCopyToSurfaceTask.h
@@ -42,7 +42,7 @@ class AsyncCopyToSurfaceTask final : public CXcpObjectBase< IImageTask >
     _Check_return_ HRESULT CopyOperation(
         unsigned int width,
         unsigned int height,
-        _Outref_ xref_ptr<OfferableSoftwareBitmap>& spOutputSurface
+        _Out_ xref_ptr<OfferableSoftwareBitmap>& spOutputSurface
         );
 
     void CopyToSoftwareSurface(
diff --git a/src/dxaml/xcp/components/imaging/inc/AsyncImageDecoder.h b/src/dxaml/xcp/components/imaging/inc/AsyncImageDecoder.h
index 7a099968d0..e3f76d7ec2 100644
--- a/src/dxaml/xcp/components/imaging/inc/AsyncImageDecoder.h
+++ b/src/dxaml/xcp/components/imaging/inc/AsyncImageDecoder.h
@@ -75,7 +75,7 @@ class AsyncImageDecoder
         std::shared_ptr<EncodedImageData> m_spEncodedImageData;
         xref_ptr<ImageDecodeParams> m_spDecodeParams;
         xref::weakref_ptr<IImageDecodeCallback> m_imageDecodeCallback;
-        uint64_t m_requestId;
+        uint64_t m_requestId{};
 
         std::unique_ptr<IImageDecoder> m_spImageDecoder;
         wrl::ComPtr<wsyt::IThreadPoolTimer> m_spPresentTimer;
diff --git a/src/dxaml/xcp/components/imaging/inc/EncodedImageData.h b/src/dxaml/xcp/components/imaging/inc/EncodedImageData.h
index 19b6d56485..439bb10d0b 100644
--- a/src/dxaml/xcp/components/imaging/inc/EncodedImageData.h
+++ b/src/dxaml/xcp/components/imaging/inc/EncodedImageData.h
@@ -38,13 +38,13 @@ class EncodedImageData
     const ImageMetadata& GetMetadata() const;
 
     _Check_return_ HRESULT CreateWicBitmapDecoder(
-        _Outref_ wrl::ComPtr<IWICBitmapDecoder>& spWicBitmapDecoder
+        _Out_ wrl::ComPtr<IWICBitmapDecoder>& spWicBitmapDecoder
         );
     bool IsAnimatedImage() const;
 
     bool IsMetadataAvailable() const { return m_isParsed; }
 
-    _Check_return_ HRESULT CreateIStream(_Outref_ wrl::ComPtr<IStream>& spIStream);
+    _Check_return_ HRESULT CreateIStream(_Out_ wrl::ComPtr<IStream>& spIStream);
 
     std::uint64_t GetRawDataSize() const;
 
diff --git a/src/dxaml/xcp/components/imaging/inc/ImageCache.h b/src/dxaml/xcp/components/imaging/inc/ImageCache.h
index 361419af11..9a2455e6e0 100644
--- a/src/dxaml/xcp/components/imaging/inc/ImageCache.h
+++ b/src/dxaml/xcp/components/imaging/inc/ImageCache.h
@@ -70,12 +70,12 @@ class ImageCache
         _In_opt_ IInvalidateImageCacheCallback* pInvalidateCallback
         );
 
-    std::shared_ptr<ImageMetadataView> GetMetadataView(_In_opt_ const std::shared_ptr<ImagingTelemetry::ImageDecodeActivity>& decodeActivity, uint64_t imageId);
+    std::shared_ptr<ImageMetadataView> GetMetadataView(uint64_t imageId);
 
     _Check_return_ HRESULT GetImage(
         _In_ xref_ptr<ImageDecodeParams>& spDecodeParams,
         _In_ const xref_ptr<IImageAvailableCallback>& spImageAvailableCallback,
-        _Outref_ xref_ptr<IAbortableImageOperation>& spAbortableImageOperation
+        _Out_ xref_ptr<IAbortableImageOperation>& spAbortableImageOperation
         );
 
     std::shared_ptr<EncodedImageData> GetEncodedImageData() const;
@@ -148,7 +148,7 @@ class ImageCache
 
     bool IsSvg() const { return m_isSvg; }
 
-    CCoreServices* m_core;
+    CCoreServices* m_core{};
     xref_ptr<ImageTaskDispatcher> m_dispatcher;
     xstring_ptr m_strCacheKey;
     xstring_ptr m_strUri;
diff --git a/src/dxaml/xcp/components/imaging/inc/ImageDecodeParams.h b/src/dxaml/xcp/components/imaging/inc/ImageDecodeParams.h
index 4ea7477695..026e5c3ab4 100644
--- a/src/dxaml/xcp/components/imaging/inc/ImageDecodeParams.h
+++ b/src/dxaml/xcp/components/imaging/inc/ImageDecodeParams.h
@@ -18,7 +18,6 @@ class ImageDecodeParams
         unsigned int decodeWidth,
         unsigned int decodeHeight,
         bool isLoadedImageSurface,
-        _In_ std::shared_ptr<ImagingTelemetry::ImageDecodeActivity> decodeActivity,
         uint64_t imageId,
         xstring_ptr source
         )
@@ -27,7 +26,6 @@ class ImageDecodeParams
         , m_decodeHeight(decodeHeight)
         , m_autoPlay(false)
         , m_isLoadedImageSurface(isLoadedImageSurface)
-        , m_decodeActivity(decodeActivity)
         , m_imageId(imageId)
         , m_strSource(source)
     {
@@ -40,7 +38,6 @@ class ImageDecodeParams
         bool autoPlay,
         _In_ SurfaceUpdateList const& surfaceUpdateList,
         bool isLoadedImageSurface,
-        _In_ std::shared_ptr<ImagingTelemetry::ImageDecodeActivity> decodeActivity,
         uint64_t imageId,
         xstring_ptr source
         )
@@ -50,7 +47,6 @@ class ImageDecodeParams
         , m_autoPlay(autoPlay)
         , m_surfaceUpdateList(std::move(surfaceUpdateList))
         , m_isLoadedImageSurface(isLoadedImageSurface)
-        , m_decodeActivity(decodeActivity)
         , m_imageId(imageId)
         , m_strSource(source)
     {
@@ -62,7 +58,6 @@ class ImageDecodeParams
         unsigned int decodeHeight,
         bool autoPlay,
         bool isLoadedImageSurface,
-        _In_ std::shared_ptr<ImagingTelemetry::ImageDecodeActivity> decodeActivity,
         uint64_t imageId,
         xstring_ptr source
         )
@@ -71,7 +66,6 @@ class ImageDecodeParams
         , m_decodeHeight(decodeHeight)
         , m_autoPlay(autoPlay)
         , m_isLoadedImageSurface(isLoadedImageSurface)
-        , m_decodeActivity(decodeActivity)
         , m_imageId(imageId)
         , m_strSource(source)
     {
@@ -83,7 +77,6 @@ class ImageDecodeParams
     bool IsAutoPlay() const { return m_autoPlay; }
     bool IsHardwareOutput() const { return !m_surfaceUpdateList.empty(); }
     bool IsLoadedImageSurface() const { return m_isLoadedImageSurface; }
-    const std::shared_ptr<ImagingTelemetry::ImageDecodeActivity> GetDecodeActivity() const { return m_decodeActivity; }
 
     uint64_t GetImageId() const { return m_imageId; }
     xstring_ptr GetStrSource() const { return m_strSource; }
@@ -105,9 +98,6 @@ class ImageDecodeParams
     bool m_autoPlay;
     SurfaceUpdateList m_surfaceUpdateList;
     bool m_isLoadedImageSurface;
-
-    // Used for ETW tracing
-    std::shared_ptr<ImagingTelemetry::ImageDecodeActivity> m_decodeActivity;
     uint64_t m_imageId;
     xstring_ptr m_strSource;
 };
diff --git a/src/dxaml/xcp/components/imaging/inc/ImageTaskDispatcher.h b/src/dxaml/xcp/components/imaging/inc/ImageTaskDispatcher.h
index 18ce89a058..93a4587474 100644
--- a/src/dxaml/xcp/components/imaging/inc/ImageTaskDispatcher.h
+++ b/src/dxaml/xcp/components/imaging/inc/ImageTaskDispatcher.h
@@ -28,7 +28,7 @@ class ImageTaskDispatcher final : public CXcpObjectBase< IPALExecuteOnUIThread >
 private:
     ~ImageTaskDispatcher() override;
 
-    CCoreServices* m_core;
+    CCoreServices* m_core{};
     std::deque<xref_ptr<IImageTask>> m_tasks;
     wil::critical_section m_taskLock;
     LONG m_hasCallbackQueued = FALSE;
diff --git a/src/dxaml/xcp/components/imaging/inc/ImageViewBase.h b/src/dxaml/xcp/components/imaging/inc/ImageViewBase.h
index 434c91d73a..931d40a71b 100644
--- a/src/dxaml/xcp/components/imaging/inc/ImageViewBase.h
+++ b/src/dxaml/xcp/components/imaging/inc/ImageViewBase.h
@@ -25,7 +25,7 @@ class ImageViewBase
     // * Download - access, network issues, corrupted media
     // * Decode - unsupported format, data corruption
     // * Upload - driver errors
-    virtual HRESULT GetHR(_In_ const std::shared_ptr<ImagingTelemetry::ImageDecodeActivity>& decodeActivity, uint64_t imageId) const = 0;
+    virtual HRESULT GetHR(uint64_t imageId) const = 0;
 
 protected:
     std::vector<IImageViewListener*> m_imageViewListeners;
diff --git a/src/dxaml/xcp/components/imaging/inc/ImagingTelemetry.h b/src/dxaml/xcp/components/imaging/inc/ImagingTelemetry.h
index a94bdf752e..b3cf829d00 100644
--- a/src/dxaml/xcp/components/imaging/inc/ImagingTelemetry.h
+++ b/src/dxaml/xcp/components/imaging/inc/ImagingTelemetry.h
@@ -14,195 +14,175 @@ class ImagingTelemetry final : public TelemetryBase
 
 public:
 
+    // Note: The order of the params matters. We want the ability to look at all imaging events for a particular
+    // ImageSource, so put that in Field 1 for grouping purposes.
+
     // Start of Uri decoding - called when the source Uri is set
-    DEFINE_TRACELOGGING_EVENT_PARAM2(SetUriSource_noactivity,
+    DEFINE_TRACELOGGING_EVENT_PARAM2(SetUriSource,
+        uint64_t, Id,
+        PCWSTR, Uri,
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
+    // Start of stream decoding - called when the source stream is set (SetSource/SetSourceAsync)
+    DEFINE_TRACELOGGING_EVENT_PARAM1(SetStreamSource,
+        uint64_t, Id,
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
+    // Start of stream decoding - called when the SoftwareBitmap is set on a SoftwareBitmapSource
+    DEFINE_TRACELOGGING_EVENT_PARAM1(SetSoftwareBitmap,
+        uint64_t, Id,
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
+    // Start of LoadedImageSurface decoding - called when a LoadedImageSurface loads a Uri
+    DEFINE_TRACELOGGING_EVENT_PARAM2(SetLoadedImageSurfaceUri,
         uint64_t, Id,
         PCWSTR, Uri,
         TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
 
+    // Start of LoadedImageSurface decoding - called when a LoadedImageSurface initializes from memory
+    DEFINE_TRACELOGGING_EVENT_PARAM1(SetLoadedImageSurfaceMemory,
+        uint64_t, Id,
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
+    // When ImageCache queues a UI thread callback to kick off the off-thread download.
+    DEFINE_TRACELOGGING_EVENT_PARAM2(QueueProcessDownload,
+        uint64_t, Id,
+        PCWSTR, Uri,
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
 
-    BEGIN_COMPLIANT_TRACELOGGING_ACTIVITY_CLASS_WITH_LEVEL(ImageDecodeActivity, PDT_ProductAndServicePerformance, WINEVENT_LEVEL_VERBOSE)
-
-        // Note: events are identified by "Id", which is the pointer to the object. This can be either an ImageSource or a LoadedImageSurface.
-        DEFINE_ACTIVITY_START(XUINT64 Id)
-        {
-            TraceLoggingClassWriteStart(ImageDecodeActivity, TraceLoggingValue(Id));
-        }
-
-        // Note: The casing of the params matters. WPA has a bug where the Trace Logging table sorts its columns in
-        // alphabetical order, with upper case before lower case. We want "Id" to be the first field for all these
-        // events so it can be used to group all these events, so name it starting with an upper case "Id". Uri should
-        // come next, so it's named "Uri". All other fields start with a lower case letter.
-        // See https://perftoolkit.visualstudio.com/DefaultCollection/WPA/_workitems/edit/2438
-
-        // Start of Uri decoding - called when the source Uri is set
-        DEFINE_TAGGED_TRACELOGGING_EVENT_PARAM2(SetUriSource,
-            uint64_t, Id,
-            PCWSTR, Uri,
-            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-
-        // Start of stream decoding - called when the source stream is set (SetSource/SetSourceAsync)
-        DEFINE_TAGGED_TRACELOGGING_EVENT_PARAM1(SetStreamSource,
-            uint64_t, Id,
-            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-
-        // Start of stream decoding - called when the SoftwareBitmap is set on a SoftwareBitmapSource
-        DEFINE_TAGGED_TRACELOGGING_EVENT_PARAM1(SetSoftwareBitmap,
-            uint64_t, Id,
-            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-
-        // Start of LoadedImageSurface decoding - called when a LoadedImageSurface loads a Uri
-        DEFINE_TAGGED_TRACELOGGING_EVENT_PARAM2(SetLoadedImageSurfaceUri,
-            uint64_t, Id,
-            PCWSTR, Uri,
-            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-
-        // Start of LoadedImageSurface decoding - called when a LoadedImageSurface initializes from memory
-        DEFINE_TAGGED_TRACELOGGING_EVENT_PARAM1(SetLoadedImageSurfaceMemory,
-            uint64_t, Id,
-            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-
-        // When ImageCache queues a UI thread callback to kick off the off-thread download.
-        DEFINE_TAGGED_TRACELOGGING_EVENT_PARAM2(QueueProcessDownload,
-            uint64_t, Id,
-            PCWSTR, Uri,
-            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-
-        // When an ImageSource finds an ImageCache that has a download already in progress, it attaches itself and waits
-        // for the existing download to complete.
-        DEFINE_TAGGED_TRACELOGGING_EVENT_PARAM1(WaitForDownloadInProgress,
-            uint64_t, Id,
-            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-
-        // When an ImageSource finds an ImageCache that has already completed the download, the ImageSource can read the
-        // metadata immediately and proceed with triggering a decode.
-        DEFINE_TAGGED_TRACELOGGING_EVENT_PARAM1(FoundCompletedDownload,
-            uint64_t, Id,
-            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-
-        // When we start parsing an encoded image's metadata
-        DEFINE_TAGGED_TRACELOGGING_EVENT_PARAM1(ParseImageMetadataStart,
-            uint64_t, Id,
-            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-
-        // When we stop parsing an encoded image's metadata
-        DEFINE_TAGGED_TRACELOGGING_EVENT_PARAM2(ParseImageMetadataStop,
-            uint64_t, Id,
-            HRESULT, parseHR,
-            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-
-        // When an image download has completed, or we found previously cached bits so we don't need to download
-        DEFINE_TAGGED_TRACELOGGING_EVENT_PARAM3(ImageDownloadCompleteNotification,
-            uint64_t, Id,
-            PCWSTR, Uri,
-            bool, decodeToRenderSize,
-            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-
-        // When we create a new ImageCache with encoded bits
-        DEFINE_TAGGED_TRACELOGGING_EVENT_PARAM2(CreateImageCache,
-            uint64_t, Id,
-            PCWSTR, Uri,
-            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-
-        // When we find an existing ImageCache with encoded bits
-        DEFINE_TAGGED_TRACELOGGING_EVENT_PARAM2(FoundImageCache,
-            uint64_t, Id,
-            PCWSTR, Uri,
-            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-
-        // When we found cached encoded bits and created a new ImageCache from them
-        // This use case is a bit unintuitive. ImageSource will create an ImageCache to start downloading, then when the
-        // download completes it creates a _second_ ImageCache to kick off the decode. The second ImageCache picks up
-        // the existing cached encoded bits. Why not just use the ImageCache we already have?
-        DEFINE_TAGGED_TRACELOGGING_EVENT_PARAM2(CreateImageCacheFromExistingEncodedData,
-            uint64_t, Id,
-            PCWSTR, Uri,
-            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-
-        // A request for a decode to render size has come in.
-        DEFINE_TAGGED_TRACELOGGING_EVENT_PARAM5(RequestDecodeToRenderSize,
-            uint64_t, Id,
-            PCSTR, imageState,
-            uint32_t, requestedWidth,
-            uint32_t, requestedHeight,
-            bool, decodeToRenderSize,
-            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-
-        // The ImageSource has been disqualified for decoding to render size.
-        DEFINE_TAGGED_TRACELOGGING_EVENT_PARAM2(DecodeToRenderSizeDisqualified,
-            uint64_t, Id,
-            PCSTR, reason,
-            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-
-        // When a decode to render size starts.
-        DEFINE_TAGGED_TRACELOGGING_EVENT_PARAM7(DecodeToRenderSizeStart,
-            uint64_t, Id,
-            uint32_t, imageSourceWidth,
-            uint32_t, imageSourceHeight,
-            uint32_t, newWidth,
-            uint32_t, newHeight,
-            uint32_t, metadataWidth,
-            uint32_t, metadataHeight,
-            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-
-        // When a decode to dender size stops.
-        DEFINE_TAGGED_TRACELOGGING_EVENT_PARAM1(DecodeToRenderSizeStop,
-            uint64_t, Id,
-            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-
-        // The ImageCache posts a work item back to the UI thread to queue decode requests.
-        // Note that there are two levels of indirection here. This queues the ProcessDecodeRequests, and once that
-        // is processed it may queue the actual decode work off-thread.
-        DEFINE_TAGGED_TRACELOGGING_EVENT_PARAM2(QueueProcessDecodeRequests,
-            uint64_t, Id,
-            PCWSTR, Uri,
-            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-
-        // The ImageCache running the ProcessDecodeRequests that was queued by QueueProcessDecodeRequests.
-        DEFINE_TAGGED_TRACELOGGING_EVENT_PARAM3(ProcessDecodeRequests,
-            uint64_t, Id,
-            PCWSTR, Uri,
-            uint32_t, State,
-            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-
-        // The ImageCache kicks off a decode once it's finished downloading
-        DEFINE_TAGGED_TRACELOGGING_EVENT_PARAM2(QueueDecodeFromImageCache,
-            uint64_t, Id,
-            PCWSTR, Uri,
-            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-
-        // The point where Xaml queues off-thread work that does the decode. This should follow immediately from QueueDecodeFromImageCache.
-        DEFINE_TAGGED_TRACELOGGING_EVENT_PARAM1(QueueOffThreadDecode,
-            uint64_t, Id,
-            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-
-        // The work running off-thread to decode the image. This work was queued by QueueOffThreadDecode.
-        DEFINE_TAGGED_TRACELOGGING_EVENT_PARAM3(OffThreadDecodeStart,
-            uint64_t, Id,
-            PCWSTR, Uri,
-            bool, isHardwareDecode,
-            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-
-        // The work running off-thread to decode the image. This work was queued by QueueOffThreadDecode.
-        DEFINE_TAGGED_TRACELOGGING_EVENT_PARAM1(OffThreadDecodeStop,
-            uint64_t, Id,
-            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-
-        // When a direct SoftwareBitmap upload to hardware failed, so we fall back to uploading it to a software surface
-        // instead. We'll try to upload the software surface to hardware later, with automatic retries later if that
-        // encounters another failure.
-        DEFINE_TAGGED_TRACELOGGING_EVENT_PARAM2(SoftwareBitmapFallbackAfterUploadError,
-            uint64_t, Id,
-            uint32_t, uploadResult,
-            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-
-        // TODO: Events for decoding on the UI thread
-
-        // Decode completed notification received on UI thread
-        DEFINE_TAGGED_TRACELOGGING_EVENT_PARAM2(DecodeResultAvailable,
-            uint64_t, Id,
-            uint32_t, decodeResult,
-            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-
-    END_ACTIVITY_CLASS();
+    // When an ImageSource finds an ImageCache that has a download already in progress, it attaches itself and waits
+    // for the existing download to complete.
+    DEFINE_TRACELOGGING_EVENT_PARAM1(WaitForDownloadInProgress,
+        uint64_t, Id,
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
+    // When an ImageSource finds an ImageCache that has already completed the download, the ImageSource can read the
+    // metadata immediately and proceed with triggering a decode.
+    DEFINE_TRACELOGGING_EVENT_PARAM1(FoundCompletedDownload,
+        uint64_t, Id,
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
+    // When we start parsing an encoded image's metadata
+    DEFINE_TRACELOGGING_EVENT_PARAM1(ParseImageMetadataStart,
+        uint64_t, Id,
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
+    // When we stop parsing an encoded image's metadata
+    DEFINE_TRACELOGGING_EVENT_PARAM2(ParseImageMetadataStop,
+        uint64_t, Id,
+        HRESULT, parseHR,
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
+    // When an image download has completed, or we found previously cached bits so we don't need to download
+    DEFINE_TRACELOGGING_EVENT_PARAM3(ImageDownloadCompleteNotification,
+        uint64_t, Id,
+        PCWSTR, Uri,
+        bool, decodeToRenderSize,
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
+    // When we create a new ImageCache with encoded bits
+    DEFINE_TRACELOGGING_EVENT_PARAM2(CreateImageCache,
+        uint64_t, Id,
+        PCWSTR, Uri,
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
+    // When we find an existing ImageCache with encoded bits
+    DEFINE_TRACELOGGING_EVENT_PARAM2(FoundImageCache,
+        uint64_t, Id,
+        PCWSTR, Uri,
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
+    // When we found cached encoded bits and created a new ImageCache from them
+    // This use case is a bit unintuitive. ImageSource will create an ImageCache to start downloading, then when the
+    // download completes it creates a _second_ ImageCache to kick off the decode. The second ImageCache picks up
+    // the existing cached encoded bits. Why not just use the ImageCache we already have?
+    DEFINE_TRACELOGGING_EVENT_PARAM2(CreateImageCacheFromExistingEncodedData,
+        uint64_t, Id,
+        PCWSTR, Uri,
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
+    // A request for a decode to render size has come in.
+    DEFINE_TRACELOGGING_EVENT_PARAM5(RequestDecodeToRenderSize,
+        uint64_t, Id,
+        PCSTR, imageState,
+        uint32_t, requestedWidth,
+        uint32_t, requestedHeight,
+        bool, decodeToRenderSize,
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
+    // The ImageSource has been disqualified for decoding to render size.
+    DEFINE_TRACELOGGING_EVENT_PARAM2(DecodeToRenderSizeDisqualified,
+        uint64_t, Id,
+        PCSTR, reason,
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
+    // When a decode to render size starts.
+    DEFINE_TRACELOGGING_EVENT_PARAM7(DecodeToRenderSizeStart,
+        uint64_t, Id,
+        uint32_t, imageSourceWidth,
+        uint32_t, imageSourceHeight,
+        uint32_t, newWidth,
+        uint32_t, newHeight,
+        uint32_t, metadataWidth,
+        uint32_t, metadataHeight,
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
+    // When a decode to dender size stops.
+    DEFINE_TRACELOGGING_EVENT_PARAM1(DecodeToRenderSizeStop,
+        uint64_t, Id,
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
+    // The ImageCache posts a work item back to the UI thread to queue decode requests.
+    // Note that there are two levels of indirection here. This queues the ProcessDecodeRequests, and once that
+    // is processed it may queue the actual decode work off-thread.
+    DEFINE_TRACELOGGING_EVENT_PARAM2(QueueProcessDecodeRequests,
+        uint64_t, Id,
+        PCWSTR, Uri,
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
+    // The ImageCache running the ProcessDecodeRequests that was queued by QueueProcessDecodeRequests.
+    DEFINE_TRACELOGGING_EVENT_PARAM3(ProcessDecodeRequests,
+        uint64_t, Id,
+        PCWSTR, Uri,
+        uint32_t, State,
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
+    // The ImageCache kicks off a decode once it's finished downloading
+    DEFINE_TRACELOGGING_EVENT_PARAM2(QueueDecodeFromImageCache,
+        uint64_t, Id,
+        PCWSTR, Uri,
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
+    // The point where Xaml queues off-thread work that does the decode. This should follow immediately from QueueDecodeFromImageCache.
+    DEFINE_TRACELOGGING_EVENT_PARAM1(QueueOffThreadDecode,
+        uint64_t, Id,
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
+    // The work running off-thread to decode the image. This work was queued by QueueOffThreadDecode.
+    DEFINE_TRACELOGGING_EVENT_PARAM3(OffThreadDecodeStart,
+        uint64_t, Id,
+        PCWSTR, Uri,
+        bool, isHardwareDecode,
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
+    // The work running off-thread to decode the image. This work was queued by QueueOffThreadDecode.
+    DEFINE_TRACELOGGING_EVENT_PARAM1(OffThreadDecodeStop,
+        uint64_t, Id,
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
+    // When a direct SoftwareBitmap upload to hardware failed, so we fall back to uploading it to a software surface
+    // instead. We'll try to upload the software surface to hardware later, with automatic retries later if that
+    // encounters another failure.
+    DEFINE_TRACELOGGING_EVENT_PARAM2(SoftwareBitmapFallbackAfterUploadError,
+        uint64_t, Id,
+        uint32_t, uploadResult,
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
+    // TODO: Events for decoding on the UI thread
+
+    // Decode completed notification received on UI thread
+    DEFINE_TRACELOGGING_EVENT_PARAM2(DecodeResultAvailable,
+        uint64_t, Id,
+        uint32_t, decodeResult,
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
 };
diff --git a/src/dxaml/xcp/components/imaging/inc/ImagingUtility.h b/src/dxaml/xcp/components/imaging/inc/ImagingUtility.h
index 369db49671..a586870d14 100644
--- a/src/dxaml/xcp/components/imaging/inc/ImagingUtility.h
+++ b/src/dxaml/xcp/components/imaging/inc/ImagingUtility.h
@@ -41,33 +41,33 @@ _Check_return_ HRESULT IsHdrSource(
 
 _Check_return_ HRESULT DoesSourceSupportAlpha(
     _In_ const wrl::ComPtr<IWICBitmapSource>& spBitmapSource,
-    _Outref_ bool& supportsAlpha
+    _Out_ bool& supportsAlpha
     );
 
 _Check_return_ HRESULT CreateDefaultScaler(
     uint32_t targetWidth,
     uint32_t targetHeight,
     _In_ const wrl::ComPtr<IWICBitmapSource>& spInputSource,
-    _Outref_ wrl::ComPtr<IWICBitmapScaler>& spBitmapScaler
+    _Out_ wrl::ComPtr<IWICBitmapScaler>& spBitmapScaler
     );
 
 _Check_return_ HRESULT CreateDefaultConverter(
     const WICPixelFormatGUID& targetFormat,
     _In_ const wrl::ComPtr<IWICBitmapSource>& spInputSource,
-    _Outref_ wrl::ComPtr<IWICFormatConverter>& spFormatConverter
+    _Out_ wrl::ComPtr<IWICFormatConverter>& spFormatConverter
     );
 
 _Check_return_ HRESULT CreateDefaultColorTransform(
     _In_ const WICPixelFormatGUID& targetFormat,
     _In_ const wrl::ComPtr<IWICBitmapFrameDecode>& spBitmapFrameDecode,
     _In_ const wrl::ComPtr<IWICBitmapSource>& spInputSource,
-    _Outref_ wrl::ComPtr<IWICColorTransform>& spColorTransform
+    _Out_ wrl::ComPtr<IWICColorTransform>& spColorTransform
     );
 
 _Check_return_ HRESULT CreateDefaultFlipRotator(
     WICBitmapTransformOptions transformOptions,
     _In_ const wrl::ComPtr<IWICBitmapSource>& spInputSource,
-    _Outref_ wrl::ComPtr<IWICBitmapFlipRotator>& spBitmapFlipRotator
+    _Out_ wrl::ComPtr<IWICBitmapFlipRotator>& spBitmapFlipRotator
     );
 
 XSIZE CalculateScaledSize(
@@ -80,7 +80,7 @@ _Check_return_ HRESULT RealizeBitmapSource(
     _In_ const ImageMetadata& imageMetadata,
     _In_ IWICBitmapSource* bitmapSource,
     _In_ const ImageDecodeParams& decodeParams,
-    _Outref_ xref_ptr<OfferableSoftwareBitmap>& spSoftwareBitmap
+    _Out_ xref_ptr<OfferableSoftwareBitmap>& spSoftwareBitmap
     );
 
 _Check_return_ HRESULT ConvertWicPixelFormat(
diff --git a/src/dxaml/xcp/components/imaging/inc/OfferableSoftwareBitmap.h b/src/dxaml/xcp/components/imaging/inc/OfferableSoftwareBitmap.h
index c0c8b5a770..4dddd2b625 100644
--- a/src/dxaml/xcp/components/imaging/inc/OfferableSoftwareBitmap.h
+++ b/src/dxaml/xcp/components/imaging/inc/OfferableSoftwareBitmap.h
@@ -50,9 +50,9 @@ class OfferableSoftwareBitmap
     // IPALSurface Implementation
     _Check_return_ HRESULT Lock(
         _Outptr_result_bytebuffer_(*pStride * *pHeight) void** ppAddress,
-        _Outptr_ int32_t* pStride,
-        _Outptr_ uint32_t* pWidth,
-        _Outptr_ uint32_t* pHeight) override;
+        _Out_ int32_t* pStride,
+        _Out_ uint32_t* pWidth,
+        _Out_ uint32_t* pHeight) override;
 
     _Check_return_ HRESULT Unlock() override;
 
diff --git a/src/dxaml/xcp/components/imaging/inc/SoftwareBitmapUtility.h b/src/dxaml/xcp/components/imaging/inc/SoftwareBitmapUtility.h
index 4c15b41294..9bd1e4b68a 100644
--- a/src/dxaml/xcp/components/imaging/inc/SoftwareBitmapUtility.h
+++ b/src/dxaml/xcp/components/imaging/inc/SoftwareBitmapUtility.h
@@ -12,7 +12,7 @@ namespace SoftwareBitmapUtility
     static _Check_return_ HRESULT CreateSoftwareBitmap(
         uint32_t width,
         uint32_t height,
-        _Outref_ wrl::ComPtr<wgri::ISoftwareBitmap>& spSoftwareBitmap
+        _Out_ wrl::ComPtr<wgri::ISoftwareBitmap>& spSoftwareBitmap
         );
 
     static _Check_return_ HRESULT CreateSoftwareBitmap(
@@ -20,13 +20,13 @@ namespace SoftwareBitmapUtility
         uint32_t height,
         wgri::BitmapPixelFormat pixelFormat,
         wgri::BitmapAlphaMode alphaMode,
-        _Outref_ wrl::ComPtr<wgri::ISoftwareBitmap>& spSoftwareBitmap
+        _Out_ wrl::ComPtr<wgri::ISoftwareBitmap>& spSoftwareBitmap
         );
 
     static _Check_return_ HRESULT CreateSoftwareBitmap(
         _In_ const wrl::ComPtr<IWICBitmap>& spWicBitmap,
         bool readOnly,
-        _Outref_ wrl::ComPtr<wgri::ISoftwareBitmap>& spSoftwareBitmap
+        _Out_ wrl::ComPtr<wgri::ISoftwareBitmap>& spSoftwareBitmap
         );
 
     // Validates the SoftwareBitmap fulfills the requirements for use in XAML
diff --git a/src/dxaml/xcp/components/imaging/inc/SvgImageDecoder.h b/src/dxaml/xcp/components/imaging/inc/SvgImageDecoder.h
index f8ad312776..eb2591ae3b 100644
--- a/src/dxaml/xcp/components/imaging/inc/SvgImageDecoder.h
+++ b/src/dxaml/xcp/components/imaging/inc/SvgImageDecoder.h
@@ -17,8 +17,8 @@ class SvgImageDecoder final
         _In_ EncodedImageData& encodedImageData,
         _In_ const ImageDecodeParams& decodeParams,
         int frameIndex,
-        _Outref_ wrl::ComPtr<IWICBitmapSource>& bitmapSource,
-        _Outref_ std::chrono::milliseconds& frameDelay
+        _Out_ wrl::ComPtr<IWICBitmapSource>& bitmapSource,
+        _Out_ std::chrono::milliseconds& frameDelay
         ) final;
 
     // Test hook - simulates a device lost error when we're setting up a SVG decoder
diff --git a/src/dxaml/xcp/components/imaging/inc/SvgImageSource.h b/src/dxaml/xcp/components/imaging/inc/SvgImageSource.h
index 77ef2388c2..5f3ff34340 100644
--- a/src/dxaml/xcp/components/imaging/inc/SvgImageSource.h
+++ b/src/dxaml/xcp/components/imaging/inc/SvgImageSource.h
@@ -34,8 +34,8 @@ class CSvgImageSource final
     _Check_return_ HRESULT GetID2D1SvgDocument(
         _In_ ID2D1DeviceContext5* pD2DDeviceContextNoRef,
         _Out_ wrl::ComPtr<ID2D1SvgDocument>& d2dSvgDocument,
-        _Outptr_ uint32_t* width,
-        _Outptr_ uint32_t* height
+        _Out_ uint32_t* width,
+        _Out_ uint32_t* height
         ) final;
 
     _Check_return_ HRESULT GetTitle(_Outptr_ HSTRING* output) final;
diff --git a/src/dxaml/xcp/components/imaging/inc/WicAnimatedGifDecoder.h b/src/dxaml/xcp/components/imaging/inc/WicAnimatedGifDecoder.h
index ac64ffc7ec..82229e9d04 100644
--- a/src/dxaml/xcp/components/imaging/inc/WicAnimatedGifDecoder.h
+++ b/src/dxaml/xcp/components/imaging/inc/WicAnimatedGifDecoder.h
@@ -40,21 +40,21 @@ class WicAnimatedGifDecoder
         _In_ EncodedImageData& encodedImageData,
         _In_ const ImageDecodeParams& decodeParams,
         int frameIndex,
-        _Outref_ wrl::ComPtr<IWICBitmapSource>& bitmapSource,
-        _Outref_ std::chrono::milliseconds& frameDelay
+        _Out_ wrl::ComPtr<IWICBitmapSource>& bitmapSource,
+        _Out_ std::chrono::milliseconds& frameDelay
         ) override;
 
     static _Check_return_ HRESULT CreateDeltaFrameSource(
         _In_ const wrl::ComPtr<IWICBitmapDecoder>& spBitmapDecoder,
         int frameIndex,
-        _Outref_ DeltaFrameInfo& gifDeltaFrameInfo,
-        _Outref_ wrl::ComPtr<IWICBitmapSource>& spBitmapSource
+        _Out_ DeltaFrameInfo& gifDeltaFrameInfo,
+        _Out_ wrl::ComPtr<IWICBitmapSource>& spBitmapSource
         );
 
 private:
     static _Check_return_ HRESULT GetDeltaFrameInfo(
         _In_ const wrl::ComPtr<IWICBitmapFrameDecode>& spBitmapFrameDecode,
-        _Outref_ DeltaFrameInfo& deltaFrameInfo
+        _Out_ DeltaFrameInfo& deltaFrameInfo
         );
 
     DeltaFrameInfo m_currentDeltaFrameInfo = {};
diff --git a/src/dxaml/xcp/components/imaging/inc/WicSingleImageDecoder.h b/src/dxaml/xcp/components/imaging/inc/WicSingleImageDecoder.h
index 6c1ed39e1a..c1748981c4 100644
--- a/src/dxaml/xcp/components/imaging/inc/WicSingleImageDecoder.h
+++ b/src/dxaml/xcp/components/imaging/inc/WicSingleImageDecoder.h
@@ -13,7 +13,7 @@ class WicSingleImageDecoder
         _In_ EncodedImageData& encodedImageData,
         _In_ const ImageDecodeParams& decodeParams,
         int frameIndex,
-        _Outref_ wrl::ComPtr<IWICBitmapSource>& bitmapSource,
-        _Outref_ std::chrono::milliseconds& frameDelay
+        _Out_ wrl::ComPtr<IWICBitmapSource>& bitmapSource,
+        _Out_ std::chrono::milliseconds& frameDelay
         ) override;
 };
diff --git a/src/dxaml/xcp/components/imaging/inc/imaginginterfaces.h b/src/dxaml/xcp/components/imaging/inc/imaginginterfaces.h
index 6c28d72944..620c8a4406 100644
--- a/src/dxaml/xcp/components/imaging/inc/imaginginterfaces.h
+++ b/src/dxaml/xcp/components/imaging/inc/imaginginterfaces.h
@@ -19,8 +19,8 @@ struct IImageDecoder
         _In_ EncodedImageData& encodedImageData,
         _In_ const ImageDecodeParams& decodeParams,
         int frameIndex,
-        _Outref_ wrl::ComPtr<IWICBitmapSource>& bitmapSource,
-        _Outref_ std::chrono::milliseconds& frameDelay
+        _Out_ wrl::ComPtr<IWICBitmapSource>& bitmapSource,
+        _Out_ std::chrono::milliseconds& frameDelay
         ) = 0;
     virtual ~IImageDecoder() = 0 {}
 };
diff --git a/src/dxaml/xcp/components/lifetime/inc/AutoPeg.h b/src/dxaml/xcp/components/lifetime/inc/AutoPeg.h
index 74a6ef49ce..89efd12992 100644
--- a/src/dxaml/xcp/components/lifetime/inc/AutoPeg.h
+++ b/src/dxaml/xcp/components/lifetime/inc/AutoPeg.h
@@ -19,19 +19,19 @@ namespace ctl
         bool m_fPeggedIfNull;
 
     public:
-        XNOTHROW AutoPeg(_In_opt_ T* ptr)
+        AutoPeg(_In_opt_ T* ptr) noexcept
             : m_fPeggedIfNull(FALSE)
         {
             Init(ptr);
         }
 
-        XNOTHROW AutoPeg(_In_opt_ T* ptr, _In_opt_ bool fPeggedIfNull )
+        AutoPeg(_In_opt_ T* ptr, _In_opt_ bool fPeggedIfNull ) noexcept
             : m_fPeggedIfNull(fPeggedIfNull)
         {
             Init(ptr);
         }
 
-        XNOTHROW AutoPeg(AutoPeg&& other)
+        AutoPeg(AutoPeg&& other) noexcept
             : m_ptr(nullptr), m_fPegged(FALSE), m_fPeggedIfNull(FALSE)
         {
             m_ptr = other.m_ptr;
@@ -57,7 +57,7 @@ namespace ctl
                 || (m_ptr == NULL) && m_fPeggedIfNull;
         }
 
-        XNOTHROW ~AutoPeg()
+        ~AutoPeg() noexcept
         {
             if (m_fPegged)
             {
diff --git a/src/dxaml/xcp/components/lifetime/inc/TrackerPtr.h b/src/dxaml/xcp/components/lifetime/inc/TrackerPtr.h
index 0e2d18c6a7..46f732417c 100644
--- a/src/dxaml/xcp/components/lifetime/inc/TrackerPtr.h
+++ b/src/dxaml/xcp/components/lifetime/inc/TrackerPtr.h
@@ -18,7 +18,7 @@ namespace DirectUI
 
         TrackerPtr(const TrackerPtr& other) = delete;
 
-        TrackerPtr(TrackerPtr&& other)
+        TrackerPtr(TrackerPtr&& other) noexcept
         {
             *this = std::move(other);
         }
diff --git a/src/dxaml/xcp/components/lifetime/inc/TrackerTargetReference.h b/src/dxaml/xcp/components/lifetime/inc/TrackerTargetReference.h
index a7bfc527eb..b65eecd4ae 100644
--- a/src/dxaml/xcp/components/lifetime/inc/TrackerTargetReference.h
+++ b/src/dxaml/xcp/components/lifetime/inc/TrackerTargetReference.h
@@ -67,12 +67,11 @@ namespace DirectUI
     protected:
         TrackerTargetReference();
         TrackerTargetReference(const TrackerTargetReference& other) = delete;
-        TrackerTargetReference(TrackerTargetReference&& other);
+        TrackerTargetReference(TrackerTargetReference&& other) noexcept;
 
         // Note: This method is safe to call under the lock 
         // if this object is empty
-        TrackerTargetReference& Assign(
-            _In_ TrackerTargetReference&& other);
+        TrackerTargetReference& Assign(_In_ TrackerTargetReference&& other) noexcept;
 
         bool operator==(const TrackerTargetReference& other) const;
         bool operator!=(const TrackerTargetReference& other) const;
diff --git a/src/dxaml/xcp/components/lifetime/lib/TrackerTargetReference.cpp b/src/dxaml/xcp/components/lifetime/lib/TrackerTargetReference.cpp
index 2b023e5145..c188ba88f1 100644
--- a/src/dxaml/xcp/components/lifetime/lib/TrackerTargetReference.cpp
+++ b/src/dxaml/xcp/components/lifetime/lib/TrackerTargetReference.cpp
@@ -235,7 +235,7 @@ TrackerTargetReference::TrackerTargetReference()
     Initialize();
 }
 
-TrackerTargetReference::TrackerTargetReference(TrackerTargetReference&& other)
+TrackerTargetReference::TrackerTargetReference(TrackerTargetReference&& other) noexcept
 {
     XCP_STRONG(&m_value);
     Initialize();
@@ -293,7 +293,7 @@ void TrackerTargetReference::Initialize()
 
 // Note: This method is safe to call under the lock 
 // if this object is empty
-TrackerTargetReference& TrackerTargetReference::Assign(_In_ TrackerTargetReference&& other)
+TrackerTargetReference& TrackerTargetReference::Assign(_In_ TrackerTargetReference&& other) noexcept
 {
     // If this tracker is not empty then we can't call this 
     // method under the lock or we will stop responding
diff --git a/src/dxaml/xcp/components/math/inc/HitTestPolygon.h b/src/dxaml/xcp/components/math/inc/HitTestPolygon.h
index d664890ef2..5bd1947616 100644
--- a/src/dxaml/xcp/components/math/inc/HitTestPolygon.h
+++ b/src/dxaml/xcp/components/math/inc/HitTestPolygon.h
@@ -54,7 +54,7 @@ class HitTestPolygon
     std::vector<XPOINTF4> m_3DPoints;
 
     // Optimization for when we're in 2D mode and the points represent an axis aligned rect
-    XRECTF m_rect;
+    XRECTF m_rect{};
 
     bool m_isRect {false};
 
diff --git a/src/dxaml/xcp/components/metadata/StaticMetadata.g.cpp b/src/dxaml/xcp/components/metadata/StaticMetadata.g.cpp
index 3e8f93b466..8e689cc6ee 100644
--- a/src/dxaml/xcp/components/metadata/StaticMetadata.g.cpp
+++ b/src/dxaml/xcp/components/metadata/StaticMetadata.g.cpp
@@ -21745,9 +21745,9 @@ extern constexpr IID c_aTypeUUIDs[KnownTypeCount] =
     __uuidof(ABI::Windows::Foundation::IReference<ABI::Microsoft::UI::Xaml::HorizontalAlignment>),
     __uuidof(ABI::Windows::Foundation::IReference<ABI::Microsoft::UI::Xaml::Controls::IncrementalLoadingTrigger>),
     __uuidof(ABI::Windows::Foundation::IReference<ABI::Microsoft::UI::Xaml::Input::InputScopeNameValue>),
-    __uuidof(ABI::Windows::Foundation::IReference<ABI::Microsoft::UI::Xaml::Controls::InputValidationErrorEventAction>),
-    __uuidof(ABI::Windows::Foundation::IReference<ABI::Microsoft::UI::Xaml::Controls::InputValidationKind>),
-    __uuidof(ABI::Windows::Foundation::IReference<ABI::Microsoft::UI::Xaml::Controls::InputValidationMode>),
+    GUID{} /*GUID_NULL*/,
+    GUID{} /*GUID_NULL*/,
+    GUID{} /*GUID_NULL*/,
     __uuidof(ABI::Windows::Foundation::IReference<ABI::Microsoft::UI::Xaml::Controls::ItemsUpdatingScrollMode>),
     __uuidof(ABI::Windows::Foundation::IReference<ABI::Microsoft::UI::Xaml::Input::KeyboardAcceleratorPlacementMode>),
     __uuidof(ABI::Windows::Foundation::IReference<ABI::Microsoft::UI::Xaml::Input::KeyboardNavigationMode>),
@@ -33850,7 +33850,7 @@ extern const MetaDataProperty c_aProperties[KnownPropertyCount] =
         KnownTypeIndex::DataTemplate, // Property type
         KnownTypeIndex::PasswordBox, // Declaring type
         KnownTypeIndex::PasswordBox, // Target type
-        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsPublic)), // Property flags
+        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse)), // Property flags
     },
     // Microsoft.UI.Xaml.Controls.PasswordBox.HasValidationErrors
     {
@@ -33858,7 +33858,7 @@ extern const MetaDataProperty c_aProperties[KnownPropertyCount] =
         KnownTypeIndex::Boolean, // Property type
         KnownTypeIndex::PasswordBox, // Declaring type
         KnownTypeIndex::PasswordBox, // Target type
-        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsPublic) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsReadOnlyProperty) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsExternalReadOnlyProperty)), // Property flags
+        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsReadOnlyProperty) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsExternalReadOnlyProperty)), // Property flags
     },
     // Microsoft.UI.Xaml.Controls.PasswordBox.Header
     {
@@ -33898,7 +33898,7 @@ extern const MetaDataProperty c_aProperties[KnownPropertyCount] =
         KnownTypeIndex::InputValidationKind, // Property type
         KnownTypeIndex::PasswordBox, // Declaring type
         KnownTypeIndex::PasswordBox, // Target type
-        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsPublic)), // Property flags
+        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse)), // Property flags
     },
     // Microsoft.UI.Xaml.Controls.PasswordBox.InputValidationMode
     {
@@ -33906,7 +33906,7 @@ extern const MetaDataProperty c_aProperties[KnownPropertyCount] =
         KnownTypeIndex::InputValidationMode, // Property type
         KnownTypeIndex::PasswordBox, // Declaring type
         KnownTypeIndex::PasswordBox, // Target type
-        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsPublic)), // Property flags
+        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse)), // Property flags
     },
     // Microsoft.UI.Xaml.Controls.PasswordBox.IsPasswordRevealButtonEnabled
     {
@@ -34002,7 +34002,7 @@ extern const MetaDataProperty c_aProperties[KnownPropertyCount] =
         KnownTypeIndex::InputValidationContext, // Property type
         KnownTypeIndex::PasswordBox, // Declaring type
         KnownTypeIndex::PasswordBox, // Target type
-        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsPublic)), // Property flags
+        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse)), // Property flags
     },
     // Microsoft.UI.Xaml.Controls.PasswordBox.ValidationErrors
     {
@@ -34010,7 +34010,7 @@ extern const MetaDataProperty c_aProperties[KnownPropertyCount] =
         KnownTypeIndex::ValidationErrorsCollection, // Property type
         KnownTypeIndex::PasswordBox, // Declaring type
         KnownTypeIndex::PasswordBox, // Target type
-        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsPublic) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsReadOnlyProperty) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsExternalReadOnlyProperty) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsOnDemandProperty)), // Property flags
+        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsReadOnlyProperty) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsExternalReadOnlyProperty) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsOnDemandProperty)), // Property flags
     },
     // Microsoft.UI.Xaml.Shapes.Path.Data
     {
@@ -34762,7 +34762,7 @@ extern const MetaDataProperty c_aProperties[KnownPropertyCount] =
         KnownTypeIndex::DataTemplate, // Property type
         KnownTypeIndex::TextBox, // Declaring type
         KnownTypeIndex::TextBox, // Target type
-        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsPublic)), // Property flags
+        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse)), // Property flags
     },
     // Microsoft.UI.Xaml.Controls.TextBox.HasValidationErrors
     {
@@ -34770,7 +34770,7 @@ extern const MetaDataProperty c_aProperties[KnownPropertyCount] =
         KnownTypeIndex::Boolean, // Property type
         KnownTypeIndex::TextBox, // Declaring type
         KnownTypeIndex::TextBox, // Target type
-        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsPublic) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsReadOnlyProperty) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsExternalReadOnlyProperty)), // Property flags
+        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsReadOnlyProperty) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsExternalReadOnlyProperty)), // Property flags
     },
     // Microsoft.UI.Xaml.Controls.TextBox.Header
     {
@@ -34818,7 +34818,7 @@ extern const MetaDataProperty c_aProperties[KnownPropertyCount] =
         KnownTypeIndex::InputValidationKind, // Property type
         KnownTypeIndex::TextBox, // Declaring type
         KnownTypeIndex::TextBox, // Target type
-        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsPublic)), // Property flags
+        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse)), // Property flags
     },
     // Microsoft.UI.Xaml.Controls.TextBox.InputValidationMode
     {
@@ -34826,7 +34826,7 @@ extern const MetaDataProperty c_aProperties[KnownPropertyCount] =
         KnownTypeIndex::InputValidationMode, // Property type
         KnownTypeIndex::TextBox, // Declaring type
         KnownTypeIndex::TextBox, // Target type
-        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsPublic)), // Property flags
+        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse)), // Property flags
     },
     // Microsoft.UI.Xaml.Controls.TextBox.IsColorFontEnabled
     {
@@ -35018,7 +35018,7 @@ extern const MetaDataProperty c_aProperties[KnownPropertyCount] =
         KnownTypeIndex::InputValidationContext, // Property type
         KnownTypeIndex::TextBox, // Declaring type
         KnownTypeIndex::TextBox, // Target type
-        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsPublic)), // Property flags
+        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse)), // Property flags
     },
     // Microsoft.UI.Xaml.Controls.TextBox.ValidationErrors
     {
@@ -35026,7 +35026,7 @@ extern const MetaDataProperty c_aProperties[KnownPropertyCount] =
         KnownTypeIndex::ValidationErrorsCollection, // Property type
         KnownTypeIndex::TextBox, // Declaring type
         KnownTypeIndex::TextBox, // Target type
-        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsPublic) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsReadOnlyProperty) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsExternalReadOnlyProperty) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsOnDemandProperty)), // Property flags
+        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsReadOnlyProperty) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsExternalReadOnlyProperty) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsOnDemandProperty)), // Property flags
     },
     // Microsoft.UI.Xaml.Controls.Primitives.Thumb.IsDragging
     {
@@ -35346,7 +35346,7 @@ extern const MetaDataProperty c_aProperties[KnownPropertyCount] =
         KnownTypeIndex::DataTemplate, // Property type
         KnownTypeIndex::AutoSuggestBox, // Declaring type
         KnownTypeIndex::AutoSuggestBox, // Target type
-        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsPublic)), // Property flags
+        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse)), // Property flags
     },
     // Microsoft.UI.Xaml.Controls.AutoSuggestBox.HasValidationErrors
     {
@@ -35354,7 +35354,7 @@ extern const MetaDataProperty c_aProperties[KnownPropertyCount] =
         KnownTypeIndex::Boolean, // Property type
         KnownTypeIndex::AutoSuggestBox, // Declaring type
         KnownTypeIndex::AutoSuggestBox, // Target type
-        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsPublic) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsReadOnlyProperty) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsExternalReadOnlyProperty)), // Property flags
+        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsReadOnlyProperty) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsExternalReadOnlyProperty)), // Property flags
     },
     // Microsoft.UI.Xaml.Controls.AutoSuggestBox.Header
     {
@@ -35378,7 +35378,7 @@ extern const MetaDataProperty c_aProperties[KnownPropertyCount] =
         KnownTypeIndex::InputValidationKind, // Property type
         KnownTypeIndex::AutoSuggestBox, // Declaring type
         KnownTypeIndex::AutoSuggestBox, // Target type
-        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsPublic)), // Property flags
+        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse)), // Property flags
     },
     // Microsoft.UI.Xaml.Controls.AutoSuggestBox.InputValidationMode
     {
@@ -35386,7 +35386,7 @@ extern const MetaDataProperty c_aProperties[KnownPropertyCount] =
         KnownTypeIndex::InputValidationMode, // Property type
         KnownTypeIndex::AutoSuggestBox, // Declaring type
         KnownTypeIndex::AutoSuggestBox, // Target type
-        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsPublic)), // Property flags
+        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse)), // Property flags
     },
     // Microsoft.UI.Xaml.Controls.AutoSuggestBox.IsSuggestionListOpen
     {
@@ -35474,7 +35474,7 @@ extern const MetaDataProperty c_aProperties[KnownPropertyCount] =
         KnownTypeIndex::InputValidationContext, // Property type
         KnownTypeIndex::AutoSuggestBox, // Declaring type
         KnownTypeIndex::AutoSuggestBox, // Target type
-        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsPublic)), // Property flags
+        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse)), // Property flags
     },
     // Microsoft.UI.Xaml.Controls.AutoSuggestBox.ValidationErrors
     {
@@ -35482,7 +35482,7 @@ extern const MetaDataProperty c_aProperties[KnownPropertyCount] =
         KnownTypeIndex::ValidationErrorsCollection, // Property type
         KnownTypeIndex::AutoSuggestBox, // Declaring type
         KnownTypeIndex::AutoSuggestBox, // Target type
-        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsPublic) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsReadOnlyProperty) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsExternalReadOnlyProperty) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsOnDemandProperty)), // Property flags
+        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsReadOnlyProperty) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsExternalReadOnlyProperty) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsOnDemandProperty)), // Property flags
     },
     // Microsoft.UI.Xaml.Documents.BlockCollection.ContentProperty
     {
@@ -37026,7 +37026,7 @@ extern const MetaDataProperty c_aProperties[KnownPropertyCount] =
         KnownTypeIndex::DataTemplate, // Property type
         KnownTypeIndex::ComboBox, // Declaring type
         KnownTypeIndex::ComboBox, // Target type
-        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsPublic)), // Property flags
+        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse)), // Property flags
     },
     // Microsoft.UI.Xaml.Controls.ComboBox.HasValidationErrors
     {
@@ -37034,7 +37034,7 @@ extern const MetaDataProperty c_aProperties[KnownPropertyCount] =
         KnownTypeIndex::Boolean, // Property type
         KnownTypeIndex::ComboBox, // Declaring type
         KnownTypeIndex::ComboBox, // Target type
-        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsPublic) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsReadOnlyProperty) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsExternalReadOnlyProperty)), // Property flags
+        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsReadOnlyProperty) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsExternalReadOnlyProperty)), // Property flags
     },
     // Microsoft.UI.Xaml.Controls.ComboBox.Header
     {
@@ -37066,7 +37066,7 @@ extern const MetaDataProperty c_aProperties[KnownPropertyCount] =
         KnownTypeIndex::InputValidationKind, // Property type
         KnownTypeIndex::ComboBox, // Declaring type
         KnownTypeIndex::ComboBox, // Target type
-        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsPublic)), // Property flags
+        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse)), // Property flags
     },
     // Microsoft.UI.Xaml.Controls.ComboBox.InputValidationMode
     {
@@ -37074,7 +37074,7 @@ extern const MetaDataProperty c_aProperties[KnownPropertyCount] =
         KnownTypeIndex::InputValidationMode, // Property type
         KnownTypeIndex::ComboBox, // Declaring type
         KnownTypeIndex::ComboBox, // Target type
-        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsPublic)), // Property flags
+        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse)), // Property flags
     },
     // Microsoft.UI.Xaml.Controls.ComboBox.IsDropDownOpen
     {
@@ -37202,7 +37202,7 @@ extern const MetaDataProperty c_aProperties[KnownPropertyCount] =
         KnownTypeIndex::InputValidationContext, // Property type
         KnownTypeIndex::ComboBox, // Declaring type
         KnownTypeIndex::ComboBox, // Target type
-        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsPublic)), // Property flags
+        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse)), // Property flags
     },
     // Microsoft.UI.Xaml.Controls.ComboBox.ValidationErrors
     {
@@ -37210,7 +37210,7 @@ extern const MetaDataProperty c_aProperties[KnownPropertyCount] =
         KnownTypeIndex::ValidationErrorsCollection, // Property type
         KnownTypeIndex::ComboBox, // Declaring type
         KnownTypeIndex::ComboBox, // Target type
-        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsPublic) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsReadOnlyProperty) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsExternalReadOnlyProperty) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsOnDemandProperty)), // Property flags
+        static_cast<MetaDataPropertyInfoFlags>(static_cast<UINT>(MetaDataPropertyInfoFlags::IsSparse) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsReadOnlyProperty) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsExternalReadOnlyProperty) | static_cast<UINT>(MetaDataPropertyInfoFlags::IsOnDemandProperty)), // Property flags
     },
     // Microsoft.UI.Xaml.Controls.CommandBar.CommandBarOverflowPresenterStyle
     {
diff --git a/src/dxaml/xcp/components/metadata/inc/Indexes.g.h b/src/dxaml/xcp/components/metadata/inc/Indexes.g.h
index 8ca2cc3f0e..1e4b9bda73 100644
--- a/src/dxaml/xcp/components/metadata/inc/Indexes.g.h
+++ b/src/dxaml/xcp/components/metadata/inc/Indexes.g.h
@@ -3208,6 +3208,7 @@ enum class KnownMethodIndex: UINT16
     Window_ReleaseGraphicsDeviceOnSuspend,
     Window_SetAtlasRequestCallback,
     Window_GetWindowContentBoundsForElement,
+    XamlRoot_TryGetContentIsland,
     CustomXamlResourceLoader_GetResource,
     Brush_StartAnimation,
     Brush_StopAnimation,
@@ -4052,59 +4053,6 @@ enum class KnownMethodIndex: UINT16
     XamlIslandRoot_TrySetFocus,
     XamlIslandRoot_GetIslandFromElement,
     XamlShutdownCompletedOnThreadEventArgs_GetDispatcherQueueDeferral,
-    XamlDirect_GetDefault,
-    XamlDirect_GetObject,
-    XamlDirect_GetXamlDirectObject,
-    XamlDirect_CreateInstance,
-    XamlDirect_SetObjectProperty,
-    XamlDirect_SetXamlDirectObjectProperty,
-    XamlDirect_SetBooleanProperty,
-    XamlDirect_SetDoubleProperty,
-    XamlDirect_SetInt32Property,
-    XamlDirect_SetStringProperty,
-    XamlDirect_SetDateTimeProperty,
-    XamlDirect_SetPointProperty,
-    XamlDirect_SetRectProperty,
-    XamlDirect_SetSizeProperty,
-    XamlDirect_SetTimeSpanProperty,
-    XamlDirect_SetColorProperty,
-    XamlDirect_SetCornerRadiusProperty,
-    XamlDirect_SetDurationProperty,
-    XamlDirect_SetGridLengthProperty,
-    XamlDirect_SetThicknessProperty,
-    XamlDirect_SetMatrixProperty,
-    XamlDirect_SetMatrix3DProperty,
-    XamlDirect_SetEnumProperty,
-    XamlDirect_GetObjectProperty,
-    XamlDirect_GetXamlDirectObjectProperty,
-    XamlDirect_GetBooleanProperty,
-    XamlDirect_GetDoubleProperty,
-    XamlDirect_GetInt32Property,
-    XamlDirect_GetStringProperty,
-    XamlDirect_GetDateTimeProperty,
-    XamlDirect_GetPointProperty,
-    XamlDirect_GetRectProperty,
-    XamlDirect_GetSizeProperty,
-    XamlDirect_GetTimeSpanProperty,
-    XamlDirect_GetColorProperty,
-    XamlDirect_GetCornerRadiusProperty,
-    XamlDirect_GetDurationProperty,
-    XamlDirect_GetGridLengthProperty,
-    XamlDirect_GetThicknessProperty,
-    XamlDirect_GetMatrixProperty,
-    XamlDirect_GetMatrix3DProperty,
-    XamlDirect_GetEnumProperty,
-    XamlDirect_ClearProperty,
-    XamlDirect_GetCollectionCount,
-    XamlDirect_GetXamlDirectObjectFromCollectionAt,
-    XamlDirect_AddToCollection,
-    XamlDirect_InsertIntoCollectionAt,
-    XamlDirect_RemoveFromCollection,
-    XamlDirect_RemoveFromCollectionAt,
-    XamlDirect_ClearCollection,
-    XamlDirect_AddEventHandler,
-    XamlDirect_AddEventHandler_HandledEventsToo,
-    XamlDirect_RemoveEventHandler,
 };
 
 enum class KnownEventIndex: UINT16
@@ -4401,6 +4349,6 @@ constexpr UINT16 KnownTypeCount                 = static_cast<UINT16>(KnownTypeI
 constexpr UINT16 KnownPropertyCount             = static_cast<UINT16>(KnownPropertyIndex::LinearGradientBrush_Translation) + 1;
 constexpr UINT16 KnownDependencyPropertyCount   = static_cast<UINT16>(KnownPropertyIndex::RadioButton_GroupName) + 1;
 constexpr UINT16 KnownSimplePropertyCount       = 29; // KnownPropertyIndex::LinearGradientBrush_Translation
-constexpr UINT16 KnownMethodCount               = static_cast<UINT16>(KnownMethodIndex::XamlDirect_RemoveEventHandler) + 1;
+constexpr UINT16 KnownMethodCount               = static_cast<UINT16>(KnownMethodIndex::XamlShutdownCompletedOnThreadEventArgs_GetDispatcherQueueDeferral) + 1;
 constexpr UINT16 KnownEventCount                = static_cast<UINT16>(KnownEventIndex::WindowsXamlManager_XamlShutdownCompletedOnThread) + 1;
 constexpr KnownEventIndex LastControlEvent = KnownEventIndex::Control_InheritedPropertyChanged;
diff --git a/src/dxaml/xcp/components/metadata/inc/TypeNamePtr.h b/src/dxaml/xcp/components/metadata/inc/TypeNamePtr.h
index 8da8c09790..9fceeca605 100644
--- a/src/dxaml/xcp/components/metadata/inc/TypeNamePtr.h
+++ b/src/dxaml/xcp/components/metadata/inc/TypeNamePtr.h
@@ -44,7 +44,7 @@ class TypeNamePtr
         return *this;
     }
 
-    TypeNamePtr& operator=(TypeNamePtr&& other)
+    TypeNamePtr& operator=(TypeNamePtr&& other) noexcept
     {
         if (this != &other)
         {
diff --git a/src/dxaml/xcp/components/metadata/inc/TypeTableStructs.h b/src/dxaml/xcp/components/metadata/inc/TypeTableStructs.h
index c7780db2ef..e3c1180836 100644
--- a/src/dxaml/xcp/components/metadata/inc/TypeTableStructs.h
+++ b/src/dxaml/xcp/components/metadata/inc/TypeTableStructs.h
@@ -255,6 +255,7 @@ class CClassInfo : public MetaDataTypeNonAggregate
     }
     bool IsPrimitive() const               { return IsSet(MetaDataTypeInfoFlags::IsPrimitive); }
     bool IsPublic() const                  { return IsSet(MetaDataTypeInfoFlags::IsPublic); }
+#pragma warning (suppress : 26813) // Use 'bitwise and' to check if a flag is set.
     bool IsUnknown() const                 { return (m_flags == MetaDataTypeInfoFlags::IsCustomType); }
     bool IsValueType() const               { return IsSet(MetaDataTypeInfoFlags::IsValueType); }
     bool IsWhitespaceSignificant() const   { return IsSet(MetaDataTypeInfoFlags::IsWhitespaceSignificant); }
diff --git a/src/dxaml/xcp/components/moco/inc/StackingLayoutStrategyImpl.h b/src/dxaml/xcp/components/moco/inc/StackingLayoutStrategyImpl.h
index 8ffa946ae1..770b8a2f98 100644
--- a/src/dxaml/xcp/components/moco/inc/StackingLayoutStrategyImpl.h
+++ b/src/dxaml/xcp/components/moco/inc/StackingLayoutStrategyImpl.h
@@ -162,6 +162,10 @@ namespace DirectUI { namespace Components { namespace Moco {
         void RegisterSpecialContainerSize(_In_ int itemIndex, _In_ wf::Size containerDesiredSize);
         void RegisterSpecialHeaderSize(_In_ int groupIndex, _In_ wf::Size headerDesiredSize);
 
+        // Used to estimate tracked element reposition during items source updates.
+        float GetAverageHeaderSize() const;
+        float GetAverageContainerSize() const;
+
     private:
         const float GetDistanceBetweenGroups() const;
 
@@ -170,8 +174,6 @@ namespace DirectUI { namespace Components { namespace Moco {
         float GetAverageVirtualizedExtentOfItems(_In_ float itemCount) const;
 
         void RegisterSize(_In_ int index, _In_ bool isHeader, _In_ float size);
-        float GetAverageHeaderSize() const;
-        float GetAverageContainerSize() const;
 
         // Used by GetElementBounds for each element type.
         wf::Rect GetContainerBounds(
diff --git a/src/dxaml/xcp/components/moco/lib/StackingLayoutStrategyImpl.cpp b/src/dxaml/xcp/components/moco/lib/StackingLayoutStrategyImpl.cpp
index 9966646e09..3ee1b142c8 100644
--- a/src/dxaml/xcp/components/moco/lib/StackingLayoutStrategyImpl.cpp
+++ b/src/dxaml/xcp/components/moco/lib/StackingLayoutStrategyImpl.cpp
@@ -746,7 +746,6 @@ float StackingLayoutStrategyImpl::GetAverageHeaderSize() const
 {
     // if we have just 1 group header and it is collapsed there will be no registered size for it.
     return static_cast<float>(m_headerSizesStoredTotal > 0 ? m_headerSizesTotal / m_headerSizesStoredTotal : 10.0);
-
 }
 
 float StackingLayoutStrategyImpl::GetAverageContainerSize() const
@@ -1006,46 +1005,48 @@ StackingLayoutStrategyImpl::EstimateItemIndexFromWindow(
     int itemDelta = 0;
     switch (relativeReferencePosition)
     {
-    case RelativePosition::Before:
-    {
-        // Take into account a potential inline header
-        virtualizedReferencePoint += headerAdjustment;
-
-        // Gather information about the distance to traverse
-        const float nearWindowEdge = window.*PointFromRectInVirtualizingDirection();
-        const float distance = nearWindowEdge - virtualizedReferencePoint;
-        if (distance > 0)
+        case RelativePosition::Before:
         {
-            itemDelta = static_cast<int>(std::floor(distance / averageContainerSize));
-        }
-        else
-        {
-            itemDelta = 0;
+            // Take into account a potential inline header
+            virtualizedReferencePoint += headerAdjustment;
+
+            // Gather information about the distance to traverse
+            const float nearWindowEdge = window.*PointFromRectInVirtualizingDirection();
+            const float distance = nearWindowEdge - virtualizedReferencePoint;
+            if (distance > 0)
+            {
+                itemDelta = static_cast<int>(std::floor(distance / averageContainerSize));
+            }
+            else
+            {
+                itemDelta = 0;
+            }
+            break;
         }
-    }
-        break;
 
-    case RelativePosition::After:
-    {
-        // Gather information about the distance to traverse
-        const float nearWindowEdge = window.*PointFromRectInVirtualizingDirection() + window.*SizeFromRectInVirtualizingDirection();
-        const float distance = nearWindowEdge - virtualizedReferencePoint;
-        if (distance < 0 && !referenceIsHeader)
+        case RelativePosition::After:
         {
-            itemDelta = static_cast<int>(std::floor(distance / averageContainerSize));
+            // Gather information about the distance to traverse
+            const float nearWindowEdge = window.*PointFromRectInVirtualizingDirection() + window.*SizeFromRectInVirtualizingDirection();
+            const float distance = nearWindowEdge - virtualizedReferencePoint;
+            if (distance < 0 && !referenceIsHeader)
+            {
+                itemDelta = static_cast<int>(std::floor(distance / averageContainerSize));
+            }
+            else
+            {
+                // In case we're going backwards from a header, just pick the first item in the group.
+                itemDelta = 0;
+            }
+            break;
         }
-        else
+
+        default:
         {
-            // In case we're going backwards from a header, just pick the first item in the group.
             itemDelta = 0;
+            break;
         }
     }
-        break;
-
-    default:
-        itemDelta = 0;
-        break;
-    }
 
     // Get the target index, bounds-check it, and calculate the distance moved
     targetItemIndex = referenceIndex + itemDelta;
diff --git a/src/dxaml/xcp/components/mrt/ModernResourceProvider.cpp b/src/dxaml/xcp/components/mrt/ModernResourceProvider.cpp
index b0caee5f45..de66e41b82 100644
--- a/src/dxaml/xcp/components/mrt/ModernResourceProvider.cpp
+++ b/src/dxaml/xcp/components/mrt/ModernResourceProvider.cpp
@@ -564,7 +564,7 @@ HRESULT ModernResourceProvider::UpdateThemeQualifier()
 _Check_return_
 HRESULT ModernResourceProvider::TryGetResourceCandidate(
     _In_ IPALUri* pMSResourceUri,
-    _Outptr_result_maybenull_ wrl::ComPtr<mwar::IResourceCandidate>& resourceCandidate)
+    _Out_ wrl::ComPtr<mwar::IResourceCandidate>& resourceCandidate)
 {
     resourceCandidate.Reset();
 
diff --git a/src/dxaml/xcp/components/mrt/inc/ModernResourceProvider.h b/src/dxaml/xcp/components/mrt/inc/ModernResourceProvider.h
index b8dc075039..7e7978ee2a 100644
--- a/src/dxaml/xcp/components/mrt/inc/ModernResourceProvider.h
+++ b/src/dxaml/xcp/components/mrt/inc/ModernResourceProvider.h
@@ -72,7 +72,7 @@ class ModernResourceProvider final : public IPALResourceProvider, private CRefer
 
     _Check_return_ HRESULT TryGetResourceCandidate(
         _In_ IPALUri* pMSResourceUri,
-        _Outptr_result_maybenull_ wrl::ComPtr<mwar::IResourceCandidate>& resourceCandidate);
+        _Out_ wrl::ComPtr<mwar::IResourceCandidate>& resourceCandidate);
 
     _Check_return_ HRESULT UpdateContrastQualifier();
     _Check_return_ HRESULT UpdateDeviceFamilyQualifier();
diff --git a/src/dxaml/xcp/components/namescope/lib/NameScopeTableEntry.cpp b/src/dxaml/xcp/components/namescope/lib/NameScopeTableEntry.cpp
index 3a5ad56d0b..b751b0b429 100644
--- a/src/dxaml/xcp/components/namescope/lib/NameScopeTableEntry.cpp
+++ b/src/dxaml/xcp/components/namescope/lib/NameScopeTableEntry.cpp
@@ -188,7 +188,7 @@ namespace Jupiter {
             }
         }
 
-        NameScopeTableEntry& NameScopeTableEntry::operator=(NameScopeTableEntry&& other)
+        NameScopeTableEntry& NameScopeTableEntry::operator=(NameScopeTableEntry&& other) noexcept
         {
             if (this != &other)
             {
diff --git a/src/dxaml/xcp/components/namescope/lib/NameScopeTableEntry.h b/src/dxaml/xcp/components/namescope/lib/NameScopeTableEntry.h
index b68691d061..59be036cdb 100644
--- a/src/dxaml/xcp/components/namescope/lib/NameScopeTableEntry.h
+++ b/src/dxaml/xcp/components/namescope/lib/NameScopeTableEntry.h
@@ -35,7 +35,7 @@ namespace Jupiter {
             NameScopeTableEntry& operator=(const NameScopeTableEntry& other);
 
             NameScopeTableEntry(NameScopeTableEntry&& other) noexcept;
-            NameScopeTableEntry& operator=(NameScopeTableEntry&& other);
+            NameScopeTableEntry& operator=(NameScopeTableEntry&& other) noexcept;
 
         private:
 
diff --git a/src/dxaml/xcp/components/perf_guard/type_layout.cpp b/src/dxaml/xcp/components/perf_guard/type_layout.cpp
index 4411da5c5f..edc7215d27 100644
--- a/src/dxaml/xcp/components/perf_guard/type_layout.cpp
+++ b/src/dxaml/xcp/components/perf_guard/type_layout.cpp
@@ -61,41 +61,41 @@
 // inheritance level - level on class hierarchy (need to be sorted to point to class which caused change)
 
 //                                                  type_name,  32f,  32c,  64f, inheritance level
-VALIDATE_TYPE_LAYOUT(                       CDependencyObject,   52,   68,   96) // 1
-VALIDATE_TYPE_LAYOUT(                            CVisualState,   88,  104,  168) // 2
-VALIDATE_TYPE_LAYOUT(                               CTimeSpan,   64,   80,  104) // 2
-VALIDATE_TYPE_LAYOUT(                                 CMatrix,   76,   92,  120) // 2
-VALIDATE_TYPE_LAYOUT(                              CUIElement,  264,  280,  368) // 2
-VALIDATE_TYPE_LAYOUT(                     CTargetPropertyPath,   80,   96,  152) // 2
-VALIDATE_TYPE_LAYOUT(              CShareableDependencyObject,   56,   72,  104) // 2
-VALIDATE_TYPE_LAYOUT(                                CPointer,   64,   80,  112) // 2
-VALIDATE_TYPE_LAYOUT(                             CEnumerated,   60,   76,  104) // 2
-VALIDATE_TYPE_LAYOUT(                              CKeySpline,   72,   88,  120) // 2
-VALIDATE_TYPE_LAYOUT(                      CRectangleGeometry,   88,  104,  144) // 3
-VALIDATE_TYPE_LAYOUT(                                CKeyTime,   72,   88,  112) // 3
-VALIDATE_TYPE_LAYOUT(      CNoParentShareableDependencyObject,   60,   76,  112) // 3
-VALIDATE_TYPE_LAYOUT(                       CFrameworkElement,  308,  324,  448) // 3
-VALIDATE_TYPE_LAYOUT(                              CTextBlock,  428,  444,  648) // 4
-VALIDATE_TYPE_LAYOUT(                     CResourceDictionary,  192,  212,  360) // 4
-VALIDATE_TYPE_LAYOUT(                          CRichTextBlock,  448,  464,  680) // 4
-VALIDATE_TYPE_LAYOUT(          CObjectAnimationUsingKeyFrames,  296,  312,  464) // 4
-VALIDATE_TYPE_LAYOUT(                                CBinding,   56,   72,  104) // 4
-VALIDATE_TYPE_LAYOUT(                                 CBorder,  368,  384,  520) // 4
-VALIDATE_TYPE_LAYOUT(                 CManagedObjectReference,   76,   92,  136) // 4
-VALIDATE_TYPE_LAYOUT(                       CContentPresenter,  348,  364,  512) // 4
-VALIDATE_TYPE_LAYOUT(                        CDoubleAnimation,  248,  264,  392) // 4
-VALIDATE_TYPE_LAYOUT(   CMultiParentShareableDependencyObject,   76,   92,  144) // 4
-VALIDATE_TYPE_LAYOUT(                     CTimelineCollection,   88,  104,  168) // 5
-VALIDATE_TYPE_LAYOUT(                                  CBrush,   84,  100,  160) // 5
-VALIDATE_TYPE_LAYOUT(                         CContentControl,  412,  428,  616) // 5
-VALIDATE_TYPE_LAYOUT(                             CStoryboard,  248,  264,  368) // 5
-VALIDATE_TYPE_LAYOUT(         HWCompWinRTVisualRenderDataNode,   64,   80,  120) // 5
-VALIDATE_TYPE_LAYOUT(          CDoubleAnimationUsingKeyFrames,  248,  264,  392) // 5
-VALIDATE_TYPE_LAYOUT(                                   CGrid,  344,  360,  512) // 5
-VALIDATE_TYPE_LAYOUT(                              CRectangle,  396,  412,  552) // 5
-VALIDATE_TYPE_LAYOUT(                             CStackPanel,  336,  352,  488) // 5
-VALIDATE_TYPE_LAYOUT(                                 CSetter,  112,  128,  208) // 6
-VALIDATE_TYPE_LAYOUT(               CDoubleKeyFrameCollection,   92,  108,  176) // 6
-VALIDATE_TYPE_LAYOUT(               CObjectKeyFrameCollection,   92,  108,  176) // 6
-VALIDATE_TYPE_LAYOUT(                        CSolidColorBrush,   96,  112,  184) // 6
-VALIDATE_TYPE_LAYOUT(                        CMatrixTransform,   88,  104,  168) // 7
\ No newline at end of file
+VALIDATE_TYPE_LAYOUT(                       CDependencyObject,   48,   64,   88) // 1
+VALIDATE_TYPE_LAYOUT(                            CVisualState,   84,  100,  160) // 2
+VALIDATE_TYPE_LAYOUT(                               CTimeSpan,   56,   72,   96) // 2
+VALIDATE_TYPE_LAYOUT(                                 CMatrix,   72,   88,  112) // 2
+VALIDATE_TYPE_LAYOUT(                              CUIElement,  260,  276,  360) // 2
+VALIDATE_TYPE_LAYOUT(                     CTargetPropertyPath,   76,   92,  144) // 2
+VALIDATE_TYPE_LAYOUT(              CShareableDependencyObject,   52,   68,   96) // 2
+VALIDATE_TYPE_LAYOUT(                                CPointer,   60,   76,  104) // 2
+VALIDATE_TYPE_LAYOUT(                             CEnumerated,   56,   72,   96) // 2
+VALIDATE_TYPE_LAYOUT(                              CKeySpline,   68,   84,  112) // 2
+VALIDATE_TYPE_LAYOUT(                      CRectangleGeometry,   84,  100,  136) // 3
+VALIDATE_TYPE_LAYOUT(                                CKeyTime,   64,   80,  104) // 3
+VALIDATE_TYPE_LAYOUT(      CNoParentShareableDependencyObject,   56,   72,  104) // 3
+VALIDATE_TYPE_LAYOUT(                       CFrameworkElement,  304,  320,  440) // 3
+VALIDATE_TYPE_LAYOUT(                              CTextBlock,  424,  440,  640) // 4
+VALIDATE_TYPE_LAYOUT(                     CResourceDictionary,  188,  208,  352) // 4
+VALIDATE_TYPE_LAYOUT(                          CRichTextBlock,  444,  460,  672) // 4
+VALIDATE_TYPE_LAYOUT(          CObjectAnimationUsingKeyFrames,  288,  304,  456) // 4
+VALIDATE_TYPE_LAYOUT(                                CBinding,   52,   68,   96) // 4
+VALIDATE_TYPE_LAYOUT(                                 CBorder,  364,  380,  512) // 4
+VALIDATE_TYPE_LAYOUT(                 CManagedObjectReference,   72,   88,  128) // 4
+VALIDATE_TYPE_LAYOUT(                       CContentPresenter,  344,  360,  504) // 4
+VALIDATE_TYPE_LAYOUT(                        CDoubleAnimation,  240,  256,  384) // 4
+VALIDATE_TYPE_LAYOUT(   CMultiParentShareableDependencyObject,   72,   88,  136) // 4
+VALIDATE_TYPE_LAYOUT(                     CTimelineCollection,   84,  100,  160) // 5
+VALIDATE_TYPE_LAYOUT(                                  CBrush,   80,   96,  152) // 5
+VALIDATE_TYPE_LAYOUT(                         CContentControl,  408,  424,  608) // 5
+VALIDATE_TYPE_LAYOUT(                             CStoryboard,  240,  256,  360) // 5
+VALIDATE_TYPE_LAYOUT(         HWCompWinRTVisualRenderDataNode,   60,   76,  112) // 5
+VALIDATE_TYPE_LAYOUT(          CDoubleAnimationUsingKeyFrames,  240,  256,  384) // 5
+VALIDATE_TYPE_LAYOUT(                                   CGrid,  340,  356,  504) // 5
+VALIDATE_TYPE_LAYOUT(                              CRectangle,  392,  408,  544) // 5
+VALIDATE_TYPE_LAYOUT(                             CStackPanel,  332,  348,  480) // 5
+VALIDATE_TYPE_LAYOUT(                                 CSetter,  108,  124,  200) // 6
+VALIDATE_TYPE_LAYOUT(               CDoubleKeyFrameCollection,   88,  104,  168) // 6
+VALIDATE_TYPE_LAYOUT(               CObjectKeyFrameCollection,   88,  104,  168) // 6
+VALIDATE_TYPE_LAYOUT(                        CSolidColorBrush,   92,  108,  176) // 6
+VALIDATE_TYPE_LAYOUT(                        CMatrixTransform,   84,  100,  160) // 7
diff --git a/src/dxaml/xcp/components/qualifiers/QualifierContext.cpp b/src/dxaml/xcp/components/qualifiers/QualifierContext.cpp
index 2ce739dc1a..82bbab306c 100644
--- a/src/dxaml/xcp/components/qualifiers/QualifierContext.cpp
+++ b/src/dxaml/xcp/components/qualifiers/QualifierContext.cpp
@@ -87,7 +87,7 @@ void QualifierContext::CallIfRegistered(_In_ QualifierFlags flags, _In_ std::pai
     { 
         if(v.first)
         {
-            v.first->OnQualifierContextChanged();
+            VERIFYHR(v.first->OnQualifierContextChanged());
         }
     }
 };
diff --git a/src/dxaml/xcp/components/qualifiers/inc/VariantMap.h b/src/dxaml/xcp/components/qualifiers/inc/VariantMap.h
index f9654e218f..64dabab8ee 100644
--- a/src/dxaml/xcp/components/qualifiers/inc/VariantMap.h
+++ b/src/dxaml/xcp/components/qualifiers/inc/VariantMap.h
@@ -74,7 +74,7 @@ class VariantMap : public IQualifierContextCallback
 
     private:
         std::vector<VariantMapItem<TTarget, TData> > m_qualifiedObjects;
-        TTarget m_selectedItem;
+        TTarget m_selectedItem{};
         std::shared_ptr<QualifierContext> m_pQualifierContext;
         bool m_dirty;
         bool m_isSelectionValid;
diff --git a/src/dxaml/xcp/components/relativepanel/inc/RPGraph.h b/src/dxaml/xcp/components/relativepanel/inc/RPGraph.h
index 11d387fb99..dfda999997 100644
--- a/src/dxaml/xcp/components/relativepanel/inc/RPGraph.h
+++ b/src/dxaml/xcp/components/relativepanel/inc/RPGraph.h
@@ -119,7 +119,7 @@ class RPGraph
 
     std::forward_list<RPNode> m_nodes;
 
-    XSIZEF m_availableSizeForNodeResolution;
+    XSIZEF m_availableSizeForNodeResolution{};
 
     float m_minX;
     float m_maxX;
diff --git a/src/dxaml/xcp/components/relativepanel/inc/RPNode.h b/src/dxaml/xcp/components/relativepanel/inc/RPNode.h
index 492583a80e..a599435d60 100644
--- a/src/dxaml/xcp/components/relativepanel/inc/RPNode.h
+++ b/src/dxaml/xcp/components/relativepanel/inc/RPNode.h
@@ -152,11 +152,11 @@ class RPNode
     // Represents the space that's available to an element given its set of
     // constraints. The width and height of this rect is used to measure
     // a given element.
-    XRECTF m_measureRect;
+    XRECTF m_measureRect{};
 
     // Represents the exact space within the MeasureRect that will be used 
     // to arrange a given element.
-    XRECTF m_arrangeRect;
+    XRECTF m_arrangeRect{};
 
     RPState m_state;
 
diff --git a/src/dxaml/xcp/components/relativepanel/lib/RPNode.cpp b/src/dxaml/xcp/components/relativepanel/lib/RPNode.cpp
index 7f7c8a7bcd..54d0472938 100644
--- a/src/dxaml/xcp/components/relativepanel/lib/RPNode.cpp
+++ b/src/dxaml/xcp/components/relativepanel/lib/RPNode.cpp
@@ -548,7 +548,7 @@ void RPNode::GetPropertyValue(
 
                 if (index == propertyIndex)
                 {
-                    value->CopyConverted(prop.second);
+                    IFCFAILFAST(value->CopyConverted(prop.second));
                     valueSet = true;
                     break;
                 }
diff --git a/src/dxaml/xcp/components/resources/ResourceDictionary.cpp b/src/dxaml/xcp/components/resources/ResourceDictionary.cpp
index ef0c7a0467..652e97a5fe 100644
--- a/src/dxaml/xcp/components/resources/ResourceDictionary.cpp
+++ b/src/dxaml/xcp/components/resources/ResourceDictionary.cpp
@@ -88,7 +88,7 @@ CResourceDictionary::GetItemWithAddRef(UINT32 index)
     // the size of the deferred + undeferred resources. This makes it possible for
     // someone to try and get something from the dictionary that is out of the range so
     // we'll just fault in all deferred resources at this point.
-    LoadAllDeferredResources();
+    IFCFAILFAST(LoadAllDeferredResources());
     return CDOCollection::GetItemWithAddRef(index);
 }
 
diff --git a/src/dxaml/xcp/components/runtimeEnabledFeatures/RuntimeFeatureData.cpp b/src/dxaml/xcp/components/runtimeEnabledFeatures/RuntimeFeatureData.cpp
index 84cbf547f5..f2f0ee1ae5 100644
--- a/src/dxaml/xcp/components/runtimeEnabledFeatures/RuntimeFeatureData.cpp
+++ b/src/dxaml/xcp/components/runtimeEnabledFeatures/RuntimeFeatureData.cpp
@@ -77,5 +77,9 @@ namespace RuntimeFeatureBehavior
         { L"DenySelectionIndicatorVisualEnabled", RuntimeEnabledFeature::DenySelectionIndicatorVisualEnabled, false, 0, 0 },
         { L"ForceSelectionIndicatorModeInline", RuntimeEnabledFeature::ForceSelectionIndicatorModeInline, false, 0, 0 },
         { L"ForceSelectionIndicatorModeOverlay", RuntimeEnabledFeature::ForceSelectionIndicatorModeOverlay, false, 0, 0 },
+
+        // Until the feature is complete, we will default the typographic model back to the legacy one.
+        { L"DisableDWriteTypographicModel", RuntimeEnabledFeature::DisableDWriteTypographicModel, false, 0, 0 },
+        { L"ForceDWriteTypographicModel", RuntimeEnabledFeature::ForceDWriteTypographicModel, false, 0, 0 },
     };
 }
diff --git a/src/dxaml/xcp/components/runtimeEnabledFeatures/inc/RuntimeEnabledFeaturesEnum.h b/src/dxaml/xcp/components/runtimeEnabledFeatures/inc/RuntimeEnabledFeaturesEnum.h
index 26aa61bd13..fb9a85de51 100644
--- a/src/dxaml/xcp/components/runtimeEnabledFeatures/inc/RuntimeEnabledFeaturesEnum.h
+++ b/src/dxaml/xcp/components/runtimeEnabledFeatures/inc/RuntimeEnabledFeaturesEnum.h
@@ -72,6 +72,8 @@ namespace RuntimeFeatureBehavior
         DenySelectionIndicatorVisualEnabled,
         ForceSelectionIndicatorModeInline,
         ForceSelectionIndicatorModeOverlay,
+        DisableDWriteTypographicModel,
+        ForceDWriteTypographicModel,        // overides DisableDWriteTypographicModel
 
         // Insert new enum values before this one.
         // This is used to initialize the lengths of the
diff --git a/src/dxaml/xcp/components/simple/inc/SimpleProperty.h b/src/dxaml/xcp/components/simple/inc/SimpleProperty.h
index 009e7af718..fb3d8e555f 100644
--- a/src/dxaml/xcp/components/simple/inc/SimpleProperty.h
+++ b/src/dxaml/xcp/components/simple/inc/SimpleProperty.h
@@ -471,10 +471,8 @@ namespace SimpleProperty
 
         static void DestroyAllProperties();
 
-#if DBG
         // Sanity check to verify NotifyDestroyed has been called.
 
         static bool AreAllCleanedUp(const_objid_t obj);
-#endif
     };
 }
\ No newline at end of file
diff --git a/src/dxaml/xcp/components/text/TextHighlightRenderer.cpp b/src/dxaml/xcp/components/text/TextHighlightRenderer.cpp
index 29dd65f7bb..ecf6236a08 100644
--- a/src/dxaml/xcp/components/text/TextHighlightRenderer.cpp
+++ b/src/dxaml/xcp/components/text/TextHighlightRenderer.cpp
@@ -37,8 +37,8 @@ namespace
     _Check_return_ HRESULT
     GetDefaultHighlighterBrushes(
         _In_ CCoreServices* coreServices,
-        _Outref_ xref_ptr<CSolidColorBrush>& foregroundBrush,
-        _Outref_ xref_ptr<CSolidColorBrush>& backgroundBrush
+        _Out_ xref_ptr<CSolidColorBrush>& foregroundBrush,
+        _Out_ xref_ptr<CSolidColorBrush>& backgroundBrush
         )
     {
         xref_ptr<CDependencyObject> defaultForegroundBrushDO;
@@ -69,9 +69,8 @@ namespace
         IterateHighlighterCallback callback
         )
     {
-#if DBG
+#pragma warning(suppress: 4189) // C4189: PREFast does not know this local variable is being used at least in the chk build by the ASSERT() below.
         auto textLength = static_cast<int>(textView->GetContentLength());
-#endif
 
         // Merge all the highlighters so that there is no overlap in ranges and
         // earlier items in the collection get overwritten by later ones.
diff --git a/src/dxaml/xcp/components/text/TextRangeCollection.cpp b/src/dxaml/xcp/components/text/TextRangeCollection.cpp
index 0e85664355..f97fbe4ae8 100644
--- a/src/dxaml/xcp/components/text/TextRangeCollection.cpp
+++ b/src/dxaml/xcp/components/text/TextRangeCollection.cpp
@@ -141,7 +141,7 @@ CTextRangeCollection::IndexOf(
 _Check_return_ HRESULT
 CTextRangeCollection::EnsureValue(
     _In_ const CValue& originalValue,
-    _Outref_ CValue& coercedValue)
+    _Out_ CValue& coercedValue)
 {
     ASSERT(&originalValue != &coercedValue);
 
diff --git a/src/dxaml/xcp/components/text/inc/TextRangeCollection.h b/src/dxaml/xcp/components/text/inc/TextRangeCollection.h
index 5cb41a0bb0..1668395577 100644
--- a/src/dxaml/xcp/components/text/inc/TextRangeCollection.h
+++ b/src/dxaml/xcp/components/text/inc/TextRangeCollection.h
@@ -56,7 +56,7 @@ class CTextRangeCollection final : public CCollection
         : CCollection(core)
     {}
 
-    static _Check_return_ HRESULT EnsureValue(_In_ const CValue& originalValue, _Outref_ CValue& coercedValue);
+    static _Check_return_ HRESULT EnsureValue(_In_ const CValue& originalValue, _Out_ CValue& coercedValue);
     void OnCollectionChanged();
 
     std::vector<TextRangeData> m_items;
diff --git a/src/dxaml/xcp/components/theming/inc/FrameworkTheming.h b/src/dxaml/xcp/components/theming/inc/FrameworkTheming.h
index 1c10efa565..44288be28f 100644
--- a/src/dxaml/xcp/components/theming/inc/FrameworkTheming.h
+++ b/src/dxaml/xcp/components/theming/inc/FrameworkTheming.h
@@ -68,7 +68,7 @@ class FrameworkTheming
     bool IsHighContrastChanging() const { return m_isHighContrastChanging; }
 
 private:
-    _Check_return_ void RebuildColorAndBrushResources();
+    void RebuildColorAndBrushResources();
 
     std::shared_ptr<IThemingInterop> m_spThemingInterop;
     NotifyThemeChangedFunc           m_notifyThemeChangedFunc;
diff --git a/src/dxaml/xcp/components/transforms/HitTestParams.cpp b/src/dxaml/xcp/components/transforms/HitTestParams.cpp
index c3afcaac4a..0b28881f1f 100644
--- a/src/dxaml/xcp/components/transforms/HitTestParams.cpp
+++ b/src/dxaml/xcp/components/transforms/HitTestParams.cpp
@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 #include "precomp.h"
+#include "Projection.h"
 #include "HitTestParams.h"
 #include "Transform3D.h"
 
diff --git a/src/dxaml/xcp/components/unittest-uielement.props b/src/dxaml/xcp/components/unittest-uielement.props
index f6e62896f3..16ec4afd4c 100644
--- a/src/dxaml/xcp/components/unittest-uielement.props
+++ b/src/dxaml/xcp/components/unittest-uielement.props
@@ -10,10 +10,7 @@
 
     <ItemDefinitionGroup>
         <Link>
-            <AdditionalDependencies>
-                %(AdditionalDependencies) dwmapi.lib;
-                $(FrameworkUdkLibPath)\Microsoft.Internal.FrameworkUdk.lib;
-            </AdditionalDependencies>
+            <AdditionalDependencies>%(AdditionalDependencies) dwmapi.lib;</AdditionalDependencies>
             <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(VC_LibraryPath_VC_Desktop_CurrentPlatform_spectre);</AdditionalLibraryDirectories>
         </Link>
     </ItemDefinitionGroup>
diff --git a/src/dxaml/xcp/components/unittest.props b/src/dxaml/xcp/components/unittest.props
index 54b2375c37..a892b4bb4f 100644
--- a/src/dxaml/xcp/components/unittest.props
+++ b/src/dxaml/xcp/components/unittest.props
@@ -74,7 +74,6 @@
                 onecoreuap.lib;
                 ntdll.lib;
                 dbghelp.lib;
-                $(FrameworkUdkLibPath)\Microsoft.Internal.FrameworkUdk.lib;
             </AdditionalDependencies>
             
             <DelayLoadDLLs>api-ms-win-rtcore-ntuser-private-l1-*.dll;</DelayLoadDLLs>
diff --git a/src/dxaml/xcp/components/vsm/CVisualStateManager2.cpp b/src/dxaml/xcp/components/vsm/CVisualStateManager2.cpp
index 046b1e7df3..15cb23ba8a 100644
--- a/src/dxaml/xcp/components/vsm/CVisualStateManager2.cpp
+++ b/src/dxaml/xcp/components/vsm/CVisualStateManager2.cpp
@@ -169,10 +169,10 @@ _Check_return_ HRESULT CVisualStateManager2::FaultInChildren(_In_ CVisualStateGr
         indexRangesToSkip = customRuntimeData->GetStateTriggerCollectionTokens();
     }
 
-    creator.ApplyStreamToExistingInstance(
+    IFC_RETURN(creator.ApplyStreamToExistingInstance(
         groupCollection->GetCustomRuntimeData()->GetEntireGroupCollectionToken(),
         groupCollection,
-        indexRangesToSkip);
+        indexRangesToSkip));
 
     ASSERT(groupCollection->size() == 0 || groupCollection->GetGroupContext().size() == 0 ||
         groupCollection->size() == groupCollection->GetGroupContext().size());
diff --git a/src/dxaml/xcp/components/vsm/OptimizedVisualStateManagerDataSource.cpp b/src/dxaml/xcp/components/vsm/OptimizedVisualStateManagerDataSource.cpp
index 257f09fafe..5b7ee3c84e 100644
--- a/src/dxaml/xcp/components/vsm/OptimizedVisualStateManagerDataSource.cpp
+++ b/src/dxaml/xcp/components/vsm/OptimizedVisualStateManagerDataSource.cpp
@@ -231,7 +231,7 @@ _Check_return_ HRESULT OptimizedVisualStateManagerDataSource::GetQualifiersFromS
     ASSERT(onCreated);
     IFC_RETURN(GetQualifiersFromStateTriggerValues(index, onCreated));
     IFC_RETURN(GetQualifiersFromStateTriggerTokens(index, onCreated));
-    GetQualifiersFromStaticResourceTriggerTokens(index, onCreated);
+    IFC_RETURN(GetQualifiersFromStaticResourceTriggerTokens(index, onCreated));
     return S_OK;
 };
 
diff --git a/src/dxaml/xcp/components/vsm/VisualStateManagerActuator.cpp b/src/dxaml/xcp/components/vsm/VisualStateManagerActuator.cpp
index 2992cc7ce6..f350830e54 100644
--- a/src/dxaml/xcp/components/vsm/VisualStateManagerActuator.cpp
+++ b/src/dxaml/xcp/components/vsm/VisualStateManagerActuator.cpp
@@ -246,12 +246,12 @@ _Check_return_ HRESULT VisualStateManagerActuator::ChangeVisualState(_In_ int gr
     // We need to check our cached list of old modified objects / properties
     // against the list of current modified objects/properties and make sure we don't clear anything
     // that was just (or will be) set, whether by setter or storyboard.
-    SelectExistingPropertySettersToRemove(
+    IFC_RETURN(SelectExistingPropertySettersToRemove(
         previouslyActivePropertySetters,
         destinationPropertySetters,
         transition ? transition->m_pStoryboard : nullptr,
         destinationStoryboard.get(),
-        dynamicStoryboard.get());
+        dynamicStoryboard.get()));
     IFC_RETURN(StopAndRemovePropertySetters(groupIndex, previouslyActivePropertySetters));
 
     return S_OK;
diff --git a/src/dxaml/xcp/components/vsm/VisualStateManagerDataSource.cpp b/src/dxaml/xcp/components/vsm/VisualStateManagerDataSource.cpp
index d333d604c8..c0cb1f3c8a 100644
--- a/src/dxaml/xcp/components/vsm/VisualStateManagerDataSource.cpp
+++ b/src/dxaml/xcp/components/vsm/VisualStateManagerDataSource.cpp
@@ -252,7 +252,7 @@ _Check_return_ HRESULT VisualStateManagerDataSource::TryGetOrCreatePropertySette
 
     for (auto& setter : setters)
     {
-        ParentDeferredSetter(xref_ptr<CSetter>(setter.get()));
+        IFC_RETURN(ParentDeferredSetter(xref_ptr<CSetter>(setter.get())));
 
         auto unparentGuard = wil::scope_exit([&]()
         {
diff --git a/src/dxaml/xcp/components/xamlDiagnostics/ElementStateChangedBuilder.cpp b/src/dxaml/xcp/components/xamlDiagnostics/ElementStateChangedBuilder.cpp
index e68da22c46..b6da9dafdb 100644
--- a/src/dxaml/xcp/components/xamlDiagnostics/ElementStateChangedBuilder.cpp
+++ b/src/dxaml/xcp/components/xamlDiagnostics/ElementStateChangedBuilder.cpp
@@ -142,7 +142,7 @@ namespace Diagnostics
                     {
                         CValue cVal;
                         auto resProp = MetadataAPI::GetPropertyByIndex(KnownPropertyIndex::Application_Resources);
-                        parent->GetValue(resProp, &cVal);
+                        IFC_RETURN(parent->GetValue(resProp, &cVal));
                         CResourceDictionary* appResources = do_pointer_cast<CResourceDictionary>(cVal);
                         if (childResources == appResources)
                         {
diff --git a/src/dxaml/xcp/components/xamlDiagnostics/LiveVisualTree.cpp b/src/dxaml/xcp/components/xamlDiagnostics/LiveVisualTree.cpp
index d958d65fb5..94792f1ab4 100644
--- a/src/dxaml/xcp/components/xamlDiagnostics/LiveVisualTree.cpp
+++ b/src/dxaml/xcp/components/xamlDiagnostics/LiveVisualTree.cpp
@@ -443,10 +443,8 @@ XamlDiagnostics::PopulateParentRelation(
         if (auto children = runtimeParent->GetChildren())
         {
             size_t childIndex = 0;
-#if DBG
-            bool hasChild =
-#endif
-            children->TryGetIndexOf(runtimeElement, childIndex);
+#pragma warning(suppress: 4189) // C4189: PREFast does not know this local variable is being used at least in the chk build by the TELEMETRY_ASSERT() below.
+            bool hasChild = children->TryGetIndexOf(runtimeElement, childIndex);
             MICROSOFT_TELEMETRY_ASSERT_DISABLED(hasChild);
             relation.ChildIndex = static_cast<unsigned>(childIndex);
         }
diff --git a/src/dxaml/xcp/components/xamlDiagnostics/inc/RuntimeObject.h b/src/dxaml/xcp/components/xamlDiagnostics/inc/RuntimeObject.h
index cef176c4ce..1fe26f8abe 100644
--- a/src/dxaml/xcp/components/xamlDiagnostics/inc/RuntimeObject.h
+++ b/src/dxaml/xcp/components/xamlDiagnostics/inc/RuntimeObject.h
@@ -120,7 +120,7 @@ namespace Diagnostics
 
         virtual void Initialize(_In_ IInspectable* backingObject, std::shared_ptr<RuntimeObject> parent);
     private:
-        InstanceHandle m_handle;
+        InstanceHandle m_handle{};
         Microsoft::WRL::ComPtr<IInspectable> m_backingObject;
         std::weak_ptr<RuntimeObject> m_parent;
         std::map<RuntimeProperty, std::shared_ptr<RuntimeObject>> m_values;
diff --git a/src/dxaml/xcp/components/xstring/inc/HStringUtil.h b/src/dxaml/xcp/components/xstring/inc/HStringUtil.h
index 7a5349ea4a..419ca685bb 100644
--- a/src/dxaml/xcp/components/xstring/inc/HStringUtil.h
+++ b/src/dxaml/xcp/components/xstring/inc/HStringUtil.h
@@ -6,7 +6,7 @@
 namespace HStringUtil {
 
     // Below all apis are copied from windowsstringp.h
-    inline bool HasEmbeddedNull(_In_ const HSTRING hString) throw()
+    inline bool HasEmbeddedNull(_In_ const HSTRING hString) noexcept
     {
         BOOL answer{};
         // Not capturing HRESULT
@@ -14,7 +14,7 @@ namespace HStringUtil {
         return !!answer;
     }
 
-    inline HRESULT GetLpcwstr(_In_ const HSTRING hString, _Outptr_ LPCWSTR *ppsz) throw()
+    inline HRESULT GetLpcwstr(_In_ const HSTRING hString, _Outptr_ LPCWSTR *ppsz) noexcept
     {
         if (HasEmbeddedNull(hString))
         {
@@ -25,7 +25,7 @@ namespace HStringUtil {
         return S_OK;
     }
 
-    inline LPCWSTR GetRawBuffer(_In_ const HSTRING hString, _Out_opt_ UINT32 *length) throw()
+    inline LPCWSTR GetRawBuffer(_In_ const HSTRING hString, _Out_opt_ UINT32 *length) noexcept
     {
         return WindowsGetStringRawBuffer(hString, length);
     }
diff --git a/src/dxaml/xcp/components/xstring/inc/XStringBuilder.h b/src/dxaml/xcp/components/xstring/inc/XStringBuilder.h
index 516ffd9595..4934a1f188 100644
--- a/src/dxaml/xcp/components/xstring/inc/XStringBuilder.h
+++ b/src/dxaml/xcp/components/xstring/inc/XStringBuilder.h
@@ -19,7 +19,7 @@ class TStringBuilder
     HSTRING_BUFFER m_hPreallocatedBuffer;
     uint32_t m_cBuffer;
     uint32_t m_cActual;
-    WCHAR m_inlineBuffer[Ti];
+    WCHAR m_inlineBuffer[Ti]{};
 
 public:
     _Check_return_ HRESULT Initialize(uint32_t uInitialSize = Ti);
diff --git a/src/dxaml/xcp/components/xstring/inc/xstring_ptr.h b/src/dxaml/xcp/components/xstring/inc/xstring_ptr.h
index d15f6d2ead..380a442258 100644
--- a/src/dxaml/xcp/components/xstring/inc/xstring_ptr.h
+++ b/src/dxaml/xcp/components/xstring/inc/xstring_ptr.h
@@ -227,7 +227,7 @@ constexpr const xencoded_string_ptr& xencoded_string_ptr::EmptyString() { return
     public: \
         Ty(Ty&& other) noexcept \
             : xstring_ptr_view(other.ReleaseEncodedStorage()) { } \
-        Ty& operator=(Ty&& other) { \
+        Ty& operator=(Ty&& other) noexcept { \
             if (this != &other) { SetEncodedStorage(other.ReleaseEncodedStorage()); } \
             return (* this); \
         }
@@ -632,7 +632,7 @@ class xephemeral_string_ptr : public xstring_ptr_view
         );
 
 private:
-    xstring_ptr_storage m_ephemeralStorage;
+    xstring_ptr_storage m_ephemeralStorage{};
 };
 
 
diff --git a/src/dxaml/xcp/control/common/shared/CommonBrowserHost.h b/src/dxaml/xcp/control/common/shared/CommonBrowserHost.h
index 23d83500e1..28014f98f1 100644
--- a/src/dxaml/xcp/control/common/shared/CommonBrowserHost.h
+++ b/src/dxaml/xcp/control/common/shared/CommonBrowserHost.h
@@ -232,7 +232,7 @@ class CommonBrowserHost :
 
 protected:
     bool                    m_bInResetVisualTree;
-    bool                    m_fForceRedraw;
+    bool                    m_fForceRedraw{};
 
     // Private methods
 
diff --git a/src/dxaml/xcp/control/common/shared/CommonBrowserHost.hpp b/src/dxaml/xcp/control/common/shared/CommonBrowserHost.hpp
index ceaa9f8a28..8e9f9e5ea9 100644
--- a/src/dxaml/xcp/control/common/shared/CommonBrowserHost.hpp
+++ b/src/dxaml/xcp/control/common/shared/CommonBrowserHost.hpp
@@ -17,7 +17,7 @@ CEventInfo::~CEventInfo()
 
 CEventInfo::CEventInfo(
         _In_opt_ CDependencyObject *pListener,
-        _In_     EventHandle hEvent,
+        _In_opt_ EventHandle hEvent,
         _In_opt_ CDependencyObject *pSender,
         _In_opt_ CEventArgs *pArgs,
         _In_ XINT32 flags,
@@ -380,7 +380,7 @@ CommonBrowserHost::set_EnableFrameRateCounter(bool isEnabled)
 //-------------------------------------------------------------------------
 _Check_return_ HRESULT
     CommonBrowserHost:: GetSystemGlyphTypefaces(
-        _Outptr_ CDependencyObject*  *ppDo)
+        _Outptr_opt_ CDependencyObject*  *ppDo)
 {
     HRESULT hr = S_OK;
 
@@ -787,7 +787,7 @@ CommonBrowserHost::CheckUri(
 //  Synopsis:
 //
 //-------------------------------------------------------------------------
-HRESULT
+_Check_return_ HRESULT
 CommonBrowserHost::EnsureDownloader()
 {
     HRESULT hr = S_OK;
diff --git a/src/dxaml/xcp/control/common/shared/ResourceManager.cpp b/src/dxaml/xcp/control/common/shared/ResourceManager.cpp
index 03a6c0b405..fa03be46ca 100644
--- a/src/dxaml/xcp/control/common/shared/ResourceManager.cpp
+++ b/src/dxaml/xcp/control/common/shared/ResourceManager.cpp
@@ -291,7 +291,7 @@ _Check_return_ HRESULT ResourceManager::TryResolveUri(
     IFC(IsLocalResourceUri(pResourceUri, &fLocalResource));
     if (fLocalResource)
     {
-        TryGetLocalResource(pResourceUri, ppResource);
+        IFC(TryGetLocalResource(pResourceUri, ppResource));
         goto Cleanup;
     }
 
diff --git a/src/dxaml/xcp/control/inc/DownloadRequest.h b/src/dxaml/xcp/control/inc/DownloadRequest.h
index e4c3f662b9..bcc82ba291 100644
--- a/src/dxaml/xcp/control/inc/DownloadRequest.h
+++ b/src/dxaml/xcp/control/inc/DownloadRequest.h
@@ -24,7 +24,7 @@ class CDownloadRequest
     IDownloader* m_pDownloader;
     IPALUri* m_pUriAbsolute;
     IPALDownloadResponseCallback* m_pCallback;
-    XINT32 m_fCrossDomain;
+    XINT32 m_fCrossDomain{};
     XINT32 m_fRemoveHttpsLock;
     CAbortableAsyncDownload* m_pAbortableDownload;
     XUINT32 m_eUnsecureDownloadAction;
diff --git a/src/dxaml/xcp/core/Parser/XamlServiceProviderContext.cpp b/src/dxaml/xcp/core/Parser/XamlServiceProviderContext.cpp
index 2dc296fe7e..ef386fd5a8 100644
--- a/src/dxaml/xcp/core/Parser/XamlServiceProviderContext.cpp
+++ b/src/dxaml/xcp/core/Parser/XamlServiceProviderContext.cpp
@@ -51,7 +51,7 @@ HRESULT XamlServiceProviderContext::GetAllAmbientValues(
     _In_ std::shared_ptr<XamlProperty> spProperty,
     _In_ std::shared_ptr<XamlType> spTypeToFind,
     _In_ CompressedStackCacheHint eCacheHint,
-    _Outref_ AmbientValuesVector& rvecValues)
+    _Out_ AmbientValuesVector& rvecValues)
 {
     IFC_RETURN(GetObjectWriterContext()->ServiceProvider_GetAllAmbientValues(spCeilingType, spProperty, spTypeToFind, eCacheHint, rvecValues));
 
diff --git a/src/dxaml/xcp/core/animation/timemgr.cpp b/src/dxaml/xcp/core/animation/timemgr.cpp
index dc94aebd7c..463826db82 100644
--- a/src/dxaml/xcp/core/animation/timemgr.cpp
+++ b/src/dxaml/xcp/core/animation/timemgr.cpp
@@ -20,7 +20,7 @@
 _Check_return_ HRESULT
 CTimeManager::Create(
     _In_ CCoreServices *pCore,
-    _In_ IPALTickableClock *pIClock,
+    _In_ RefreshAlignedClock* pIClock,
     _Outptr_ CTimeManager **ppObject
     )
 {
@@ -39,7 +39,7 @@ CTimeManager::Create(
 //------------------------------------------------------------------------
 CTimeManager::CTimeManager(
     _In_ CCoreServices *pCore,
-    _In_ IPALTickableClock *pIClock
+    _In_ RefreshAlignedClock* pIClock
     )
     : CDependencyObject(pCore)
     , m_isLoaded(FALSE)
diff --git a/src/dxaml/xcp/core/animation/timer.cpp b/src/dxaml/xcp/core/animation/timer.cpp
index aa8c34f2f9..6dcd184a2c 100644
--- a/src/dxaml/xcp/core/animation/timer.cpp
+++ b/src/dxaml/xcp/core/animation/timer.cpp
@@ -7,10 +7,6 @@
 #include "TimeSpan.h"
 #include <UIThreadScheduler.h>
 #include "XamlTelemetry.h"
-#include <FrameworkUdk/Containment.h>
-
-// Bug 49537618: [1.5 servicing] DispatcherTimer callbacks are taking much longer on Cadmus
-#define WINAPPSDK_CHANGEID_49537618 49537618
 
 _Check_return_ HRESULT CDispatcherTimer::Create(
     _Outptr_ CDependencyObject **ppObject,
@@ -79,7 +75,12 @@ _Check_return_ HRESULT CDispatcherTimer::ComputeStateImpl(
     // The frame scheduler is NULL when ticking animations for continuous handoff. Dispatcher timers never hand off to anything.
     ASSERT(parentParams.pFrameSchedulerNoRef != NULL);
 
-    if (m_fRunning && !m_fWorkPending)
+    // Don't tick if there aren't any event handlers - the point of a DispatcherTimer is for app code to be called at a
+    // later time. If there's no app code to be called, there's no need to tick. Note that the start time was snapped
+    // when Start was called. If someone attached an event handler while the DispatcherTimer is running, we'll be able
+    // to continue ticking and fire the Tick event at the appropriate time, rather than effectively restarting the timer
+    // when the Tick event handler was added.
+    if (m_pEventList && m_fRunning && !m_fWorkPending)
     {
         // Dispatcher timers are root timelines, so the parent time should always be provided.
         ASSERT(parentParams.hasTime);
@@ -90,31 +91,25 @@ _Check_return_ HRESULT CDispatcherTimer::ComputeStateImpl(
         // If we've reached the point where the timer should fire, raise the event and start time over.
         if (timeRemainingInMilliseconds <= 0)
         {
-            if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_49537618>())
-            {
-                TraceLoggingProviderWrite(
-                    XamlTelemetry, "DispatcherTimer_Tick",
-                    TraceLoggingUInt64(reinterpret_cast<uint64_t>(this), "ObjectPointer"),
-                    TraceLoggingWideString(m_strName.GetBuffer(), "TimerName"),
-                    TraceLoggingUInt64(static_cast<uint64_t>(m_pInterval->m_rTimeSpan * 1000.0), "IntervalInMilliseconds"),
-                    TraceLoggingBoolean(!!m_pEventList, "HasListeners"),
-                    TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-            }
+            TraceLoggingProviderWrite(
+                XamlTelemetry, "DispatcherTimer_Tick",
+                TraceLoggingUInt64(reinterpret_cast<uint64_t>(this), "ObjectPointer"),
+                TraceLoggingWideString(m_strName.GetBuffer(), "TimerName"),
+                TraceLoggingUInt64(static_cast<uint64_t>(m_pInterval->m_rTimeSpan * 1000.0), "IntervalInMilliseconds"),
+                TraceLoggingInt64(static_cast<int64_t>(timeRemainingInMilliseconds), "TimeRemainingInMilliseconds"),
+                TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
 
             FireTickEvent();
 
-            // Snap the time the DispatcherTimer ticked - the next interval is relative to this point.
-            // This interval is only used when there's no Tick event listeners.  When there are listeners,
-            // m_fWorkPending is true until the Tick event is complete and the interval is snapped in WorkComplete instead.
-            // TODO: Should we bother to tick the timer at all if no one is listening to the Tick event?  See Win8 567717
-            m_rLastTickTime  = parentParams.time;
-            timeRemainingInMilliseconds = m_pInterval->m_rTimeSpan * 1000.0;
+            // We'll snap the start time for the next iteration in WorkComplete after the Tick event hander finishes running.
+        }
+        else
+        {
+            // Request a tick at the point when the DispatcherTimer should fire next.
+            IFC_RETURN(parentParams.pFrameSchedulerNoRef->RequestAdditionalFrame(
+                XcpCeiling(timeRemainingInMilliseconds),
+                RequestFrameReason::TimerTick));
         }
-
-        // Request a tick at the point when the DispatcherTimer should fire next.
-        IFC_RETURN(parentParams.pFrameSchedulerNoRef->RequestAdditionalFrame(
-            XcpCeiling(timeRemainingInMilliseconds),
-            RequestFrameReason::TimerTick));
     }
 
     // Check external references
@@ -129,15 +124,13 @@ _Check_return_ HRESULT CDispatcherTimer::ComputeStateImpl(
 // Call the event manager to fire this event when the interval hits.
 void CDispatcherTimer::FireTickEvent()
 {
-    // See if we have an event handler for "Tick"
-    if (m_pEventList)
+    ASSERT(m_pEventList);
+
+    CEventManager *pEventManager = GetContext()->GetEventManager();
+    if (pEventManager)
     {
-        CEventManager *pEventManager = GetContext()->GetEventManager();
-        if (pEventManager)
-        {
-            m_fWorkPending = TRUE;
-            pEventManager->Raise(EventHandle(KnownEventIndex::DispatcherTimer_Tick), TRUE, this, NULL);
-        }
+        m_fWorkPending = TRUE;
+        pEventManager->Raise(EventHandle(KnownEventIndex::DispatcherTimer_Tick), TRUE, this, NULL);
     }
 }
 
@@ -183,16 +176,13 @@ _Check_return_ HRESULT CDispatcherTimer::Start()
 
     m_rLastTickTime  =  pTimeManager->GetEstimatedNextTickTime();
 
-    if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_49537618>())
-    {
-        TraceLoggingProviderWrite(
-            XamlTelemetry, "DispatcherTimer_Start",
-            TraceLoggingUInt64(reinterpret_cast<uint64_t>(this), "ObjectPointer"),
-            TraceLoggingWideString(m_strName.GetBuffer(), "TimerName"),
-            TraceLoggingUInt64(static_cast<uint64_t>(m_pInterval->m_rTimeSpan * 1000.0), "IntervalInMilliseconds"),
-            TraceLoggingUInt64(static_cast<uint64_t>(m_rLastTickTime * 1000.0), "StartTickTimeInMilliseconds"),
-            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-    }
+    TraceLoggingProviderWrite(
+        XamlTelemetry, "DispatcherTimer_Start",
+        TraceLoggingUInt64(reinterpret_cast<uint64_t>(this), "ObjectPointer"),
+        TraceLoggingWideString(m_strName.GetBuffer(), "TimerName"),
+        TraceLoggingUInt64(static_cast<uint64_t>(m_pInterval->m_rTimeSpan * 1000.0), "IntervalInMilliseconds"),
+        TraceLoggingUInt64(static_cast<uint64_t>(m_rLastTickTime * 1000.0), "StartTickTimeInMilliseconds"),
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
 
     // Request a tick to update the timeline.
     // The browser host and/or frame scheduler can be NULL during shutdown.
@@ -225,15 +215,12 @@ _Check_return_ HRESULT CDispatcherTimer::Stop()
         m_fAddedToManager = FALSE;
     }
 
-    if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_49537618>())
-    {
-        TraceLoggingProviderWrite(
-            XamlTelemetry, "DispatcherTimer_Stop",
-            TraceLoggingUInt64(reinterpret_cast<uint64_t>(this), "ObjectPointer"),
-            TraceLoggingWideString(m_strName.GetBuffer(), "TimerName"),
-            TraceLoggingUInt64(static_cast<uint64_t>(m_pInterval->m_rTimeSpan * 1000.0), "IntervalInMilliseconds"),
-            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-    }
+    TraceLoggingProviderWrite(
+        XamlTelemetry, "DispatcherTimer_Stop",
+        TraceLoggingUInt64(reinterpret_cast<uint64_t>(this), "ObjectPointer"),
+        TraceLoggingWideString(m_strName.GetBuffer(), "TimerName"),
+        TraceLoggingUInt64(static_cast<uint64_t>(m_pInterval->m_rTimeSpan * 1000.0), "IntervalInMilliseconds"),
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
 
     return S_OK;
 }
@@ -253,18 +240,16 @@ _Check_return_ HRESULT CDispatcherTimer::WorkComplete()
     m_fWorkPending = FALSE;
     m_rLastTickTime  =  pTimeManager->GetEstimatedNextTickTime();
 
-    if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_49537618>())
-    {
-        TraceLoggingProviderWrite(
-            XamlTelemetry, "DispatcherTimer_TickComplete",
-            TraceLoggingUInt64(reinterpret_cast<uint64_t>(this), "ObjectPointer"),
-            TraceLoggingWideString(m_strName.GetBuffer(), "TimerName"),
-            TraceLoggingUInt64(static_cast<uint64_t>(m_pInterval->m_rTimeSpan * 1000.0), "IntervalInMilliseconds"),
-            TraceLoggingUInt64(static_cast<uint64_t>(m_rLastTickTime * 1000.0), "StartTickTimeInMilliseconds"),
-            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-    }
+    TraceLoggingProviderWrite(
+        XamlTelemetry, "DispatcherTimer_TickComplete",
+        TraceLoggingUInt64(reinterpret_cast<uint64_t>(this), "ObjectPointer"),
+        TraceLoggingWideString(m_strName.GetBuffer(), "TimerName"),
+        TraceLoggingUInt64(static_cast<uint64_t>(m_pInterval->m_rTimeSpan * 1000.0), "IntervalInMilliseconds"),
+        TraceLoggingUInt64(static_cast<uint64_t>(m_rLastTickTime * 1000.0), "StartTickTimeInMilliseconds"),
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
 
-    // Request a tick to update the timeline.
+    // Request a tick to update the timeline now that the app's handler is done. Note that we didn't request a tick when
+    // the timer elapsed because we didn't know how long the app handler would take yet.
     // The browser host and/or frame scheduler can be NULL during shutdown.
     IXcpBrowserHost *pBH = core->GetBrowserHost();
     if (pBH != NULL)
@@ -273,7 +258,7 @@ _Check_return_ HRESULT CDispatcherTimer::WorkComplete()
 
         if (pFrameScheduler != NULL)
         {
-            VERIFYHR(pFrameScheduler->RequestAdditionalFrame(0 /* immediate */, RequestFrameReason::TimerTick));
+            VERIFYHR(pFrameScheduler->RequestAdditionalFrame(XcpCeiling(m_pInterval->m_rTimeSpan * 1000.0), RequestFrameReason::TimerTick));
         }
     }
 
diff --git a/src/dxaml/xcp/core/compositor/RefreshAlignedClock.cpp b/src/dxaml/xcp/core/compositor/RefreshAlignedClock.cpp
index 87dde02fd9..21efeb8da4 100644
--- a/src/dxaml/xcp/core/compositor/RefreshAlignedClock.cpp
+++ b/src/dxaml/xcp/core/compositor/RefreshAlignedClock.cpp
@@ -4,10 +4,6 @@
 #include "precomp.h"
 #include "RefreshAlignedClock.h"
 #include "XamlTelemetry.h"
-#include <FrameworkUdk/Containment.h>
-
-// Bug 49537618: [1.5 servicing] DispatcherTimer callbacks are taking much longer on Cadmus
-#define WINAPPSDK_CHANGEID_49537618 49537618
 
 //------------------------------------------------------------------------
 //
@@ -39,7 +35,6 @@ RefreshAlignedClock::Create(
 RefreshAlignedClock::RefreshAlignedClock()
     : m_pIClock(NULL)
     , m_lastReportedTime(0.0f)
-    , m_pRefreshRateInfo(NULL)
 {
 }
 
@@ -52,7 +47,6 @@ RefreshAlignedClock::RefreshAlignedClock()
 RefreshAlignedClock::~RefreshAlignedClock()
 {
     ReleaseInterface(m_pIClock);
-    ReleaseInterface(m_pRefreshRateInfo);
 }
 
 //------------------------------------------------------------------------
@@ -79,19 +73,16 @@ RefreshAlignedClock::Initialize()
 XDOUBLE
 RefreshAlignedClock::Tick()
 {
-    auto guard = m_Lock.lock(); // can be called from ui thread + compositor thread simultaneously
+    auto guard = m_Lock.lock();
 
     m_lastReportedTime = GetNextTickTimeInSeconds();
 
-    if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_49537618>())
-    {
-        TraceLoggingProviderWrite(
-            XamlTelemetry, "RefreshAlignedClock_Tick",
-            TraceLoggingUInt64(reinterpret_cast<uint64_t>(this), "ObjectPointer"),
-            TraceLoggingUInt64(static_cast<uint64_t>(m_lastReportedTime * 1000.0), "LastReportedTimeInMilliseconds"),
-            TraceLoggingUInt64(reinterpret_cast<uint64_t>(m_pIClock), "ClockPointer"),
-            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-    }
+    TraceLoggingProviderWrite(
+        XamlTelemetry, "RefreshAlignedClock_Tick",
+        TraceLoggingUInt64(reinterpret_cast<uint64_t>(this), "ObjectPointer"),
+        TraceLoggingUInt64(static_cast<uint64_t>(m_lastReportedTime * 1000.0), "LastReportedTimeInMilliseconds"),
+        TraceLoggingUInt64(reinterpret_cast<uint64_t>(m_pIClock), "ClockPointer"),
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
 
     return m_lastReportedTime;
 }
@@ -100,7 +91,6 @@ RefreshAlignedClock::Tick()
 //
 //  Synopsis:
 //     Returns what the next tick time would be without changing the clock state.
-//     This clock rounds its tick times to 'refresh rate' intervals.
 //
 //------------------------------------------------------------------------
 XDOUBLE
@@ -108,55 +98,24 @@ RefreshAlignedClock::GetNextTickTimeInSeconds() const
 {
     auto guard = m_Lock.lock(); // can be called from ui thread + compositor thread simultaneously
 
-    if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_49537618>())
-    {
-        double currentTime = m_pIClock->GetAbsoluteTimeInSeconds();
-
-        // Make sure time never flows backwards. If we calculated something less than the last reported time, just return
-        // the last reported time.
-        if (currentTime < m_lastReportedTime)
-        {
-            TraceLoggingProviderWrite(
-                XamlTelemetry, "RefreshAlignedClock_GetNextTickTimeInSeconds_TimeMovedBackwards",
-                TraceLoggingUInt64(reinterpret_cast<uint64_t>(this), "ObjectPointer"),
-                TraceLoggingUInt64(static_cast<uint64_t>(currentTime * 1000.0), "CurrentTimeInMilliseconds"),
-                TraceLoggingUInt64(static_cast<uint64_t>(m_lastReportedTime * 1000.0), "LastReportedTimeInMilliseconds"),
-                TraceLoggingUInt64(reinterpret_cast<uint64_t>(m_pIClock), "ClockPointer"),
-                TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
-
-            currentTime = m_lastReportedTime;
-        }
-
-        return currentTime;
-    }
-    else
+    double currentTime = m_pIClock->GetAbsoluteTimeInSeconds();
+
+    // Make sure time never flows backwards. If we calculated something less than the last reported time, just return
+    // the last reported time.
+    if (currentTime < m_lastReportedTime)
     {
-        XDOUBLE refreshIntervalInSeconds;
-
-        if (m_pRefreshRateInfo != NULL)
-        {
-            refreshIntervalInSeconds = static_cast<XDOUBLE>(m_pRefreshRateInfo->GetRefreshIntervalInMilliseconds()) / 1000.0;
-        }
-        else
-        {
-            // The refresh rate can't be read from the system yet.
-            refreshIntervalInSeconds = static_cast<XDOUBLE>(DefaultRefreshIntervalInMilliseconds) / 1000.0;
-        }
-
-        // Round time forward to the refresh rate interval.
-        XDOUBLE unroundedTime = static_cast<XDOUBLE>(m_pIClock->GetAbsoluteTimeInSeconds());
-        XDOUBLE roundedTime = static_cast<XDOUBLE>(XcpCeiling(unroundedTime / refreshIntervalInSeconds)) * refreshIntervalInSeconds;
-        XDOUBLE tolerance = 0.00001; // allow 0.01ms error
-
-        // Make sure we advance time by at least a frame each time the composition thread ticks.
-        if (roundedTime <= m_lastReportedTime + tolerance)
-        {
-            roundedTime = m_lastReportedTime + refreshIntervalInSeconds;
-        }
-
-        ASSERT(roundedTime > m_lastReportedTime);
-        return roundedTime;
+        TraceLoggingProviderWrite(
+            XamlTelemetry, "RefreshAlignedClock_GetNextTickTimeInSeconds_TimeMovedBackwards",
+            TraceLoggingUInt64(reinterpret_cast<uint64_t>(this), "ObjectPointer"),
+            TraceLoggingUInt64(static_cast<uint64_t>(currentTime * 1000.0), "CurrentTimeInMilliseconds"),
+            TraceLoggingUInt64(static_cast<uint64_t>(m_lastReportedTime * 1000.0), "LastReportedTimeInMilliseconds"),
+            TraceLoggingUInt64(reinterpret_cast<uint64_t>(m_pIClock), "ClockPointer"),
+            TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
+        currentTime = m_lastReportedTime;
     }
+
+    return currentTime;
 }
 
 //------------------------------------------------------------------------
@@ -173,19 +132,7 @@ RefreshAlignedClock::GetLastTickTimeInSeconds() const
     return m_lastReportedTime;
 }
 
-//------------------------------------------------------------------------
-//
-//  Synopsis:
-//      Sets the object used to get the refresh rate.
-//
-//------------------------------------------------------------------------
-void
-RefreshAlignedClock::SetRefreshRateInfo(_In_opt_ IPALRefreshRateInfo *pRefreshRateInfo)
+float RefreshAlignedClock::GetAbsoluteTimeInMilliseconds()
 {
-    // The UI thread could be reading the field in GetNextTickTimeInSeconds via a DispatcherTimer, so take the lock before
-    // writing to the field on the render thread. All other reads occur on the render thread or on the UI thread inside
-    // the render thread lock and do not require additional locking.
-    auto guard = m_Lock.lock();
-    ReplaceInterface(m_pRefreshRateInfo, pRefreshRateInfo);
+    return 1000.0f * static_cast<float>(m_pIClock->GetAbsoluteTimeInSeconds());
 }
-
diff --git a/src/dxaml/xcp/core/compositor/RefreshAlignedClock.h b/src/dxaml/xcp/core/compositor/RefreshAlignedClock.h
index 4fcd0ae62b..4d491f662d 100644
--- a/src/dxaml/xcp/core/compositor/RefreshAlignedClock.h
+++ b/src/dxaml/xcp/core/compositor/RefreshAlignedClock.h
@@ -3,23 +3,56 @@
 
 #pragma once
 
-// A clock that is shared between the compositor thread and the UI thread.
-// It can drift forward because of queuing frames ahead on the compositor thread for
-// animation, but reports consistent time with the UI thread since it is shared.
-class RefreshAlignedClock final : public CXcpObjectBase<IPALTickableClock>
+struct IPALClock;
+
+//
+// A clock that is shared between the scheduling thread and the UI thread. This clocked is backed by
+// QueryPerformanceCounter, but rather than having every "what time is it?" question go to QPC, it caches the current
+// time and only updates it from the scheduling thread. Whenever the UI thread asks for the current time, it gets a
+// consistent answer. This is desirable because the UI thread can ask for the current time multiple times in a frame,
+// and we want to make sure that it gets the same answer each time, otherwise timers and animations may not all be in
+// sync.
+//
+// Note that while we take the precaution to cache the current time, there aren't that many places on the UI thread that
+// ask for the current time:
+//
+//   1. The UI thread's TimeManager will ask for the current time once and pass it down to all the timelines inside.
+//      Active timelines (i.e. Storyboard animations and DispatcherTimers) should be using the time passed down, instead
+//      of asking again for the current time.
+//
+//      The TimeManager will also ask for the current time when it starts in order to initialize its "time started"
+//      field, but when it does that it can reuse the time for evaluating animations rather than asking again. This will
+//      give the desired behavior that all animations start at time 0 during startup.
+//
+//   2. The other place that asks for the current time is the UIThreadScheduler when starting and ending a tick. If it
+//      discovers that the scheduling thread has moved the clock forward during the tick, we queue another tick from the
+//      UI thread directly rather than wait for the scheduling thread to do it. This may no longer be possible. This
+//      only happens if the scheduling thread wakes from its sleep and does another RenderThreadFrame while the UI
+//      thread is still in the middle of a tick, but the only thing that wakes the scheduling thread should be the _end_
+//      of a tick.
+//
+// If we can reduce this to a single place that asks for the current time, this entire class becomes unnecessary - we
+// can just ask QPC for the current time instead of going through this time-caching mechanism.
+//
+class RefreshAlignedClock final : public CXcpObjectBase<>
 {
 public:
     static _Check_return_ HRESULT Create(_Outptr_ RefreshAlignedClock **ppTimeManagerClock);
 
-    XDOUBLE Tick() override;
-    XDOUBLE GetLastTickTimeInSeconds() const override;
-    XDOUBLE GetNextTickTimeInSeconds() const override;
+    // Updates the cached time. Called on the scheduling thread only.
+    XDOUBLE Tick();
+
+    // Returns the cached time.
+    XDOUBLE GetLastTickTimeInSeconds() const;
+
+    // Returns the current time, backed by a QPC call.
+    XDOUBLE GetNextTickTimeInSeconds() const;
 
-    void SetRefreshRateInfo(_In_opt_ IPALRefreshRateInfo *pRefreshRateInfo);
+    float GetAbsoluteTimeInMilliseconds();
 
 private:
     RefreshAlignedClock();
-    ~RefreshAlignedClock() override;
+    ~RefreshAlignedClock();
 
     _Check_return_ HRESULT Initialize();
 
@@ -27,5 +60,4 @@ class RefreshAlignedClock final : public CXcpObjectBase<IPALTickableClock>
     IPALClock *m_pIClock;
     mutable wil::critical_section m_Lock;
     XDOUBLE m_lastReportedTime;
-    IPALRefreshRateInfo *m_pRefreshRateInfo;
 };
diff --git a/src/dxaml/xcp/core/compositor/RefreshRateInfo.h b/src/dxaml/xcp/core/compositor/RefreshRateInfo.h
new file mode 100644
index 0000000000..64757efbc6
--- /dev/null
+++ b/src/dxaml/xcp/core/compositor/RefreshRateInfo.h
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+#pragma once
+
+#include <powrprof.h>
+
+//
+// A class that returns the refresh rate and waits for a vblank.
+//
+// The refresh rate comes from DComp's GetFrameStatistics. The scheduling thread doesn't have the DComp device; the UI
+// thread does, so the UI thread queries it and sets it on this object. The schduling thread reads it off this object.
+//
+using unique_powerhpowernotify = wil::unique_any<
+    HPOWERNOTIFY,
+    decltype(&::PowerSettingUnregisterNotification),
+    ::PowerSettingUnregisterNotification>;
+
+class RefreshRateInfo
+    : public CXcpObjectBase<CXcpObjectAddRefPolicy>
+{
+    friend class DCompTreeHost;
+
+public:
+    static _Check_return_ HRESULT Create(_Outptr_ RefreshRateInfo** ppRefreshRateInfo);
+
+    float GetRefreshIntervalInMilliseconds();
+
+    _Check_return_ HRESULT WaitForRefreshInterval();
+
+    void SetIsDisplayOn(bool isDisplayOn);
+
+private:
+    RefreshRateInfo(_In_ IPALClock* clock);
+    ~RefreshRateInfo();
+
+    // DCompTreeHost
+    void SetRefreshIntervalInMilliseconds(float refreshIntervalInMilliseconds);
+
+    // WaitForCompositorClock
+    auto GetWaitForCompositorClockFn();
+    _Check_return_ HRESULT TryWaitForCompositorClock(_Out_ bool* waitForCompositorClockFound);
+    void RegisterForPowerNotification();
+
+private:
+
+    float m_refreshIntervalInMilliseconds;
+    wrl::ComPtr<IPALClock> m_clock;
+
+    // WaitForCompositorClock
+    bool m_isDisplayOn {true};
+    unique_powerhpowernotify m_hOcclusion;
+    HMODULE m_dcompModule = 0;
+};
diff --git a/src/dxaml/xcp/core/compositor/UIThreadScheduler.cpp b/src/dxaml/xcp/core/compositor/UIThreadScheduler.cpp
index 500fdbb186..406701b21c 100644
--- a/src/dxaml/xcp/core/compositor/UIThreadScheduler.cpp
+++ b/src/dxaml/xcp/core/compositor/UIThreadScheduler.cpp
@@ -5,6 +5,7 @@
 #include "UIThreadScheduler.h"
 #include <PALTypes.h>
 #include <CompositorScheduler.h>
+#include "GraphicsTelemetry.h"
 
 //------------------------------------------------------------------------------
 //
@@ -79,27 +80,40 @@ UIThreadScheduler::~UIThreadScheduler()
 //------------------------------------------------------------------------------
 _Check_return_ HRESULT
 UIThreadScheduler::RequestAdditionalFrame(
-    XUINT32 nextTickInterval,
+    XUINT32 nextTickIntervalInMilliseconds,
     RequestFrameReason reason)
 {
     {
         // TODO: TICK: Could probably use interlocked exchange for all m_currentState/m_nextTickIntervalInMilliseconds usage if necessary
         auto guard = m_NextTickLock.lock();
 
-        // All future tick requests OUTSIDE of tick processing will be treated as immediate
-        // because they lack a frame of reference to compare against (the last tick and next tick
-        // cannot be reliably determined).
         //
-        // It's expected that if the requestor still needs to be scheduled for a future time, that
-        // request would be made again while processing that 'immediate' tick, since as noted above
-        // tick requests do not persist tick-over-tick.
+        // Within a frame, all requests for additional frames are relative to the same time, so that multiple requests
+        // for the same interval all target the same time. We use the m_lastTickTimeInSeconds, snapped at the beginning
+        // of the frame, as the point of reference. The assumption is that a frame (at least in steady-state) is quick
+        // enough that the passage of time during the tick can be ignored.
         //
-        // Note that, even if there's a tick queued, we need to handle this case. It's possible that this tick
-        // was posted as low-priority, but some input processing that was re-prioritized is now pushing the
-        // deferred tick to high priority.
-        if (m_currentState != UITSS_Ticking)
+        // But m_lastTickTimeInSeconds is meaningless outside a frame. We may have been idle for a long time, so the
+        // actual time has progressed significantly since the frame started. If we just use m_lastTickTimeInSeconds as
+        // the point of reference, we'll have a target time that's much sooner than intended. For example, if it's been
+        // 500ms since m_lastTickTimeInSeconds, and a request comes in for 2000ms from now, then that's actually 2500ms
+        // since m_lastTickTimeInSeconds. We need to account for the difference.
+        //
+        if (nextTickIntervalInMilliseconds > 0 && m_currentState != UITSS_Ticking)
         {
-            nextTickInterval = 0;
+            uint64_t currentTimeInMilliseconds = static_cast<uint64_t>(m_pIClock->GetNextTickTimeInSeconds() * 1000);
+            uint64_t lastTickTimeInMilliseconds = static_cast<uint64_t>(m_lastTickTimeInSeconds * 1000);
+            uint32_t originalIntervalInMilliseconds = nextTickIntervalInMilliseconds;
+            nextTickIntervalInMilliseconds = originalIntervalInMilliseconds + static_cast<uint32_t>(currentTimeInMilliseconds - lastTickTimeInMilliseconds);
+
+            TraceLoggingProviderWrite(
+                GraphicsTelemetry, "Scheduling_RequestAdditionalFrameOutsideTick",
+                TraceLoggingUInt32(originalIntervalInMilliseconds, "OriginalIntervalInMilliseconds"),
+                TraceLoggingUInt64(currentTimeInMilliseconds, "CurrentTimeInMilliseconds"),
+                TraceLoggingUInt64(lastTickTimeInMilliseconds, "LastTickTimeInMilliseconds"),
+                TraceLoggingUInt32(nextTickIntervalInMilliseconds, "NextTickIntervalInMilliseconds"),
+                TraceLoggingUInt32(static_cast<uint32_t>(reason), "RequestFrameReason"),
+                TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
 
             // Tick requests OUTSIDE of tick processing will be treated as high-priority.
             // This includes changing layout, rendering, or animation state directly from input events or
@@ -113,13 +127,16 @@ UIThreadScheduler::RequestAdditionalFrame(
             m_isHighPriority = TRUE;
         }
 
+        bool wasNextTickIntervalInMillisecondsUpdated = false;
+
         // If there's already a tick queued, this schedule request can be otherwise ignored.
         // The work is going to be picked up or scheduled again anyway when the tick is processed.
         if (m_currentState != UITSS_TickQueued)
         {
-            if (nextTickInterval < m_nextTickIntervalInMilliseconds)
+            if (nextTickIntervalInMilliseconds < m_nextTickIntervalInMilliseconds)
             {
-                m_nextTickIntervalInMilliseconds = nextTickInterval;
+                m_nextTickIntervalInMilliseconds = nextTickIntervalInMilliseconds;
+                wasNextTickIntervalInMillisecondsUpdated = true;
 
                 // If the request came when no other work was scheduled, ensure the render thread
                 // is awake to process it and queue another tick.
@@ -133,13 +150,13 @@ UIThreadScheduler::RequestAdditionalFrame(
             }
         }
 
-        // Log the reason if it's new
-        if ((m_requestFrameReasons & reason) == 0)
+        // Log the reason if it's new or if we asked for a sooner tick.
+        if (wasNextTickIntervalInMillisecondsUpdated || ((m_requestFrameReasons & reason) == 0))
         {
             m_requestFrameReasons = static_cast<RequestFrameReason>(m_requestFrameReasons | reason);
 
             TraceRequestFrameReasonInfo(
-                nextTickInterval,
+                nextTickIntervalInMilliseconds,
                 m_nextTickIntervalInMilliseconds,
                 reason,
                 m_requestFrameReasons);
@@ -199,20 +216,20 @@ UIThreadScheduler::EndTick()
         // If there was a frame scheduled during ticking, ensure another UI thread frame will be scheduled.
         if (m_nextTickIntervalInMilliseconds < XINFINITE)
         {
-            // If the render thread's clock has progressed since this tick started, the UI thread is running behind.
-            // Go ahead and queue the next tick immediately to keep the UI thread pipeline as full as possible,
-            // while still throttling to the render thread's execution rate (the refresh rate).
-            if (m_lastTickTimeInSeconds < m_pIClock->GetLastTickTimeInSeconds())
-            {
-                IFC_RETURN(QueueTick());
-            }
-            // Otherwise, ensure the render thread is awake to queue the tick next time it runs.
-            // It will have ignored the UI thread during the 'ticking' state, but will process it now that we're
-            // back in the 'waiting' state.
-            else
+            double lastClockTimeInSeconds = m_pIClock->GetLastTickTimeInSeconds();
+            if (m_lastTickTimeInSeconds < lastClockTimeInSeconds)
             {
-                IFC_RETURN(m_pCompositorScheduler->WakeCompositionThread());
+                TraceLoggingProviderWrite(
+                    GraphicsTelemetry, "Scheduling_ClockAdvancedDuringTick",
+                    TraceLoggingUInt64(reinterpret_cast<uint64_t>(m_pIClock), "ClockPointer"),
+                    TraceLoggingUInt64(static_cast<uint64_t>(lastClockTimeInSeconds * 1000000), "LastClockTimeInMilliseconds"),
+                    TraceLoggingUInt64(static_cast<uint64_t>(m_lastTickTimeInSeconds * 1000000), "LastTickTimeInMilliseconds"),
+                    TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
             }
+
+            // Wake the scheduling thread and have it queue a tick. This ensures we get throttled properly to the frame
+            // rate, if needed.
+            IFC_RETURN(m_pCompositorScheduler->WakeCompositionThread());
         }
 
         // Reset the priority now that the tick is finished.
@@ -281,6 +298,11 @@ UIThreadScheduler::QueueTick()
         }
     }
 
+    TraceLoggingProviderWrite(
+        GraphicsTelemetry, "Scheduling_QueueTick",
+        TraceLoggingBoolean(shouldQueueTick, "WasTickQueued"),
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
     if (shouldQueueTick)
     {
         IFC_RETURN(m_pDispatcher->QueueTick());
diff --git a/src/dxaml/xcp/core/compositor/compositorscheduler.cpp b/src/dxaml/xcp/core/compositor/compositorscheduler.cpp
index e86673f503..0dce9a4eba 100644
--- a/src/dxaml/xcp/core/compositor/compositorscheduler.cpp
+++ b/src/dxaml/xcp/core/compositor/compositorscheduler.cpp
@@ -8,6 +8,9 @@
 #include <WindowsGraphicsDeviceManager.h>
 #include <DependencyLocator.h>
 #include <D3D11Device.h>
+#include "RefreshRateInfo.h"
+#include "Scheduler.h"
+#include "GraphicsTelemetry.h"
 
 XUINT32 g_csPreviousBatchCount = 0;
 XUINT32 g_csMaxBatchCount = 0;
@@ -29,7 +32,6 @@ CompositorScheduler::CompositorScheduler(
     , m_fShutdownThread(FALSE)
     , m_pCompositorWait(NULL)
     , m_pUIThreadSchedulerNoRef(NULL)
-    , m_pRefreshRateInfo(NULL)
     , m_waitingForWork(FALSE)
     , m_renderThreadId(0)
     , m_renderThreadHR(S_OK)
@@ -64,7 +66,6 @@ CompositorScheduler::~CompositorScheduler()
     }
 
     ReleaseInterface(m_pClock);
-    ReleaseInterface(m_pRefreshRateInfo);
 
     delete m_pRenderStateChangedCommand;
     m_pRenderStateChangedCommand = nullptr;
@@ -103,6 +104,8 @@ CompositorScheduler::Initialize()
 {
     IFC_RETURN(RefreshAlignedClock::Create(&m_pClock));
 
+    m_scheduler.Attach(new Scheduler(m_graphicsDeviceManager->GetRefreshRateInfo(), m_pClock));
+
     return S_OK;
 }
 
@@ -197,7 +200,7 @@ CompositorScheduler::WakeCompositionThread()
 void
 CompositorScheduler::RegisterUIThreadScheduler(
     _In_ UIThreadScheduler *pScheduler,
-    _Outptr_ IPALTickableClock **ppIClock
+    _Outptr_ RefreshAlignedClock **ppIClock
     )
 {
     auto guard = m_UIThreadSchedulerLock.lock();
@@ -285,14 +288,19 @@ CompositorScheduler::RenderThreadMain()
     return 0;
 }
 
-//------------------------------------------------------------------------
 //
-//  Synopsis:
-//     The method comprising everything the render thread does in a single frame.
+// Figures out when to wake the UI thread, and wakes it up as appropriate.
 //
-//------------------------------------------------------------------------
-void
-CompositorScheduler::RenderThreadFrame()
+// We have a UIThreadScheduler object that's shared with the UI thread. The UI thread calls RequestAdditionalFrame with
+// a time and a reason whenever it finds we need another frame. This could be from the tree being dirty or a
+// DispatcherTimer elapsing or many other reasons. Internally the UIThreadScheduler keeps track of the next time we need
+// a frame. For example, if a DispatcherTimer elapses in 2 seconds, then the tree is dirtied immediately, then we need a
+// frame immediately.
+//
+// Here we get the next frame time from the UIThreadScheduler. If it's in the future, then we can just wait until then.
+// If it's immediately, then we wake the UI thread while putting a max limit on how many frames we can have per second.
+//
+void CompositorScheduler::RenderThreadFrame()
 {
     HRESULT hr = S_OK;
 
@@ -300,12 +308,7 @@ CompositorScheduler::RenderThreadFrame()
     // but it never runs faster than the refresh rate of the primary display.
     XUINT32 timeToNextWorkInMilliseconds = XINFINITE;
 
-    TraceRenderThreadFrameBegin();
-
     {
-        // Scope the lock to update independent property values.
-        // Both animations and manipulations can be ticked on the UI thread and this thread.
-
         auto lock = m_pDrawListsLock.lock();
 
         TraceCompositorLockBegin();
@@ -313,8 +316,8 @@ CompositorScheduler::RenderThreadFrame()
         // Move the clock forward.
         const XDOUBLE frameTickTime = m_pClock->Tick();
 
-        // Now that the animation clock and DM have been ticked, queue a tick to the UI thread.
-        // It is important that this happens after ticking the clock and DM so that the UI thread sees up-to-date
+        // Now that the animation clock has been ticked, queue a tick to the UI thread.
+        // It is important that this happens after ticking the clock so that the UI thread sees up-to-date
         // values. In virtualization scenarios, if the UI thread sees an "old" value, then it may choose to sleep until
         // the next vsync rather than generating new content.
         {
@@ -325,13 +328,22 @@ CompositorScheduler::RenderThreadFrame()
             if (m_pUIThreadSchedulerNoRef != NULL)
             {
                 const XUINT32 uiThreadRequest = m_pUIThreadSchedulerNoRef->GetScheduledIntervalInMilliseconds(frameTickTime);
+
+                TraceLoggingProviderWrite(
+                    GraphicsTelemetry, "Scheduling_UIThreadRequest",
+                    TraceLoggingUInt32(uiThreadRequest, "TimeInMilliseconds"),
+                    TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
                 if (uiThreadRequest > 0)
                 {
                     // Schedule the future tick.
-                    timeToNextWorkInMilliseconds = MIN(timeToNextWorkInMilliseconds, uiThreadRequest);
+                    timeToNextWorkInMilliseconds = uiThreadRequest;
                 }
                 else
                 {
+                    // Handles throttling to the refresh rate if needed
+                    IFC(m_scheduler->OnImmediateUIThreadFrame());
+
                     // Queue the requested tick now.
                     IFC(m_pUIThreadSchedulerNoRef->QueueTick());
                 }
@@ -349,71 +361,10 @@ CompositorScheduler::RenderThreadFrame()
             }
         }
 
-        if (m_isRenderEnabled && SUCCEEDED(GetRenderThreadHR()))
-        {
-            SuspendFailFastOnStowedException suspender;
-
-            IFC(EnsureRefreshRateInfo());
-        }
-
         TraceCompositorLockEnd();
     } /* DrawListsLock*/
 
-    //
-    // Determine how long to wait for work and/or the next scheduled frame. The next scheduled frame should have come
-    // from the UI thread scheduler.
-    //
-    if (timeToNextWorkInMilliseconds != XINFINITE && m_pRefreshRateInfo != NULL)
-    {
-        XFLOAT refreshInterval = m_pRefreshRateInfo->GetRefreshIntervalInMilliseconds();
-
-        XUINT32 roundedRefreshInterval = XcpCeiling(refreshInterval);
-        // The vBlank interrupt will fire for at least vBlankTimeout times after our last Present (from observation, it's currently ~10).
-        // Sleeping using a timer for any period of time less than this number of vBlanks gains nothing for battery life, since
-        // the interrupt continues to fire anyway.  Also, doing so loses out on predictability of updates since timers don't fire
-        // accurately compared to the hardware interrupt.  So, if the time-to-next-frame is less than 5 vBlanks, continue to
-        // block on vBlanks instead of sleeping on a timer.
-        // Beyond this timeout period, it's better for power consumption to sleep on a timer, which gives the system the
-        // opportunity to go idle, at the cost of some variability in when the thread wakes up.  We'll always wait for
-        // vBlank at least one time, though to ensure we don't tick more frequently than the refresh rate in on-demand mode.
-        // TODO: TICK: Variability in timer wake-up could be reduced by waking up earlier by the timer resolution error, and then using vBlank(s) again for the remaining time.
-        // TODO: TICK: Should switch to using a coalescable timer (SetWaitableTimerEx)
-        const XUINT32 vBlankTimeout = 5;
-
-        if (timeToNextWorkInMilliseconds <= vBlankTimeout * roundedRefreshInterval)
-        {
-            timeToNextWorkInMilliseconds = 0;
-        }
-        else
-        {
-            ASSERT(timeToNextWorkInMilliseconds > roundedRefreshInterval);
-
-            // We're going to wait for vBlank and then a timer.
-            // Reduce the timer interval by the max wait time (the refresh interval) to make sure we don't wake up too late.
-            timeToNextWorkInMilliseconds -= roundedRefreshInterval;
-        }
-    }
-
-    TraceRenderThreadLogTimeToNextWorkInfo(timeToNextWorkInMilliseconds);
-
-    TraceRenderThreadFrameEnd();
-
-    //
-    // If we're scheduled immediately but we shouldn't produce another frame immediately,
-    // wait for the next display refresh before proceeding.  Generally, there's no reason to
-    // tick or render faster than the screen can display the results.
-    //
-    if (m_pRefreshRateInfo != NULL)
-    {
-        IFC(m_pRefreshRateInfo->WaitForRefreshInterval());
-    }
-    else
-    {
-        // We skip waiting for the vblank if there are no device resources available yet. We go idle and
-        // wait for the UI thread to take action instead (by initializing resources). This only typically
-        // happens during start-up.
-        timeToNextWorkInMilliseconds = XINFINITE;
-    }
+    ASSERT(timeToNextWorkInMilliseconds > 0);
 
 Cleanup:
     // All render thread failures are treated as recoverable by notifying the UI thread.
@@ -446,10 +397,11 @@ CompositorScheduler::RenderThreadFrame()
             );
     }
 
-    if (timeToNextWorkInMilliseconds > 0)
-    {
-        TraceRenderThreadWaitForWorkBegin();
-    }
+    TraceLoggingProviderWrite(
+        GraphicsTelemetry, "Scheduling_RenderThreadWaitForWork",
+        TraceLoggingUInt32(1, "IsStart"),
+        TraceLoggingUInt32(timeToNextWorkInMilliseconds, "TimeInMilliseconds"),
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
 
     // If the call to WaitForObjects has no timeout
     // then the render thread is only going to wake up
@@ -457,10 +409,7 @@ CompositorScheduler::RenderThreadFrame()
     // Save this state so the UI thread can query it
     if (timeToNextWorkInMilliseconds == XINFINITE)
     {
-        InterlockedExchange(
-            &m_waitingForWork,
-            TRUE
-            );
+        InterlockedExchange(&m_waitingForWork, TRUE);
     }
 
     // If we weren't scheduled immediately, this will let the render thread go idle until the scheduled time,
@@ -473,57 +422,17 @@ CompositorScheduler::RenderThreadFrame()
         timeToNextWorkInMilliseconds
         ));
 
-    // Restore the m_waitingForWork state back to it's original value
+    // Restore the m_waitingForWork state back to its original value
     if (timeToNextWorkInMilliseconds == XINFINITE)
     {
-        InterlockedExchange(
-            &m_waitingForWork,
-            FALSE
-            );
-    }
-
-    if (timeToNextWorkInMilliseconds > 0)
-    {
-        TraceRenderThreadWaitForWorkEnd();
-    }
-}
-
-//------------------------------------------------------------------------
-//
-//  Synopsis:
-//      Ensures that a refresh rate info object exists. Re-creates the
-//      object if it's no longer valid.
-//
-//------------------------------------------------------------------------
-_Check_return_ HRESULT CompositorScheduler::EnsureRefreshRateInfo()
-{
-    const auto& device = m_graphicsDeviceManager->GetGraphicsDevice();
-
-    // If the IDXGIOutput inside the refresh rate info is no longer valid, then release it and create a new one.
-    if (m_pRefreshRateInfo != NULL && !m_pRefreshRateInfo->IsValid())
-    {
-        ReleaseInterface(m_pRefreshRateInfo);
-        m_pClock->SetRefreshRateInfo(NULL);
-    }
-
-    // Get the object for querying for the refresh rate and waiting for vblank.
-    //
-    // It's possible that either the graphics device or the refresh-rate info it returns are NULL, but only for
-    // the period before device resources have been fully initialized.
-    //
-    // Whenever the UI thread submits a frame these objects will be available again because the UI thread blocks
-    // waiting for them to exist. It's not a good idea for the render thread to block on resource initialization for two
-    // reasons - first, it's not necessary, and second, the render thread is higher priority than the UI thread, and
-    // blocking causes the resource initialization background thread also to increase in priority and c-switch out the
-    // UI thread during start-up.
-    if (m_pRefreshRateInfo == NULL
-        && device != nullptr)
-    {
-        IFC_RETURN(device->GetRefreshRateInfo(&m_pRefreshRateInfo));
-        m_pClock->SetRefreshRateInfo(m_pRefreshRateInfo);
+        InterlockedExchange(&m_waitingForWork, FALSE);
     }
 
-    return S_OK;
+    TraceLoggingProviderWrite(
+        GraphicsTelemetry, "Scheduling_RenderThreadWaitForWork",
+        TraceLoggingUInt32(0, "IsStart"),
+        TraceLoggingUInt32(timeToNextWorkInMilliseconds, "TimeInMilliseconds"),
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
 }
 
 //------------------------------------------------------------------------
diff --git a/src/dxaml/xcp/core/compositor/compositorscheduler.h b/src/dxaml/xcp/core/compositor/compositorscheduler.h
index 5a0f1c01d0..716992ea14 100644
--- a/src/dxaml/xcp/core/compositor/compositorscheduler.h
+++ b/src/dxaml/xcp/core/compositor/compositorscheduler.h
@@ -5,10 +5,12 @@ struct IXcpDispatcher;
 class UIThreadScheduler;
 class RefreshAlignedClock;
 struct ISchedulerCommand;
+class RefreshRateInfo;
 
 #pragma once
 
 class WindowsGraphicsDeviceManager;
+#include "Scheduler.h"
 
 class CompositorScheduler
     final : public CXcpObjectBase<IObject>
@@ -36,7 +38,7 @@ class CompositorScheduler
 
     void RegisterUIThreadScheduler(
         _In_ UIThreadScheduler *pScheduler,
-        _Outptr_ IPALTickableClock **ppIClock
+        _Outptr_ RefreshAlignedClock **ppIClock
         );
 
     void UnregisterUIThreadScheduler(
@@ -76,9 +78,8 @@ class CompositorScheduler
 
     void RenderThreadFrame();
 
-    _Check_return_ HRESULT EnsureRefreshRateInfo();
-
 private:
+    wrl::ComPtr<Scheduler> m_scheduler;
     RefreshAlignedClock *m_pClock;
 
     _Notnull_ xref_ptr<WindowsGraphicsDeviceManager> m_graphicsDeviceManager;
@@ -99,8 +100,6 @@ class CompositorScheduler
 
     UIThreadScheduler *m_pUIThreadSchedulerNoRef;
 
-    IPALRefreshRateInfo *m_pRefreshRateInfo;
-
     LONG m_waitingForWork;
 
     DWORD m_renderThreadId;
diff --git a/src/dxaml/xcp/core/compositor/windowrendertarget.h b/src/dxaml/xcp/core/compositor/windowrendertarget.h
index 4b4e592914..42f19cd99e 100644
--- a/src/dxaml/xcp/core/compositor/windowrendertarget.h
+++ b/src/dxaml/xcp/core/compositor/windowrendertarget.h
@@ -103,7 +103,7 @@ class CWindowRenderTarget final
     xref_ptr<WindowsPresentTarget> m_presentTarget;
 
     _Notnull_ HWWalk *m_pHwWalk;
-    _Maybenull_ CompositorTreeHost *m_pCompositorTreeHost;
+    _Maybenull_ CompositorTreeHost *m_pCompositorTreeHost{};
 
     bool m_isPrimaryWindowTarget : 1;
     // TODO: these need to be tracked per-compositor now that the render target can have many.
diff --git a/src/dxaml/xcp/core/core/elements/DragEventArgs.cpp b/src/dxaml/xcp/core/core/elements/DragEventArgs.cpp
index 04c9100d95..a4b98954ec 100644
--- a/src/dxaml/xcp/core/core/elements/DragEventArgs.cpp
+++ b/src/dxaml/xcp/core/core/elements/DragEventArgs.cpp
@@ -6,11 +6,6 @@
 #include "Activators.g.h"
 
 #include <WRLHelper.h>
-#include <FrameworkUdk/Containment.h>
-
-// Bug 49668748: [1.5 Servicing] After dragging an FE Home item, all item drops on breadcrumbs don't support Move after first drag
-#define LOCAL_WINAPPSDK_CHANGEID_49668748 49668748
-
 
 // Initialize the DragEventArgs with any framework specific context.
 _Check_return_ HRESULT CDragEventArgs::Create(_In_ CCoreServices* pCore, _Outptr_ CDragEventArgs** ppArgs, _In_opt_ IInspectable* pWinRtDragInfo, _In_opt_ IInspectable* pDragDropAsyncOperation)
@@ -24,16 +19,14 @@ _Check_return_ HRESULT CDragEventArgs::Create(_In_ CCoreServices* pCore, _Outptr
     if(pWinRtDragInfo)
     {
         IFC_RETURN(spArgs->m_spWinRtDragInfo.reset(pWinRtDragInfo));
-        if (WinAppSdk::Containment::IsChangeEnabled<LOCAL_WINAPPSDK_CHANGEID_49668748>())
+        wrl::ComPtr<mui::DragDrop::IDragInfo> dragInfo;
+        if (SUCCEEDED(pWinRtDragInfo->QueryInterface(IID_PPV_ARGS(&dragInfo))))
         {
-            wrl::ComPtr<mui::DragDrop::IDragInfo> dragInfo;
-            if (SUCCEEDED(pWinRtDragInfo->QueryInterface(IID_PPV_ARGS(&dragInfo))))
-            {
-                wadt::DataPackageOperation allowedOperations;
-                IFC_RETURN(dragInfo->get_AllowedOperations(&allowedOperations));
-                IFC_RETURN(spArgs->put_AllowedOperations(static_cast<DirectUI::DataPackageOperation>(allowedOperations)));
-            }
+            wadt::DataPackageOperation allowedOperations;
+            IFC_RETURN(dragInfo->get_AllowedOperations(&allowedOperations));
+            IFC_RETURN(spArgs->put_AllowedOperations(static_cast<DirectUI::DataPackageOperation>(allowedOperations)));
         }
+
     }
 
     if(pDragDropAsyncOperation)
diff --git a/src/dxaml/xcp/core/core/elements/HitTestHelper.cpp b/src/dxaml/xcp/core/core/elements/HitTestHelper.cpp
index 2823466800..daa9350110 100644
--- a/src/dxaml/xcp/core/core/elements/HitTestHelper.cpp
+++ b/src/dxaml/xcp/core/core/elements/HitTestHelper.cpp
@@ -15,16 +15,8 @@ HitTestHelper::HitTestHelper(
     )
     : m_tolerance(tolerance)
     , m_encounteredNaN(FALSE)
+    , m_transform(pTransform ? *pTransform : CMILMatrix(true /*initialize*/))
 {
-    if (pTransform != NULL)
-    {
-        m_transform = *pTransform;
-    }
-    else
-    {
-        m_transform.SetToIdentity();
-    }
-
     m_currentPoint.x = 0;
     m_currentPoint.y = 0;
 }
diff --git a/src/dxaml/xcp/core/core/elements/ListViewBaseItemChrome.cpp b/src/dxaml/xcp/core/core/elements/ListViewBaseItemChrome.cpp
index 31da6ae5e2..b0b29bcdf6 100644
--- a/src/dxaml/xcp/core/core/elements/ListViewBaseItemChrome.cpp
+++ b/src/dxaml/xcp/core/core/elements/ListViewBaseItemChrome.cpp
@@ -2851,7 +2851,19 @@ _Check_return_ HRESULT CListViewBaseItemChrome::GoToChromedStateNewStyle(
             else if (m_selectionIndicatorRectangle && showSelectionIndicator && oldPressed != pressed)
             {
                 float currentHeight = m_selectionIndicatorRectangle->GetActualHeight();
-                fromScale = pressed ? currentHeight / (currentHeight - s_selectionIndicatorHeightShrinkage) : (currentHeight + s_selectionIndicatorHeightShrinkage) / currentHeight;
+
+                if (pressed && currentHeight <= s_selectionIndicatorHeightShrinkage)
+                {
+                    // s_selectionIndicatorHeightShrinkage equals 6.  currentHeight may be the rounded down value of s_selectionIndicatorHeightShrinkage + 1,
+                    // but it is not expected to be smaller than or equal to s_selectionIndicatorHeightShrinkage.
+                    ASSERT(false);
+                    fromScale = 1.0f;
+                }
+                else
+                {
+                    fromScale = pressed ? currentHeight / (currentHeight - s_selectionIndicatorHeightShrinkage)
+                                        : currentHeight / (currentHeight + s_selectionIndicatorHeightShrinkage);
+                }
 
                 // Trigger animation to shrink/expand the selection indicator.
                 animationCommand.reset(new ListViewBaseItemAnimationCommand_SelectionIndicatorVisibility(
diff --git a/src/dxaml/xcp/core/core/elements/Popup.cpp b/src/dxaml/xcp/core/core/elements/Popup.cpp
index d2bc0cd9d3..5197fdf9b4 100644
--- a/src/dxaml/xcp/core/core/elements/Popup.cpp
+++ b/src/dxaml/xcp/core/core/elements/Popup.cpp
@@ -43,11 +43,7 @@
 #include "WinRTExpressionConversionContext.h"
 #include "VisualDebugTags.h"
 #include "xcpwindow.h"
-#include <FrameworkUdk/Containment.h>
-
-// Bug 49613456: [1.5 servicing] [GitHub] AutoSuggestBox, ComboBox, (probably others) no longer transform their popups correctly in WindowsAppSDK 1.4
-#define WINAPPSDK_CHANGEID_49613456 49613456
-
+#include <Microsoft.UI.Content.Private.h>
 
 using namespace DirectUI;
 using namespace Focus;
@@ -95,8 +91,6 @@ CPopup::CPopup(_In_ CCoreServices *pCore)
     , m_isClosing(FALSE)
     , m_isUnloading(FALSE)
     , m_isImplicitClose(FALSE)
-    , m_skippedCreatingPopupHwnd(FALSE)
-    , m_registeredWindowPositionChangedHandler(FALSE)
 {
     m_requiresReleaseOverride = true;
 }
@@ -123,6 +117,7 @@ CPopup::~CPopup()
 
     if (m_spUIAWindow)
     {
+        m_spUIAWindow->UIADisconnectAllProviders();
         m_spUIAWindow->Deinit();
     }
 
@@ -468,7 +463,15 @@ _Check_return_ HRESULT CPopup::Open()
         // DManip, and the IslandInputSite comes from the popup window bridge's ContentIsland.
         if (IsWindowed())
         {
-            IFC_RETURN(EnsureWindowForWindowedPopup());
+            bool windowCreated = false;
+            IFC_RETURN(EnsureWindowForWindowedPopup(&windowCreated));
+
+            // If the window was not created, early-out.
+            if (!windowCreated)
+            {
+                return S_OK;
+            }
+
             IFC_RETURN(EnsureDCompResourcesForWindowedPopup());
         }
 
@@ -963,7 +966,7 @@ _Check_return_ HRESULT CPopup::SetIsWindowedIfNeeded()
     if (!value.AsBool() || IsWindowed())
     {
         // Before making the popup windowed, run a set of tests that determine if we can correctly compute
-        // the bounds for the popup's HWND.  If these requirements aren't met, don't actually make it windowed.
+        // the bounds for the popup's island.  If these requirements aren't met, don't actually make it windowed.
         // Note that these requirements are re-evaluated every time the popup is opened, so it's possible for
         // the popup to toggle between windowed/non-windowed due to these requirements.  However it's not possible
         // for an app to toggle the popup between windowed/non-windowed via the ShouldConstrainToRootBounds property
@@ -994,16 +997,6 @@ _Check_return_ HRESULT CPopup::SetIsWindowed()
     // fall back to non-windowed placement.
     if (DoesPlatformSupportWindowedPopup(pCore))
     {
-        // Call DXaml peer to hook up window position handlers for light dismiss behavior
-        if (pCore)
-        {
-            if (!m_registeredWindowPositionChangedHandler)
-            {
-                IFC_RETURN(FxCallbacks::Popup_HookupWindowPositionChangedHandler(this));
-                m_registeredWindowPositionChangedHandler = TRUE;
-            }
-        }
-
         m_isWindowed = true;
     }
 
@@ -1031,129 +1024,116 @@ bool CPopup::HasPointerCapture() const
 }
 
 // Create windowed popup's window, if it doesn't exit
-_Check_return_ HRESULT CPopup::EnsureWindowForWindowedPopup()
+_Check_return_ HRESULT CPopup::EnsureWindowForWindowedPopup(_Out_ bool* windowCreated)
 {
+    *windowCreated = false;
+
     auto core = GetContext();
 
     ASSERT(IsWindowed());
 
-    if (core->GetHostSite()->IsWindowDestroyed())
+    //
+    // It's possible this windowed popup has moved between islands since it last closed. Xaml uses a shared context
+    // menu for all TextBoxes, for example, so we need to check that this windowed popup is still anchored to the same
+    // island. If not, release all the window-related resources and re-create them.
+    //
+    CXamlIslandRoot* island = GetAssociatedXamlIslandNoRef();
+
+    UINT64 currentXamlIslandId;
+    IFC_RETURN(island->GetContentIsland()->get_Id(&currentXamlIslandId));
+
+    if (m_previousXamlIslandId != currentXamlIslandId)
     {
-        // Xaml is shutting down. Trying to create a child hwnd of the destroyed Xaml hwnd will hit an error. Just no-op.
-        m_skippedCreatingPopupHwnd = true;
+        // The PopupWindowSiteBridge needs to be explicitly IClosable::Close()ed, otherwise it will leak. This is because
+        // the bridge's underlying hwnd has a ref count on it, and until we destroy that hwnd (via IClosable::Close)) the
+        // bridge will always be kept alive.
+        // Bug 43723959 - Remove this once the underlying problem is fixed
+        EnsureBridgeClosed();
+
+        m_contentIsland.Reset();
+        m_inputSiteAdapter.reset();
+        m_popupWindowBridge.Reset();
+        m_desktopBridge.Reset();
+        m_windowedPopupWindow = NULL;
+
+        m_previousXamlIslandId = currentXamlIslandId;
     }
-    else
+
+    if (!m_popupWindowBridge)
     {
-        //
-        // It's possible this windowed popup has moved between islands since it last closed. Xaml uses a shared context
-        // menu for all TextBoxes, for example, so we need to check that this windowed popup is still anchored to the same
-        // island. If not, release all the window-related resources and re-create them.
-        //
-        CXamlIslandRoot* island = GetAssociatedXamlIslandNoRef();
+        // PopupSiteBridges can't be created from CoreWindowSiteBridge, only from DesktopChildSiteBridge. That means
+        // windowed popups aren't supported for UWPs (see DoesPlatformSupportWindowedPopup). The lack of support comes
+        // from lack of features for top-level window moving, monitor tracking, and light dismiss behavior in UWPs.
+        ASSERT(island != nullptr);
 
-        UINT64 currentXamlIslandId;
-        IFC_RETURN(island->GetContentIsland()->get_Id(&currentXamlIslandId));
+        wrl::ComPtr<ixp::IDesktopChildSiteBridge> desktopChildSiteBridge { island->GetDesktopContentBridgeNoRef() };
+        wrl::ComPtr<ixp::IDesktopSiteBridge2> contentSiteBridge;
 
-        if (m_previousXamlIslandId != currentXamlIslandId)
+        if (desktopChildSiteBridge)
         {
-            // The PopupWindowSiteBridge needs to be explicitly IClosable::Close()ed, otherwise it will leak. This is because
-            // the bridge's underlying hwnd has a ref count on it, and until we destroy that hwnd (via IClosable::Close)) the
-            // bridge will always be kept alive.
-            // Bug 43723959 - Remove this once the underlying problem is fixed
-            EnsureBridgeClosed();
-
-            m_contentIsland.Reset();
-            m_inputSiteAdapter.reset();
-            m_popupWindowBridge.Reset();
-            m_desktopBridge.Reset();
-            m_windowedPopupWindow = NULL;
-
-            m_previousXamlIslandId = currentXamlIslandId;
+            IFCFAILFAST(desktopChildSiteBridge.As(&contentSiteBridge));
         }
-
-        if (!m_popupWindowBridge)
+        else
         {
-            // PopupSiteBridges can't be created from CoreWindowSiteBridge, only from DesktopChildSiteBridge. That means
-            // windowed popups aren't supported for UWPs (see DoesPlatformSupportWindowedPopup). The lack of support comes
-            // from lack of features for top-level window moving, monitor tracking, and light dismiss behavior in UWPs.
-            ASSERT(island != nullptr);
-
-            wrl::ComPtr<ixp::IDesktopChildSiteBridge> desktopChildSiteBridge { island->GetDesktopContentBridgeNoRef() };
-            wrl::ComPtr<ixp::IDesktopSiteBridge2> contentSiteBridge;
-            IFCFAILFAST(desktopChildSiteBridge.As(&contentSiteBridge));
-            IFC_RETURN(contentSiteBridge->TryCreatePopupSiteBridge(m_popupWindowBridge.ReleaseAndGetAddressOf()));
-
-            // Retrieve and cache the windowed popup hwnd.
-            ABI::Microsoft::UI::WindowId windowId;
-            IFCFAILFAST(m_popupWindowBridge.As(&m_desktopBridge));
-            IFC_RETURN(m_desktopBridge->get_WindowId(&windowId));
-            IFC_RETURN(Windowing_GetWindowFromWindowId(windowId, &m_windowedPopupWindow));
-
-            // Ensure that the window text is correct for UIA.
-            xstring_ptr strPopupHostUIAName;
-            IFC_RETURN(core->GetBrowserHost()->GetLocalizedResourceString(UIA_WINDOWED_POPUP_HOST, &strPopupHostUIAName));
-            if (!SetWindowText(m_windowedPopupWindow, strPopupHostUIAName.GetBuffer()))
-            {
-                IFC_RETURN(HResultFromKnownLastError());
-            }
+            // https://task.ms/48749483
+            // This is a temporary workaround to support windowed popups in a XamlIsland. See the
+            // definition of GetDesktopSiteBridge for more information.
+            auto desktopSiteBridge = GetDesktopSiteBridge();
+            IFCFAILFAST(desktopSiteBridge.As(&contentSiteBridge));
+        }
 
-            {
-                wrl::ComPtr<mu::IClosableNotifier> closableNotifier;
-                IFCFAILFAST(m_popupWindowBridge.As(&closableNotifier));
+        wrl::ComPtr<mu::IClosableNotifier> contentSiteBridgeAsClosable;
+        IFCFAILFAST(contentSiteBridge.As(&contentSiteBridgeAsClosable));
 
-                // It's safe to capture "this" here becasue we ensure the event is unsubscribed in CPopup's dtor.
-                auto frameworkClosedCallback = [this]() -> HRESULT
-                {
-                    // http://task.ms/45244384 Simplify the shutdown process of DesktopWindowXamlSource and Popups...
-                    // TODO: When the bridge unexpectedly closes we should probably do more cleanup, but this event subscription
-                    // was added late in 1.4 and we wanted to reduce risk of regression.
-                    this->m_bridgeClosed = true;
-                    return S_OK;
-                };
-
-                IFCFAILFAST(closableNotifier->add_FrameworkClosed(
-                    WRLHelper::MakeAgileCallback<mu::IClosableNotifierHandler>(frameworkClosedCallback).Get(),
-                    &m_bridgeClosedToken));
-
-                // We just successfully set up a new bridge along with the event handler to inform us when it is Closed.
-                // Reset our flag tracking if the bridge is closed to false.
-                m_bridgeClosed = false;
-            }
+        BOOLEAN isClosed;
+        IFC_RETURN(contentSiteBridgeAsClosable->get_IsClosed(&isClosed));
 
+        if (isClosed)
+        {
+            return S_OK;
         }
-    }
 
-    return S_OK;
-}
+        IFC_RETURN(contentSiteBridge->TryCreatePopupSiteBridge(m_popupWindowBridge.ReleaseAndGetAddressOf()));
 
-_Check_return_ HRESULT CPopup::GetScreenOffsetFromOwner(_Out_ XPOINTF_COORDS* offset)
-{
-    ABI::Microsoft::UI::WindowId windowId;
-    IFCFAILFAST(m_desktopBridge->get_WindowId(&windowId));
+        // Retrieve and cache the windowed popup hwnd.
+        ABI::Microsoft::UI::WindowId windowId;
+        IFCFAILFAST(m_popupWindowBridge.As(&m_desktopBridge));
+        IFC_RETURN(m_desktopBridge->get_WindowId(&windowId));
+        IFC_RETURN(Windowing_GetWindowFromWindowId(windowId, &m_windowedPopupWindow));
 
-    HWND popupHwnd;
-    Windowing_GetWindowFromWindowId(windowId, &popupHwnd);
+        // Ensure that the window text is correct for UIA.
+        xstring_ptr strPopupHostUIAName;
+        IFC_RETURN(core->GetBrowserHost()->GetLocalizedResourceString(UIA_WINDOWED_POPUP_HOST, &strPopupHostUIAName));
+        if (!SetWindowText(m_windowedPopupWindow, strPopupHostUIAName.GetBuffer()))
+        {
+            IFC_RETURN(HResultFromKnownLastError());
+        }
 
-    POINT origin = {0, 0};
-    ::ClientToScreen(popupHwnd, &origin);
+        {
+            wrl::ComPtr<mu::IClosableNotifier> closableNotifier;
+            IFCFAILFAST(m_popupWindowBridge.As(&closableNotifier));
 
-    // Get the popup owner hwnd so that we can get the windowed popup offsets in relation to
-    // its owner which we assume has the same origin as the main window.
-    // Note: Currently this does not work for getting the correct window when running as uap.
-    HWND popupOwnerHwnd = ::GetWindow(popupHwnd, GW_OWNER);
-    if (!popupOwnerHwnd)
-    {
-        IFCW32_RETURN(FALSE);
-    }
+            // It's safe to capture "this" here becasue we ensure the event is unsubscribed in CPopup's dtor.
+            auto frameworkClosedCallback = [this]() -> HRESULT
+            {
+                // http://task.ms/45244384 Simplify the shutdown process of DesktopWindowXamlSource and Popups...
+                // TODO: When the bridge unexpectedly closes we should probably do more cleanup, but this event subscription
+                // was added late in 1.4 and we wanted to reduce risk of regression.
+                this->m_bridgeClosed = true;
+                return S_OK;
+            };
 
-    POINT ownerOrigin = {0, 0};
-    ::ClientToScreen(popupOwnerHwnd, &ownerOrigin);
+            IFCFAILFAST(closableNotifier->add_FrameworkClosed(
+                WRLHelper::MakeAgileCallback<mu::IClosableNotifierHandler>(frameworkClosedCallback).Get(),
+                &m_bridgeClosedToken));
 
-    // ::ClientToScreen doesn't account for the display scale. That's on the popup bridge.
-    offset->isPhysicalPixels = true;
-    offset->x = static_cast<float>(origin.x - ownerOrigin.x);
-    offset->y = static_cast<float>(origin.y - ownerOrigin.y);
+            // We just successfully set up a new bridge along with the event handler to inform us when it is Closed.
+            // Reset our flag tracking if the bridge is closed to false.
+            m_bridgeClosed = false;
+        }
+    }
 
+    *windowCreated = true;
     return S_OK;
 }
 
@@ -1171,6 +1151,31 @@ wrl::ComPtr<ixp::IIslandInputSitePartner> CPopup::GetIslandInputSite() const
     return const_cast<CPopup*>(this)->GetElementIslandInputSite();
 }
 
+wrl::ComPtr<ixp::IDesktopSiteBridge> CPopup::GetDesktopSiteBridge()
+{
+    // https://task.ms/48749483
+    // TODO: Remove once XAML creates Windowed popups without a DesktopSiteBridge. This is a
+    // temporary workaround since we need a DesktopSiteBridge to create windowed popups.
+    // XamlIslands do not have access to a bridge, and may not be hosted in a DesktopSiteBridge
+    // at all, but to unblock the scenario we need a way to create popups. This method
+    // should not be used except to create windowed popups, and once we have another way to
+    // create them this should be removed.
+
+    wrl::ComPtr<ixp::IDesktopSiteBridge> desktopSiteBridge;
+
+    if (auto xamlIsland = GetAssociatedXamlIslandNoRef())
+    {
+        wrl::ComPtr<ixp::IContentIslandPartner> contentIslandPartner;
+        wrl::ComPtr<ixp::IContentIsland> contentIsland = xamlIsland->GetContentIsland();
+
+        IFCFAILFAST(contentIsland.As(&contentIslandPartner));
+
+        IFCFAILFAST(contentIslandPartner->get_TEMP_DesktopSiteBridge(&desktopSiteBridge));
+    }
+
+    return desktopSiteBridge;
+}
+
 // Ensure that DComp resources are created for windowed popup
 _Check_return_ HRESULT CPopup::EnsureDCompResourcesForWindowedPopup()
 {
@@ -1316,7 +1321,8 @@ void CPopup::ReleaseDCompResourcesForWindowedPopup()
     // the SystemBackdrop is removed in the meantime, we'll clear out the link then.
 
     // Note: We don't close or reset the bridge here. ScrollViewers in the popup subtree have already cached the popup
-    // bridge's hwnd for DManip. We don't currently have a code path for those elements to reset the hwnd and pick up a new one.
+    // bridge's input hwnd for DManip. We don't currently have a code path for those elements to reset the input hwnd
+    // and pick up a new one.
 }
 
 // Show windowed popup's window
@@ -1384,7 +1390,7 @@ bool CPopup::ReplayPointerUpdate()
 _Check_return_ HRESULT CPopup::PositionAndSizeWindowForWindowedPopup()
 {
     // Ignore if not windowed
-    if (!m_windowedPopupWindow)
+    if (!m_desktopBridge)
     {
         return S_OK;
     }
@@ -1410,22 +1416,9 @@ _Check_return_ HRESULT CPopup::PositionAndSizeWindowForWindowedPopup()
     // Find the offset to the root in physical pixels.  This is either XAML's main CoreWindow,
     // or the associated XamlIslandRoot.
     POINT rootOffsetPhysical = {};
-    if (CXamlIslandRoot* island = GetAssociatedXamlIslandNoRef())
-    {
-        // If this popup is attached to a XamlIslandRoot, get the screen offset from the XamlIslandRoot,
-        // it knows its own screen offset.
-        rootOffsetPhysical = island->GetScreenOffset();
-    }
-    else
-    {
-        XamlOneCoreTransforms::FailFastIfEnabled(); // Due to ClientToScreen.  12768041 tracks using island-based windowed popups in XamlOneCoreTransforms mode
-
-        // Get the bounds of the CoreWindow
-        const HWND hwndJupiter = static_cast<HWND>(GetContext()->GetHostSite()->GetXcpControlWindow());
-
-        rootOffsetPhysical = { 0, 0 };
-        ::ClientToScreen(hwndJupiter, &rootOffsetPhysical);
-    }
+    CXamlIslandRoot* island = GetAssociatedXamlIslandNoRef();
+    ASSERT(island);
+    rootOffsetPhysical = island->GetScreenOffset();
 
     // Compute Popup window's position
     int popupWindowLeft = 0;
@@ -1488,11 +1481,11 @@ _Check_return_ HRESULT CPopup::PositionAndSizeWindowForWindowedPopup()
     //  </root>
     //
     // Popup p's child c should render with the transform a-b-p-c. This is also the offset that should be applied to the
-    // popup's hwnd. Xaml rendering code will automatically produce a comp node (and a Composition Visual) for the popup
+    // popup's bridge. Xaml rendering code will automatically produce a comp node (and a Composition Visual) for the popup
     // element, with its transform p already set, and a visual for the popup content with its transform c set on it.
-    // If we just put these visuals inside the hwnd, we'll end up with the transform (a-b-p-c)-p-c. This double counts
-    // two transforms and produces the wrong result. So we apply an undo transform under the hwnd to make sure the net
-    // offset is what we want. We'll have
+    // If we just put these visuals inside the island (which is inside the bridge), we'll end up with the transform
+    // (a-b-p-c)-p-c. This double counts two transforms and produces the wrong result. So we apply an undo transform
+    // under the island to make sure the net offset is what we want. We'll have
     //
     //  (a-b-p-c)-(c'-p')-(p)-(c) = a-b-p-c
     //   ^         ^       ^   ^
@@ -1502,12 +1495,12 @@ _Check_return_ HRESULT CPopup::PositionAndSizeWindowForWindowedPopup()
     //   |         |
     //   |         +- undo transform on the hidden root visual
     //   |
-    //   +- applied by the hwnd
+    //   +- applied by the bridge
     //
     //      where c' and p' are inverse transforms of c and p
     //
     // Note that this is just the offset. In addition we can potentially inherit a scale from the popup's ancestors as
-    // well. This scale can't be baked into the hwnd, so we have to apply it in the subtree under the hwnd. It should be
+    // well. This scale can't be baked into the bridge, so we have to apply it in the subtree under the island. It should be
     // applied at the m_contentIslandRootVisual, where it covers any potential shadows, backdrops, and animations (see
     // the banner comment on EnsureWindowedPopupRootVisualTree for the full visual tree). In terms of the transform
     // chain, it should take the place of (a-b-p-c). Under it should be the undo transform, and under that should be the
@@ -1525,7 +1518,7 @@ _Check_return_ HRESULT CPopup::PositionAndSizeWindowForWindowedPopup()
         // the popup cannot be windowed via the checks done in MeetsRenderingRequirementsForWindowedPopup(), but we will respect
         // the 2D portions of any 3D transforms that are present (Translation.X and Translation.Y).
         //
-        // Note that the undo transform does not always correspond to the hwnd's position. Consider a scenario there's an
+        // Note that the undo transform does not always correspond to the bridge's position. Consider a scenario there's an
         // RTL popup inside an LTR parent. The popup's child lines up with the popup:
         //
         //  o-------------------------------------+
@@ -1542,15 +1535,15 @@ _Check_return_ HRESULT CPopup::PositionAndSizeWindowForWindowedPopup()
         //
         //      "o" is the origin of each element.
         //
-        // Here, the RTL popup has its origin at the top-right corner, but the hwnd that we create for it is positioned by
-        // its top-left corner. So even though the transform from the popup to its parent is 65px, we position the hwnd at
+        // Here, the RTL popup has its origin at the top-right corner, but the bridge that we create for it is positioned by
+        // its top-left corner. So even though the transform from the popup to its parent is 65px, we position the bridge at
         // 15. We do this using GetPhysicalBounds to transform an entire rect up the tree, then taking its top-left corner.
         //
         // Meanwhile, the popup child's undo transform must have -65, because that's transform applied by the popup's comp
-        // node. Here the undo transform doesn't match the hwnd position.
+        // node. Here the undo transform doesn't match the bridge position.
         //
         // Here, we also put an in-place flip (scaleX = -1, dX = 50) on m_contentIslandRootVisual to make its content
-        // render RTL inside the LTR hwnd (see further below as we're computing the transform for m_contentIslandRootVisual).
+        // render RTL inside the LTR island (see further below as we're computing the transform for m_contentIslandRootVisual).
         //
 
         // First transform [0,0] up from Popup.Child to Popup
@@ -1585,21 +1578,14 @@ _Check_return_ HRESULT CPopup::PositionAndSizeWindowForWindowedPopup()
     {
         // Set any scale inherited from the ancestor chain
         CMILMatrix rootTransform(true);
-        if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_49613456>())
-        {
-            rootTransform.SetM11(scaleX);
-            rootTransform.SetM22(scaleY);
-
-            // Set premultiplied "undo" transform on the window's root visual
-            CMILMatrix undo(true);
-            undo.SetDx(undoX);
-            undo.SetDy(undoY);
-            rootTransform.Prepend(undo);
-        }
-        else
-        {
-            rootTransform.AppendTranslation(undoX, undoY);
-        }
+        rootTransform.SetM11(scaleX);
+        rootTransform.SetM22(scaleY);
+
+        // Set premultiplied "undo" transform on the window's root visual
+        CMILMatrix undo(true);
+        undo.SetDx(undoX);
+        undo.SetDy(undoY);
+        rootTransform.Prepend(undo);
 
         if (isParentedPopup && IsRightToLeft())
         {
@@ -1857,9 +1843,9 @@ _Check_return_ HRESULT CPopup::GetPhysicalBounds(_In_ CUIElement* element, _Out_
 
     if (useActualBounds)
     {
-        // With the "UseActualBounds" policy we compute the bounds of the HWND according to the following:
-        // 1) The size of the HWND is based on Popup.Child's ActualWidth/Height
-        // 2) The position of the HWND is based on the position of Popup.
+        // With the "UseActualBounds" policy we compute the bounds of the bridge according to the following:
+        // 1) The size of the bridge is based on Popup.Child's ActualWidth/Height
+        // 2) The position of the bridge is based on the position of Popup.
         // We hope that for 19H1 this can be the policy we ship with.  However the policy is currently turned off by default
         // as multiple controls need to change to work correctly with the policy.
         xref_ptr<CGeneralTransform> transform;
@@ -1867,16 +1853,13 @@ _Check_return_ HRESULT CPopup::GetPhysicalBounds(_In_ CUIElement* element, _Out_
         IFC_RETURN(transform->TransformRect({ left, top, elementForBounds->GetActualWidth(), elementForBounds->GetActualHeight() }, physicalBounds));
         DipsToPhysicalPixelsRect(physicalBounds);
 
-        if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_49613456>())
-        {
-            IFC_RETURN(transform->TransformRect(oneByOneTransformed, &oneByOneTransformed));
-        }
+        IFC_RETURN(transform->TransformRect(oneByOneTransformed, &oneByOneTransformed));
     }
     else
     {
-        // The current policy is to compute the bounds of the HWND according to the following:
-        // 1) The size of the HWND is based on Popup.Child's unclipped desired size, if set.
-        // 2) The position of the HWND is based on Popup.Child's position.
+        // The current policy is to compute the bounds of the bridge according to the following:
+        // 1) The size of the bridge is based on Popup.Child's unclipped desired size, if set.
+        // 2) The position of the bridge is based on Popup.Child's position.
         // This policy has caused numerous bugs and will be harder for public customers to understand.
         // If we can convert all controls to adhere to the "UseActualBounds" policy above, we can delete this code path.
         if (elementForBounds->HasLayoutStorage() &&
@@ -1888,10 +1871,7 @@ _Check_return_ HRESULT CPopup::GetPhysicalBounds(_In_ CUIElement* element, _Out_
             IFC_RETURN(transform->TransformRect({ 0, 0, elementForBounds->UnclippedDesiredSize.width, elementForBounds->UnclippedDesiredSize.height }, physicalBounds));
             DipsToPhysicalPixelsRect(physicalBounds);
 
-            if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_49613456>())
-            {
-                IFC_RETURN(transform->TransformRect(oneByOneTransformed, &oneByOneTransformed));
-            }
+            IFC_RETURN(transform->TransformRect(oneByOneTransformed, &oneByOneTransformed));
         }
         else
         {
@@ -1903,11 +1883,8 @@ _Check_return_ HRESULT CPopup::GetPhysicalBounds(_In_ CUIElement* element, _Out_
     }
 
     // Note: These assume that the transform was axis-aligned. We don't support windowed popups with rotations above them.
-    if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_49613456>())
-    {
-        *scaleX = oneByOneTransformed.Width;
-        *scaleY = oneByOneTransformed.Height;
-    }
+    *scaleX = oneByOneTransformed.Width;
+    *scaleY = oneByOneTransformed.Height;
 
     // In addition to the contents in the windowed popup, also union in all the non-windowed popups that are nested
     // inside this windowed popup's. They must live in the same island as the windowed popup so that they won't be
@@ -1997,9 +1974,9 @@ XTHICKNESS CPopup::GetInsetsForDropShadow()
     // Round the insets according to the root scale. We do this for a couple of reasons:
     //
     //   1. These insets get multiplied by the root scale in AdjustWindowedPopupBoundsForDropShadow.
-    //      Rounding them here allows us to calculate integer offsets for the hwnd.
+    //      Rounding them here allows us to calculate integer offsets for the bridge.
     //
-    //   2. These insets also factor into the offsets that we set on the hwnd root visual at the end of
+    //   2. These insets also factor into the offsets that we set on the island root visual at the end of
     //      PositionAndSizeWindowForWindowedPopup. Those offsets also get multiplied by the root scale,
     //      and we want integers at the end. Otherwise the content in the windowed popup get placed at
     //      a fractional offset, which produces blurry content.
@@ -2026,7 +2003,7 @@ static bool IsElementScaleOrTranslationOnly(_In_ CUIElement* uielement)
 
 bool CPopup::MeetsRenderingRequirementsForWindowedPopup()
 {
-    // Currently, popups can only be windowed if the bounds for the HWND are of the "simple, rectangular" form.
+    // Currently, popups can only be windowed if the bounds for the island are of the "simple, rectangular" form.
     // This means only scales/translates for everything from Popup.Child up to the root.
     bool isParentedPopup = IsActive();
     if (isParentedPopup)
@@ -2206,10 +2183,10 @@ void CPopup::EnsureWindowedPopupRootVisualTree()
 
         if (RuntimeFeatureBehavior::GetRuntimeEnabledFeatureDetector()->IsFeatureEnabled(RuntimeFeatureBehavior::RuntimeEnabledFeature::EnableWindowedPopupDebugVisual))
         {
-            // Create a "debug" visual for windowed popups.  This visual will be sized to the size of the HWND and will draw
-            // a semi-transparent green color on top of all the content inside the Popup.
-            // This debug visual allows us to see exactly where the HWND is on screen and is helpful in debugging cases where
-            // either the HWND bounds or the "undo transform" was not computed correctly.
+            // Create a "debug" visual for windowed popups.  This visual will be sized to the size of the island and
+            // will draw a semi-transparent green color on top of all the content inside the Popup. This debug visual
+            // allows us to see exactly where the bridge/island are on screen and is helpful in debugging cases where
+            // either the island bounds or the "undo transform" was not computed correctly.
             wrl::ComPtr<ixp::ICompositionColorBrush> debugColor_cb;
             IFCFAILFAST(compositorNoRef->CreateColorBrush(&debugColor_cb));
             IFCFAILFAST(debugColor_cb->put_Color(ColorUtils::GetWUColor(0x8800ff00)));
@@ -2236,20 +2213,14 @@ void CPopup::EnsureWindowedPopupRootVisualTree()
 
 void CPopup::EnsureUIAWindow()
 {
-    if (m_spUIAWindow == nullptr && m_windowedPopupWindow != nullptr)
+    if (m_spUIAWindow == nullptr && m_popupWindowBridge)
     {
         auto core = GetContext();
 
         UIAHostEnvironmentInfo uiaInfo;
-        if (CXamlIslandRoot* island = GetAssociatedXamlIslandNoRef())
-        {
-            uiaInfo = UIAHostEnvironmentInfo(island);
-        }
-        else
-        {
-            // Use Jupiter window here because all elements are positioned relative to it for hit testing
-            uiaInfo = UIAHostEnvironmentInfo(m_windowedPopupWindow, static_cast<HWND>(core->GetHostSite()->GetXcpControlWindow()));
-        }
+        CXamlIslandRoot* island = GetAssociatedXamlIslandNoRef();
+        ASSERT(island);
+        uiaInfo = UIAHostEnvironmentInfo(island);
 
         IFCFAILFAST(CUIAHostWindow::Create(
             uiaInfo,
@@ -2260,6 +2231,7 @@ void CPopup::EnsureUIAWindow()
 }
 
 // If popup is windowed, return popup's positioning (host/non-input) window. Else, return Jupiter window.
+// Should be removable after Task 50004748: Switch TextBoxBase in windowed popups to IContentCoordinateConverter
 HWND CPopup::GetPopupPositioningWindow() const
 {
     // Note: We can't assume that the popup hwnd exists. We won't create one of someone opens a windowed popup
@@ -4051,18 +4023,6 @@ void CPopupRoot::CloseAllPopupsForTreeReset()
     }
 }
 
-void CPopupRoot::OnHostWindowPositionChanged()
-{
-    if (m_pOpenPopups != nullptr)
-    {
-        for (auto node = m_pOpenPopups->GetHead(); node != nullptr; node = node->m_pNext)
-        {
-            CPopup* popup = node->m_pData;
-            FxCallbacks::Popup_OnHostWindowPositionChanged(popup);
-        }
-    }
-}
-
 void CPopupRoot::OnIslandLostFocus()
 {
     for (CPopup* popup : GetPopupsInSafeClosingOrder())
diff --git a/src/dxaml/xcp/core/core/elements/SplitView.cpp b/src/dxaml/xcp/core/core/elements/SplitView.cpp
index 175ee379c8..88cf02e27a 100644
--- a/src/dxaml/xcp/core/core/elements/SplitView.cpp
+++ b/src/dxaml/xcp/core/core/elements/SplitView.cpp
@@ -48,7 +48,7 @@ class CSplitViewPaneClosingExecutor : public CXcpObjectBase<IPALExecuteOnUIThrea
 //
 CSplitView::~CSplitView()
 {
-    NT_VERIFY(SUCCEEDED(UnregisterEventHandlers()));
+    VERIFYHR(UnregisterEventHandlers());
 
     ReleaseInterface(m_pTemplateSettings);
 }
diff --git a/src/dxaml/xcp/core/core/elements/SvgImageSource.cpp b/src/dxaml/xcp/core/core/elements/SvgImageSource.cpp
index 6b95e1d0ce..4c773efa5a 100644
--- a/src/dxaml/xcp/core/core/elements/SvgImageSource.cpp
+++ b/src/dxaml/xcp/core/core/elements/SvgImageSource.cpp
@@ -177,8 +177,8 @@ CSvgImageSource::OnDownloadImageAvailableImpl(
 _Check_return_ HRESULT CSvgImageSource::GetID2D1SvgDocument(
     _In_ ID2D1DeviceContext5* d2dDeviceContextNoRef, //Note the ID2D1SvgDocument object needs to be created by the same D2D factory, that's why this ID2D1DeviceContext5 is passed in as a parameter.
     _Out_ wrl::ComPtr<ID2D1SvgDocument>& d2dSvgDocumentOut,
-    _Outptr_ uint32_t* width,
-    _Outptr_ uint32_t* height
+    _Out_ uint32_t* width,
+    _Out_ uint32_t* height
     )
 {
     d2dSvgDocumentOut.Reset();
diff --git a/src/dxaml/xcp/core/core/elements/ThemeResourceExtension.cpp b/src/dxaml/xcp/core/core/elements/ThemeResourceExtension.cpp
index 12fa444cb8..28a5848b85 100644
--- a/src/dxaml/xcp/core/core/elements/ThemeResourceExtension.cpp
+++ b/src/dxaml/xcp/core/core/elements/ThemeResourceExtension.cpp
@@ -308,7 +308,7 @@ CThemeResourceExtension::GetValue(_Out_ CValue* pValue)
         IFC_RETURN(SetIsValueFromInitialTheme(pTargetDictionaryNoRef));
    }
 
-   pValue->CopyConverted(m_lastResolvedThemeValue);
+   IFC_RETURN(pValue->CopyConverted(m_lastResolvedThemeValue));
 
    return S_OK;
 }
diff --git a/src/dxaml/xcp/core/core/elements/UIAPatternProvider.cpp b/src/dxaml/xcp/core/core/elements/UIAPatternProvider.cpp
index 7663a0e458..a932bfa47c 100644
--- a/src/dxaml/xcp/core/core/elements/UIAPatternProvider.cpp
+++ b/src/dxaml/xcp/core/core/elements/UIAPatternProvider.cpp
@@ -1447,7 +1447,7 @@ HRESULT CManagedTextRangeProvider::FindAttribute(
     Automation::CValue retVal;
     Automation::CValue params[3];
     params[0].SetSigned(attributeId);
-    params[1].ConvertFrom(attributeValue);
+    IFC_RETURN(params[1].ConvertFrom(attributeValue));
     params[2].SetSigned(backward);
     IFC_RETURN(FxCallbacks::AutomationPeer_UIATextRangeInvoke(m_pInteropObject, 5/*FindAttribute*/, 3/*cParams*/, params, &retVal));
     *pRetVal = m_pAP->GetTextRangePattern(retVal.m_pdoValue);
diff --git a/src/dxaml/xcp/core/core/elements/depends.cpp b/src/dxaml/xcp/core/core/elements/depends.cpp
index 7ebc7bddea..04764a61d9 100644
--- a/src/dxaml/xcp/core/core/elements/depends.cpp
+++ b/src/dxaml/xcp/core/core/elements/depends.cpp
@@ -1607,7 +1607,7 @@ CDependencyObject* CDependencyObject::GetTreeRoot(_In_ bool publicParentOnly /*
     {
         VERIFYHR(core->IsObjectAnActiveRootVisual(pParent, &parentIsRootVisual));
     }
-    while (pParent && (!publicParentOnly || !parentIsRootVisual))
+    while (pParent && (!publicParentOnly || !parentIsRootVisual) && !do_pointer_cast<CXamlIslandRoot>(pParent))
     {
         pBase = pParent;
         pParent = pParent->GetParentInternal(publicParentOnly);
diff --git a/src/dxaml/xcp/core/core/elements/framework.cpp b/src/dxaml/xcp/core/core/elements/framework.cpp
index 1a619cfac9..f81ddd6755 100644
--- a/src/dxaml/xcp/core/core/elements/framework.cpp
+++ b/src/dxaml/xcp/core/core/elements/framework.cpp
@@ -3440,7 +3440,7 @@ CFrameworkElement::NotifyThemeChangedForInheritedProperties(
         // inherited.
         if (pBrushNoRef)
         {
-            pTextFormatting->SetForeground(this, pBrushNoRef);
+            IFC(pTextFormatting->SetForeground(this, pBrushNoRef));
             pTextFormatting->SetFreezeForeground(true);
 
             // Mark inheritance chain as dirty
diff --git a/src/dxaml/xcp/core/core/elements/geometry.cpp b/src/dxaml/xcp/core/core/elements/geometry.cpp
index bfd7ac76cc..c3ba9cb7b0 100644
--- a/src/dxaml/xcp/core/core/elements/geometry.cpp
+++ b/src/dxaml/xcp/core/core/elements/geometry.cpp
@@ -1712,9 +1712,8 @@ CPathGeometry::ParseGeometry(
             }
 
         // Read the boolean or floating point value from the data
-#if DBG
+#pragma warning(suppress: 4189) // C4189: PREFast does not know this local variable is being used at least in the chk build by the ASSERT() below.
             const WCHAR* pPrevious = pRasterizerPath;
-#endif
             const XUINT32 cPrevious = cData;
 
             if (mBoolean & 1)
diff --git a/src/dxaml/xcp/core/core/elements/icon.cpp b/src/dxaml/xcp/core/core/elements/icon.cpp
index 99c025d106..f3ef7d2b7b 100644
--- a/src/dxaml/xcp/core/core/elements/icon.cpp
+++ b/src/dxaml/xcp/core/core/elements/icon.cpp
@@ -307,7 +307,7 @@ CSymbolIcon::InitInstance()
     return S_OK;
 }
 
-_Check_return_ HRESULT CSymbolIcon::ApplyTemplate(_Out_ bool& fAddedVisuals)
+_Check_return_ HRESULT CSymbolIcon::ApplyTemplate(_Inout_ bool& fAddedVisuals)
 {
     HRESULT hr = S_OK;
     CTextBlock* pTextBlock = NULL;
@@ -519,7 +519,7 @@ WCHAR CSymbolIcon::ConvertSymbolValueToGlyph(const UINT32 symbolValue)
     case 0xE1C8: return static_cast<WCHAR>(0xE8E9); // FontSize
     case 0xE111: return static_cast<WCHAR>(0xE72A); // Forward
     case 0xE1E9: return static_cast<WCHAR>(0xE908); // FourBars
-    case 0xE1D9: return static_cast<WCHAR>(0xE8F3); // FullScreen
+    case 0xE1D9: return static_cast<WCHAR>(0xE740); // FullScreen
     case 0xE700: return static_cast<WCHAR>(0xE700); // GlobalNavigationButton
     case 0xE12B: return static_cast<WCHAR>(0xE774); // Globe
     case 0xE143: return static_cast<WCHAR>(0xE8AD); // Go
@@ -746,7 +746,7 @@ _Check_return_ HRESULT CFontIcon::PullInheritedTextFormatting()
     return S_OK;
 }
 
-_Check_return_ HRESULT CFontIcon::ApplyTemplate(_Out_ bool& fAddedVisuals)
+_Check_return_ HRESULT CFontIcon::ApplyTemplate(_Inout_ bool& fAddedVisuals)
 {
     HRESULT hr = S_OK;
     CTextBlock* pTextBlock = NULL;
@@ -922,7 +922,7 @@ CPathIcon::Create(
 }
 
 
-_Check_return_ HRESULT CPathIcon::ApplyTemplate(_Out_ bool& fAddedVisuals)
+_Check_return_ HRESULT CPathIcon::ApplyTemplate(_Inout_ bool& fAddedVisuals)
 {
     HRESULT hr = S_OK;
     CPath* pPath = NULL;
@@ -1005,7 +1005,7 @@ CBitmapIcon::~CBitmapIcon()
 }
 
 
-_Check_return_ HRESULT CBitmapIcon::ApplyTemplate(_Out_ bool& fAddedVisuals)
+_Check_return_ HRESULT CBitmapIcon::ApplyTemplate(_Inout_ bool& fAddedVisuals)
 {
     HRESULT hr = S_OK;
     CImage* pImage = NULL;
@@ -1459,7 +1459,7 @@ CIconSourceElement::~CIconSourceElement()
     }
 }
 
-_Check_return_ HRESULT CIconSourceElement::ApplyTemplate(_Out_ bool& fAddedVisuals)
+_Check_return_ HRESULT CIconSourceElement::ApplyTemplate(_Inout_ bool& fAddedVisuals)
 {
     if (!GetChildElementNoRef() && m_iconSource)
     {
diff --git a/src/dxaml/xcp/core/core/elements/imagesource.cpp b/src/dxaml/xcp/core/core/elements/imagesource.cpp
index 2644397c1c..5cfc566bcc 100644
--- a/src/dxaml/xcp/core/core/elements/imagesource.cpp
+++ b/src/dxaml/xcp/core/core/elements/imagesource.cpp
@@ -219,10 +219,7 @@ HRESULT CImageSource::SetupImageSource(
                 }
             }
 
-            if (const auto& decodeActivity = GetContext()->GetImageProvider()->GetDecodeActivity())
-            {
-                decodeActivity->SetUriSource(reinterpret_cast<uint64_t>(this), m_strSource.GetBuffer());
-            }
+            ImagingTelemetry::SetUriSource(reinterpret_cast<uint64_t>(this), m_strSource.GetBuffer());
         }
     }
 
@@ -307,11 +304,8 @@ CImageSource::OnImageAvailableCommon(
 
     HRESULT hrImageResult = pResponse->GetDecodingResult();
 
-    if (const auto& decodeActivity = GetContext()->GetImageProvider()->GetDecodeActivity())
-    {
-        decodeActivity->DecodeResultAvailable(reinterpret_cast<uint64_t>(this), hrImageResult);
-        // TODO: Trace the surface upload as well.
-    }
+    ImagingTelemetry::DecodeResultAvailable(reinterpret_cast<uint64_t>(this), hrImageResult);
+    // TODO: Trace the surface upload as well.
 
     if (SUCCEEDED(hrImageResult))
     {
@@ -591,7 +585,7 @@ CBitmapSource::Create(
     bitmapSource.attach(new CBitmapSource(createParameters->m_pCore));
 
     // Intentionally doesn't set CREATEPARAMETERS for CBitmapSource
-    bitmapSource->SetupImageSource(true /*mustKeepSoftwareSurface*/);
+    IFC_RETURN(bitmapSource->SetupImageSource(true /*mustKeepSoftwareSurface*/));
 
     *retObject = bitmapSource.detach();
 
@@ -658,28 +652,23 @@ _Check_return_ HRESULT CImageSource::SetImageCache(xref_ptr<ImageCache> imageCac
 
             SetBitmapState(BitmapImageState::Downloading);
 
-            const auto& decodeActivity = GetContext()->GetImageProvider()->GetDecodeActivity();
-
-            m_imageMetadataView = m_imageCache->GetMetadataView(decodeActivity, reinterpret_cast<uint64_t>(this));
+            m_imageMetadataView = m_imageCache->GetMetadataView(reinterpret_cast<uint64_t>(this));
             m_imageMetadataView->SetGraphicsDevice(GetContext()->GetGraphicsDevice());
             m_imageMetadataView->SetMaxRootSize(GetContext()->GetContentRootMaxSize());
             m_imageMetadataView->AddImageViewListener(*this);
-            if (m_imageMetadataView->GetImageMetadata() || FAILED(m_imageMetadataView->GetHR(decodeActivity, reinterpret_cast<uint64_t>(this))))
+            if (m_imageMetadataView->GetImageMetadata() || FAILED(m_imageMetadataView->GetHR(reinterpret_cast<uint64_t>(this))))
             {
                 // We already have metadata available, so this doesn't need to be downloaded. Go straight to
                 // OnImageViewUpdated (which gets called when the download completes).
-                if (decodeActivity)
-                {
-                    decodeActivity->FoundCompletedDownload(reinterpret_cast<uint64_t>(this));
-                }
+                ImagingTelemetry::FoundCompletedDownload(reinterpret_cast<uint64_t>(this));
                 IFC_RETURN(OnImageViewUpdated(*m_imageMetadataView));
             }
-            else if (decodeActivity)
+            else
             {
                 // The ImageCache doesn't have metadata yet, so the download is still in progress. We'll wait for the
                 // existing download to complete and be notified via OnImageViewUpdated afterwards (the
                 // AddImageViewListener call above puts us in the list of things to notify once download completes).
-                decodeActivity->WaitForDownloadInProgress(reinterpret_cast<uint64_t>(this));
+                ImagingTelemetry::WaitForDownloadInProgress(reinterpret_cast<uint64_t>(this));
             }
         }
         else
@@ -719,10 +708,7 @@ CImageSource::SetSource(
     // Clear the existing URI source.
     m_strSource.Reset();
 
-    if (const auto& decodeActivity = GetContext()->GetImageProvider()->GetDecodeActivity())
-    {
-        decodeActivity->SetStreamSource(reinterpret_cast<uint64_t>(this));
-    }
+    ImagingTelemetry::SetStreamSource(reinterpret_cast<uint64_t>(this));
 
     // OnSourceSet() is called when we have a stream source. We don't do any automatic
     // reloading for a stream source, so unregister from the reload manager.
@@ -792,7 +778,6 @@ CImageSource::SetSource(
             nullptr /* absoluteUri */,
             false /* isSvg */,
             GetImageOptions::None,
-            GetContext()->GetImageProvider()->GetDecodeActivity(),
             reinterpret_cast<uint64_t>(this),
             &cacheHit,
             imageCache.ReleaseAndGetAddressOf()));
@@ -1280,10 +1265,7 @@ CImageSource::SetValue(_In_ const SetValueParams& args)
 //------------------------------------------------------------------------
 _Check_return_ HRESULT CImageSource::OnUriSourceChanged(bool retainPlaybackState)
 {
-    if (const auto& decodeActivity = GetContext()->GetImageProvider()->GetDecodeActivity())
-    {
-        decodeActivity->SetUriSource(reinterpret_cast<uint64_t>(this), m_strSource.GetBuffer());
-    }
+    ImagingTelemetry::SetUriSource(reinterpret_cast<uint64_t>(this), m_strSource.GetBuffer());
 
     // We may keep the HW surface to avoid flickering when switching URIs.
     IFC_RETURN(ResetForSourceChange(
@@ -1637,7 +1619,6 @@ CImageSource::ReloadImage(bool uriChanged, bool retainPlaybackState)
             m_absoluteUri,
             OfTypeByIndex<KnownTypeIndex::SvgImageSource>(),
             imageGetOptions,
-            GetContext()->GetImageProvider()->GetDecodeActivity(),
             reinterpret_cast<uint64_t>(this),
             &cacheHit,
             imageCache.ReleaseAndGetAddressOf()));
@@ -2548,15 +2529,12 @@ CImageSource::RequestDecode(
             ASSERT(false);
         }
 
-        if (const auto& decodeActivity = GetContext()->GetImageProvider()->GetDecodeActivity())
-        {
-            decodeActivity->RequestDecodeToRenderSize(
-                reinterpret_cast<uint64_t>(this),
-                imageState,
-                requestWidth,
-                requestHeight,
-                m_fDecodeToRenderSize);
-        }
+        ImagingTelemetry::RequestDecodeToRenderSize(
+            reinterpret_cast<uint64_t>(this),
+            imageState,
+            requestWidth,
+            requestHeight,
+            m_fDecodeToRenderSize);
 
         IFC_RETURN(DecodeToRenderSize(requestWidth, requestHeight, retainPlaybackState));
     }
@@ -2568,10 +2546,7 @@ _Check_return_ HRESULT CImageSource::OnImageViewUpdated(ImageViewBase& sender)
 {
     ASSERT(m_imageMetadataView.get() == &sender);
 
-    if (const auto& decodeActivity = GetContext()->GetImageProvider()->GetDecodeActivity())
-    {
-        decodeActivity->ImageDownloadCompleteNotification(reinterpret_cast<uint64_t>(this), m_strSource.GetBuffer(), m_fDecodeToRenderSize);
-    }
+    ImagingTelemetry::ImageDownloadCompleteNotification(reinterpret_cast<uint64_t>(this), m_strSource.GetBuffer(), m_fDecodeToRenderSize);
 
     if (ShouldContinueAsyncAction())
     {
@@ -2579,7 +2554,7 @@ _Check_return_ HRESULT CImageSource::OnImageViewUpdated(ImageViewBase& sender)
 
         // Unintuitive behavior: this GetHR call kicks off the initial parse of the encoded image to read the metadata.
         // Move this out to an explicit "parse for metadata" call?
-        HRESULT parseHR = m_imageMetadataView->GetHR(GetContext()->GetImageProvider()->GetDecodeActivity(), reinterpret_cast<uint64_t>(this));
+        HRESULT parseHR = m_imageMetadataView->GetHR(reinterpret_cast<uint64_t>(this));
 
         if (FAILED(parseHR))
         {
@@ -2732,17 +2707,14 @@ CImageSource::DecodeToRenderSize(
 
         m_pendingDecodeForLostSoftwareSurface = FALSE;
 
-        if (const auto& decodeActivity = GetContext()->GetImageProvider()->GetDecodeActivity())
-        {
-            decodeActivity->DecodeToRenderSizeStart(
-                reinterpret_cast<uint64_t>(this),
-                imageSourceWidth,
-                imageSourceHeight,
-                newWidth,
-                newHeight,
-                imageMetadata->width,
-                imageMetadata->height);
-        }
+        ImagingTelemetry::DecodeToRenderSizeStart(
+            reinterpret_cast<uint64_t>(this),
+            imageSourceWidth,
+            imageSourceHeight,
+            newWidth,
+            newHeight,
+            imageMetadata->width,
+            imageMetadata->height);
 
         // Keep this old event for now. There are tests listening for it.
         TraceDecodeToRenderSizeBegin1(
@@ -2789,10 +2761,7 @@ CImageSource::DecodeToRenderSize(
 
         TraceDecodeToRenderSizeEnd(reinterpret_cast<XUINT64>(this), m_strSource.GetBuffer());
 
-        if (const auto& decodeActivity = GetContext()->GetImageProvider()->GetDecodeActivity())
-        {
-            decodeActivity->DecodeToRenderSizeStop(reinterpret_cast<uint64_t>(this));
-        }
+        ImagingTelemetry::DecodeToRenderSizeStop(reinterpret_cast<uint64_t>(this));
     }
 
     return S_OK;
@@ -3633,7 +3602,6 @@ HRESULT CBitmapImage::GetAutoPlay(
                 isAutoPlay,
                 surfaceUpdateList,
                 false /* isLoadedImageSurface */,
-                GetContext()->GetImageProvider()->GetDecodeActivity(),
                 reinterpret_cast<XUINT64>(this),
                 m_strSource);
         }
@@ -3649,7 +3617,6 @@ HRESULT CBitmapImage::GetAutoPlay(
             height,
             isAutoPlay,
             false /* isLoadedImageSurface */,
-            GetContext()->GetImageProvider()->GetDecodeActivity(),
             reinterpret_cast<XUINT64>(this),
             m_strSource);
     }
@@ -3984,8 +3951,5 @@ void CImageSource::TraceDecodeToRenderSizeDisqualified(ImageDecodeBoundsFinder::
         break;
     }
 
-    if (const auto& decodeActivity = GetContext()->GetImageProvider()->GetDecodeActivity())
-    {
-        decodeActivity->DecodeToRenderSizeDisqualified(reinterpret_cast<uint64_t>(this), description);
-    }
+    ImagingTelemetry::DecodeToRenderSizeDisqualified(reinterpret_cast<uint64_t>(this), description);
 }
diff --git a/src/dxaml/xcp/core/core/elements/uielement.cpp b/src/dxaml/xcp/core/core/elements/uielement.cpp
index 956512a29b..c51dccedc1 100644
--- a/src/dxaml/xcp/core/core/elements/uielement.cpp
+++ b/src/dxaml/xcp/core/core/elements/uielement.cpp
@@ -2997,6 +2997,12 @@ CUIElement::TransformToVisualHelperGetTransformer(
     {
         // For app-compat reasons, use this code path when not in an island scenario.
         // TODO:  Can we delete this code path altogether?
+        // Update: If we can host media controls on the media root then it would be possible to hit this path even
+        //         in a Lifted island scenario. 
+        //         Theoretically, we could combine these two code paths now that GetTreeRoot will stop at the
+        //         the island roots, since for the media root it will stop at the same place, but, it is unclear
+        //         what the purpose of the RootScale check is and why we switch to the public root and whether it
+        //         would apply in our media root scenario or whether it should be applied for the non-media scenarios.
         IFC_RETURN(DoPointerCast(pRoot, GetTreeRoot()));
 
         IFC_RETURN(pRoot ? S_OK : E_FAIL);
@@ -3592,7 +3598,6 @@ CUIElement::InvalidateMeasureInternal(_In_opt_ CLayoutManager* layoutManager)
         }
     }
 
-
     SetIsMeasureDirty(TRUE);
     PropagateOnMeasureDirtyPath();
     if (EventEnabledInvalidateMeasureInfo())
@@ -3653,7 +3658,6 @@ CUIElement::InvalidateArrangeInternal(_In_opt_ CLayoutManager* layoutManager)
         }
     }
 
-
     SetIsArrangeDirty(TRUE);
     PropagateOnArrangeDirtyPath();
     if (EventEnabledInvalidateArrangeInfo())
@@ -3914,10 +3918,8 @@ CUIElement::Measure(XSIZEF availableSize)
 
     bool wasInNonClippingTree = false;
 
-    // All paths exiting this method MUST go through Cleanup.
-    // This line should ALWAYS execute.
-    LockParent();
-
+    auto scopedParentLock = LockParent();
+    
     pLayoutManager = VisualTree::GetLayoutManagerForElement(this);
     IFCPTR(pLayoutManager);
 
@@ -4020,8 +4022,9 @@ CUIElement::Measure(XSIZEF availableSize)
     ASSERT(count > 0);
 
 Cleanup:
-
-    UnlockParent();
+    // We manually release the lock here because there was concern that the rest of cleanup code may be
+    // afftected by the lock.
+    scopedParentLock.reset();
 
     // We're not on Measure Stack anymore.
     SetIsOnMeasureStack(FALSE);
@@ -4221,7 +4224,7 @@ CUIElement::Arrange(XRECTF finalRect)
     bool bSavedAllowTransitionsToRun = false;
     int count = CLayoutManager::MaxLayoutIterations;
 
-    LockParent(); // all paths exiting this method MUST go through Cleanup, and this line should ALWAYS execute
+    auto scopedParentLock = LockParent();
 
     CLayoutManager* pLayoutManager = VisualTree::GetLayoutManagerForElement(this);
     IFCPTR(pLayoutManager);
@@ -4318,7 +4321,9 @@ CUIElement::Arrange(XRECTF finalRect)
     }
 
 Cleanup:
-    UnlockParent();
+    // We manually release the lock here because there was concern that the rest of cleanup code may be
+    // afftected by the lock.
+    scopedParentLock.reset();
 
     if (pLayoutManager->GetRequiresMeasure())
     {
@@ -14715,7 +14720,7 @@ ApplyTransformToHitType(
     )
 {
     pSrcTarget->CopyTo(pDestTarget);
-    pDestTarget->Transform(pTransform != nullptr);
+    pDestTarget->Transform(*pTransform);
 }
 
 //------------------------------------------------------------------------
@@ -15219,7 +15224,7 @@ void CUIElement::EnsureRootCanvasCompNode()
 
     if (publicRoot->OfTypeByIndex<KnownTypeIndex::Canvas>() && !publicRoot->IsProjectedShadowDefaultReceiver())
     {
-        publicRoot->SetRequiresComposition(CompositionRequirement::ProjectedShadowDefaultReceiver, IndependentAnimationType::None);
+        IFCFAILFAST(publicRoot->SetRequiresComposition(CompositionRequirement::ProjectedShadowDefaultReceiver, IndependentAnimationType::None));
     }
 }
 
diff --git a/src/dxaml/xcp/core/dll/CoreImports.cpp b/src/dxaml/xcp/core/dll/CoreImports.cpp
index ba617a46bb..5647fcbcc1 100644
--- a/src/dxaml/xcp/core/dll/CoreImports.cpp
+++ b/src/dxaml/xcp/core/dll/CoreImports.cpp
@@ -1729,16 +1729,17 @@ _Check_return_ HRESULT DependencyObject_GetVisualRelative(
 
     // Get the parent or children
 
-    if (iRelativeLinkKind == 0)
+    if (iRelativeLinkKind == 0 /* VisualRelativeKind_Child */)
     {
         pObjectNoRef = (CDependencyObject*)pElement->GetChildren();
     }
-    else if (iRelativeLinkKind == 1)
+    else if (iRelativeLinkKind == 1 /* VisualRelativeKind_Parent */)
     {
         pObjectNoRef = (CDependencyObject*)pElement->GetParent();
     }
-    else
+    else // VisualRelativeKind_Root
     {
+        ASSERT(iRelativeLinkKind == 2 /* VisualRelativeKind_Root */);
         pObjectNoRef = (CDependencyObject*)pElement->GetTreeRoot(true);
     }
 
diff --git a/src/dxaml/xcp/core/dll/VisualTree.cpp b/src/dxaml/xcp/core/dll/VisualTree.cpp
index c6e3ec3555..f62d805849 100644
--- a/src/dxaml/xcp/core/dll/VisualTree.cpp
+++ b/src/dxaml/xcp/core/dll/VisualTree.cpp
@@ -555,10 +555,9 @@ VisualTree::VisualTree(_In_ CCoreServices *pCore, _In_ XUINT32 backgroundColor,
         IFCFAILFAST(CreateDO(m_rootVisual.ReleaseAndGetAddressOf(), &cp));
 
         // Mark the element as the root of the render walk.
-        m_rootVisual->SetRequiresComposition(
+        IFCFAILFAST(m_rootVisual->SetRequiresComposition(
             CompositionRequirement::RootElement,
-            IndependentAnimationType::None
-            );
+            IndependentAnimationType::None));
 
         IFCFAILFAST(m_rootVisual->SetAssociatedVisualTree(this));
 
diff --git a/src/dxaml/xcp/core/dll/focusmgr.cpp b/src/dxaml/xcp/core/dll/focusmgr.cpp
index d7645414eb..23aac83a5b 100644
--- a/src/dxaml/xcp/core/dll/focusmgr.cpp
+++ b/src/dxaml/xcp/core/dll/focusmgr.cpp
@@ -21,10 +21,6 @@
 
 #include "InitialFocusSIPSuspender.h"
 #include "FocusLockOverrideGuard.h"
-#include <FrameworkUdk/Containment.h>
-
-// Bug 51401727: [1.5 Servicing][WASDK] [GitHub] Webview2: Window blur and focus events always fire when clicking the WebView
-#define WINAPPSDK_CHANGEID_51401727 51401727
 
 #define E_FOCUS_ASYNCOP_INPROGRESS 64L
 
@@ -112,7 +108,7 @@ CFocusManager::GetFocusedElementNoRef() const
     return m_pFocusedElement;
 }
 
-const FocusMovementResult
+_Check_return_ const FocusMovementResult
 CFocusManager::SetFocusedElement(_In_ const FocusMovement& movement)
 {
     CDependencyObject* pFocusedElement = movement.GetTarget();
@@ -237,7 +233,7 @@ CFocusManager::GetFirstFocusableElementFromRoot(_In_ bool bReverse)
 //------------------------------------------------------------------------
 
 CDependencyObject*
-CFocusManager::GetFirstFocusableElement(_In_ CDependencyObject* pSearchStart, _In_ CDependencyObject *pFirstFocus)
+CFocusManager::GetFirstFocusableElement(_In_ CDependencyObject* pSearchStart, _In_opt_ CDependencyObject *pFirstFocus)
 {
 
     pFirstFocus = GetFirstFocusableElementInternal(pSearchStart, pFirstFocus);
@@ -268,7 +264,7 @@ CFocusManager::GetFirstFocusableElement(_In_ CDependencyObject* pSearchStart, _I
 CDependencyObject*
 CFocusManager::GetFirstFocusableElementInternal(
     _In_ CDependencyObject* pSearchStart,
-    _In_ CDependencyObject *pFirstFocus)
+    _In_opt_ CDependencyObject *pFirstFocus)
 {
     CDependencyObject *pFirstFocusableFromCallback = NULL;
     bool useFirstFocusableFromCallback = false;
@@ -336,7 +332,7 @@ CFocusManager::GetFirstFocusableElementInternal(
 //------------------------------------------------------------------------
 
 CDependencyObject*
-CFocusManager::GetLastFocusableElement(_In_ CDependencyObject* pSearchStart, _In_ CDependencyObject *pLastFocus)
+CFocusManager::GetLastFocusableElement(_In_ CDependencyObject* pSearchStart, _In_opt_ CDependencyObject *pLastFocus)
 {
     pLastFocus = GetLastFocusableElementInternal(pSearchStart, pLastFocus);
 
@@ -364,7 +360,7 @@ CFocusManager::GetLastFocusableElement(_In_ CDependencyObject* pSearchStart, _In
 CDependencyObject*
 CFocusManager::GetLastFocusableElementInternal(
     _In_ CDependencyObject* pSearchStart,
-    _In_ CDependencyObject *pLastFocus)
+    _In_opt_ CDependencyObject *pLastFocus)
 {
     CDependencyObject *pLastFocusableFromCallback = NULL;
     bool useLastFocusableFromCallback = false;
@@ -707,9 +703,7 @@ CFocusManager::ProcessTabStop(_In_ bool bPressedShift, _Out_ bool* bHandled)
     }
     else
     {
-        GUID correlationId = {};
-        UuidCreate(&correlationId);
-        IFC_RETURN(m_focusObserver->DepartFocus(navigationDirection, correlationId, bHandled));
+        IFC_RETURN(m_focusObserver->DepartFocus(navigationDirection, Focus::CreateCorrelationId(), bHandled));
     }
 
     return S_OK;
@@ -1786,22 +1780,19 @@ bool CFocusManager::ShouldSetWindowFocus(const FocusMovement& movement) const
         return false;
     }
 
-    if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_51401727>())
+    // If focused element is hwnd-based component hosted inside the Xaml island (aka WebView2), don't set focus to the hwnd,
+    // to avoid Xaml stealing focus back after the user interacts with the component hwnd, and focus is already there.
+    if (m_pFocusedElement && m_pFocusedElement->GetTypeIndex() == KnownTypeIndex::Panel)
     {
-        // If focused element is hwnd-based component hosted inside the Xaml island (aka WebView2), don't set focus to the hwnd,
-        // to avoid Xaml stealing focus back after the user interacts with the component hwnd, and focus is already there.
-        if (m_pFocusedElement && m_pFocusedElement->GetTypeIndex() == KnownTypeIndex::Panel)
+        HWND componentHwnd = DXamlServices::GetComponentHwndForPeer(m_pFocusedElement);
+        if(componentHwnd)
         {
-            HWND componentHwnd = DXamlServices::GetComponentHwndForPeer(m_pFocusedElement);
-            if(componentHwnd)
+            HWND focusedHwnd = ::GetFocus();
+            // Check if the componendHwnd has focus or its child has
+            // https://task.ms/49085931 -  [API Gap] InputFocusController needs some sort of ContainsFocus API to detect when Focus is in nested Content (eg XAML and a WebView2)
+            if (componentHwnd == focusedHwnd || ::IsChild(componentHwnd, focusedHwnd))
             {
-                HWND focusedHwnd = ::GetFocus();
-                // Check if the componendHwnd has focus or its child has
-                // https://task.ms/49085931 -  [API Gap] InputFocusController needs some sort of ContainsFocus API to detect when Focus is in nested Content (eg XAML and a WebView2)
-                if (componentHwnd == focusedHwnd || ::IsChild(componentHwnd, focusedHwnd))
-                {
-                    return false;
-                }
+                return false;
             }
         }
     }
@@ -2527,7 +2518,7 @@ CFocusManager::FindAndSetNextFocus(
     return result.WasMoved();
 }
 
-FocusMovementResult
+_Check_return_ FocusMovementResult
 CFocusManager::FindAndSetNextFocus(_In_ const FocusMovement& movement)
 {
     HRESULT hr = S_OK;
@@ -2901,7 +2892,7 @@ bool CFocusManager::RaiseChangingFocusEvent(
     _In_ DirectUI::FocusNavigationDirection navigationDirection,
     _In_ KnownEventIndex index,
     _In_ GUID correlationId,
-    _Outptr_ CDependencyObject** pFinalGettingFocusElement)
+    _Outptr_result_maybenull_ CDependencyObject** pFinalGettingFocusElement)
 {
     auto scopeGuard = wil::scope_exit([&]
     {
@@ -3132,10 +3123,8 @@ void CFocusManager::RaiseNoFocusCandidateFoundEvent(
         noFocusCandidateFoundTarget = focusedElementAsTextElement->GetContainingFrameworkElement();
     }
 
-    GUID correlationId = {};
-    UuidCreate(&correlationId);
     bool bHandled = false;
-    IFCFAILFAST(m_focusObserver->DepartFocus(navigationDirection, correlationId, &bHandled));
+    IFCFAILFAST(m_focusObserver->DepartFocus(navigationDirection, Focus::CreateCorrelationId(), &bHandled));
 
     //We should never raise on a NULL source
     if (noFocusCandidateFoundTarget)
@@ -3267,8 +3256,7 @@ _Check_return_ HRESULT CFocusManager::SetWindowFocus(
 {
     xref_ptr<CRoutedEventArgs> args;
 
-    GUID correlationId = {};
-    UuidCreate(&correlationId);
+    const GUID correlationId {Focus::CreateCorrelationId()};
 
     SetPluginFocusStatus(isFocused);
 
@@ -3450,7 +3438,7 @@ _Check_return_ HRESULT CFocusManager::SetWindowFocus(
                 DirectUI::FocusState focusedState = focusedElementAsControl->GetFocusState();
                 focusedElementAsControl->UpdateFocusState(DirectUI::FocusState::Unfocused);
 
-                FxCallbacks::Control_UpdateVisualState(focusedElement, true /*fUseTransitions*/);
+                IFC_RETURN(FxCallbacks::Control_UpdateVisualState(focusedElement, true /*fUseTransitions*/));
 
                 //Restore the original focus state. We lie and say that the focused state is unfocused, although that isn't
                 //the case. This is done so that if this element is being inspected before a window activated has been received,
diff --git a/src/dxaml/xcp/core/dll/rendertargetbitmapmgr.cpp b/src/dxaml/xcp/core/dll/rendertargetbitmapmgr.cpp
index ceb236c646..b1dd813511 100644
--- a/src/dxaml/xcp/core/dll/rendertargetbitmapmgr.cpp
+++ b/src/dxaml/xcp/core/dll/rendertargetbitmapmgr.cpp
@@ -508,7 +508,7 @@ CRenderTargetBitmapManager::PreCommit(
                     {
                         if (completionEvent != nullptr)
                         {
-                            completionEvent->Close();
+                            VERIFYHR(completionEvent->Close());
                         }
                     });
 
diff --git a/src/dxaml/xcp/core/dll/xcpcore.cpp b/src/dxaml/xcp/core/dll/xcpcore.cpp
index 649dddace1..dcb30eb81c 100644
--- a/src/dxaml/xcp/core/dll/xcpcore.cpp
+++ b/src/dxaml/xcp/core/dll/xcpcore.cpp
@@ -74,6 +74,8 @@
 #include <windows.system.h>
 #include "DXamlServices.h"
 #include "JupiterWindow.h"
+#include "RefreshRateInfo.h"
+#include "GraphicsTelemetry.h"
 
 #if XCP_MONITOR
 #include "XcpAllocationDebug.h"
@@ -563,6 +565,7 @@ CCoreServices::CCoreServices()
     m_pHasDeferredAnimationOperationsEvent = nullptr;
     m_pDeferredAnimationOperationsCompleteEvent = nullptr;
     m_pRootVisualResetEvent = NULL;
+    m_layoutCleanEvent = nullptr;
     m_pImageDecodingIdleEvent = NULL;
     m_pFontDownloadsIdleEvent = nullptr;
     m_pPopupMenuCommandInvokedEvent = nullptr;
@@ -771,6 +774,12 @@ CCoreServices::~CCoreServices() noexcept
         m_pRootVisualResetEvent = nullptr;
     }
 
+    if (m_layoutCleanEvent)
+    {
+        m_layoutCleanEvent->Close();
+        m_layoutCleanEvent = nullptr;
+    }
+
     if (m_pImageDecodingIdleEvent)
     {
         m_pImageDecodingIdleEvent->Close();
@@ -6278,6 +6287,12 @@ CCoreServices::NWDrawTree(
         // Update the state of elements that change their state asynchronously.
         IFC(UpdateDirtyState());
 
+        if (pLayoutManager)
+        {
+            bool isLayoutClean = pLayoutManager->IsLayoutClean();
+            IFC(SetLayoutCleanSignaledStatus(isLayoutClean));
+        }
+
         // Ensure that device resources have been created before the render walk.
         if (isRenderEnabled)
         {
@@ -6910,9 +6925,6 @@ CCoreServices::SubmitPrimitiveCompositionCommands(
     // DComp animations have been committed. Clear the flag for "new independent animations started this frame".
     pTimeManager->ResetIndependentTimelinesChanged();
 
-    // Wake the independent thread since the UI thread submitted work.
-    IFC_RETURN(compositorScheduler->WakeCompositionThread());
-
     // Commit the main device outside the lock. It is possible that the content of the frame and its animations will
     // get out of sync. The render thread can start ticking animations before the content changes are picked up.
     // However, the main device Commit() of the content changes can take a long time (> 1 vBlank) to return.
@@ -10344,6 +10356,21 @@ CCoreServices::SetSystemFontCollectionOverride(_In_opt_ IDWriteFontCollection* p
     return S_OK;
 }
 
+//------------------------------------------------------------------------------
+//
+//  Synopsis:
+//      Indicates whether the DWrite Typographic model should be used.
+//
+//------------------------------------------------------------------------------
+_Check_return_ HRESULT
+CCoreServices::ShouldUseTypographicFontModel(_Out_ bool* useDWriteTypographicModel)
+{
+    CTextCore* pTextCore = nullptr;
+    IFC_RETURN(GetTextCore(&pTextCore));
+    IFC_RETURN(pTextCore->GetWinTextCore()->ShouldUseTypographicFontModel(useDWriteTypographicModel));
+    return S_OK;
+}
+
 void
 CCoreServices::SetTransparentBackground(bool isTransparent)
 {
@@ -10525,6 +10552,14 @@ CCoreServices::InitWaitForIdleEvents()
         XSTRING_PTR_EPHEMERAL(L"RootVisualReset"),
         FALSE /* bReturnFailureIfCreationFailed */));
 
+    IFC_RETURN(gps->NamedEventCreate(
+        &m_layoutCleanEvent,
+        InitModeOpenOrCreate,
+        TRUE /* bInitialState */,
+        TRUE /* bManualReset */,
+        XSTRING_PTR_EPHEMERAL(L"LayoutClean"),
+        FALSE /* bReturnFailureIfCreationFailed */));
+
     IFC_RETURN(gps->NamedEventCreate(
         &m_pImageDecodingIdleEvent,
         InitModeOpenOrCreate,
@@ -10694,6 +10729,23 @@ CCoreServices::SetRootVisualResetEventSignaledStatus(_In_ bool bSignaled)
     return S_OK;
 }
 
+_Check_return_ HRESULT CCoreServices::SetLayoutCleanSignaledStatus(_In_ bool bSignaled)
+{
+    if (m_layoutCleanEvent != nullptr)
+    {
+        if (bSignaled)
+        {
+            IFC_RETURN(m_layoutCleanEvent->Set());
+        }
+        else
+        {
+            IFC_RETURN(m_layoutCleanEvent->Reset());
+        }
+    }
+
+    return S_OK;
+}
+
 //------------------------------------------------------------------------
 //
 //  Synopsis:
diff --git a/src/dxaml/xcp/core/error/ErrorService.cpp b/src/dxaml/xcp/core/error/ErrorService.cpp
index dd810bedc7..78e2e5a43f 100644
--- a/src/dxaml/xcp/core/error/ErrorService.cpp
+++ b/src/dxaml/xcp/core/error/ErrorService.cpp
@@ -153,34 +153,9 @@ const HResultToECodePair eResult_eCode_Table[] =
     {(HRESULT)MX_E_ENCODING,           AG_E_PARSER_INVALID_ENCODING},
     {(HRESULT)WC_E_UNIQUEATTRIBUTE,    AG_E_PARSER_MULT_PROP_VALUES},
 
-    {E_CAPTURE_DEVICE_IN_USE,        AG_E_CAPTURE_DEVICE_IN_USE},
-    {E_CAPTURE_DEVICE_REMOVED,       AG_E_CAPTURE_DEVICE_REMOVED},
-    {E_CAPTURE_DEVICE_ACCESS_DENIED, AG_E_CAPTURE_DEVICE_ACCESS_DENIED},
-    {E_CAPTURE_SOURCE_NOT_STOPPED,   AG_E_CAPTURE_SOURCE_NOT_STOPPED},
-    {E_CAPTURE_DEVICE_NOT_AVAILABLE, AG_E_CAPTURE_DEVICE_NOT_AVAILABLE},
     {E_INVALID_APP_SIGNATURE,        AG_E_INVALID_APP_SIGNATURE},
 };
 
-//
-// Table mapping specific media errors to generic equivalents.  Allows
-// us to expose new media errors in MSS scenario without changing others.
-//
-const ECodePair Media_Specific_to_Generic_Table[] =
-{
-    {AG_E_ATTRIBUTENOTFOUND,           AG_E_UNABLE_TO_PLAY},
-    {AG_E_END_OF_STREAM,               AG_E_UNABLE_TO_PLAY},
-    {AG_E_INVALIDINDEX,                AG_E_UNABLE_TO_PLAY},
-    {AG_E_INVALIDSTREAMNUMBER,         AG_E_UNABLE_TO_PLAY},
-    {AG_E_NO_SAMPLE_DURATION,          AG_E_UNABLE_TO_PLAY},
-    {AG_E_NO_SAMPLE_TIMESTAMP,         AG_E_UNABLE_TO_PLAY},
-    {AG_E_SHUTDOWN,                    AG_E_UNABLE_TO_PLAY},
-    {AG_E_INVALIDMEDIATYPE,            AG_E_INVALID_FILE_FORMAT},
-    {AG_E_INVALIDTYPE,                 AG_E_INVALID_FILE_FORMAT},
-    {AG_E_INVALID_FORMAT,              AG_E_INVALID_FILE_FORMAT},
-    {AG_E_UNSUPPORTED_REPRESENTATION,  AG_E_INVALID_FILE_FORMAT},
-    {AG_E_INVALIDREQUEST,              AG_E_NOT_FOUND},
-};
-
 
 //------------------------------------------------------------------------
 //  Method:   Create
@@ -716,36 +691,6 @@ CErrorService::UpdateErrorCodeFromHResult(_In_ HRESULT hResult, _Out_ XUINT32 *p
     return S_OK;
 }
 
-_Check_return_ HRESULT
-CErrorService::UnspecifyMediaError(_In_ XUINT32 iSpecificCode, _Out_ XUINT32 *pGenericCode)
-{
-    XUINT32 cecp = sizeof(Media_Specific_to_Generic_Table) / sizeof(ECodePair);
-    const ECodePair *pecp = Media_Specific_to_Generic_Table;
-
-    if (pGenericCode == NULL)
-    {
-        IFC_RETURN(E_INVALIDARG);
-    }
-
-    *pGenericCode = iSpecificCode;
-
-    // Search the Specific_to_Generic mapping table to get the original code.
-
-    while (cecp)
-    {
-        if (pecp->m_iKey == iSpecificCode)
-        {
-            // Found a mapping
-            *pGenericCode = pecp->m_iEquivalent;
-            break;
-        }
-
-        pecp++;
-        cecp--;
-    }
-    return S_OK;
-}
-
 //-----------------------------------------------------------------------------
 //
 //  Function: CErrorService::AddError
diff --git a/src/dxaml/xcp/core/hw/VisualContentRenderer.h b/src/dxaml/xcp/core/hw/VisualContentRenderer.h
index ea8d563e11..716a5fc407 100644
--- a/src/dxaml/xcp/core/hw/VisualContentRenderer.h
+++ b/src/dxaml/xcp/core/hw/VisualContentRenderer.h
@@ -142,7 +142,7 @@ class VisualContentRenderer : public BaseContentRenderer
     // are retrieved starting at m_idxNextReusable. This collection is ref-counted starting at
     // m_idxNextReusable (inclusive).
     PCRenderDataList m_RecycledRenderData;
-    XUINT32 m_idxNextReusable;
+    XUINT32 m_idxNextReusable{};
 
     wrl::ComPtr<WUComp::IVisualCollection> m_spCurrentParentCollection;
 };
diff --git a/src/dxaml/xcp/core/hw/hwwalk.cpp b/src/dxaml/xcp/core/hw/hwwalk.cpp
index 378a2c9355..80fc569a6b 100644
--- a/src/dxaml/xcp/core/hw/hwwalk.cpp
+++ b/src/dxaml/xcp/core/hw/hwwalk.cpp
@@ -27,6 +27,7 @@
 #include "XboxUtility.h"
 #include <XamlOneCoreTransforms.h>
 #include <RootScale.h>
+#include "GraphicsTelemetry.h"
 
 using namespace RuntimeFeatureBehavior;
 
@@ -174,7 +175,6 @@ HWWalk::Render(
     )
 {
     HRESULT hr = S_OK;
-    TraceRenderElementBegin((XUINT64)pUIElement);
 
     ASSERT(parentRP.pTransformToRoot != NULL);
     ASSERT(parentRP.pTransformsAndClipsToCompNode != NULL);
@@ -258,6 +258,12 @@ HWWalk::Render(
             bool skipRenderWhileTransformTooSmall = false;
             bool skipRenderWhileParentHasZeroSizedClip = parentRP.pTransformsAndClipsToCompNode->HasZeroSizedClip() && !pUIElement->IsForceNoCulling();
 
+            TraceLoggingProviderWrite(
+                GraphicsTelemetry, "RenderWalk_RenderElement",
+                TraceLoggingUInt64(reinterpret_cast<uint64_t>(pUIElement), "ElementPointer"),
+                TraceLoggingWideString(pUIElement->GetClassName().GetBuffer(), "ClassName"),
+                TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
             // Skip rendering this element subgraph if possible.
             // IMPORTANT: The checks in Cleanup for cleaning specific dirty flags need to reflect the order we check each condition here.
             //            If we clean the wrong dirty flag when multiple conditions are true, we may never detect the change that causes the
@@ -393,7 +399,6 @@ HWWalk::Render(
     }
 
 Cleanup:
-    TraceRenderElementEnd();
     RRETURN(hr);
 }
 
diff --git a/src/dxaml/xcp/core/hw/hwwalk.h b/src/dxaml/xcp/core/hw/hwwalk.h
index 8be1be0f10..a2c1b88645 100644
--- a/src/dxaml/xcp/core/hw/hwwalk.h
+++ b/src/dxaml/xcp/core/hw/hwwalk.h
@@ -158,7 +158,7 @@ struct HWRenderParamsBase
     // themselves to this, then they are attached to the DComp tree under the root visual with 1.4x scale. The final size
     // of these elements will be 1371.4 * 1.4 = 1920 by 857.1 * 1.4 = 1200.
     //
-    XSIZEF effectiveWindowSize;
+    XSIZEF effectiveWindowSize{};
 
     // A list of lights that are attached to the ancestor chain at any point in the walk. Updated as we visit elements during the
     // render walk. Any UIElement with a XamlLight.TargetId will look in this list for lights with matching target IDs.
diff --git a/src/dxaml/xcp/core/imaging/ImagingProvider/ImageProvider.cpp b/src/dxaml/xcp/core/imaging/ImagingProvider/ImageProvider.cpp
index 114958c3c8..4b93e3ccd8 100644
--- a/src/dxaml/xcp/core/imaging/ImagingProvider/ImageProvider.cpp
+++ b/src/dxaml/xcp/core/imaging/ImagingProvider/ImageProvider.cpp
@@ -75,12 +75,6 @@ ImageProvider::~ImageProvider(
 
     ReleaseInterface(m_pImageFactory);
     ReleaseInterface(m_pStore);
-
-    // Note: The dtor will log an error if Stop isn't called first.
-    if (m_decodeActivity && m_decodeActivity->IsRunning())
-    {
-        m_decodeActivity->Stop();
-    }
 }
 
 //------------------------------------------------------------------------
@@ -122,11 +116,9 @@ ImageProvider::GetImage(
     GetImageOptions options,
     _In_ const xref_ptr<IImageAvailableCallback>& spImageAvailableCallback,
     _In_ CCoreServices* pCore,
-    _Outref_ xref_ptr<IAbortableImageOperation>& spAbortableImageOperation
+    _Out_ xref_ptr<IAbortableImageOperation>& spAbortableImageOperation
     )
 {
-    const std::shared_ptr<ImagingTelemetry::ImageDecodeActivity>& decodeActivity = spDecodeParams->GetDecodeActivity();
-
     auto parseHR = spEncodedImageData->Parse(pCore->GetGraphicsDevice(), pCore->GetContentRootMaxSize());
 
     bool isAnimatedImage = SUCCEEDED(parseHR) && spEncodedImageData->IsAnimatedImage();
@@ -199,10 +191,7 @@ ImageProvider::GetImage(
 
             imageCache->SetEncodedImageData(spEncodedImageData);
 
-            if (decodeActivity)
-            {
-                decodeActivity->CreateImageCacheFromExistingEncodedData(spDecodeParams->GetImageId(), spDecodeParams->GetStrSource().GetBuffer());
-            }
+            ImagingTelemetry::CreateImageCacheFromExistingEncodedData(spDecodeParams->GetImageId(), spDecodeParams->GetStrSource().GetBuffer());
 
             IFC_RETURN(imageCache->GetImage(spDecodeParams, spImageAvailableCallback, spAbortableImageOperation));
         }
@@ -415,7 +404,6 @@ ImageProvider::EnsureCacheEntry(
     _In_opt_ IPALUri *pAbsoluteUri,
     bool isSvg,
     GetImageOptions options,
-    _In_ const std::shared_ptr<ImagingTelemetry::ImageDecodeActivity>& decodeActivity,
     uint64_t imageId,
     _Out_ bool *pCacheHit,
     _Outptr_ ImageCache **ppImageCache
@@ -445,10 +433,7 @@ ImageProvider::EnsureCacheEntry(
 
     if (imageCache == nullptr)
     {
-        if (decodeActivity)
-        {
-            decodeActivity->CreateImageCache(imageId, strUri.GetBuffer());
-        }
+        ImagingTelemetry::CreateImageCache(imageId, strUri.GetBuffer());
 
         imageCache = make_xref<ImageCache>(
             strCacheKey,
@@ -469,11 +454,7 @@ ImageProvider::EnsureCacheEntry(
     }
     else
     {
-        if (decodeActivity)
-        {
-            decodeActivity->FoundImageCache(imageId, strUri.GetBuffer());
-        }
-
+        ImagingTelemetry::FoundImageCache(imageId, strUri.GetBuffer());
         *pCacheHit = true;
     }
 
diff --git a/src/dxaml/xcp/core/imaging/ImagingProvider/ImageProvider.h b/src/dxaml/xcp/core/imaging/ImagingProvider/ImageProvider.h
index 5a8b11232b..2d8f132775 100644
--- a/src/dxaml/xcp/core/imaging/ImagingProvider/ImageProvider.h
+++ b/src/dxaml/xcp/core/imaging/ImagingProvider/ImageProvider.h
@@ -42,14 +42,14 @@ class ImageProvider : public CXcpObjectBase< >,
         GetImageOptions options,
         _In_ const xref_ptr<IImageAvailableCallback>& spImageAvailableCallback,
         _In_ CCoreServices* pCore,
-        _Outref_ xref_ptr<IAbortableImageOperation>& spAbortableImageOperation
+        _Out_ xref_ptr<IAbortableImageOperation>& spAbortableImageOperation
         );
 
     _Check_return_ HRESULT CopyImage(
         _In_ xref_ptr<ImageCopyParams>& spCopyParams,
         _In_ const xref_ptr<IImageAvailableCallback>& spImageAvailableCallback,
         _In_ CCoreServices* pCore,
-        _Outref_ xref_ptr<IAbortableImageOperation>& spAbortableImageOperation
+        _Out_ xref_ptr<IAbortableImageOperation>& spAbortableImageOperation
         );
 
     _Check_return_ HRESULT CleanupCaches();
@@ -60,14 +60,11 @@ class ImageProvider : public CXcpObjectBase< >,
         _In_opt_ IPALUri *pAbsoluteUri,
         bool isSvg,
         GetImageOptions options,
-        _In_ const std::shared_ptr<ImagingTelemetry::ImageDecodeActivity>& decodeActivity,
         uint64_t imageId,
         _Out_ bool *pCacheHit,
         _Outptr_ ImageCache **ppImageCache
         );
 
-    std::shared_ptr<ImagingTelemetry::ImageDecodeActivity>& GetDecodeActivity();
-
 private:
     ImageProvider();
     ~ImageProvider() override;
@@ -103,16 +100,8 @@ class ImageProvider : public CXcpObjectBase< >,
         _Out_ bool* useCache
         );
 
-    void EnsureDecodeActivity();
-
     CCoreServices* m_pCore;
     IAsyncImageFactory* m_pImageFactory;
     CValueStore* m_pStore;
     ImageTaskDispatcher* m_pDispatcher;
-
-    // For ETW tracing - tracks the entire decode process, from requesting a decode to the decode running (whether
-    // on the UI thread or on a background thread) to the decode completing (whether successfully or not) to the
-    // completion notification being delivered back to the ImageSource on the UI thread. Use one activity for all images
-    // in the entire CCoreServices.
-    std::shared_ptr<ImagingTelemetry::ImageDecodeActivity> m_decodeActivity;
 };
diff --git a/src/dxaml/xcp/core/imaging/ImagingProvider/LoadedImageSurface.cpp b/src/dxaml/xcp/core/imaging/ImagingProvider/LoadedImageSurface.cpp
index ff515e3aff..ed6bbcd191 100644
--- a/src/dxaml/xcp/core/imaging/ImagingProvider/LoadedImageSurface.cpp
+++ b/src/dxaml/xcp/core/imaging/ImagingProvider/LoadedImageSurface.cpp
@@ -177,7 +177,6 @@ void CLoadedImageSurface::SetDesiredSize(float width, float height)
 static HRESULT GetImageCache(
     _In_ CCoreServices &core,
     const xstring_ptr &uri,
-    const std::shared_ptr<ImagingTelemetry::ImageDecodeActivity>& decodeActivity,
     uint64_t imageId,
     _Outptr_ ImageCache **imageCache)
 {
@@ -195,7 +194,7 @@ static HRESULT GetImageCache(
 
     // EnsureCacheEntry creates the ImageCache object and doesn't cache it unless there is a valid URI.
     // The returned ImageCache is being used here as a download/decode engine.
-    IFC_RETURN(core.GetImageProvider()->EnsureCacheEntry(uri, absoluteUri.get(), false /* isSvg */, GetImageOptions::None, decodeActivity, imageId, &cacheHit, imageCache));
+    IFC_RETURN(core.GetImageProvider()->EnsureCacheEntry(uri, absoluteUri.get(), false /* isSvg */, GetImageOptions::None, imageId, &cacheHit, imageCache));
 
     return S_OK;
 }
@@ -208,7 +207,7 @@ _Check_return_ HRESULT CLoadedImageSurface::GetImageDescription(ImageCache &imag
         m_imageMetadataView.reset();
     }
 
-    m_imageMetadataView = imageCache.GetMetadataView(GetContext()->GetImageProvider()->GetDecodeActivity(), reinterpret_cast<uint64_t>(this));
+    m_imageMetadataView = imageCache.GetMetadataView(reinterpret_cast<uint64_t>(this));
     m_imageMetadataView->AddImageViewListener(*this);
     if (m_imageMetadataView->GetImageMetadata())
     {
@@ -221,15 +220,10 @@ _Check_return_ HRESULT CLoadedImageSurface::InitFromUri(xstring_ptr uri)
 {
     IFCEXPECTRC_RETURN(!m_closed, RO_E_CLOSED);
 
-    const auto& decodeActivity = GetContext()->GetImageProvider()->GetDecodeActivity();
-
-    if (decodeActivity)
-    {
-        decodeActivity->SetLoadedImageSurfaceUri(reinterpret_cast<uint64_t>(this), uri.GetBuffer());
-    }
+    ImagingTelemetry::SetLoadedImageSurfaceUri(reinterpret_cast<uint64_t>(this), uri.GetBuffer());
 
     auto core = GetContext();
-    IFC_RETURN(GetImageCache(*core, uri, decodeActivity, reinterpret_cast<uint64_t>(this), m_imageCache.ReleaseAndGetAddressOf()));
+    IFC_RETURN(GetImageCache(*core, uri, reinterpret_cast<uint64_t>(this), m_imageCache.ReleaseAndGetAddressOf()));
 
     // Start asynchronous download/decode operation
     IFC_RETURN(GetImageDescription(*m_imageCache));
@@ -250,15 +244,10 @@ _Check_return_ HRESULT CLoadedImageSurface::InitFromMemory(_In_ wistd::unique_pt
 {
     IFCEXPECTRC_RETURN(!m_closed, RO_E_CLOSED);
 
-    const auto& decodeActivity = GetContext()->GetImageProvider()->GetDecodeActivity();
-
-    if (decodeActivity)
-    {
-        decodeActivity->SetLoadedImageSurfaceMemory(reinterpret_cast<uint64_t>(this));
-    }
+    ImagingTelemetry::SetLoadedImageSurfaceMemory(reinterpret_cast<uint64_t>(this));
 
     auto core = GetContext();
-    IFC_RETURN(GetImageCache(*core, xstring_ptr::NullString() /* uri */, decodeActivity, reinterpret_cast<uint64_t>(this), m_imageCache.ReleaseAndGetAddressOf()));
+    IFC_RETURN(GetImageCache(*core, xstring_ptr::NullString() /* uri */, reinterpret_cast<uint64_t>(this), m_imageCache.ReleaseAndGetAddressOf()));
 
     // Set encoded data to skip async downloading
     m_imageCache->SetEncodedImageData(std::make_shared<EncodedImageData>(std::move(rawData)));
@@ -431,7 +420,6 @@ _Check_return_ HRESULT CLoadedImageSurface::StartDecodingHelper()
         false /* isAutoPlay */,
         surfaceUpdateList,
         true /* isLoadedImageSurface */,
-        GetContext()->GetImageProvider()->GetDecodeActivity(),
         reinterpret_cast<XUINT64>(this),
         xstring_ptr::EmptyString());
 
@@ -552,7 +540,7 @@ _Check_return_ HRESULT CLoadedImageSurface::OnScaleChanged()
 
             // TODO: GetImageCache should operate based on fully resolved file path.
             //       Then we could skip downloading for non-MRT resources.
-            IFC_RETURN(GetImageCache(*GetContext(), uri, GetContext()->GetImageProvider()->GetDecodeActivity(), reinterpret_cast<uint64_t>(this), m_imageCache.ReleaseAndGetAddressOf()));
+            IFC_RETURN(GetImageCache(*GetContext(), uri, reinterpret_cast<uint64_t>(this), m_imageCache.ReleaseAndGetAddressOf()));
             IFC_RETURN(GetImageDescription(*m_imageCache));
         }
         else
@@ -621,7 +609,7 @@ void CLoadedImageSurface::OnLowMemory()
 
 _Check_return_ HRESULT CLoadedImageSurface::OnImageViewUpdated(ImageViewBase& sender)
 {
-    HRESULT decodeOrDownloadHR = sender.GetHR(GetContext()->GetImageProvider()->GetDecodeActivity(), reinterpret_cast<uint64_t>(this));
+    HRESULT decodeOrDownloadHR = sender.GetHR(reinterpret_cast<uint64_t>(this));
     if (SUCCEEDED(decodeOrDownloadHR))
     {
         // If we're in the middle of shutting down then don't bother decoding. The device that we'll need is released.
diff --git a/src/dxaml/xcp/core/inc/Activators.g.h b/src/dxaml/xcp/core/inc/Activators.g.h
index 15e54686df..53e9c29271 100644
--- a/src/dxaml/xcp/core/inc/Activators.g.h
+++ b/src/dxaml/xcp/core/inc/Activators.g.h
@@ -741,117 +741,117 @@ HRESULT OnCoreCreateZoomUnit(_Outptr_ CDependencyObject **ppObject, _In_ CREATEP
 
 namespace DirectUI
 {
-    HRESULT OnFrameworkCreateBindingFailedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateBringIntoViewRequestedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateDragEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateDragStartingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateDropCompletedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateEffectiveViewportChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateExceptionRoutedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateMediaFailedRoutedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateResourceManagerRequestedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateRoutedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateSizeChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateUnhandledExceptionEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateVisualStateChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateWindowCreatedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateXamlResourceReferenceFailedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateXamlRootChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateLoadedImageSourceLoadCompletedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateMediaTransportControlsThumbnailRequestedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateRenderedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateRenderingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateAccessKeyDisplayDismissedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateAccessKeyDisplayRequestedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateAccessKeyInvokedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateCanExecuteRequestedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateCharacterReceivedRoutedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateContextRequestedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateDoubleTappedRoutedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateExecuteRequestedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateFocusedElementRemovedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateFocusManagerGotFocusEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateFocusManagerLostFocusEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateGettingFocusEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateHoldingRoutedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateKeyboardAcceleratorInvokedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateKeyRoutedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateLosingFocusEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateManipulationCompletedRoutedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateManipulationDeltaRoutedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateManipulationInertiaStartingRoutedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateManipulationStartedRoutedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateManipulationStartingRoutedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateNoFocusCandidateFoundEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreatePointerRoutedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateRightTappedRoutedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateTappedRoutedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateHyperlinkClickEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateAnchorRequestedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateCalendarDatePickerDateChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateCalendarViewDayItemChangingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateCalendarViewSelectedDatesChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateCandidateWindowBoundsChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateCleanUpVirtualizedItemEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateComboBoxTextSubmittedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateCommandingContextChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateContentDialogButtonClickEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateContentDialogClosedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateContentDialogClosingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateContentDialogOpenedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateContextMenuEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateDatePickerSelectedValueChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateDatePickerValueChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateDragItemsCompletedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateDragItemsStartingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateDynamicOverflowItemsChangingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateFocusDisengagedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateFocusEngagedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateHasValidationErrorsChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateHubSectionHeaderClickEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateInputValidationErrorEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateIsTextTrimmedChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateItemClickEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreatePasswordBoxPasswordChangingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateRichEditBoxSelectionChangingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateRichEditBoxTextChangingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateScrollViewerViewChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateScrollViewerViewChangingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateSectionsInViewChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateSelectionChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateSemanticZoomViewChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateSplitViewPaneClosingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateTextBoxBeforeTextChangingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateTextBoxSelectionChangingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateTextBoxTextChangingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateTextChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateTextCompositionChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateTextCompositionEndedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateTextCompositionStartedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateTextControlCopyingToClipboardEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateTextControlCuttingToClipboardEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateTextControlPasteEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateTimePickerSelectedValueChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateTimePickerValueChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateIsEnabledChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateDownloadProgressEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateSvgImageSourceFailedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateSvgImageSourceOpenedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateDragCompletedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateDragDeltaEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateDragStartedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateFlyoutBaseClosingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateRangeBaseValueChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateScrollEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateCurrentChangingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateDataErrorsChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateAddPagesEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateGetPreviewPageEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreatePaginateEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateNavigatingCancelEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateNavigationEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateNavigationFailedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateDesktopWindowXamlSourceGotFocusEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
-    HRESULT OnFrameworkCreateDesktopWindowXamlSourceTakeFocusRequestedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateBindingFailedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateBringIntoViewRequestedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateDragEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateDragStartingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateDropCompletedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateEffectiveViewportChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateExceptionRoutedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateMediaFailedRoutedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateResourceManagerRequestedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateRoutedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateSizeChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateUnhandledExceptionEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateVisualStateChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateWindowCreatedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateXamlResourceReferenceFailedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateXamlRootChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateLoadedImageSourceLoadCompletedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateMediaTransportControlsThumbnailRequestedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateRenderedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateRenderingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateAccessKeyDisplayDismissedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateAccessKeyDisplayRequestedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateAccessKeyInvokedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateCanExecuteRequestedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateCharacterReceivedRoutedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateContextRequestedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateDoubleTappedRoutedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateExecuteRequestedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateFocusedElementRemovedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateFocusManagerGotFocusEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateFocusManagerLostFocusEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateGettingFocusEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateHoldingRoutedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateKeyboardAcceleratorInvokedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateKeyRoutedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateLosingFocusEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateManipulationCompletedRoutedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateManipulationDeltaRoutedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateManipulationInertiaStartingRoutedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateManipulationStartedRoutedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateManipulationStartingRoutedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateNoFocusCandidateFoundEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreatePointerRoutedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateRightTappedRoutedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateTappedRoutedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateHyperlinkClickEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateAnchorRequestedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateCalendarDatePickerDateChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateCalendarViewDayItemChangingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateCalendarViewSelectedDatesChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateCandidateWindowBoundsChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateCleanUpVirtualizedItemEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateComboBoxTextSubmittedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateCommandingContextChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateContentDialogButtonClickEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateContentDialogClosedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateContentDialogClosingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateContentDialogOpenedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateContextMenuEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateDatePickerSelectedValueChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateDatePickerValueChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateDragItemsCompletedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateDragItemsStartingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateDynamicOverflowItemsChangingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateFocusDisengagedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateFocusEngagedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateHasValidationErrorsChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateHubSectionHeaderClickEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateInputValidationErrorEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateIsTextTrimmedChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateItemClickEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreatePasswordBoxPasswordChangingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateRichEditBoxSelectionChangingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateRichEditBoxTextChangingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateScrollViewerViewChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateScrollViewerViewChangingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateSectionsInViewChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateSelectionChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateSemanticZoomViewChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateSplitViewPaneClosingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateTextBoxBeforeTextChangingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateTextBoxSelectionChangingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateTextBoxTextChangingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateTextChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateTextCompositionChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateTextCompositionEndedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateTextCompositionStartedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateTextControlCopyingToClipboardEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateTextControlCuttingToClipboardEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateTextControlPasteEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateTimePickerSelectedValueChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateTimePickerValueChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateIsEnabledChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateDownloadProgressEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateSvgImageSourceFailedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateSvgImageSourceOpenedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateDragCompletedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateDragDeltaEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateDragStartedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateFlyoutBaseClosingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateRangeBaseValueChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateScrollEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateCurrentChangingEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateDataErrorsChangedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateAddPagesEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateGetPreviewPageEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreatePaginateEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateNavigatingCancelEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateNavigationEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateNavigationFailedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateDesktopWindowXamlSourceGotFocusEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT OnFrameworkCreateDesktopWindowXamlSourceTakeFocusRequestedEventArgs(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
 }
diff --git a/src/dxaml/xcp/core/inc/AutomationPeer.h b/src/dxaml/xcp/core/inc/AutomationPeer.h
index 268553ecdb..040ec4d4e1 100644
--- a/src/dxaml/xcp/core/inc/AutomationPeer.h
+++ b/src/dxaml/xcp/core/inc/AutomationPeer.h
@@ -33,7 +33,7 @@ IAutomationPeerHwndInterop : public IUnknown
 
     virtual /* [propget] */ HRESULT STDMETHODCALLTYPE IsCorrectPeerForHwnd(
                                                  HWND hwnd,
-        /* [retval][out] */ __RPC__deref_out_opt bool * value) = 0;
+        /* [retval][out] */ __RPC__out bool * value) = 0;
 
 };
 
diff --git a/src/dxaml/xcp/core/inc/CDependencyObject.h b/src/dxaml/xcp/core/inc/CDependencyObject.h
index 0bb61436df..1dcd74a82e 100644
--- a/src/dxaml/xcp/core/inc/CDependencyObject.h
+++ b/src/dxaml/xcp/core/inc/CDependencyObject.h
@@ -152,84 +152,7 @@ enum class ObjectStrictness : uint8_t
     StrictOnly = 2
 };
 
-namespace ctl
-{
-    template<typename impl_type>
-    class interface_forwarder<xaml::Core::Direct::IXamlDirectObject, impl_type> : public interface_forwarder_base<xaml::Core::Direct::IXamlDirectObject>
-    {
-        impl_type* This() { return this->This_helper<impl_type>(); }
-
-        IFACEMETHODIMP QueryInterface(
-            /* [in] */ REFIID riid,
-            /* [iid_is][out] */ _COM_Outptr_ void __RPC_FAR *__RPC_FAR *ppvObject) final
-        {
-            if (InlineIsEqualGUID(riid, __uuidof(IUnknown))
-                || InlineIsEqualGUID(riid, __uuidof(IInspectable))
-                || InlineIsEqualGUID(riid, __uuidof(xaml::Core::Direct::IXamlDirectObject)))
-            {
-                *ppvObject = ctl::interface_cast<xaml::Core::Direct::IXamlDirectObject>(This());
-            }
-            else
-            {
-                *ppvObject = nullptr;
-                return E_NOINTERFACE;
-            }
-
-            This()->AddRef();
-            return S_OK;
-        }
-
-        IFACEMETHODIMP_(ULONG) AddRef(void) final
-        {
-            This()->AddRef();
-            return This()->GetRefCount();
-        }
-
-        IFACEMETHODIMP_(ULONG) Release(void) final
-        {
-            ULONG cRefCount = This()->GetRefCount();
-            This()->Release();
-            return cRefCount - 1;
-        }
-
-        IFACEMETHODIMP GetIids(
-            /* [out] */ __RPC__out ULONG *iidCount,
-            /* [size_is][size_is][out] */ __RPC__deref_out_ecount_full_opt(*iidCount) IID **iids) final
-        {
-            static const IID* const cdoIIDs[] = {
-                &__uuidof(IUnknown),
-                &__uuidof(IInspectable),
-                &__uuidof(xaml::Core::Direct::IXamlDirectObject),
-            };
-
-            IID* iidArray = static_cast<IID*>(::CoTaskMemAlloc(sizeof(IID) * ARRAY_SIZE(cdoIIDs)));
-            for (unsigned int i = 0; i < ARRAY_SIZE(cdoIIDs); ++i)
-            {
-                iidArray[i] = *cdoIIDs[i];
-            }
-
-            *iidCount = ARRAY_SIZE(cdoIIDs);
-            *iids = iidArray;
-            return S_OK;
-        }
-
-        IFACEMETHODIMP GetRuntimeClassName(
-            /* [out] */ __RPC__deref_out_opt HSTRING *className) final
-        {
-            constexpr wchar_t classNameStr[] = L"Microsoft.UI.Xaml.IXamlDirectObject";
-            return wrl_wrappers::HStringReference(classNameStr, SZ_COUNT(classNameStr)).CopyTo(className);
-        }
-
-        IFACEMETHODIMP GetTrustLevel(
-            /* [out] */ __RPC__out TrustLevel *trustLevel) final
-        {
-            *trustLevel = TrustLevel::BaseTrust;
-            return S_OK;
-        }
-    };
-}
-
-class CDependencyObject : public ctl::forwarder_holder<xaml::Core::Direct::IXamlDirectObject, CDependencyObject>
+class CDependencyObject
 {
     // Allow unit tests to access everything.
     friend class Microsoft::UI::Xaml::Tests::Framework::DependencyObject::ConversionUnitTests;
diff --git a/src/dxaml/xcp/core/inc/CalendarViewBaseItemChrome.h b/src/dxaml/xcp/core/inc/CalendarViewBaseItemChrome.h
index 8c4124dafb..539b3a3c3f 100644
--- a/src/dxaml/xcp/core/inc/CalendarViewBaseItemChrome.h
+++ b/src/dxaml/xcp/core/inc/CalendarViewBaseItemChrome.h
@@ -298,7 +298,7 @@ class CCalendarViewBaseItemChrome : public CControl
     static const int s_maxNumberOfDensityBars = 10;
     static std::optional<bool> s_isRoundedCalendarViewBaseItemChromeEnabled;
 
-    std::array<wu::Color, s_maxNumberOfDensityBars> m_densityBarColors;
+    std::array<wu::Color, s_maxNumberOfDensityBars> m_densityBarColors{};
     UINT m_numberOfDensityBar;
 
 protected:
diff --git a/src/dxaml/xcp/core/inc/CandidateWindowBoundsChangedEventArgs.h b/src/dxaml/xcp/core/inc/CandidateWindowBoundsChangedEventArgs.h
index 2dba29cfca..7523c3eaf4 100644
--- a/src/dxaml/xcp/core/inc/CandidateWindowBoundsChangedEventArgs.h
+++ b/src/dxaml/xcp/core/inc/CandidateWindowBoundsChangedEventArgs.h
@@ -30,5 +30,5 @@ class CCandidateWindowBoundsChangedEventArgs final : public CEventArgs
         return S_OK;
     }
 
-    XRECTF m_bounds;
+    XRECTF m_bounds{};
 };
diff --git a/src/dxaml/xcp/core/inc/CompositeTransform.h b/src/dxaml/xcp/core/inc/CompositeTransform.h
index 8c900348b1..c907209995 100644
--- a/src/dxaml/xcp/core/inc/CompositeTransform.h
+++ b/src/dxaml/xcp/core/inc/CompositeTransform.h
@@ -26,12 +26,12 @@ class CCompositeTransform final : public CTransform
         , m_isRotateAnimationDirty(false)
         , m_isTranslateXAnimationDirty(false)
         , m_isTranslateYAnimationDirty(false)
+        , m_compositeMatrix(true /*initialize*/)
     {
         m_fDirty      = FALSE; // Transform starts as identity so it's not dirty
         m_isTransitionClipTransform = FALSE;
         m_hasMarkedParentAsAnimated = FALSE;
         m_hasSimpleExpression = false;
-        m_compositeMatrix.SetToIdentity();
     }
 
 protected:
@@ -47,6 +47,7 @@ class CCompositeTransform final : public CTransform
         , m_isTranslateXAnimationDirty(false)
         , m_isTranslateYAnimationDirty(false)
         , m_hasUndoCenterTransformFlip(false)
+        , m_compositeMatrix(original.m_compositeMatrix)
     {
         m_ptCenter.x      = original.m_ptCenter.x;
         m_ptCenter.y      = original.m_ptCenter.y;
@@ -57,7 +58,6 @@ class CCompositeTransform final : public CTransform
         m_eRotation       = original.m_eRotation;
         m_eTranslateX     = original.m_eTranslateX;
         m_eTranslateY     = original.m_eTranslateY;
-        m_compositeMatrix = original.m_compositeMatrix;
         m_fDirty          = original.m_fDirty;
         m_isTransitionClipTransform = original.m_isTransitionClipTransform;
         m_hasMarkedParentAsAnimated = original.m_hasMarkedParentAsAnimated;
diff --git a/src/dxaml/xcp/core/inc/CustomClassInfo.h b/src/dxaml/xcp/core/inc/CustomClassInfo.h
index 9260d8857a..59d00eee7f 100644
--- a/src/dxaml/xcp/core/inc/CustomClassInfo.h
+++ b/src/dxaml/xcp/core/inc/CustomClassInfo.h
@@ -50,5 +50,5 @@ class CCustomClassInfo : public CClassInfo
     KnownPropertyIndex                                      m_nContentPropertyIndex;
     KnownTypeIndex                                          m_boxedTypeIndex;
     KnownNamespaceIndex                                     m_nNamespaceIndex;
-    bool                                                    m_isBindable;
+    bool                                                    m_isBindable{};
 };
diff --git a/src/dxaml/xcp/core/inc/DMViewport.h b/src/dxaml/xcp/core/inc/DMViewport.h
index 35cd6a35d9..ff647d775d 100644
--- a/src/dxaml/xcp/core/inc/DMViewport.h
+++ b/src/dxaml/xcp/core/inc/DMViewport.h
@@ -57,6 +57,28 @@ class CDMCViewport : public CXcpObjectBase<IObject>
     // CDMCViewport Protected Constructor/Destructor
     // ------------------------------------------------------------------------
 protected:
+#ifdef DM_DEBUG
+    bool DM_TraceDbg() const
+    {
+        if constexpr (DMV_DBG)
+        {
+            return true;
+        }
+
+        return gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT);
+    }
+
+    bool DMv_TraceDbg() const
+    {
+        if constexpr (DMVv_DBG)
+        {
+            return true;
+        }
+
+        return gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | XCP_TRACE_VERBOSE));
+    }
+#endif // DM_DEBUG
+
     CDMCViewport(
         _In_ IPALDirectManipulationCompositorService* pDMCompositorService,
         _In_ IObject* pCompositorViewport,
@@ -75,7 +97,7 @@ class CDMCViewport : public CXcpObjectBase<IObject>
         AddRefInterface(pCompositorPrimaryContent);
 
 #ifdef DM_DEBUG
-        if (DMVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | XCP_TRACE_VERBOSE)))
+        if (DMv_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | XCP_TRACE_VERBOSE | DMVv_DBG) /*traceType*/, L"DMVv[0x%p]:  CDMCViewport constructor.", this));
         }
@@ -85,7 +107,7 @@ class CDMCViewport : public CXcpObjectBase<IObject>
     ~CDMCViewport() override
     {
 #ifdef DM_DEBUG
-        if (DMVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | XCP_TRACE_VERBOSE)))
+        if (DMv_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | XCP_TRACE_VERBOSE | DMVv_DBG) /*traceType*/, L"DMVv[0x%p]:  ~CDMCViewport destructor.", this));
         }
@@ -154,6 +176,32 @@ class CDMViewportBase : public CXcpObjectBase<IObject>
         m_fIsCrossSlideViewport = fIsCrossSlideViewport;
     }
 
+#ifdef DM_DEBUG
+    bool DM_TraceDbg() const
+    {
+        bool result = gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT);
+            
+        if constexpr (DMV_DBG)
+        {
+            result = true;
+        }
+
+        return result;
+    }
+
+    bool DMv_TraceDbg() const
+    {
+        bool result = gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | XCP_TRACE_VERBOSE));
+
+        if constexpr (DMVv_DBG)
+        {
+            result = true;
+        }
+
+        return result;
+    }
+#endif
+
     // ------------------------------------------------------------------------
     // CDMViewportBase Protected Constructor/Destructor
     // ------------------------------------------------------------------------
@@ -167,7 +215,7 @@ class CDMViewportBase : public CXcpObjectBase<IObject>
         SetIsCrossSlideViewport(FALSE);
 
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   CDMViewportBase constructor.", this));
         }
@@ -177,7 +225,7 @@ class CDMViewportBase : public CXcpObjectBase<IObject>
     ~CDMViewportBase() override
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   ~CDMViewportBase destructor.", this));
         }
@@ -241,7 +289,7 @@ class CDMViewport final : public CDMViewportBase
         }
 
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   DebugStatuses: %I64u.",
                 this, statuses));
@@ -264,7 +312,7 @@ class CDMViewport final : public CDMViewportBase
     void SetCompositorViewport(_In_opt_ IObject* pCompositorViewport)
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   SetCompositorViewport - old=0x%p, new=0x%p.",
                 this, m_pCompositorViewport, pCompositorViewport));
@@ -281,7 +329,7 @@ class CDMViewport final : public CDMViewportBase
     void SetCompositorPrimaryContent(_In_opt_ IObject* pCompositorPrimaryContent)
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   SetCompositorPrimaryContent - old=0x%p, new=0x%p.",
                 this, m_pCompositorPrimaryContent, pCompositorPrimaryContent));
@@ -312,7 +360,7 @@ class CDMViewport final : public CDMViewportBase
     void SetIsPrimaryContentLayoutRefreshedAfterStart(_In_ bool fIsPrimaryContentLayoutRefreshedAfterStart)
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   SetIsPrimaryContentLayoutRefreshedAfterStart - old=%d, new=%d.",
                 this, m_fIsPrimaryContentLayoutRefreshedAfterStart, fIsPrimaryContentLayoutRefreshedAfterStart));
@@ -331,7 +379,7 @@ class CDMViewport final : public CDMViewportBase
     void SetIsPrimaryContentLayoutRefreshedAfterCompletion(_In_ bool fIsPrimaryContentLayoutRefreshedAfterCompletion)
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   SetIsPrimaryContentLayoutRefreshedAfterCompletion - old=%d, new=%d.",
                 this, m_fIsPrimaryContentLayoutRefreshedAfterCompletion, fIsPrimaryContentLayoutRefreshedAfterCompletion));
@@ -348,7 +396,7 @@ class CDMViewport final : public CDMViewportBase
     void SetIsTouchConfigurationActivated(_In_ bool fIsTouchConfigurationActivated)
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   SetIsTouchConfigurationActivated - old=%d, new=%d.",
                 this, m_fIsTouchConfigurationActivated, fIsTouchConfigurationActivated));
@@ -365,7 +413,7 @@ class CDMViewport final : public CDMViewportBase
     void SetIsNonTouchConfigurationActivated(_In_ bool fIsNonTouchConfigurationActivated)
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   SetIsNonTouchConfigurationActivated - old=%d, new=%d.",
                 this, m_fIsNonTouchConfigurationActivated, fIsNonTouchConfigurationActivated));
@@ -387,7 +435,7 @@ class CDMViewport final : public CDMViewportBase
     void SetIsTouchInteractionEndExpected(_In_ bool fIsTouchInteractionEndExpected)
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   SetIsTouchInteractionEndExpected - old=%d, new=%d.",
                 this, m_fIsTouchInteractionEndExpected, fIsTouchInteractionEndExpected));
@@ -404,7 +452,7 @@ class CDMViewport final : public CDMViewportBase
     void SetIsTouchInteractionStartProcessed(_In_ bool fIsTouchInteractionStartProcessed)
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   SetIsTouchInteractionStartProcessed - old=%d, new=%d.",
                 this, m_fIsTouchInteractionStartProcessed, fIsTouchInteractionStartProcessed));
@@ -421,7 +469,7 @@ class CDMViewport final : public CDMViewportBase
     void SetIsProcessingMakeVisibleInertia(_In_ bool fIsProcessingMakeVisibleInertia)
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   SetIsProcessingMakeVisibleInertia - old=%d, new=%d.",
                 this, m_fIsProcessingMakeVisibleInertia, fIsProcessingMakeVisibleInertia));
@@ -448,7 +496,7 @@ class CDMViewport final : public CDMViewportBase
     void SetHasNewManipulation(_In_ bool fHasNewManipulation)
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   SetHasNewManipulation - old=%d, new=%d (HasOldManipulation=%d, IsCompositorAware=%d).",
                 this, m_fHasNewManipulation, fHasNewManipulation, m_fHasOldManipulation, m_fIsCompositorAware));
@@ -465,7 +513,7 @@ class CDMViewport final : public CDMViewportBase
     void SetHasOldManipulation(_In_ bool fHasOldManipulation)
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   SetHasOldManipulation - old=%d, new=%d.",
                 this, m_fHasOldManipulation, fHasOldManipulation));
@@ -499,7 +547,7 @@ class CDMViewport final : public CDMViewportBase
     void SetHasDelayedStatusChangeProcessing(_In_ bool fHasDelayedStatusChangeProcessing)
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   SetHasDelayedStatusChangeProcessing - old=%d, new=%d.",
                 this, m_fHasDelayedStatusChangeProcessing, fHasDelayedStatusChangeProcessing));
@@ -516,7 +564,7 @@ class CDMViewport final : public CDMViewportBase
     void SetHasReceivedContactIdInInertia(_In_ bool fHasReceivedContactIdInInertia)
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   SetHasReceivedContactIdInInertia - old=%d, new=%d.",
                 this, m_fHasReceivedContactIdInInertia, fHasReceivedContactIdInInertia));
@@ -533,7 +581,7 @@ class CDMViewport final : public CDMViewportBase
     void SetNeedsUnregistration(_In_ bool fNeedsUnregistration)
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   SetNeedsUnregistration - old=%d, new=%d.",
                 this, m_fNeedsUnregistration, fNeedsUnregistration));
@@ -555,7 +603,7 @@ class CDMViewport final : public CDMViewportBase
     void IncrementRemovedRunningStatuses()
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   IncrementRemovedRunningStatuses - old=%d, new=%d.",
                 this, m_cRemovedRunningStatuses, m_cRemovedRunningStatuses + 1));
@@ -567,7 +615,7 @@ class CDMViewport final : public CDMViewportBase
     void DecrementRemovedRunningStatuses()
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   DecrementRemovedRunningStatuses - old=%d, new=%d.",
                 this, m_cRemovedRunningStatuses, m_cRemovedRunningStatuses - 1));
@@ -595,7 +643,7 @@ class CDMViewport final : public CDMViewportBase
     void SetIsCompletedStateSkipped(_In_ bool fIsCompletedStateSkipped)
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   SetIsCompletedStateSkipped - old=%d, new=%d.",
                 this, m_fIsCompletedStateSkipped, fIsCompletedStateSkipped));
@@ -672,7 +720,7 @@ class CDMViewport final : public CDMViewportBase
         _In_ XFLOAT initialZoomFactorY)
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/,
                 L"DMV[0x%p]:   SetInitialTransformationValues - initialTranslationX=%4.6lf, initialTranslationY=%4.6lf, initialUncompressedZoomFactor=%4.8lf, initialZoomFactorX=%4.8lf, initialZoomFactorY=%4.8lf.",
@@ -711,7 +759,7 @@ class CDMViewport final : public CDMViewportBase
         _In_ XFLOAT zoomFactorY)
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/,
                 L"DMV[0x%p]:   SetCurrentTransformationValues - translationX=%4.6lf, translationY=%4.6lf, uncompressedZoomFactor=%4.8lf, zoomFactorX=%4.8lf, zoomFactorY=%4.8lf.",
@@ -741,7 +789,7 @@ class CDMViewport final : public CDMViewportBase
         _In_ XFLOAT autoScrollYVelocity)
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/,
                 L"DMV[0x%p]:   SetCurrentAutoScrollVelocities - autoScrollXVelocity=%4.6lf, autoScrollYVelocity=%4.6lf.",
@@ -767,7 +815,7 @@ class CDMViewport final : public CDMViewportBase
         _In_ XFLOAT translationAdjustmentY)
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   SetTranslationAdjustments - translationAdjustmentX=%4.6lf, translationAdjustmentY=%4.6lf.",
                 this, translationAdjustmentX, translationAdjustmentY));
@@ -790,7 +838,7 @@ class CDMViewport final : public CDMViewportBase
         _In_ XFLOAT marginY)
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   SetMargins - marginX=%4.6lf, marginY=%4.6lf.",
                 this, marginX, marginY));
@@ -813,7 +861,7 @@ class CDMViewport final : public CDMViewportBase
         _In_ XFLOAT initialContentOffsetY)
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   SetInitialContentOffsets - initialContentOffsetX=%4.6lf, initialContentOffsetY=%4.6lf.",
                 this, initialContentOffsetX, initialContentOffsetY));
@@ -836,7 +884,7 @@ class CDMViewport final : public CDMViewportBase
         _In_ XFLOAT contentOffsetY)
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   SetContentOffsets - contentOffsetX=%4.6lf, contentOffsetY=%4.6lf.",
                 this, contentOffsetX, contentOffsetY));
@@ -869,7 +917,7 @@ class CDMViewport final : public CDMViewportBase
         _In_ float targetTranslationY)
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   SetTargetTranslations - targetTranslationX=%4.6lf, targetTranslationY=%4.6lf.",
                 this, targetTranslationX, targetTranslationY));
@@ -897,7 +945,7 @@ class CDMViewport final : public CDMViewportBase
         _In_ XFLOAT zoomFactor)
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   SetCompositorTransformationValues - translationX=%4.6lf, translationY=%4.6lf, zoomFactor=%4.8lf.",
                 this, translationX, translationY, zoomFactor));
@@ -932,7 +980,7 @@ class CDMViewport final : public CDMViewportBase
     void IncrementIgnoredRunningStatuses()
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   IncrementIgnoredRunningStatuses - old=%d, new=%d.",
                 this, m_cIgnoredRunningStatuses, m_cIgnoredRunningStatuses + 1));
@@ -944,7 +992,7 @@ class CDMViewport final : public CDMViewportBase
     void DecrementIgnoredRunningStatuses()
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   DecrementIgnoredRunningStatuses - old=%d, new=%d.",
                 this, m_cIgnoredRunningStatuses, m_cIgnoredRunningStatuses - 1));
@@ -1045,7 +1093,7 @@ class CDMViewport final : public CDMViewportBase
     void SetHasDMHitTestContactId(_In_ bool fHasDMHitTestContactId)
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   SetHasDMHitTestContactId - old=%d, new=%d.",
                 this, m_fHasDMHitTestContactId, fHasDMHitTestContactId));
@@ -1182,7 +1230,7 @@ class CDMViewport final : public CDMViewportBase
         AddRefInterface(pManipulatedElement);
 
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   CDMViewport constructor.", this));
         }
@@ -1192,7 +1240,7 @@ class CDMViewport final : public CDMViewportBase
     ~CDMViewport() override
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   ~CDMViewport destructor.", this));
         }
@@ -1521,7 +1569,7 @@ class CDMCrossSlideViewport : public CDMViewportBase
         SetIsCrossSlideViewport(TRUE);
 
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   CDMCrossSlideViewport constructor.", this));
         }
@@ -1531,7 +1579,7 @@ class CDMCrossSlideViewport : public CDMViewportBase
     ~CDMCrossSlideViewport() override
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   ~CDMCrossSlideViewport destructor.", this));
         }
diff --git a/src/dxaml/xcp/core/inc/DebugSource.h b/src/dxaml/xcp/core/inc/DebugSource.h
index 3e83818aa2..b701f4828a 100644
--- a/src/dxaml/xcp/core/inc/DebugSource.h
+++ b/src/dxaml/xcp/core/inc/DebugSource.h
@@ -53,7 +53,7 @@ class DOSourceFileInformation
 
     SourceFileInformation m_objectSourceInformation;
     std::map<KnownPropertyIndex, SourceFileInformation> m_propertySourceInformation;
-    unsigned __int64 m_creationTime;
+    unsigned __int64 m_creationTime{};
 };
 
 // This class is used for looking up source information for XAML dependency objects.
diff --git a/src/dxaml/xcp/core/inc/DeferredMapping.h b/src/dxaml/xcp/core/inc/DeferredMapping.h
index 179bf7eca3..6fe8a3d247 100644
--- a/src/dxaml/xcp/core/inc/DeferredMapping.h
+++ b/src/dxaml/xcp/core/inc/DeferredMapping.h
@@ -104,7 +104,7 @@ class CDeferredMapping
             : m_enteredScope(nullptr)
         {}
 
-        DeferredInfo(DeferredInfo&& other)
+        DeferredInfo(DeferredInfo&& other) noexcept
             : m_declaringScope(std::move(other.m_declaringScope))
             , m_enteredScope(other.m_enteredScope)
             , m_declaringScopeDeferredStorage(std::move(other.m_declaringScopeDeferredStorage))
diff --git a/src/dxaml/xcp/core/inc/DragEventArgs.h b/src/dxaml/xcp/core/inc/DragEventArgs.h
index 548f770c90..41b8708390 100644
--- a/src/dxaml/xcp/core/inc/DragEventArgs.h
+++ b/src/dxaml/xcp/core/inc/DragEventArgs.h
@@ -15,7 +15,7 @@ class CDragEventArgs final : public CInputPointEventArgs
 
     // This specifies if the EventArgs are created by a Drop Event
     // so that we can allow access to the GetData and GetFormats methods on IDataObject
-    bool m_bAllowDataAccess;
+    bool m_bAllowDataAccess{};
 
     // Copy the given object into m_spData (pointer copy only), then
     // peg the managed object reference contained within.
diff --git a/src/dxaml/xcp/core/inc/EffectiveValue.h b/src/dxaml/xcp/core/inc/EffectiveValue.h
index c8c3c5dd42..60d6195f20 100644
--- a/src/dxaml/xcp/core/inc/EffectiveValue.h
+++ b/src/dxaml/xcp/core/inc/EffectiveValue.h
@@ -9,11 +9,11 @@ struct EffectiveValue
 {
     EffectiveValue() = default;
 
-    EffectiveValue(EffectiveValue&& other)
+    EffectiveValue(EffectiveValue&& other) noexcept
         : value(std::move(other.value))
     {}
 
-    EffectiveValue& operator=(EffectiveValue&& other)
+    EffectiveValue& operator=(EffectiveValue&& other) noexcept
     {
         if (this != &other)
         {
diff --git a/src/dxaml/xcp/core/inc/ErrorService.h b/src/dxaml/xcp/core/inc/ErrorService.h
index 7495ed152a..3973d5dd56 100644
--- a/src/dxaml/xcp/core/inc/ErrorService.h
+++ b/src/dxaml/xcp/core/inc/ErrorService.h
@@ -43,8 +43,6 @@ class CErrorService final : public IErrorService
 
     static _Check_return_ HRESULT UpdateErrorCodeFromHResult(_In_ HRESULT hResult, _Out_ XUINT32 *pErrorCode);
 
-    static _Check_return_ HRESULT UnspecifyMediaError(_In_ XUINT32 iSpecificCode, _Out_ XUINT32 *pGenericCode);
-
     _Check_return_ HRESULT GetMessageFromErrorCode(XUINT32 iErrorID, _Out_ xstring_ptr* pstrMessage) override;
 
     static _Check_return_ HRESULT FormatErrorMessage(_In_ const xstring_ptr& strOriginalErrorMessage,
diff --git a/src/dxaml/xcp/core/inc/FontAndScriptServices.h b/src/dxaml/xcp/core/inc/FontAndScriptServices.h
index 56491f2491..b4187bd163 100644
--- a/src/dxaml/xcp/core/inc/FontAndScriptServices.h
+++ b/src/dxaml/xcp/core/inc/FontAndScriptServices.h
@@ -18,7 +18,7 @@ struct IGlyphAnalyzer;
 struct IScriptAnalyzer;
 struct IFontFallback;
 struct IFontFallbackBuilder;
-struct CWeightStyleStretch;
+struct CFontFaceCriteria;
 class CCompositeFontFamily;
 class CCoreServices;
 class CUIElement;
@@ -26,6 +26,7 @@ class CFontFamily;
 
 DECLARE_CONST_XSTRING_PTR_STORAGE(c_strUltimateFallbackFontNameStorage, L"Global User Interface");
 DECLARE_CONST_XSTRING_PTR_STORAGE(c_strUltimateFallbackFontNameTHStorage, L"Segoe UI");
+DECLARE_CONST_XSTRING_PTR_STORAGE(c_strUltimateFallbackFontNameCobaltStorage, L"Segoe UI Variable");
 DECLARE_CONST_XSTRING_PTR_STORAGE(c_strUltimateFontNameAutoStorage, L"XamlAutoFontFamily");
 
 
diff --git a/src/dxaml/xcp/core/inc/FontFamily.h b/src/dxaml/xcp/core/inc/FontFamily.h
index a1c26075a6..af3f2b328e 100644
--- a/src/dxaml/xcp/core/inc/FontFamily.h
+++ b/src/dxaml/xcp/core/inc/FontFamily.h
@@ -15,127 +15,47 @@ class  CCompositeFontFamily;
 
 //------------------------------------------------------------------------
 //
-//  Class:  CWeightStyleStretch
+//  Class:  CFontFaceCriteria
 //
 //  Encapsulates the values which distinguish the typefaces that make up
 //  a FontFamily in a package that is quick to pass around.
 //
 //------------------------------------------------------------------------
 
-struct CWeightStyleStretch
+struct CFontFaceCriteria
 {
 public:
     XUINT16 m_weight  : 10;  // 0 - 999, normal = 400
     XUINT16 m_style   :  2;  // 0 = normal, 1 = oblique, 2 = italic
     XUINT16 m_stretch :  4;  // 0 - 9, normal = 5
 
-    XUINT16 AsXUINT16() const {return (m_weight<<6)|(m_style<<4)|(m_stretch);}
-    bool operator==(const CWeightStyleStretch& other) const
+    XFLOAT  m_opticalSize;
+
+    XUINT16 AsXUINT16() const { return (m_weight << 6) | (m_style << 4) | (m_stretch); }
+    bool operator==(const CFontFaceCriteria& other) const
     {
-        return AsXUINT16() == other.AsXUINT16();
+        return AsXUINT16() == other.AsXUINT16() && m_opticalSize == other.m_opticalSize;
     }
 
-    void Set(XUINT32 weight, XUINT32 style, XUINT32 stretch)
+    void Set(XUINT32 weight, XUINT32 style, XUINT32 stretch, XFLOAT opticalSize)
     {
         m_weight  = weight;
         m_style   = style;
         m_stretch = stretch;
-    }
-    CWeightStyleStretch(XUINT32 weight, XUINT32 style, XUINT32 stretch)
-    {
-        Set(weight, style, stretch);
-    }
-
-    CWeightStyleStretch(XUINT16 compactedWeightStyleStretch)
-    {
-        // weight, style and stretch are being compacted into a XUINT16 as
-        // XUINT16 weight  : 10;  // 0 - 999, normal = 400
-        // XUINT16 style   :  2;  // 0 = normal, 1 = oblique, 2 = italic
-        // XUINT16 stretch :  4;  // 0 - 9, normal = 5
-        Set( (compactedWeightStyleStretch & 0xFFC0) >> 6, (compactedWeightStyleStretch & 0x30) >> 4, compactedWeightStyleStretch & 0xf);
-    }
-
-    CWeightStyleStretch()
-    {
-        Set(static_cast<XUINT32>(DirectUI::CoreFontWeight::Normal),
-            static_cast<XUINT32>(DirectUI::FontStyle::Normal),
-            static_cast<XUINT32>(DirectUI::FontStretch::Normal));
-    }
-
-    _Check_return_ XFLOAT GetNormalizedWeight()  { return (XINT32(m_weight) - static_cast<XUINT32>(DirectUI::CoreFontWeight::Normal)) *  0.05f; } // -20 .. 29.95
-    _Check_return_ XFLOAT GetNormalizedStyle()   { return (XINT32(m_style) - static_cast<XUINT32>(DirectUI::FontStyle::Normal)) *  7.00f; } //   0 .. 21
-    _Check_return_ XFLOAT GetNormalizedStretch() { return (XINT32(m_stretch) - static_cast<XUINT32>(DirectUI::FontStretch::Normal)) * 11.00f; } // -55 .. 44
-
-    _Check_return_ XFLOAT Distance(CWeightStyleStretch other) // Distance between two faces
-    {
-        XFLOAT deltaWeight  =  GetNormalizedWeight()  - other.GetNormalizedWeight();
-        XFLOAT deltaStyle   =  GetNormalizedStyle()   - other.GetNormalizedStyle();
-        XFLOAT deltaStretch =  GetNormalizedStretch() - other.GetNormalizedStretch();
-
-        return (deltaWeight  * deltaWeight)
-             + (deltaStyle   * deltaStyle)
-             + (deltaStretch * deltaStretch);
+        m_opticalSize = opticalSize;
     }
 
-    _Check_return_ XFLOAT DotProduct(CWeightStyleStretch other) // Distance between two faces
+    CFontFaceCriteria(XUINT32 weight, XUINT32 style, XUINT32 stretch, XFLOAT opticalSize)
     {
-        return (GetNormalizedWeight()  * other.GetNormalizedWeight())
-             + (GetNormalizedStyle()   * other.GetNormalizedStyle())
-             + (GetNormalizedStretch() * other.GetNormalizedStretch());
-    }
-
-
-    bool IsBetterMatch(
-        CWeightStyleStretch target,
-        CWeightStyleStretch bestSoFar
-    )
-    {
-        // First compare with target and best-so-far by distance.
-
-        XFLOAT distanceFromTarget       = Distance(target);
-        XFLOAT distanceFromBestToTarget = bestSoFar.Distance(target);
-
-        if (distanceFromTarget < distanceFromBestToTarget)
-        {
-            return true;
-        }
-        else if (distanceFromTarget == distanceFromBestToTarget)
-        {
-            // Same length distance, try comparing by dot product
-
-            XFLOAT dotProductWithTarget     = DotProduct(target);
-            XFLOAT dotProductBestWithTarget = bestSoFar.DotProduct(target);
-
-            if (dotProductWithTarget > dotProductBestWithTarget)
-            {
-                return true; // Prefer typefaces with a greater dot product
-            }
-            else if (dotProductWithTarget == dotProductBestWithTarget)
-            {
-                // This wss is no closer to target than is bestSoFar, and has
-                // the same dot product with target as bestSoFar has.
-
-                // Tiebreaker algorithm:
-
-                if (   m_stretch > bestSoFar.m_stretch
-                    || (   m_stretch == bestSoFar.m_stretch
-                        && (   m_style > bestSoFar.m_style
-                            || (    m_style == bestSoFar.m_style
-                                 && m_weight > bestSoFar.m_weight))))
-                {
-                    return true;
-                }
-            }
-        }
-        return false; // In all other cases, this is a worse match
+        Set(weight, style, stretch, opticalSize);
     }
 };
 
 namespace std {
     template<>
-    struct hash<CWeightStyleStretch>
+    struct hash<CFontFaceCriteria>
     {
-        typedef CWeightStyleStretch argument_type;
+        typedef CFontFaceCriteria argument_type;
         typedef std::size_t result_type;
 
         result_type operator()(const argument_type& arg) const
@@ -380,7 +300,7 @@ class CFontContext
 //  Class: CFontTypeface
 //
 //  Representation a combination of a client specified of a FontFamily
-//  text element property, weight, style, stretch and language.
+//  text element property, font face criteria and language.
 //
 //  Provides the cache by codepoint of which glyph typeface to use.
 //
@@ -392,7 +312,7 @@ class CFontTypeface final : public IObject
     // Data to pass to CFontFamily when the codepoint is not
     // already cached.
     CCompositeFontFamily *m_pCompositeFontFamily;
-    CWeightStyleStretch   m_weightStyleStretch;
+    CFontFaceCriteria     m_fontFaceCriteria;
     XUINT32               m_cReferences;
 
     // FontTypeFace attributes
@@ -404,10 +324,10 @@ class CFontTypeface final : public IObject
 public:
     CFontTypeface(
         _In_ CCompositeFontFamily *pCompositeFontFamily,
-        CWeightStyleStretch   weightStyleStretch
+        CFontFaceCriteria   fontFaceCriteria
     )
     : m_pCompositeFontFamily(pCompositeFontFamily)
-    , m_weightStyleStretch(weightStyleStretch)
+    , m_fontFaceCriteria(fontFaceCriteria)
     , m_cReferences(1)
     , m_capHeight(XFLOAT_MIN)
     {
@@ -433,7 +353,7 @@ class CFontTypeface final : public IObject
 
     std::size_t hash() const
     {
-        return std::hash<CWeightStyleStretch>()(m_weightStyleStretch);
+        return std::hash<CFontFaceCriteria>()(m_fontFaceCriteria);
     }
 
     XUINT32 AddRef() override {return ++m_cReferences;}
@@ -518,7 +438,7 @@ class CFontFamily final : public CMultiParentShareableDependencyObject
 
     _Check_return_ HRESULT GetFontTypeface(
         _In_            CFontContext         *pFontContext,
-        _In_            CWeightStyleStretch   weightStyleStretch,
+        _In_            CFontFaceCriteria        fontFaceCriteria,
         _Outptr_result_maybenull_ CFontTypeface       **ppFontTypeface
     );
 
diff --git a/src/dxaml/xcp/core/inc/FxCallbacks.h b/src/dxaml/xcp/core/inc/FxCallbacks.h
index afa3b33c3c..e714f6eab7 100644
--- a/src/dxaml/xcp/core/inc/FxCallbacks.h
+++ b/src/dxaml/xcp/core/inc/FxCallbacks.h
@@ -257,10 +257,6 @@ namespace FxCallbacks
 
     _Check_return_ HRESULT Popup_OnClosed(_In_ CDependencyObject* nativePopup);
 
-    _Check_return_ HRESULT Popup_HookupWindowPositionChangedHandler(_In_ CDependencyObject* nativePopup);
-
-    void Popup_OnHostWindowPositionChanged(_In_ CDependencyObject* nativePopup);
-
     void Popup_OnIslandLostFocus(_In_ CDependencyObject* nativePopup);
 
     bool TextBlock_HasDataboundText(_In_ CTextBlock* nativeTextBlock);
@@ -335,8 +331,6 @@ namespace FxCallbacks
 
     _Check_return_ HRESULT FrameworkCallbacks_IsDXamlCoreShuttingDown(_Out_ bool* pIsDXamlCoreShuttingDown);
 
-    _Check_return_ HRESULT Core_ForwardWindowedPopupMessageToJupiterWindow(_In_ HWND window, _In_ UINT message, _In_ WPARAM wParam, _In_ LPARAM lParam, _In_opt_ CContentRoot* contentRoot, _Out_ LRESULT* pResult);
-
     _Check_return_ HRESULT XcpImports_ParticipateInTransition(_In_ CDependencyObject* nativeTransition, _In_ CDependencyObject* nativeUIElement, _In_ XINT32 transitionTrigger, _Out_ bool* DoesParticipate);
 
     _Check_return_ HRESULT XcpImports_CreateStoryboardsForTransition(_In_ CDependencyObject* nativeTransition, _In_ CDependencyObject* nativeUIElement, _In_ XRECTF startBounds, _In_ XRECTF destinationBounds, _In_ XINT32 transitionTrigger, _Out_ XINT32* cStoryboards, _Outptr_result_buffer_(* cStoryboards) CStoryboard*** pppTransitionStoryboard, _Out_ DirectUI::TransitionParent* parentToTransitionEnum);
@@ -375,9 +369,9 @@ namespace FxCallbacks
 
     _Check_return_ HRESULT AutomationPeer_GetPattern(_In_ CDependencyObject* nativeTarget, _In_ CDependencyObject** nativeInterface, _In_ UIAXcp::APPatternInterface eInterface);
 
-    _Check_return_ HRESULT AutomationPeer_UIATextRangeInvoke(_In_ CDependencyObject* nativeTarget, _In_ XINT32 eFunction, _In_ XINT32 cParams, _In_ void* pvParams, _In_ Automation::CValue* pRetVal);
+    _Check_return_ HRESULT AutomationPeer_UIATextRangeInvoke(_In_ CDependencyObject* nativeTarget, _In_ XINT32 eFunction, _In_ XINT32 cParams, _In_opt_ void* pvParams, _In_opt_ Automation::CValue* pRetVal);
 
-    _Check_return_ HRESULT AutomationPeer_UIAPatternInvoke(_In_ CDependencyObject* nativeTarget, _In_ UIAXcp::APPatternInterface eInterface, _In_ XINT32 eFunction, _In_ XINT32 cParams, _In_ void* pvParams, _In_ Automation::CValue* pRetVal);
+    _Check_return_ HRESULT AutomationPeer_UIAPatternInvoke(_In_ CDependencyObject* nativeTarget, _In_ UIAXcp::APPatternInterface eInterface, _In_ XINT32 eFunction, _In_ XINT32 cParams, _In_opt_ void* pvParams, _In_opt_ Automation::CValue* pRetVal);
 
     _Check_return_ HRESULT AutomationPeer_NotifyNoUIAClientObjectForAP(_In_ CDependencyObject* nativeTarget);
 
@@ -585,7 +579,7 @@ namespace FxCallbacks
     void XamlRoot_RaiseInputActivationChanged(_In_ IInspectable* xamlRootInsp);
     void XamlRoot_UpdatePeg(_In_ IInspectable* xamlRootInsp, bool peg);
 
-    _Check_return_ HRESULT FrameworkApplication_GetRequiresPointerMode(_Outptr_ xaml::ApplicationRequiresPointerMode* value);
+    _Check_return_ HRESULT FrameworkApplication_GetRequiresPointerMode(_Out_ xaml::ApplicationRequiresPointerMode* value);
 
     _Check_return_ HRESULT FlyoutPresenter_GetTargetIfOpenedAsTransient(_In_ CDependencyObject* nativeControl, _Outptr_ CDependencyObject** nativeTarget);
 
diff --git a/src/dxaml/xcp/core/inc/GeometryBoundsHelper.h b/src/dxaml/xcp/core/inc/GeometryBoundsHelper.h
index 12728edfab..fa6b00632d 100644
--- a/src/dxaml/xcp/core/inc/GeometryBoundsHelper.h
+++ b/src/dxaml/xcp/core/inc/GeometryBoundsHelper.h
@@ -48,7 +48,7 @@ class GeometryBoundsHelper
             _In_ const XPOINTF& endPoint
             );
 
-        XRECTF_RB m_bounds;
-        XPOINTF m_currentPoint;
-        bool m_hasFirstPoint;
+        XRECTF_RB m_bounds{};
+        XPOINTF m_currentPoint{};
+        bool m_hasFirstPoint{};
 };
diff --git a/src/dxaml/xcp/core/inc/HitTestGeometrySink.h b/src/dxaml/xcp/core/inc/HitTestGeometrySink.h
index bbd54106c2..fa1a7456ab 100644
--- a/src/dxaml/xcp/core/inc/HitTestGeometrySink.h
+++ b/src/dxaml/xcp/core/inc/HitTestGeometrySink.h
@@ -75,5 +75,5 @@ class HitTestGeometrySink : public CXcpObjectBase< IPALGeometrySink >
         XPOINTF m_startPoint;
         bool m_figureActive;
 
-        HitTestHelper* m_pBaseHitTestHelper;
+        HitTestHelper* m_pBaseHitTestHelper{};
 };
diff --git a/src/dxaml/xcp/core/inc/HitTestHelper.h b/src/dxaml/xcp/core/inc/HitTestHelper.h
index 3154c8bc09..a9b4f72928 100644
--- a/src/dxaml/xcp/core/inc/HitTestHelper.h
+++ b/src/dxaml/xcp/core/inc/HitTestHelper.h
@@ -58,9 +58,9 @@ class HitTestHelper : private CFlatteningSink
             );
 
         CMILMatrix m_transform;
-        XFLOAT m_tolerance;
-        XPOINTF m_currentPoint;
-        XPOINTF m_currentPointUntransformed;
+        XFLOAT m_tolerance{};
+        XPOINTF m_currentPoint{};
+        XPOINTF m_currentPointUntransformed{};
         bool m_encounteredNaN;
 
     private:
diff --git a/src/dxaml/xcp/core/inc/InheritedProperties.h b/src/dxaml/xcp/core/inc/InheritedProperties.h
index a1d897bc08..9126d2c7a1 100644
--- a/src/dxaml/xcp/core/inc/InheritedProperties.h
+++ b/src/dxaml/xcp/core/inc/InheritedProperties.h
@@ -240,12 +240,12 @@ class InheritedProperties : public CReferenceCount
     static void TraceDependencyObjectTextPropertyUsage();
 #endif
 
-    XUINT32 *m_pCoreInheritedPropGenerationCounter;
-    XUINT32  m_cGenerationCounter;
+    XUINT32 *m_pCoreInheritedPropGenerationCounter{};
+    XUINT32  m_cGenerationCounter{};
 
     // An InheritedProperties object may be referenced by a number of dependency
     // objects, but only one may write to it.
-    CDependencyObject *m_pWriter;
+    CDependencyObject *m_pWriter{};
 
     // The constituent properties are public so that the property system can
     // set them from within SetValue.
@@ -255,8 +255,8 @@ class InheritedProperties : public CReferenceCount
 private:
     // Property flags are publically accessible through the SetPropertyFlag and
     // IsPropertyFlagSet methods.
-    XUINT64 m_fIsSetLocally;
-    XUINT64 m_fIsSetByStyle;
+    XUINT64 m_fIsSetLocally{};
+    XUINT64 m_fIsSetByStyle{};
 
     // Clients must use Create and ReleaseInterface.
     InheritedProperties();
diff --git a/src/dxaml/xcp/core/inc/InputServices.h b/src/dxaml/xcp/core/inc/InputServices.h
index 80dc26d98d..0a797d40a1 100644
--- a/src/dxaml/xcp/core/inc/InputServices.h
+++ b/src/dxaml/xcp/core/inc/InputServices.h
@@ -20,6 +20,9 @@
 #include "TextInputProducerHelper.h"
 #include <Microsoft.UI.Input.Partner.h>
 
+// Uncomment for DManip debug outputs.
+//#define DM_DEBUG
+
 enum MouseCursor : uint8_t;
 
 // Jupiter bug 103446 - change from a UI tick count to a millisecond count.
@@ -100,8 +103,8 @@ class CDragDropState
     xref_ptr<CEventManager> m_eventManager;
     xref_ptr<IInspectable> m_winRtDragInfo;
     xref_ptr<IInspectable> m_dragDropAsyncOperation;
-    DirectUI::DragDropMessageType m_dragType;
-    DirectUI::DragDropMessageType m_nextDragType;
+    DirectUI::DragDropMessageType m_dragType{};
+    DirectUI::DragDropMessageType m_nextDragType{};
     DirectUI::DataPackageOperation m_acceptedOperation = DirectUI::DataPackageOperation::DataPackageOperation_None;
     BOOLEAN m_handled = FALSE;
     XPOINTF m_dragPoint;
@@ -427,7 +430,8 @@ class CInputServices final
     // Called when the focus is changed from the focus manager
     static BOOL IsTextEditableControl(_In_ const CDependencyObject* const pObject);
 
-    // Helper method to retrieve the underlying input HWND from an IslandInputSite.
+    // Helper method to retrieve the underlying input HWND from an IslandInputSite. Note that these hwnds will always
+    // exist, even in a world when islands themselves might no longer be backed by hwnds.
     // Solutions that maintain the encapsulation around the input HWND should be preferred.
     // If this function must be used, the use case is potentially a candidate for a better IXP API.
     static HWND GetUnderlyingInputHwndFromIslandInputSite(_In_opt_ ixp::IIslandInputSitePartner* pIslandInputSite);
@@ -1634,7 +1638,7 @@ class CInputServices final
 
     xref_ptr<KeyTipManager> m_keyTipManager;
 
-    XPOINTF m_ptLastPressedPosition;
+    XPOINTF m_ptLastPressedPosition{};
 
     wrl::ComPtr<mui::IInputSystemCursorStatics> m_inputSystemCursorStatics;
 };
diff --git a/src/dxaml/xcp/core/inc/InteractionManager.h b/src/dxaml/xcp/core/inc/InteractionManager.h
index c2731fceb5..8d344131e8 100644
--- a/src/dxaml/xcp/core/inc/InteractionManager.h
+++ b/src/dxaml/xcp/core/inc/InteractionManager.h
@@ -33,7 +33,7 @@ class InteractionMapKey final
     InteractionMapKey(const InteractionMapKey&) = delete;
     InteractionMapKey& operator=(const InteractionMapKey&) = delete;
     InteractionMapKey(InteractionMapKey&&) = default;
-    InteractionMapKey& operator=(InteractionMapKey&& rhs)
+    InteractionMapKey& operator=(InteractionMapKey&& rhs) noexcept
     {
         if (this != &rhs)
         {
diff --git a/src/dxaml/xcp/core/inc/IsEnabledChangedEventArgs.h b/src/dxaml/xcp/core/inc/IsEnabledChangedEventArgs.h
index 55aeb6f63d..7616f18da0 100644
--- a/src/dxaml/xcp/core/inc/IsEnabledChangedEventArgs.h
+++ b/src/dxaml/xcp/core/inc/IsEnabledChangedEventArgs.h
@@ -36,6 +36,6 @@ class CIsEnabledChangedEventArgs final : public CEventArgs
         RRETURN(S_OK);
     }
 
-    bool    m_fOldValue;             // Old value of IsEnabled property
-    bool    m_fNewValue;             // New value of IsEnabled property
+    bool    m_fOldValue{};             // Old value of IsEnabled property
+    bool    m_fNewValue{};             // New value of IsEnabled property
 };
diff --git a/src/dxaml/xcp/core/inc/KeyboardEventArgs.h b/src/dxaml/xcp/core/inc/KeyboardEventArgs.h
index 3140554c98..b0f323bf7d 100644
--- a/src/dxaml/xcp/core/inc/KeyboardEventArgs.h
+++ b/src/dxaml/xcp/core/inc/KeyboardEventArgs.h
@@ -102,7 +102,7 @@ class CKeyEventArgs final : public CRoutedEventArgs
 
     wsy::VirtualKey  m_platformKeyCode;
     wsy::VirtualKey  m_originalKeyCode;
-    XEDITKEY        m_xEditKey;
+    XEDITKEY        m_xEditKey{};
     xstring_ptr     m_deviceId;
 
     PhysicalKeyStatus m_physicalKeyStatus;
diff --git a/src/dxaml/xcp/core/inc/LayoutManager.h b/src/dxaml/xcp/core/inc/LayoutManager.h
index 949b502f4a..06f3d8adb2 100644
--- a/src/dxaml/xcp/core/inc/LayoutManager.h
+++ b/src/dxaml/xcp/core/inc/LayoutManager.h
@@ -124,16 +124,18 @@ class CLayoutManager
     _Check_return_ HRESULT RealizeRegisteredLayoutTransitions();
     // start a transition walk (similar to measure and arrange)
     _Check_return_ HRESULT TransitionLayout();
-    
+
     XCP_FORCEINLINE XUINT16 GetLayoutCounter() { return m_layoutCounter; }
     XCP_FORCEINLINE XUINT16 GetNextLayoutCounter() { return m_layoutCounter == XUINT16_MAX ? 2 : m_layoutCounter + 1;}  // using 2 so we have room to always subtract one for setting enter to have already happened (virtualization)
     void IncrementLayoutCounter();
 
     // This whole flag 'allow transitions to run' is currently just used by virtualizing panels.
-    // It should be interpreted as 'we are correcting layout after a manipulation'. 
+    // It should be interpreted as 'we are correcting layout after a manipulation'.
     XCP_FORCEINLINE bool GetAllowTransitionsToRunUnderCurrentSubtree() { return m_allowTransitionsToRun; }
     XCP_FORCEINLINE void SetAllowTransitionsToRunUnderCurrentSubtree(bool bAllow) { m_allowTransitionsToRun = bAllow; }
 
+    bool IsLayoutClean();
+
 #ifdef DEBUG
     // These are diagnostic methods for inspecting the layout properties of the tree.
     void DumpTree();
@@ -169,7 +171,7 @@ class CLayoutManager
     CCoreServices*  m_pCoreServices;
     VisualTree*     m_pVisualTree;
     CUIElement*     m_pTransitioningElement; // weak ref; needed during transition phase
-    CUIElement*     m_pLastExceptionElement; 
+    CUIElement*     m_pLastExceptionElement;
 
     XINT32          m_cArrangesOnStack;
     XINT32          m_cMeasuresOnStack;
diff --git a/src/dxaml/xcp/core/inc/MediaQueue.h b/src/dxaml/xcp/core/inc/MediaQueue.h
index 1c7e5f739c..f0516d856b 100644
--- a/src/dxaml/xcp/core/inc/MediaQueue.h
+++ b/src/dxaml/xcp/core/inc/MediaQueue.h
@@ -89,7 +89,7 @@ class CMediaQueue final : public CXcpObjectBase< IMediaQueue >
 private:
     CMediaQueueManager*         m_pManager;
     IMediaQueueClient*          m_pClient;
-    CCoreServices*              m_pCoreNoRef;
+    CCoreServices*              m_pCoreNoRef{};
     wil::critical_section       m_Lock;
     CMediaQueueItem*            m_pHead;
     CMediaQueueItem*            m_pTail;
diff --git a/src/dxaml/xcp/core/inc/ModifiedValue.h b/src/dxaml/xcp/core/inc/ModifiedValue.h
index 94a146601e..37d47620f7 100644
--- a/src/dxaml/xcp/core/inc/ModifiedValue.h
+++ b/src/dxaml/xcp/core/inc/ModifiedValue.h
@@ -30,7 +30,7 @@ class CModifiedValue
     ~CModifiedValue()
     {
         // Ensure the base value's expected reference is cleared.
-        ClearBaseValue();
+        VERIFYHR(ClearBaseValue());
     }
 
 public:
diff --git a/src/dxaml/xcp/core/inc/ObjectWriter.h b/src/dxaml/xcp/core/inc/ObjectWriter.h
index e48e9d1284..3aa9388d2c 100644
--- a/src/dxaml/xcp/core/inc/ObjectWriter.h
+++ b/src/dxaml/xcp/core/inc/ObjectWriter.h
@@ -55,7 +55,7 @@ class ObjectWriter final
     std::shared_ptr<ObjectWriterCommonRuntime> m_spRuntime;
     std::shared_ptr<ObjectWriterErrorService> m_spErrorService;
 
-    bool m_bCheckDuplicateProperty;
+    bool m_bCheckDuplicateProperty{};
     bool m_bIsEncoding;
     bool m_allowCustomWriter;
     bool m_skipCustomWriterProcessingOfStartObject;
diff --git a/src/dxaml/xcp/core/inc/ObjectWriterFrame.h b/src/dxaml/xcp/core/inc/ObjectWriterFrame.h
index b5bb6690f3..5f9f791454 100644
--- a/src/dxaml/xcp/core/inc/ObjectWriterFrame.h
+++ b/src/dxaml/xcp/core/inc/ObjectWriterFrame.h
@@ -149,7 +149,7 @@ class ObjectWriterFrame final
     {
     }
 
-    ObjectWriterFrame& operator=(ObjectWriterFrame&& other)
+    ObjectWriterFrame& operator=(ObjectWriterFrame&& other) noexcept
     {
         if (this != &other) {
             m_spType = std::move(other.m_spType);
diff --git a/src/dxaml/xcp/core/inc/ParserErrorEventArgs.h b/src/dxaml/xcp/core/inc/ParserErrorEventArgs.h
index 3bbc3297af..aab0c24453 100644
--- a/src/dxaml/xcp/core/inc/ParserErrorEventArgs.h
+++ b/src/dxaml/xcp/core/inc/ParserErrorEventArgs.h
@@ -12,8 +12,8 @@ class CParserErrorEventArgs final : public CErrorEventArgs
     xstring_ptr  m_strXmlElement;            // The name of the element tag in the xaml file.
     xstring_ptr  m_strXmlAttribute;          // The Attribute name in the xaml file.
 
-    XUINT32     m_uLineNumber;            // Line number in xaml file where syntactic error happens.
-    XUINT32     m_uCharPosition;          // Charactor position in the error line where the error occurs.
+    XUINT32     m_uLineNumber;               // Line number in xaml file where syntactic error happens.
+    XUINT32     m_uCharPosition{};           // Character position in the error line where the error occurs.
 
     CParserErrorEventArgs(_In_ CCoreServices* pCore) : CErrorEventArgs(pCore)
     {
diff --git a/src/dxaml/xcp/core/inc/Popup.h b/src/dxaml/xcp/core/inc/Popup.h
index 4c5e3f96e8..e375841121 100644
--- a/src/dxaml/xcp/core/inc/Popup.h
+++ b/src/dxaml/xcp/core/inc/Popup.h
@@ -321,9 +321,16 @@ class CPopup : public CFrameworkElement
 
     wrl::ComPtr<ixp::IIslandInputSitePartner> GetIslandInputSite() const;
 
-    wf::Point GetTranslationFromMainWindow() { return m_offsetFromMainWindow; }
+    // https://task.ms/48749483
+    // TODO: Remove once XAML creates Windowed popups without a DesktopSiteBridge. This is a
+    // temporary workaround since we need a DesktopSiteBridge to create windowed popups.
+    // XamlIslands do not have access to a bridge, and may not be hosted in a DesktopSiteBridge
+    // at all, but to unblock the scenario we need a way to create popups. This method
+    // should not be used except to create windowed popups, and once we have another way to
+    // create them this should be removed.
+    wrl::ComPtr<ixp::IDesktopSiteBridge> GetDesktopSiteBridge();
 
-    _Check_return_ HRESULT GetScreenOffsetFromOwner(_Out_ XPOINTF_COORDS* offset);
+    wf::Point GetTranslationFromMainWindow() { return m_offsetFromMainWindow; }
 
     // Used for MockDComp dumping
     wgr::RectInt32 GetWindowedPopupMoveAndResizeRect() const { return m_windowedPopupMoveAndResizeRect; }
@@ -429,7 +436,7 @@ class CPopup : public CFrameworkElement
 
     // This method is called once per lifetime of the CPopup. Resources created here aren't released until the CPopup is
     // deleted.
-    _Check_return_ HRESULT EnsureWindowForWindowedPopup();
+    _Check_return_ HRESULT EnsureWindowForWindowedPopup(_Out_ bool* windowCreated);
 
     // These methods are called once per open/close for the CPopup. Resources created here will be released when the
     // CPopup is closed.
@@ -594,12 +601,6 @@ class CPopup : public CFrameworkElement
     // later. This flag guards against that.
     bool m_isImplicitClose                      : 1;
 
-    // Debug flag. If someone opens a windowed popup after the main Xaml window has been destroyed, we'll no-op instead
-    // of trying to create an HWND for it. In these cases Xaml is shutting down.
-    bool m_skippedCreatingPopupHwnd             : 1;
-
-    bool m_registeredWindowPositionChangedHandler : 1;
-
     XUINT32 m_cEventListenerCount;
     ITransformer *m_pTransformer;
 
@@ -719,7 +720,7 @@ class CPopupRoot final : public CPanel
         _In_ const D2DRenderParams& printParams
         ) override;
 
-    _Check_return_ HRESULT EffectiveViewportWalkToChild(
+    virtual _Check_return_ HRESULT EffectiveViewportWalkToChild(
         _In_ CUIElement* child,
         const bool dirtyFound,
         _In_ std::vector<TransformToPreviousViewport>& transformsToViewports,
@@ -749,8 +750,6 @@ class CPopupRoot final : public CPanel
 
     void CloseAllPopupsForTreeReset();
 
-    void OnHostWindowPositionChanged();
-
     void OnIslandLostFocus();
 
     bool HasOpenOrUnloadingPopups() const;
diff --git a/src/dxaml/xcp/core/inc/PrintPageEventArgs.h b/src/dxaml/xcp/core/inc/PrintPageEventArgs.h
index 5a4d191e60..6ac403144d 100644
--- a/src/dxaml/xcp/core/inc/PrintPageEventArgs.h
+++ b/src/dxaml/xcp/core/inc/PrintPageEventArgs.h
@@ -44,7 +44,7 @@ class CPrintPageEventArgs final : public CEventArgs
     CUIElement *m_pPageVisual;
     bool       m_fHasMorePages;
     XSIZEF      m_sPrintableArea;
-    XTHICKNESS  m_tPageMargins;
+    XTHICKNESS  m_tPageMargins{};
 
 private:
     CCoreServices* m_pCore;
diff --git a/src/dxaml/xcp/core/inc/RenderData.h b/src/dxaml/xcp/core/inc/RenderData.h
index c5ad5d88ab..f519b151f6 100644
--- a/src/dxaml/xcp/core/inc/RenderData.h
+++ b/src/dxaml/xcp/core/inc/RenderData.h
@@ -72,7 +72,7 @@ struct RenderData
 
 struct PropertyRenderData : RenderData
 {
-    PrimitiveCompositionPropertyData pc;
+    PrimitiveCompositionPropertyData pc{};
 
     void Reset(RenderWalkType newType)
     {
diff --git a/src/dxaml/xcp/core/inc/RenderTargetElement.h b/src/dxaml/xcp/core/inc/RenderTargetElement.h
index 24a4cc8ae4..fc21e5efab 100644
--- a/src/dxaml/xcp/core/inc/RenderTargetElement.h
+++ b/src/dxaml/xcp/core/inc/RenderTargetElement.h
@@ -105,7 +105,7 @@ class CRenderTargetElementData : public CXcpObjectBase<IObject>
 
     CUIElement *m_pRenderElement;
     CUIElement *m_pConnectionElement;
-    CompositorTreeHost *m_pCompositorTreeHost;
+    CompositorTreeHost *m_pCompositorTreeHost{};
     TransformAndClipStack *m_pPrependTransformAndClip;
     xchainedmap<CUIElement*, HWCompTreeNode*> m_mapUIElementNoRefToCompTreeNode;
     ICoreAsyncAction *m_pRenderAsyncAction;
diff --git a/src/dxaml/xcp/core/inc/TiledSurface.h b/src/dxaml/xcp/core/inc/TiledSurface.h
index 86b0d2511c..cb1731595b 100644
--- a/src/dxaml/xcp/core/inc/TiledSurface.h
+++ b/src/dxaml/xcp/core/inc/TiledSurface.h
@@ -28,7 +28,7 @@ class CTiledSurface :  public CInterlockedReferenceCount, public CNotifyOnDelete
         XRECT                           bounds;
         XUINT64                         timeStamp;
         IntrusiveList<Tile>::ListEntry  tempListEntry;
-        bool                           shouldInitializeToTransparent;
+        bool                            shouldInitializeToTransparent{};
 
         // Returns the number of bytes of atlas space used by this tile - even if atlas space has not yet been allocated.
         XUINT64 GetAllocationSize() const
diff --git a/src/dxaml/xcp/core/inc/Timeline.h b/src/dxaml/xcp/core/inc/Timeline.h
index 5c44207c6a..a31f951b36 100644
--- a/src/dxaml/xcp/core/inc/Timeline.h
+++ b/src/dxaml/xcp/core/inc/Timeline.h
@@ -31,8 +31,8 @@ class COptionalDouble
         m_fHasValue = FALSE;
     }
 
-    XINT32 m_fHasValue;
-    XDOUBLE m_rValue;
+    XINT32 m_fHasValue{};
+    XDOUBLE m_rValue{};
 };
 
 // Base class for timeline objects
diff --git a/src/dxaml/xcp/core/inc/TouchableRectangle.h b/src/dxaml/xcp/core/inc/TouchableRectangle.h
index fc6efc0481..85c3602237 100644
--- a/src/dxaml/xcp/core/inc/TouchableRectangle.h
+++ b/src/dxaml/xcp/core/inc/TouchableRectangle.h
@@ -36,7 +36,7 @@ class CTouchableRectangle : public CRectangle
     {
     }
 
-    XPOINT m_ptGlobLast;
+    XPOINT m_ptGlobLast{};
     XINT32  m_uiCapturePointerId = -1;
     bool m_hasPointerCapture = false;
     CEventArgs* m_pPendingDoubleTapArgs = nullptr;
diff --git a/src/dxaml/xcp/core/inc/TransformGeometrySink.h b/src/dxaml/xcp/core/inc/TransformGeometrySink.h
index 9ae7760984..5d9236e2a0 100644
--- a/src/dxaml/xcp/core/inc/TransformGeometrySink.h
+++ b/src/dxaml/xcp/core/inc/TransformGeometrySink.h
@@ -71,5 +71,5 @@ class TransformGeometrySink final : public CXcpObjectBase< IPALGeometrySink >
     protected:
         IPALGeometrySink* m_pSink;
         CMILMatrix m_transform;
-        XPOINTF m_lastUntransformedPoint;
+        XPOINTF m_lastUntransformedPoint{};
 };
diff --git a/src/dxaml/xcp/core/inc/TransformGroup.h b/src/dxaml/xcp/core/inc/TransformGroup.h
index 31bf68e954..00fa5318b7 100644
--- a/src/dxaml/xcp/core/inc/TransformGroup.h
+++ b/src/dxaml/xcp/core/inc/TransformGroup.h
@@ -14,9 +14,8 @@ class CTransformGroup final : public CTransform
 private:
     CTransformGroup(_In_ CCoreServices *pCore)
         : CTransform(pCore)
-    {
-        m_groupMatrix.SetToIdentity();
-    }
+        , m_groupMatrix(true /*initialize*/)
+    { }
 
     _Check_return_ HRESULT FromString(
         _In_ CREATEPARAMETERS *pCreate
diff --git a/src/dxaml/xcp/core/inc/UIThreadScheduler.h b/src/dxaml/xcp/core/inc/UIThreadScheduler.h
index 6e0e1cae56..efa8ee028c 100644
--- a/src/dxaml/xcp/core/inc/UIThreadScheduler.h
+++ b/src/dxaml/xcp/core/inc/UIThreadScheduler.h
@@ -7,6 +7,7 @@
 
 struct IXcpDispatcher;
 class CompositorScheduler;
+class RefreshAlignedClock;
 
 // A list of reasons why anything can request a UI thread frame. Collected as a set of flags, logged when a new reason
 // comes in, and cleared when we tick the UI thread.
@@ -76,7 +77,7 @@ class UIThreadScheduler final : public CXcpObjectBase<ITickableFrameScheduler>
     _Check_return_ HRESULT EndTick() override;
     bool IsInTick() override;
     bool IsHighPriority() override;
-    IPALTickableClock* GetClock() override { return m_pIClock; }
+    RefreshAlignedClock* GetClock() override { return m_pIClock; }
 
     // Render thread API
     XUINT32 GetScheduledIntervalInMilliseconds(XDOUBLE currentTickTimeInSeconds);
@@ -95,7 +96,7 @@ class UIThreadScheduler final : public CXcpObjectBase<ITickableFrameScheduler>
     IXcpDispatcher *m_pDispatcher;
 
     // The shared clock between the UI and render thread.
-    IPALTickableClock *m_pIClock;
+    RefreshAlignedClock* m_pIClock;
 
     XDOUBLE m_lastTickTimeInSeconds;
 
diff --git a/src/dxaml/xcp/core/inc/VirtualSurfaceimageSource.h b/src/dxaml/xcp/core/inc/VirtualSurfaceimageSource.h
index 3553d18ab2..ea6d766989 100644
--- a/src/dxaml/xcp/core/inc/VirtualSurfaceimageSource.h
+++ b/src/dxaml/xcp/core/inc/VirtualSurfaceimageSource.h
@@ -24,7 +24,7 @@ struct VirtualSurfaceImageSourceStandbyLists
     xvector<VirtualSurfaceImageSourceStandbyListRecord> list[VSIS_STANDBY_LIST_COUNT];
 
     // The amount of memory (bytes) consumed by all tiles in all lists
-    XUINT64 totalSize;
+    XUINT64 totalSize{};
 };
 
 class IVirtualSurfaceImageSourceCallbacks
diff --git a/src/dxaml/xcp/core/inc/XamlBinaryFormatStringConverter.h b/src/dxaml/xcp/core/inc/XamlBinaryFormatStringConverter.h
index 19b936ff47..d85c5b089d 100644
--- a/src/dxaml/xcp/core/inc/XamlBinaryFormatStringConverter.h
+++ b/src/dxaml/xcp/core/inc/XamlBinaryFormatStringConverter.h
@@ -13,6 +13,6 @@ class XamlBinaryFormatStringConverter final
     bool TryConvertValue(_Const_ _In_ const XamlTypeToken typeConverterToken, _Inout_ CValue& valueContainer);
 
 private:
-    const CCoreServices* m_core;
+    const CCoreServices* m_core{};
 };
 
diff --git a/src/dxaml/xcp/core/inc/XamlCompositionBrush.h b/src/dxaml/xcp/core/inc/XamlCompositionBrush.h
index c75906877c..2d3a19d180 100644
--- a/src/dxaml/xcp/core/inc/XamlCompositionBrush.h
+++ b/src/dxaml/xcp/core/inc/XamlCompositionBrush.h
@@ -58,7 +58,7 @@ class CXamlCompositionBrush final : public CBrush
     _Check_return_ HRESULT GetCompositionBrush(_In_opt_ const CUIElement* element, _In_opt_ WUComp::ICompositor* compositor, _Outptr_result_maybenull_ WUComp::ICompositionBrush** compBrush);
     void SetCompositionBrush(_In_opt_ WUComp::ICompositionBrush* compBrush);
 
-    _Out_ WUComp::ICompositionBrush* GetBrushForContentRootNoRef(_In_ CContentRoot* contentRoot);
+    _Ret_maybenull_ WUComp::ICompositionBrush* GetBrushForContentRootNoRef(_In_ CContentRoot* contentRoot);
     void SetBrushForContentRoot(_In_ CContentRoot* contentRoot, _In_ WUComp::ICompositionBrush* brush);
     void ClearCompositionBrushMap();
     void ClearBrushForContentRoot(_In_ CContentRoot* contentRoot, _In_ WUComp::ICompositionBrush* brush);
diff --git a/src/dxaml/xcp/core/inc/XamlIslandRoot.h b/src/dxaml/xcp/core/inc/XamlIslandRoot.h
index d89e8b97aa..fccac45521 100644
--- a/src/dxaml/xcp/core/inc/XamlIslandRoot.h
+++ b/src/dxaml/xcp/core/inc/XamlIslandRoot.h
@@ -16,6 +16,8 @@
 #include <Microsoft.UI.Input.Partner.h>
 #include <Microsoft.UI.Content.h>
 #include "microsoft.ui.input.dragdrop.h"
+#include <Microsoft.UI.Input.Partner.h>
+#include <optional>
 
 class CContentRoot;
 
@@ -41,6 +43,7 @@ class CXamlIslandRoot final : public CPanel
     _Check_return_ HRESULT Initialize(_In_ WUComp::Desktop::IDesktopWindowContentBridgeInterop* contentBridge);
 
     void OnPostDesktopWindowContentBridgeInitialized(_In_ IUnknown* contentBridge);
+    void InitializeNonClientPointerSource(ABI::Microsoft::UI::WindowId windowId);
 
     //  IFrameworkApplicationPrivate::CreateIslandRoot():
     _Check_return_ HRESULT Initialize();
@@ -154,7 +157,7 @@ class CXamlIslandRoot final : public CPanel
     // this will apply a window style to the desktop site bridge's hwnd, but that is a child hwnd of the app's top-level
     // hwnd and forcing the child hwnd to LTR isn't expected to affect things like the min/max/close buttons in the
     // nonclient area.
-    void ForceLTRLayoutDirection();
+    _Check_return_ HRESULT ForceLTRLayoutDirection();
 
     wrl::ComPtr<ixp::IContentIslandEnvironment> GetContentIslandEnvironment() const { return m_topLevelHost; }
 
@@ -205,6 +208,25 @@ class CXamlIslandRoot final : public CPanel
         UINT msg,
         _In_ ixp::IPointerEventArgs* pArgs);
 
+    _Check_return_ HRESULT OnIslandNonClientPointerEntered(
+        _In_ ixp::IPointerPoint* pointerPoint);
+
+    _Check_return_ HRESULT OnIslandNonClientPointerExited(
+        _In_ ixp::IPointerPoint* pointerPoint);
+
+    _Check_return_ HRESULT OnIslandNonClientPointerMoved(
+        _In_ ixp::IPointerPoint* pointerPoint);
+
+    _Check_return_ HRESULT OnIslandNonClientPointerPressed(
+        _In_ ixp::IPointerPoint* pointerPoint);
+
+    _Check_return_ HRESULT OnIslandNonClientPointerReleased(
+        _In_ ixp::IPointerPoint* pointerPoint);
+
+    _Check_return_ HRESULT InjectNonClientPointerMessage(
+        UINT msg,
+        ixp::IPointerPoint* pointerPoint);
+
     void OnIslandActualSizeChanged();
 
     _Check_return_ HRESULT OnIslandGotFocus();
@@ -251,11 +273,15 @@ class CXamlIslandRoot final : public CPanel
     void InitInputObjects(_In_ ixp::IContentIsland* const contentIsland);
     void SubscribeToInputKeyboardSourceEvents();
     void SubscribeToInputPointerSourceEvents();
+    void SubscribeToInputNonClientPointerSourceEvents();
     void UnsubscribeToInputEvents();
 
+    typedef decltype(&CXamlIslandRoot::OnIslandNonClientPointerEntered) PointerHandlerFunction;
+    wrl::ComPtr<wf::ITypedEventHandler<ixp::InputNonClientPointerSource*, ixp::NonClientPointerEventArgs*>> GetNonClientPointerEventHandler(PointerHandlerFunction pointerHandler, std::optional<bool> newContactState = std::optional<bool>());
+
     bool IsDisposed() const { return m_contentRoot == nullptr; }
 
-    void UpdateLastPointerPointForReplay(const UINT uMsg, _In_ ixp::IPointerPoint* pointerPoint, _In_ ixp::IPointerEventArgs* pointerEventArgs);
+    void UpdateLastPointerPointForReplay(const UINT uMsg, _In_ ixp::IPointerPoint* pointerPoint, _In_opt_ ixp::IPointerEventArgs* pointerEventArgs, bool previousPointerPointIsNonClient = false);
 
     // For testing - normally we can get the visual out of m_spVisualTreeIsland, but for tests this returns a real
     // visual when we want the mock. So track the root visual separately.
@@ -300,6 +326,7 @@ class CXamlIslandRoot final : public CPanel
 
     bool m_hasCapture = false;
 
+    ABI::Microsoft::UI::WindowId m_contentBridgeWindowId{};
     HWND m_contentBridgeWindow = nullptr;
 
     wrl::ComPtr<ixp::IIslandInputSitePartner> m_islandInputSite;
@@ -307,6 +334,7 @@ class CXamlIslandRoot final : public CPanel
     wrl::ComPtr<ixp::IInputKeyboardSource2> m_inputKeyboardSource2;
     wrl::ComPtr<ixp::IInputPointerSource> m_inputPointerSource;
     wrl::ComPtr<ixp::IInputPointerSource2> m_inputPointerSource2;
+    wrl::ComPtr<ixp::IInputNonClientPointerSource> m_inputNonClientPointerSource;
     wrl::ComPtr<ixp::IInputPreTranslateKeyboardSourceInterop> m_inputPreTranslateKeyboardSourceInterop;
     wrl::ComPtr<ixp::IInputActivationListener> m_inputActivationListener;
     wrl::ComPtr<ixp::IDesktopChildSiteBridge> m_contentBridgeDW;
@@ -336,6 +364,13 @@ class CXamlIslandRoot final : public CPanel
 
     EventRegistrationToken m_touchHitTestRequestedToken = {};
 
+    EventRegistrationToken m_nonClientCaptionTappedToken = {};
+    EventRegistrationToken m_nonClientPointerEnteredToken = {};
+    EventRegistrationToken m_nonClientPointerExitedToken = {};
+    EventRegistrationToken m_nonClientPointerMovedToken = {};
+    EventRegistrationToken m_nonClientPointerPressedToken = {};
+    EventRegistrationToken m_nonClientPointerReleasedToken = {};
+
     EventRegistrationToken m_activationChangedToken = {};
 
     EventRegistrationToken m_topLevelHost_StateChanged = {};
@@ -363,5 +398,11 @@ class CXamlIslandRoot final : public CPanel
 
     wrl::ComPtr<ixp::IPointerPoint> m_previousPointerPoint;
     wrl::ComPtr<ixp::IPointerEventArgs> m_previousPointerEventArgs;
+    bool m_previousPointerPointIsNonClient{ false };
+    bool m_isNonClientPointerDown{ false };
+    
+    wrl::ComPtr<ixp::IPartnerPointerPointStatics> m_partnerPointerPointStatics;
+
+    _Check_return_ HRESULT EnsurePartnerPointerPointStatics();
 };
 
diff --git a/src/dxaml/xcp/core/inc/XamlQualifiedObject.h b/src/dxaml/xcp/core/inc/XamlQualifiedObject.h
index 6eb7c665da..90b158a69f 100644
--- a/src/dxaml/xcp/core/inc/XamlQualifiedObject.h
+++ b/src/dxaml/xcp/core/inc/XamlQualifiedObject.h
@@ -109,7 +109,7 @@ struct XamlQualifiedObject
     {
         other.Clear();
     }
-    XamlQualifiedObject& operator=(XamlQualifiedObject&& other)
+    XamlQualifiedObject& operator=(XamlQualifiedObject&& other) noexcept
     {
         if (this != &other)
         {
diff --git a/src/dxaml/xcp/core/inc/XamlServiceProviderContext.h b/src/dxaml/xcp/core/inc/XamlServiceProviderContext.h
index f5675e314f..63b38e7653 100644
--- a/src/dxaml/xcp/core/inc/XamlServiceProviderContext.h
+++ b/src/dxaml/xcp/core/inc/XamlServiceProviderContext.h
@@ -71,7 +71,7 @@ class XamlServiceProviderContext
         _In_ std::shared_ptr<XamlProperty> spProperty,
         _In_ std::shared_ptr<XamlType> spTypeToFind,
         _In_ CompressedStackCacheHint eCacheHint,
-        _Outref_ AmbientValuesVector& rvecValues);
+        _Out_ AmbientValuesVector& rvecValues);
 
     // Resolve the first instance object that matches the ambient search across the parser context
     // using either a type or property criteria.
diff --git a/src/dxaml/xcp/core/inc/XamlSpecialXmlNamespace.h b/src/dxaml/xcp/core/inc/XamlSpecialXmlNamespace.h
index 682efe31f0..7e574e7897 100644
--- a/src/dxaml/xcp/core/inc/XamlSpecialXmlNamespace.h
+++ b/src/dxaml/xcp/core/inc/XamlSpecialXmlNamespace.h
@@ -56,7 +56,7 @@ class XamlSpecialXmlNamespace final
     std::shared_ptr<XamlNamespace> Clone() const override;
 
 private:
-    XamlSpecialXmlNamespaceKind m_eSpecialXmlNamespaceKind;
+    XamlSpecialXmlNamespaceKind m_eSpecialXmlNamespaceKind{};
     containers::vector_map<xstring_ptr, std::shared_ptr<DirectiveProperty>> m_mapDirectiveProperties;
 };
 
diff --git a/src/dxaml/xcp/core/inc/XamlType.h b/src/dxaml/xcp/core/inc/XamlType.h
index de5f3f679f..d5b1191406 100644
--- a/src/dxaml/xcp/core/inc/XamlType.h
+++ b/src/dxaml/xcp/core/inc/XamlType.h
@@ -217,7 +217,7 @@ class XamlType
     // ContentProperty, RuntimeNameProperty, etc.
     XamlBitSet<NonBoolTypeValidBits> m_flagsNonBoolTypeValidBits;
     XamlTypeToken m_sBaseTypeToken; // The equivalent Core base type of this type.
-    bool m_bHasContentProperty;
+    bool m_bHasContentProperty{};
     
     static const size_t invalidIndex = static_cast<size_t>(-1);
     size_t m_uiRuntimeIndex = invalidIndex;
diff --git a/src/dxaml/xcp/core/inc/cinputscope.h b/src/dxaml/xcp/core/inc/cinputscope.h
index 8757c2faeb..77d736ba9a 100644
--- a/src/dxaml/xcp/core/inc/cinputscope.h
+++ b/src/dxaml/xcp/core/inc/cinputscope.h
@@ -41,7 +41,7 @@ class CInputScopeName : public CDependencyObject
 
     // CInputScopeNameValue field
 
-    DirectUI::InputScopeNameValue m_nameValue;
+    DirectUI::InputScopeNameValue m_nameValue{};
 };
 
 //------------------------------------------------------------------------
diff --git a/src/dxaml/xcp/core/inc/corep.h b/src/dxaml/xcp/core/inc/corep.h
index 68fd6d0a03..23827cb049 100644
--- a/src/dxaml/xcp/core/inc/corep.h
+++ b/src/dxaml/xcp/core/inc/corep.h
@@ -1459,11 +1459,12 @@ class CCoreServices : public IMediaServices, public IParserCoreServices
         _In_ XHANDLE hwnd,
         float testOverrideScale);
 
-    float GetTestOverrideScale() const { return m_testOverrideScale; } 
+    float GetTestOverrideScale() const { return m_testOverrideScale; }
 
     void OverrideTrimImageResourceDelay(bool enabled);
 
     _Check_return_ HRESULT SetSystemFontCollectionOverride(_In_opt_ IDWriteFontCollection* pFontCollection);
+    _Check_return_ HRESULT ShouldUseTypographicFontModel(_Out_ bool* useDWriteTypographicModel);
 
     void SetTimeManagerClockOverrideConstant(double newTime);
     HRESULT CleanUpAfterTest();
@@ -1773,7 +1774,7 @@ class CCoreServices : public IMediaServices, public IParserCoreServices
 private:
 
     XUINT32                     m_cRef;
-    DWORD                       m_nThreadID;        // Thread that created this core
+    DWORD                       m_nThreadID{};        // Thread that created this core
 
     std::shared_ptr<XamlNodeStreamCacheManager>
                                 m_spXamlNodeStreamCacheManager;
@@ -2041,8 +2042,8 @@ class CCoreServices : public IMediaServices, public IParserCoreServices
         {
         }
 
-        XUINT32 width;
-        XUINT32 height;
+        XUINT32 width{};
+        XUINT32 height{};
         bool retainPlaybackState;
     };
 
@@ -2050,7 +2051,7 @@ class CCoreServices : public IMediaServices, public IParserCoreServices
     static const UINT64         sc_imageSurfaceWrapperReleaseDelayMilliseconds = 1000;
 
     // This should only be used by tests to override waiting for the timeout to expire
-    bool                        m_testOverrideImageSurfaceWrapperReleaseDelay;
+    bool                        m_testOverrideImageSurfaceWrapperReleaseDelay{};
     bool m_forceWindowInvisible_TestHook = false;
 
     // Map for all image decode requests
@@ -2104,6 +2105,7 @@ class CCoreServices : public IMediaServices, public IParserCoreServices
     _Check_return_ HRESULT SetHasDeferredAnimationOperationsEventSignaledStatus(_In_ bool bSignaled);
     _Check_return_ HRESULT SetDeferredAnimationOperationsCompleteEvent();
     _Check_return_ HRESULT SetRootVisualResetEventSignaledStatus(_In_ bool bSignaled);
+    _Check_return_ HRESULT SetLayoutCleanSignaledStatus(_In_ bool bSignaled);
     _Check_return_ HRESULT SetImageDecodingIdleEventSignaledStatus(_In_ bool bSignaled);
     _Check_return_ HRESULT SetFontDownloadsIdleEventSignaledStatus(_In_ bool bSignaled);
     _Check_return_ HRESULT SetPopupMenuCommandInvokedEvent();
@@ -2218,6 +2220,7 @@ class CCoreServices : public IMediaServices, public IParserCoreServices
     IPALEvent                  *m_pHasDeferredAnimationOperationsEvent;
     IPALEvent                  *m_pDeferredAnimationOperationsCompleteEvent;
     IPALEvent                  *m_pRootVisualResetEvent;
+    IPALEvent*                  m_layoutCleanEvent;
     IPALEvent                  *m_pImageDecodingIdleEvent;
     IPALEvent                  *m_pFontDownloadsIdleEvent;
     IPALEvent                  *m_pPopupMenuCommandInvokedEvent;
@@ -2408,7 +2411,7 @@ class CAbortableDownloadWrapper final : public IPALAbortableOperation
         ReleaseInterface(m_pAbortable);
     }
     DREQUEST*                m_pRequest;
-    CCoreServices*           m_pcs;
+    CCoreServices*           m_pcs{};
     XUINT32                  m_cRef;
     IPALAbortableOperation*  m_pAbortable;
 };
diff --git a/src/dxaml/xcp/core/inc/focusmgr.h b/src/dxaml/xcp/core/inc/focusmgr.h
index b9c686aa30..39cf1aaee6 100644
--- a/src/dxaml/xcp/core/inc/focusmgr.h
+++ b/src/dxaml/xcp/core/inc/focusmgr.h
@@ -220,8 +220,8 @@ class CFocusManager final
     // ------------------------------------------------------------------------
     _Check_return_ HRESULT ProcessTabStopInternal(_In_ bool bPressedShift, _In_ bool queryOnly, _Outptr_ CDependencyObject** ppNewTabStopElement);
 
-    CDependencyObject* GetFirstFocusableElement(_In_ CDependencyObject* pSearchStart, _In_ CDependencyObject *pFirstFocus);
-    CDependencyObject* GetLastFocusableElement(_In_ CDependencyObject* pSearchStart, _In_ CDependencyObject *pLastFocus);
+    CDependencyObject* GetFirstFocusableElement(_In_ CDependencyObject* pSearchStart, _In_opt_ CDependencyObject *pFirstFocus);
+    CDependencyObject* GetLastFocusableElement(_In_ CDependencyObject* pSearchStart, _In_opt_ CDependencyObject *pLastFocus);
     CDependencyObject* GetNextTabStopInternal(_In_ CDependencyObject *pParent, _In_ CDependencyObject *pCurrent, _In_ CDependencyObject *pCandidate, _Inout_ bool *bCurrentPassed, _Inout_ CDependencyObject **pCurrentCompare);
     CDependencyObject* GetPreviousTabStopInternal(_In_ CDependencyObject *pParent, _In_ CDependencyObject *pCurrent, _In_ CDependencyObject *pCandidate, _Inout_ bool *bCurrentPassed, _Inout_ CDependencyObject **pCurrentCompare);
     XINT32 CompareTabIndex(_In_ CDependencyObject *pObject1, _In_ CDependencyObject *pObject2);
@@ -229,8 +229,8 @@ class CFocusManager final
     bool IsFocusOnLastTabStop();
     CUIElement* GetParentElement(_In_ CDependencyObject *pCurrent);
 
-    CDependencyObject* GetFirstFocusableElementInternal(_In_ CDependencyObject* pSearchStart, _In_ CDependencyObject *pFirstFocus);
-    CDependencyObject* GetLastFocusableElementInternal(_In_ CDependencyObject* pSearchStart, _In_ CDependencyObject *pLastFocus);
+    CDependencyObject* GetFirstFocusableElementInternal(_In_ CDependencyObject* pSearchStart, _In_opt_ CDependencyObject *pFirstFocus);
+    CDependencyObject* GetLastFocusableElementInternal(_In_ CDependencyObject* pSearchStart, _In_opt_ CDependencyObject *pLastFocus);
 
     // The following allows general FocusManager functions to stay agnostic to
     // the specific element's inheritance hierarchy.
@@ -252,7 +252,7 @@ class CFocusManager final
         _In_ DirectUI::FocusNavigationDirection navigationDirection,
         _In_ KnownEventIndex index,
         _In_ GUID correlationId,
-        _Outptr_ CDependencyObject** pFinalGettingFocusElement);
+        _Outptr_result_maybenull_ CDependencyObject** pFinalGettingFocusElement);
 
     CDependencyObject* RaiseFocusElementRemovedEvent(_In_ CDependencyObject* focusedElement);
     bool CanRaiseFocusEventChange();
@@ -282,7 +282,7 @@ class CFocusManager final
     CCoreServices *m_pCoreService;
     xref::weakref_ptr<CUIElement> m_focusRectangleUIElement;
     bool m_bPluginFocused;
-    DirectUI::FocusState m_realFocusStateForFocusedElement;
+    DirectUI::FocusState m_realFocusStateForFocusedElement{};
     std::unique_ptr<FocusObserver> m_focusObserver;
 
     Focus::XYFocus m_xyFocus;
diff --git a/src/dxaml/xcp/core/inc/geometry.h b/src/dxaml/xcp/core/inc/geometry.h
index a62ea29ee5..75fa125c2d 100644
--- a/src/dxaml/xcp/core/inc/geometry.h
+++ b/src/dxaml/xcp/core/inc/geometry.h
@@ -201,8 +201,8 @@ class CGeometryBuilder
     CCoreServices *m_pCoreNoRef;
     CPathFigureCollection *m_pPathFigures;
     CPathFigure *m_pCurrentPathFigure;
-    XPOINTF m_ptCurr;
-    XPOINTF m_ptReflect;
+    XPOINTF m_ptCurr{};
+    XPOINTF m_ptReflect{};
 
 };
 
diff --git a/src/dxaml/xcp/core/inc/icon.h b/src/dxaml/xcp/core/inc/icon.h
index 20ec6ab85e..f9b3e5d5f6 100644
--- a/src/dxaml/xcp/core/inc/icon.h
+++ b/src/dxaml/xcp/core/inc/icon.h
@@ -89,7 +89,7 @@ class CSymbolIcon final : public CIconElement
     // Overridden to set default values for font properties
     _Check_return_ HRESULT InitInstance() override;
 
-    _Check_return_ HRESULT ApplyTemplate(_Out_ bool& fAddedVisuals) final;
+    _Check_return_ HRESULT ApplyTemplate(_Inout_ bool& fAddedVisuals) final;
 
 public:
     static _Check_return_ HRESULT Create(
@@ -107,7 +107,7 @@ class CSymbolIcon final : public CIconElement
     void SetFontSize(_In_ XFLOAT fontSize);
 
     DirectUI::Symbol m_nSymbol; // The symbol that this icon will display
-    XFLOAT m_fontSize;
+    XFLOAT m_fontSize{};
 };
 
 
@@ -137,7 +137,7 @@ class CFontIcon final : public CIconElement
     // Inherited property support
     _Check_return_ HRESULT PullInheritedTextFormatting() override;
 
-    _Check_return_ HRESULT ApplyTemplate(_Out_ bool& fAddedVisuals) final;
+    _Check_return_ HRESULT ApplyTemplate(_Inout_ bool& fAddedVisuals) final;
 
 public:
     DECLARE_CREATE(CFontIcon);
@@ -179,7 +179,7 @@ class CPathIcon final : public CIconElement
    ~CPathIcon() override;
 
 protected:
-    _Check_return_ HRESULT ApplyTemplate(_Out_ bool& fAddedVisuals) final;
+    _Check_return_ HRESULT ApplyTemplate(_Inout_ bool& fAddedVisuals) final;
 
 public:
     static _Check_return_ HRESULT Create(
@@ -226,7 +226,7 @@ class CBitmapIcon : public CIconElement
    ~CBitmapIcon() override;
 
 protected:
-    _Check_return_ HRESULT ApplyTemplate(_Out_ bool& fAddedVisuals) final;
+    _Check_return_ HRESULT ApplyTemplate(_Inout_ bool& fAddedVisuals) final;
 
     _Check_return_ HRESULT ReloadSourceImage();
 
@@ -291,7 +291,7 @@ class CIconSourceElement final : public CIconElement
     ~CIconSourceElement() override;
 
 protected:
-    _Check_return_ HRESULT ApplyTemplate(_Out_ bool& fAddedVisuals) final;
+    _Check_return_ HRESULT ApplyTemplate(_Inout_ bool& fAddedVisuals) final;
 
 public:
     DECLARE_CREATE(CIconSourceElement);
diff --git a/src/dxaml/xcp/core/inc/layouttransition.h b/src/dxaml/xcp/core/inc/layouttransition.h
index 3ce3d41941..2c593815e7 100644
--- a/src/dxaml/xcp/core/inc/layouttransition.h
+++ b/src/dxaml/xcp/core/inc/layouttransition.h
@@ -13,10 +13,10 @@ class LayoutTransitionStorage
 {
 public:
     LayoutTransitionStorage()
+        : m_transformStart(true /*initialize*/)
+        , m_transformDestination(true /*initialize*/)
     {
         m_sizeStart.height = m_sizeStart.width = m_currentSize.height = m_currentSize.width = m_sizeDestination.height = m_sizeDestination.width = 0.0f;
-        m_transformStart = CMILMatrix(TRUE);
-        m_transformDestination = CMILMatrix(TRUE);
         m_currentOffset.x = m_currentOffset.y = 0.0f;
         m_arrangeInput.Height = m_arrangeInput.Width = m_arrangeInput.X = m_arrangeInput.Y = 0.0f;
         m_arrangeOutput.Height = m_arrangeOutput.Width = m_arrangeOutput.X = m_arrangeOutput.Y = 0.0f;
diff --git a/src/dxaml/xcp/core/inc/segment.h b/src/dxaml/xcp/core/inc/segment.h
index 9da7ec0724..b852fed82c 100644
--- a/src/dxaml/xcp/core/inc/segment.h
+++ b/src/dxaml/xcp/core/inc/segment.h
@@ -254,7 +254,7 @@ class CArcSegment final : public CPathSegment
         XPOINTF m_apt[2];
     };
 
-    XPOINTF m_aptCopy[3];   // Need space for geometry builder to play.
+    XPOINTF m_aptCopy[3]{};   // Need space for geometry builder to play.
     XFLOAT  m_eAngle        = 0.0f;
     bool    m_bClockwise    = false;
     bool    m_bLarge        = false;
diff --git a/src/dxaml/xcp/core/inc/shape.h b/src/dxaml/xcp/core/inc/shape.h
index a6f8409329..a5ade9eb07 100644
--- a/src/dxaml/xcp/core/inc/shape.h
+++ b/src/dxaml/xcp/core/inc/shape.h
@@ -287,7 +287,7 @@ class CShape : public CFrameworkElement
 
     // Natural bounds of the geometry, not including the stretch
     XRECTF_RB m_geometryBounds;
-    XRECTF_RB m_geometryWidenedBounds;
+    XRECTF_RB m_geometryWidenedBounds{};
 
     // Bounds of the fill & stroke, including the stretch. Used to realize brush transforms in PC.
     XRECTF_RB m_innerFillBounds;
diff --git a/src/dxaml/xcp/core/inc/tilebrush.h b/src/dxaml/xcp/core/inc/tilebrush.h
index ff1d36afac..9f8d8a9abd 100644
--- a/src/dxaml/xcp/core/inc/tilebrush.h
+++ b/src/dxaml/xcp/core/inc/tilebrush.h
@@ -159,7 +159,7 @@ class CTileBrush : public CBrush
     DirectUI::AlignmentX      m_AlignmentX  = DirectUI::AlignmentX::Center;
     DirectUI::AlignmentY      m_AlignmentY  = DirectUI::AlignmentY::Center;
     DirectUI::Stretch         m_Stretch     = DirectUI::Stretch::Fill;
-    CMILMatrix                m_matTileMode = CMILMatrix(TRUE);
+    CMILMatrix                m_matTileMode{ true };
 
 //-----------------------------------------------------------------------------
 // D2D Methods/Fields
diff --git a/src/dxaml/xcp/core/inc/timemgr.h b/src/dxaml/xcp/core/inc/timemgr.h
index 68e158f90a..696a3ea688 100644
--- a/src/dxaml/xcp/core/inc/timemgr.h
+++ b/src/dxaml/xcp/core/inc/timemgr.h
@@ -17,7 +17,7 @@ class CStoryboard;
 class CTimeline;
 class CAnimation;
 class CCoreServices;
-struct IPALTickableClock;
+class RefreshAlignedClock;
 struct IFrameScheduler;
 struct IDCompositionDesktopDevicePartner3;
 class CTranslateTransform;
@@ -110,7 +110,7 @@ class CTimeManager final : public CDependencyObject
 public:
     static _Check_return_ HRESULT Create(
         _In_ CCoreServices *pCore,
-        _In_ IPALTickableClock *pIClock,
+        _In_ RefreshAlignedClock* pIClock,
         _Outptr_ CTimeManager **ppObject
         );
 
@@ -245,7 +245,7 @@ class CTimeManager final : public CDependencyObject
     static bool ShouldFailFast();
 
 private:
-    CTimeManager(_In_ CCoreServices *pCore, _In_ IPALTickableClock *pClock);
+    CTimeManager(_In_ CCoreServices *pCore, _In_ RefreshAlignedClock* pClock);
     ~CTimeManager() override;
 
     struct HashKey
@@ -359,7 +359,7 @@ class CTimeManager final : public CDependencyObject
     bool m_hadActiveFiniteAnimations : 1;
 
     // Our clock
-    IPALTickableClock *m_pIClock;
+    RefreshAlignedClock* m_pIClock;
 
     // The time on the clock the first time the time manager ticked.
     XDOUBLE m_rTimeStarted;
diff --git a/src/dxaml/xcp/core/inc/transforms.h b/src/dxaml/xcp/core/inc/transforms.h
index 3e0964d0e5..07713a6d3e 100644
--- a/src/dxaml/xcp/core/inc/transforms.h
+++ b/src/dxaml/xcp/core/inc/transforms.h
@@ -124,9 +124,8 @@ class CMatrixTransformer : public CTransformer
 {
 public:
     CMatrixTransformer(_In_ const CMILMatrix& matTransform)
-    {
-        m_matTransform = matTransform;
-    }
+        : m_matTransform(matTransform)
+    {}
 
 protected:
     ~CMatrixTransformer() override {}
diff --git a/src/dxaml/xcp/core/inc/uielement.h b/src/dxaml/xcp/core/inc/uielement.h
index c3449ed3ee..e1371a70f2 100644
--- a/src/dxaml/xcp/core/inc/uielement.h
+++ b/src/dxaml/xcp/core/inc/uielement.h
@@ -814,11 +814,9 @@ class CUIElement : public CDependencyObject
     virtual void EvaluateIsRightToLeft();
 
     bool IsRightToLeft() override;
-
-    void LockParent();
-
-    void UnlockParent();
-
+  
+    wil::details::lambda_call<std::function<void()>> LockParent();
+  
     _Check_return_ HRESULT Focus(_In_ DirectUI::FocusState focusState,
         _In_ bool animateIfBringIntoView,
         _Out_ bool* focusChanged,
diff --git a/src/dxaml/xcp/core/inc/xamlbinaryformatreader2.h b/src/dxaml/xcp/core/inc/xamlbinaryformatreader2.h
index 4d81422f38..a4452d2f17 100644
--- a/src/dxaml/xcp/core/inc/xamlbinaryformatreader2.h
+++ b/src/dxaml/xcp/core/inc/xamlbinaryformatreader2.h
@@ -78,9 +78,9 @@ class XamlBinaryFormatReader2 :
     std::shared_ptr<XamlBinaryMetadataReader2> m_spXamlBinaryMetadataReader;  
     xvector< PersistedXamlSubStream > m_vecMasterStreamIndex;
     xref_ptr<IPALMemory> m_spXbfMemory;
-    XUINT32 m_cbNodeStreamStartOffset;
-    XUINT32 m_cbNodeStreamSize;
-    XUINT32 m_cbStreamTableSize;
+    XUINT32 m_cbNodeStreamStartOffset{};
+    XUINT32 m_cbNodeStreamSize{};
+    XUINT32 m_cbStreamTableSize{};
 
     // A vector_map of stream offset positions mapped to a tuple containing
     // the stream length of the CustomWriterRuntimeData, stored from the first time
diff --git a/src/dxaml/xcp/core/input/DMViewport.cpp b/src/dxaml/xcp/core/input/DMViewport.cpp
index 9e11b6f6be..2e895ef65d 100644
--- a/src/dxaml/xcp/core/input/DMViewport.cpp
+++ b/src/dxaml/xcp/core/input/DMViewport.cpp
@@ -261,7 +261,7 @@ _Check_return_ HRESULT
 CDMViewport::SetOldStatus(_In_ XDMViewportStatus oldStatus)
 {
 #ifdef DM_DEBUG
-    if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+    if (DM_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   SetOldStatus - oldStatus=%d.", this, oldStatus));
     }
@@ -304,7 +304,7 @@ _Check_return_ HRESULT
 CDMViewport::SetCurrentStatus(_In_ XDMViewportStatus currentStatus)
 {
 #ifdef DM_DEBUG
-    if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+    if (DM_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   SetCurrentStatus - currentStatus=%d.", this, currentStatus));
     }
@@ -341,7 +341,7 @@ void
 CDMViewport::PushInteractionType(_In_ XDMViewportInteractionType interactionType)
 {
 #ifdef DM_DEBUG
-    if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+    if (DM_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   PushInteractionType - interactionType=%d.", this, interactionType));
     }
@@ -371,7 +371,7 @@ void
 CDMViewport::PopInteractionType()
 {
 #ifdef DM_DEBUG
-    if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+    if (DM_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   PopInteractionType - interactionType=%d.", this, m_queuedInteractionTypes.front()));
     }
@@ -522,7 +522,7 @@ CDMViewport::AddConfiguration(_In_ XDMConfigurations configuration)
     if (configurationIndex == -1)
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   AddConfiguration - Adding configuration=%d.", this, configuration));
         }
@@ -551,7 +551,7 @@ CDMViewport::RemoveConfiguration(_In_ XDMConfigurations configuration)
     if (configurationIndex != -1)
     {
 #ifdef DM_DEBUG
-        if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+        if (DM_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   RemoveConfiguration - Removing configuration=%d.", this, configuration));
         }
@@ -627,7 +627,7 @@ CDMViewport::AddContent(_In_ CUIElement* pContentElement, _In_ XDMContentType co
     CDMContent* pContent = NULL;
 
 #ifdef DM_DEBUG
-    if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+    if (DM_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   AddContent - pContentElement=0x%p, contentType=%d.",
             this, pContentElement, contentType));
@@ -682,7 +682,7 @@ CDMViewport::RemoveContent(_In_ CUIElement* pContentElement, _Outptr_result_mayb
     CDMContent* pContent = NULL;
 
 #ifdef DM_DEBUG
-    if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+    if (DM_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   RemoveContent - pContentElement=0x%p.",
             this, pContentElement));
@@ -827,7 +827,7 @@ CDMViewport::ClearContents()
     CDMContent* pContent = NULL;
 
 #ifdef DM_DEBUG
-    if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+    if (DM_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   ClearContents.", this));
     }
@@ -866,7 +866,7 @@ CDMViewport::AddClipContent(_In_ CUIElement* pContentElement, _In_ XDMContentTyp
     CDMContent* pContent = NULL;
 
 #ifdef DM_DEBUG
-    if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+    if (DM_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   AddClipContent - pContentElement=0x%p, contentType=%d.",
             this, pContentElement, contentType));
@@ -921,7 +921,7 @@ CDMViewport::RemoveClipContent(_In_ CUIElement* pContentElement, _Outptr_result_
     CDMContent* pContent = NULL;
 
 #ifdef DM_DEBUG
-    if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+    if (DM_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   RemoveClipContent - pContentElement=0x%p.",
             this, pContentElement));
@@ -1077,7 +1077,7 @@ CDMViewport::ClearClipContents()
     CDMContent* pContent = NULL;
 
 #ifdef DM_DEBUG
-    if (DMV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT))
+    if (DM_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_INPUT_MANAGER_VIEWPORT | DMV_DBG) /*traceType*/, L"DMV[0x%p]:   ClearClipContents.", this));
     }
diff --git a/src/dxaml/xcp/core/input/InputServices.cpp b/src/dxaml/xcp/core/input/InputServices.cpp
index 00eedc48c8..069edac9ef 100644
--- a/src/dxaml/xcp/core/input/InputServices.cpp
+++ b/src/dxaml/xcp/core/input/InputServices.cpp
@@ -57,7 +57,6 @@ using namespace Focus;
 
 // Define as 1 (i.e. XCP_TRACE_OUTPUT_MSG) to get DirectManipulation debug outputs, and 0 otherwise
 #define DMIM_DBG 0
-//#define DM_DEBUG
 
 // Define as 1 (i.e. XCP_TRACE_OUTPUT_MSG) to get DirectManipulation verbose debug outputs, and 0 otherwise
 #define DMIMv_DBG 0
@@ -497,7 +496,6 @@ CInputServices::ProcessPointerExitedEventByPointerEnteredElementStateChange(
     CUIElement*  pNewPointerEnteredUIE = NULL;
     CUIElement*  pElementUIE = NULL;
     CPointerExitedState* pPointerExitedState = NULL;
-    XHANDLE hWindow = NULL;
     CPointer *pPointer = NULL;
     CPointerEventArgs *pPointerArgs = NULL;
     XUINT32 pointerId = 0;
@@ -573,10 +571,8 @@ CInputServices::ProcessPointerExitedEventByPointerEnteredElementStateChange(
     {
         ASSERT(pPointerEnteredDO && pointerState && pointerId);
 
-        // The use of hWindow and onCorrectThread is a hold over from previous versions where we could get pointer events for different threads.
-        // This doesn't seem to be currently possible, so we end up always being on the correct thread.  However, there still seems to be some
-        // additional changes to lifted input coming where this might be needed again.
-        const bool onCorrectThread = (!hWindow || ::GetWindowThreadProcessId(static_cast<HWND>(hWindow), nullptr /*dwProcessId*/) == ::GetCurrentThreadId());
+        // Note: If at some future point lifted input can come from a non-UI thread, we'll need an actual check here.
+        const bool onCorrectThread = true;
 
         bool isPointerInfoValid = false;
         PointerInfo pointerInfo = {};
@@ -2035,9 +2031,14 @@ CInputServices::ProcessPointerMessagesWithInteractionEngine(
     gps->DebugOutputSzNoEndl(L"[InputPointer:IM]: ProcessInteraction: XcpMsg=%d PointerId=%d Element=0x%p \r\n", pMsg->m_msgID, pointerId, pInteractionElement);
 #endif // POINTER_TRACING
 
-    // Feed the pointer messages into the interaction engine.
-    // WARNING: This function may delete its own "this" pointer.
-    IFC_RETURN(pInteractionContext->ProcessPointerMessage(*pMsg));
+    // Non-client pointer messages don't have the pointer point information that the
+    // interaction engine requires to properly detect gestures.
+    if (!pMsg->m_isNonClientPointerMessage)
+    {
+        // Feed the pointer messages into the interaction engine.
+        // WARNING: This function may delete its own "this" pointer.
+        IFC_RETURN(pInteractionContext->ProcessPointerMessage(*pMsg));
+    }
 
     return S_OK;
 }
@@ -3080,8 +3081,7 @@ CInputServices::IsTextEditableControl(_In_ const CDependencyObject* const pObjec
 }
 
 // static
-HWND
-CInputServices::GetUnderlyingInputHwndFromIslandInputSite(_In_opt_ ixp::IIslandInputSitePartner* pIslandInputSite)
+HWND CInputServices::GetUnderlyingInputHwndFromIslandInputSite(_In_opt_ ixp::IIslandInputSitePartner* pIslandInputSite)
 {
     if (nullptr != pIslandInputSite)
     {
@@ -6260,7 +6260,7 @@ CInputServices::EnableViewport(
     if (!pViewport->HasValidBounds())
     {
         // If we enable the viewport before setting the viewport bounds, DManip will use the bounds of the
-        // HWND.  This isn't valid when in XamlOneCoreTransforms mode.  To avoid this, we set the bounds first
+        // input hwnd.  This isn't valid when in XamlOneCoreTransforms mode.  To avoid this, we set the bounds first
         // to the empty bounds.
         IFC_RETURN(SetViewportBounds(pDirectManipulationService, pViewport, {} /* empty bounds */));
     }
diff --git a/src/dxaml/xcp/core/input/KeyTipManager.cpp b/src/dxaml/xcp/core/input/KeyTipManager.cpp
index 9c52ba56c8..2b1b2a4a73 100644
--- a/src/dxaml/xcp/core/input/KeyTipManager.cpp
+++ b/src/dxaml/xcp/core/input/KeyTipManager.cpp
@@ -455,7 +455,7 @@ void KeyTipManager::RemoveNullKeyTips()
 
 
 // Called on UI thread, this is where we actually create the KeyTip visuals and place them
-HRESULT KeyTipManager::Execute()
+_Check_return_ HRESULT KeyTipManager::Execute()
 {
     if (m_state == State::WaitingToUpdateKeyTips)
     {
diff --git a/src/dxaml/xcp/core/layout/LayoutManager.cpp b/src/dxaml/xcp/core/layout/LayoutManager.cpp
index c2bd8b0caf..d8eae09058 100644
--- a/src/dxaml/xcp/core/layout/LayoutManager.cpp
+++ b/src/dxaml/xcp/core/layout/LayoutManager.cpp
@@ -11,7 +11,7 @@
 // Apps usually tend to have a few entries in the sizeChangedQueue and
 // sometimes up to a dozen. The value of 24 is a conservative estimate to
 // allocate space for 24 entries in the stack vector to avoid running over
-// and having to allocate on the heap. 
+// and having to allocate on the heap.
 static constexpr size_t c_sizeChangedVectorSize = 24;
 
 // SizeChangedQueueItems
@@ -368,7 +368,7 @@ CLayoutManager::UpdateLayout(XUINT32 controlWidth, XUINT32 controlHeight)
             m_horizontalViewports.clear();
             m_verticalViewports.clear();
             m_transformsToViewports.clear();
-            
+
             // Even though the root visual is not a viewport per se,
             // we use the original arrange rect to clamp effective viewports.
             // The exception is if we have XAML islands, in which case they'll
@@ -482,7 +482,7 @@ CLayoutManager::UpdateLayout(XUINT32 controlWidth, XUINT32 controlHeight)
     // This queue should be empty but if we are exiting due to an error or too many iterations then
     // we should just throw everything away.
     m_sizeChangedQueue.clear();
-    
+
     m_isInUpdateLayout = FALSE;
 
     TraceLayoutEnd();
@@ -512,6 +512,20 @@ CLayoutManager::UpdateLayout(XUINT32 controlWidth, XUINT32 controlHeight)
     RRETURN(hr);
 }
 
+bool CLayoutManager::IsLayoutClean()
+{
+    if (m_pVisualTree)
+    {
+        CRootVisual* root = m_pVisualTree->GetRootVisual();
+        if (root)
+        {
+            return !root->GetRequiresMeasure() && !root->GetRequiresArrange();
+        }
+    }
+
+    return true;
+}
+
 //-------------------------------------------------------------------------
 //
 //  Function:   CLayoutManager::EnqueueForSizeChanged
@@ -752,7 +766,7 @@ void CLayoutManager::UnregisterElementForDeferredTransition(_In_ CUIElement* pTa
     {
         auto toErase = std::find_if(
             m_elementsWithDeferredTransitions.begin(),
-            m_elementsWithDeferredTransitions.end(), 
+            m_elementsWithDeferredTransitions.end(),
             [pTarget](const auto& item){ return item.get() == pTarget; });
 
         if(toErase != m_elementsWithDeferredTransitions.end())
@@ -761,8 +775,8 @@ void CLayoutManager::UnregisterElementForDeferredTransition(_In_ CUIElement* pTa
             pStorage->m_bRegisteredInLayoutManager = false;
         }
 
-        ASSERT(std::find_if(m_elementsWithDeferredTransitions.begin(), 
-            m_elementsWithDeferredTransitions.end(), 
+        ASSERT(std::find_if(m_elementsWithDeferredTransitions.begin(),
+            m_elementsWithDeferredTransitions.end(),
             [pTarget](const auto& item){ return item.get() == pTarget; }) == m_elementsWithDeferredTransitions.end() ,
             L"should not have found an element registered multiple times in the deferred transitions list");
     }
@@ -770,8 +784,8 @@ void CLayoutManager::UnregisterElementForDeferredTransition(_In_ CUIElement* pTa
     ASSERT(!pStorage->m_bRegisteredInLayoutManager);
 }
 
-_Check_return_ 
-HRESULT 
+_Check_return_
+HRESULT
 CLayoutManager::GetPosition(_In_ CUIElement* element, _In_ Jupiter::stack_vector<std::pair<CUIElement*, XRECTF>, 16>& cachedPositions, _Out_ XRECTF* position)
 {
     auto foundPosition = std::find_if(
@@ -798,7 +812,7 @@ ElementRectPairVector* CLayoutManager::GetOrCreateCachedElementRects(_In_ CTrans
     auto foundGroupItem = std::find_if(
                 cachedGroups.m_vector.begin(),
                 cachedGroups.m_vector.end(),
-                [transition](auto const& item) { return item.first == transition; }); 
+                [transition](auto const& item) { return item.first == transition; });
     if (foundGroupItem != cachedGroups.m_vector.end())
     {
         return foundGroupItem->second.get();
@@ -809,7 +823,7 @@ ElementRectPairVector* CLayoutManager::GetOrCreateCachedElementRects(_In_ CTrans
         if(!m_elementRectPool.empty())
         {
             elementRects = std::move(m_elementRectPool.back());
-            m_elementRectPool.pop_back(); 
+            m_elementRectPool.pop_back();
         }
         else
         {
@@ -858,7 +872,7 @@ CLayoutManager::RealizeRegisteredLayoutTransitions()
     {
         LayoutTransitionStorage* pStorage = element->GetLayoutTransitionStorage();
         IFCEXPECT(pStorage);
-        ASSERT(!pStorage->m_registeredTransitions.empty()); // should have unregistered with deferredtransitions though.       
+        ASSERT(!pStorage->m_registeredTransitions.empty()); // should have unregistered with deferredtransitions though.
 
         if (pStorage->GetTrigger() != DirectUI::TransitionTrigger::NoTrigger)
         {
@@ -867,14 +881,14 @@ CLayoutManager::RealizeRegisteredLayoutTransitions()
             CUIElement* pParent = do_pointer_cast<CUIElement>(element->GetParentInternal(false));
             IFC(GetPosition(pParent, parentPositions, &parentPosition));
 
-            XRECTF layoutSlot  = {  
+            XRECTF layoutSlot  = {
                 parentPosition.X + pStorage->m_transformStart.GetDx(),
                 parentPosition.Y + pStorage->m_transformStart.GetDy(),
                 pStorage->m_sizeStart.width,
                 pStorage->m_sizeStart.height};
             // fill the groups
             for(const auto& transition : pStorage->m_registeredTransitions)
-            {    
+            {
                 auto elementRects = GetOrCreateCachedElementRects(transition.get(), groups);
                 // finally store the combination of the layoutrect and the element for later use
                 elementRects->emplace_back(element.get(), layoutSlot);
@@ -904,7 +918,7 @@ CLayoutManager::RealizeRegisteredLayoutTransitions()
 
         ASSERT(elementRects);
         ASSERT(elementCount > 0);
-        
+
         // handle staggering
         if (transition->m_pStaggerFunction && transition->GetIsStaggeringEnabled())
         {
@@ -933,7 +947,7 @@ CLayoutManager::RealizeRegisteredLayoutTransitions()
             CUIElement *transitionedElement = pElementRectPair.first;
             // puts the target in a list so that we can later validate that storyboards were setup
             elementsTransitioned.m_vector.emplace_back(transitionedElement);
-            
+
             // will create and call begin on storyboards
             IFC(CTransition::SetupTransition(transitionedElement, transition, delayVector.m_vector[i]));
         }
@@ -949,18 +963,18 @@ CLayoutManager::RealizeRegisteredLayoutTransitions()
 
 Cleanup:
     // Now that we are done with the element rects vector, we cache it in pool member vector
-    // so that it can be reused. This way we avoid repeated allocations of these vectors only 
-    // to throw them away after this method. 
+    // so that it can be reused. This way we avoid repeated allocations of these vectors only
+    // to throw them away after this method.
     for(auto& groupItem: groups.m_vector)
     {
         groupItem.second->clear();
         m_elementRectPool.push_back(std::move(groupItem.second));
     }
-    
+
     m_isInTransitionRealization = FALSE;
     m_elementsWithDeferredTransitions.clear();
     TraceRealizeTransitionEnd();
-    
+
     RRETURN(hr);
 }
 
diff --git a/src/dxaml/xcp/core/native/inc/AgileCallback.h b/src/dxaml/xcp/core/native/inc/AgileCallback.h
index d120b016f9..468bd26e14 100644
--- a/src/dxaml/xcp/core/native/inc/AgileCallback.h
+++ b/src/dxaml/xcp/core/native/inc/AgileCallback.h
@@ -9,7 +9,7 @@ template<typename TDelegateInterface, typename TCallbackObject, typename TArg1,
 Microsoft::WRL::ComPtr<typename Microsoft::WRL::Details::ArgTraitsHelper<TDelegateInterface>::Interface>
 DispatcherCallback(
     _In_ TCallbackObject *pObject,
-    _In_ HRESULT (TCallbackObject::* pMethod)(TArg1*, TArg2*)) throw()
+    _In_ HRESULT (TCallbackObject::* pMethod)(TArg1*, TArg2*)) noexcept
 {
     static_assert(__is_base_of(IUnknown, TDelegateInterface) && !__is_base_of(IInspectable, TDelegateInterface), "Delegates objects must be 'IUnknown' base and not 'IInspectable'");
     static_assert(Microsoft::WRL::Details::ArgTraitsHelper<TDelegateInterface>::Traits::args == 2, "Number of arguments on object method doesn't match number of arguments on Delegate::Invoke");
@@ -20,7 +20,7 @@ DispatcherCallback(
 
     struct ComObject : wrl::RuntimeClass<wrl::RuntimeClassFlags<wrl::Delegate>, TDelegateInterface, wrl::FtmBase>
     {
-        ComObject(TCallbackObject *pDO, TCallbackMethod pMethod) throw()
+        ComObject(TCallbackObject *pDO, TCallbackMethod pMethod) noexcept
             : m_wpDO(xref::get_weakref(pDO)), m_pMethod(pMethod)
         {
             ctl::ComPtr<msy::IDispatcherQueueStatics> spDispatcherQueueStatics;
diff --git a/src/dxaml/xcp/core/native/text/Common/D2DTextDrawingContext.h b/src/dxaml/xcp/core/native/text/Common/D2DTextDrawingContext.h
index e84c43c17a..a008bced43 100644
--- a/src/dxaml/xcp/core/native/text/Common/D2DTextDrawingContext.h
+++ b/src/dxaml/xcp/core/native/text/Common/D2DTextDrawingContext.h
@@ -233,8 +233,8 @@ class D2DTextDrawingContext final : public RichTextServices::TextDrawingContext
     // Stores rendering data for lines
     struct LineData
     {
-        XFLOAT Width;
-        XFLOAT Thickness;
+        XFLOAT Width{};
+        XFLOAT Thickness{};
         CMILMatrix Transform;
         xref::weakref_ptr<CDependencyObject> BrushSource;
         CBrush *Brush;
diff --git a/src/dxaml/xcp/core/native/text/Common/WinTextCore.cpp b/src/dxaml/xcp/core/native/text/Common/WinTextCore.cpp
index 30cb34cada..c61200fc34 100644
--- a/src/dxaml/xcp/core/native/text/Common/WinTextCore.cpp
+++ b/src/dxaml/xcp/core/native/text/Common/WinTextCore.cpp
@@ -614,4 +614,20 @@ HRESULT WinTextCore::SetSystemFontCollectionOverride(_In_opt_ IDWriteFontCollect
     return S_OK;
 }
 
+//------------------------------------------------------------------------
+//
+//  Determines whether we should be using the typographic font model.
+//
+//------------------------------------------------------------------------
+HRESULT WinTextCore::ShouldUseTypographicFontModel(_Out_ bool* shouldUseTypographicModel)
+{
+    CTextCore* pTextCore = nullptr;
+    IFontAndScriptServices* pFontServices = nullptr;
+    DWriteFontAndScriptServices* pDWriteFontServices = nullptr;
 
+    IFC_RETURN(m_pCore->GetTextCore(&pTextCore));
+    IFC_RETURN(pTextCore->GetFontAndScriptServices(&pFontServices));
+
+    *shouldUseTypographicModel = pDWriteFontServices->ShouldUseTypographicFontModel();
+    return S_OK;
+}
diff --git a/src/dxaml/xcp/core/native/text/Common/WinTextCore.h b/src/dxaml/xcp/core/native/text/Common/WinTextCore.h
index d0970ea80b..750fe24429 100644
--- a/src/dxaml/xcp/core/native/text/Common/WinTextCore.h
+++ b/src/dxaml/xcp/core/native/text/Common/WinTextCore.h
@@ -85,6 +85,7 @@ class WinTextCore : public CXcpObjectBase<IObject>
     HRESULT ConfigureNumberSubstitution();
 
     _Check_return_ HRESULT SetSystemFontCollectionOverride(_In_opt_ IDWriteFontCollection* pFontCollection);
+    _Check_return_ HRESULT ShouldUseTypographicFontModel(_Out_ bool* useTypographicModel);
 
 private:
     // Private ctor.
diff --git a/src/dxaml/xcp/core/native/text/Controls/PasswordBox.cpp b/src/dxaml/xcp/core/native/text/Controls/PasswordBox.cpp
index 0cdb9d98bf..48352bffc0 100644
--- a/src/dxaml/xcp/core/native/text/Controls/PasswordBox.cpp
+++ b/src/dxaml/xcp/core/native/text/Controls/PasswordBox.cpp
@@ -738,17 +738,17 @@ _Check_return_ HRESULT CPasswordBox::UpdateIhmSkinToBitLocker(bool skinBitLocker
 {
     if (DesktopUtility::IsOnDesktop())
     {
-        HWND hwnd = CInputServices::GetUnderlyingInputHwndFromIslandInputSite(GetElementIslandInputSite().Get());
-        if (nullptr != hwnd)
+        HWND inputHwnd = CInputServices::GetUnderlyingInputHwndFromIslandInputSite(GetElementIslandInputSite().Get());
+        if (nullptr != inputHwnd)
         {
             if (skinBitLocker)
             {
-                IFC_RETURN(::TextInput_SetKeyboardSkin(::TextInput_KeyboardSkins::Bitlocker, hwnd));
+                IFC_RETURN(::TextInput_SetKeyboardSkin(::TextInput_KeyboardSkins::Bitlocker, inputHwnd));
                 TraceSetIhmKeyboardSkinInfo(static_cast<UINT32>(::TextInput_KeyboardSkins::Bitlocker));
             }
             else
             {
-                IFC_RETURN(::TextInput_SetKeyboardSkin(::TextInput_KeyboardSkins::Default, hwnd));
+                IFC_RETURN(::TextInput_SetKeyboardSkin(::TextInput_KeyboardSkins::Default, inputHwnd));
                 TraceSetIhmKeyboardSkinInfo(static_cast<UINT32>(::TextInput_KeyboardSkins::Default));
             }
         }
diff --git a/src/dxaml/xcp/core/native/text/Controls/PrivateTextInputSettings.h b/src/dxaml/xcp/core/native/text/Controls/PrivateTextInputSettings.h
index 523b0d7880..6151fc16eb 100644
--- a/src/dxaml/xcp/core/native/text/Controls/PrivateTextInputSettings.h
+++ b/src/dxaml/xcp/core/native/text/Controls/PrivateTextInputSettings.h
@@ -72,7 +72,7 @@ class CTextInputPrivateSettings :
     void UpdateTextPredictionSettingBits(BOOL bIsPredictionEnabled);
 
     CTextBoxBase *m_pTextBox;
-    UINT32 m_inputScope;
+    UINT32 m_inputScope{};
     TextInput_InputSettings m_inputSettings;
     Microsoft::WRL::ComPtr<ITextServices2> m_spTextServices;
   };
diff --git a/src/dxaml/xcp/core/native/text/Controls/TextBox.cpp b/src/dxaml/xcp/core/native/text/Controls/TextBox.cpp
index d8cb85336a..37293b304d 100644
--- a/src/dxaml/xcp/core/native/text/Controls/TextBox.cpp
+++ b/src/dxaml/xcp/core/native/text/Controls/TextBox.cpp
@@ -893,7 +893,7 @@ _Check_return_ HRESULT CTextBox::SetTextServicesBuffer(
         // If NULL, removes all content.
     )
 {
-    CTextBoxBase::SetTextServicesBuffer(strText);
+    IFC_RETURN(CTextBoxBase::SetTextServicesBuffer(strText));
 
 
     // TextBox in the XAML layer needs to be notified when pText is changed so it can
diff --git a/src/dxaml/xcp/core/native/text/Controls/TextBoxBase.h b/src/dxaml/xcp/core/native/text/Controls/TextBoxBase.h
index 6040256963..ce59e4e781 100644
--- a/src/dxaml/xcp/core/native/text/Controls/TextBoxBase.h
+++ b/src/dxaml/xcp/core/native/text/Controls/TextBoxBase.h
@@ -61,12 +61,12 @@ class CTextBoxBase : public CControl
 
     public:
         ScopedSuppressChangeNotifications(const ScopedSuppressChangeNotifications&) = delete;
-        ScopedSuppressChangeNotifications(ScopedSuppressChangeNotifications&& move);
+        ScopedSuppressChangeNotifications(ScopedSuppressChangeNotifications&& move) noexcept;
 
         ~ScopedSuppressChangeNotifications();
 
         ScopedSuppressChangeNotifications& operator=(const ScopedSuppressChangeNotifications&) = delete;
-        ScopedSuppressChangeNotifications& operator=(ScopedSuppressChangeNotifications&& move);
+        ScopedSuppressChangeNotifications& operator=(ScopedSuppressChangeNotifications&& move) noexcept;
 
     private:
         ScopedSuppressChangeNotifications(_In_ CTextBoxBase* textBoxBase, _In_ ITextDocument2* document);
diff --git a/src/dxaml/xcp/core/native/text/Controls/TextBoxView.cpp b/src/dxaml/xcp/core/native/text/Controls/TextBoxView.cpp
index 046f3448bf..cd4464f070 100644
--- a/src/dxaml/xcp/core/native/text/Controls/TextBoxView.cpp
+++ b/src/dxaml/xcp/core/native/text/Controls/TextBoxView.cpp
@@ -3307,7 +3307,9 @@ _Check_return_ HRESULT CTextBoxView::GetFontFaceRun(
     _Out_ XUINT32 *pRunCount
     )
 {
-    CWeightStyleStretch weightStyleStretch(weight, style, stretch);
+    // The use of zero for the optical size will cause the MapCharacters to fall
+    // back to legacy versions (non optical).
+    CFontFaceCriteria fontFaceCriteria(weight, style, stretch, 0.0f);
     DWriteFontFace *pDWriteFontFace;
     const TextFormatting* pTextFormatting = NULL;
     XFLOAT mappedScale;
@@ -3321,7 +3323,7 @@ _Check_return_ HRESULT CTextBoxView::GetFontFaceRun(
         pTextFormatting->GetResolvedLanguageStringNoRef().GetBuffer(),
         pTextFormatting->GetResolvedLanguageListStringNoRef().GetBuffer(),
         NULL,
-        weightStyleStretch,
+        fontFaceCriteria,
         &pFontFace,
         pRunCount,
         &mappedScale));
diff --git a/src/dxaml/xcp/core/packaging/application.cpp b/src/dxaml/xcp/core/packaging/application.cpp
index 14fbe7d6d2..7e10325e60 100644
--- a/src/dxaml/xcp/core/packaging/application.cpp
+++ b/src/dxaml/xcp/core/packaging/application.cpp
@@ -712,7 +712,7 @@ void CApplication::CleanupDeviceRelatedResourcesRecursive(bool cleanupDComp)
         {
             // Clear the ResourceDictionary's owner weak ref to avoid a dangling pointer
             m_pResources->SetResourceOwner(nullptr);
-            m_pResources->RemoveParent(this);
+            IFCFAILFAST(m_pResources->RemoveParent(this));
             ReleaseInterface(m_pResources);
         }
     }
diff --git a/src/dxaml/xcp/core/text/BlockLayout/BlockLayoutHelpers.cpp b/src/dxaml/xcp/core/text/BlockLayout/BlockLayoutHelpers.cpp
index 55f8ecbd74..c8655a1901 100644
--- a/src/dxaml/xcp/core/text/BlockLayout/BlockLayoutHelpers.cpp
+++ b/src/dxaml/xcp/core/text/BlockLayout/BlockLayoutHelpers.cpp
@@ -123,11 +123,11 @@ _Check_return_ HRESULT BlockLayoutHelpers::GetParagraphProperties(
 
     IFC(pFormatting->m_pFontFamily->GetFontTypeface(
         pFontContext,
-        CWeightStyleStretch(
+        CFontFaceCriteria(
             static_cast<XUINT32>(pFormatting->m_nFontWeight),
             static_cast<XUINT32>(pFormatting->m_nFontStyle),
-            static_cast<XUINT32>(pFormatting->m_nFontStretch)
-        ),
+            static_cast<XUINT32>(pFormatting->m_nFontStretch),
+            pFormatting->m_eFontSize),
         &pFontTypeface
     ));
 
@@ -210,11 +210,11 @@ _Check_return_ HRESULT BlockLayoutHelpers::CreateCollapsingSymbol(
 
     IFC(pTextFormatting->m_pFontFamily->GetFontTypeface(
         pFontContext,
-        CWeightStyleStretch(
+        CFontFaceCriteria(
             static_cast<XUINT32>(pTextFormatting->m_nFontWeight),
             static_cast<XUINT32>(pTextFormatting->m_nFontStyle),
-            static_cast<XUINT32>(pTextFormatting->m_nFontStretch)
-        ),
+            static_cast<XUINT32>(pTextFormatting->m_nFontStretch),
+            pTextFormatting->m_eFontSize),
         &pFontTypeface
         ));
 
diff --git a/src/dxaml/xcp/core/text/BlockLayout/ParagraphTextSource.cpp b/src/dxaml/xcp/core/text/BlockLayout/ParagraphTextSource.cpp
index 93dd0c71d7..9c249fdcfb 100644
--- a/src/dxaml/xcp/core/text/BlockLayout/ParagraphTextSource.cpp
+++ b/src/dxaml/xcp/core/text/BlockLayout/ParagraphTextSource.cpp
@@ -131,12 +131,12 @@ Result::Enum ParagraphTextSource::GetTextRun(
                         // Create content properties from CFormatting
                         pFontContext = GetFontContext();
 
-
                         IFC_FROM_HRESULT_RTS(pFormatting->m_pFontFamily->GetFontTypeface(
                             pFontContext,
-                            CWeightStyleStretch(static_cast<XUINT32>(pFormatting->m_nFontWeight),
+                            CFontFaceCriteria(static_cast<XUINT32>(pFormatting->m_nFontWeight),
                                                 static_cast<XUINT32>(pFormatting->m_nFontStyle),
-                                                static_cast<XUINT32>(pFormatting->m_nFontStretch)),
+                                                static_cast<XUINT32>(pFormatting->m_nFontStretch),
+                                                pFormatting->m_eFontSize),
                             &pFontTypeface));
 
                         pTextProperties = new TextRunProperties(
@@ -214,9 +214,10 @@ Result::Enum ParagraphTextSource::GetTextRun(
 
                 IFC_FROM_HRESULT_RTS(pFormatting->m_pFontFamily->GetFontTypeface(
                     pFontContext,
-                    CWeightStyleStretch(static_cast<XUINT32>(pFormatting->m_nFontWeight),
+                    CFontFaceCriteria(static_cast<XUINT32>(pFormatting->m_nFontWeight),
                                         static_cast<XUINT32>(pFormatting->m_nFontStyle),
-                                        static_cast<XUINT32>(pFormatting->m_nFontStretch)),
+                                        static_cast<XUINT32>(pFormatting->m_nFontStretch),
+                                        pFormatting->m_eFontSize),
                     &pFontTypeface));
 
                 pBrushSource = xref::get_weakref(pNestedElement != nullptr ? static_cast<CDependencyObject*>(pNestedElement) :
diff --git a/src/dxaml/xcp/core/text/Fonts/CompositeFontFamily.cpp b/src/dxaml/xcp/core/text/Fonts/CompositeFontFamily.cpp
index a190b16f7c..bcca7a4186 100644
--- a/src/dxaml/xcp/core/text/Fonts/CompositeFontFamily.cpp
+++ b/src/dxaml/xcp/core/text/Fonts/CompositeFontFamily.cpp
@@ -892,7 +892,7 @@ _Check_return_ HRESULT CCompositeFontFamily::MapCharacters(
     _In_z_ const WCHAR *pLocaleName,
     _In_z_ const WCHAR *pLocaleNameList,
     _In_opt_ const NumberSubstitutionData* pNumberSubstitutionData,
-    _In_ CWeightStyleStretch weightStyleStretch,
+    _In_ CFontFaceCriteria fontFaceCriteria,
     _Outptr_ IFssFontFace **ppMappedFontFace,
     _Out_ XUINT32 *pMappedLength,
     _Out_ XFLOAT *pMappedScale
@@ -959,9 +959,10 @@ _Check_return_ HRESULT CCompositeFontFamily::MapCharacters(
             textLength,
             haveBaseFont ? m_pBaseFontCollection : NULL,
             haveBaseFont ? pBaseFontName : NULL,
-            MIN(MAX(1, weightStyleStretch.m_weight), 999), // Scope to a valid weight or DWrite will complain
-            MIN(MAX(0, weightStyleStretch.m_style), 2),    // Scope to a valid style
-            MIN(MAX(1, weightStyleStretch.m_stretch), 9),  // Scope to a valid stretch
+            MIN(MAX(1, fontFaceCriteria.m_weight), 999), // Scope to a valid weight or DWrite will complain
+            MIN(MAX(0, fontFaceCriteria.m_style), 2),    // Scope to a valid style
+            MIN(MAX(1, fontFaceCriteria.m_stretch), 9),  // Scope to a valid stretch
+            fontFaceCriteria.m_opticalSize,
             pMappedLength,
             ppMappedFontFace,
             pMappedScale));
@@ -1008,7 +1009,7 @@ _Check_return_ HRESULT CCompositeFontFamily::MapCharacters(
 
     if (*ppMappedFontFace == NULL)
     {
-        IFC_RETURN(LookupNominalFontFace(weightStyleStretch, ppMappedFontFace));
+        IFC_RETURN(LookupNominalFontFace(fontFaceCriteria, ppMappedFontFace));
 
         if (*ppMappedFontFace == NULL)
         {
@@ -1018,7 +1019,7 @@ _Check_return_ HRESULT CCompositeFontFamily::MapCharacters(
 
             CCompositeFontFamily *pUltimateFontFamily;
             IFC_RETURN(m_pFontAndScriptServices->GetUltimateFallbackFontFamily(&pUltimateFontFamily));
-            IFC_RETURN(pUltimateFontFamily->LookupNominalFontFace(weightStyleStretch, ppMappedFontFace));
+            IFC_RETURN(pUltimateFontFamily->LookupNominalFontFace(fontFaceCriteria, ppMappedFontFace));
             // fail fast if mapped fontface is still null after ultimate font fall back.
             XCP_FAULT_ON_FAILURE(*ppMappedFontFace != nullptr);
         }
@@ -1032,13 +1033,16 @@ _Check_return_ HRESULT CCompositeFontFamily::MapCharacters(
 //
 //  Method: CCompositeFontFamily::LookupNominalGlyphTypeface
 //
-//  For a given font family, weight, style and stretch, determines which
+//  For a given set of font face criteria, determines which
 //  glyph typeface to use for the missing glyph.
 //
+//  Note, this method is used with richedit which has not yet been adapted
+//        for variable fonts and so the optical size part of the
+//        fontFaceCriteria is ignored.
 //------------------------------------------------------------------------
 
 _Check_return_ HRESULT CCompositeFontFamily::LookupNominalFontFace(
-    _In_        CWeightStyleStretch weightStyleStretch,
+    _In_     CFontFaceCriteria fontFaceCriteria,
     _Outptr_ IFssFontFace         **ppFontFace
 )
 {
@@ -1051,9 +1055,9 @@ _Check_return_ HRESULT CCompositeFontFamily::LookupNominalFontFace(
     if(m_cFontLookups > 0)
     {
         hr = (*m_pFontLookups)[0]->LookupNominalFontFace(
-                weightStyleStretch.m_weight,
-                weightStyleStretch.m_style,
-                weightStyleStretch.m_stretch,
+                fontFaceCriteria.m_weight,
+                fontFaceCriteria.m_style,
+                fontFaceCriteria.m_stretch,
                 ppFontFace);
 
         // Explicitly consider this particular error for downloadable fonts, treating it as if
@@ -1078,13 +1082,13 @@ _Check_return_ HRESULT CCompositeFontFamily::LookupNominalFontFace(
 }
 
 const xref_ptr<CFontTypeface>& CCompositeFontFamily::GetFontTypeface(
-    _In_            CWeightStyleStretch   weightStyleStretch
+    _In_            CFontFaceCriteria   fontFaceCriteria
 )
 {
-    auto& value = m_fontTypefaces[weightStyleStretch];
+    auto& value = m_fontTypefaces[fontFaceCriteria];
     if (!value)
     {
-        value = make_xref<CFontTypeface>(this, weightStyleStretch);
+        value = make_xref<CFontTypeface>(this, fontFaceCriteria);
     }
     return value;
 }
diff --git a/src/dxaml/xcp/core/text/Fonts/FontFamily.cpp b/src/dxaml/xcp/core/text/Fonts/FontFamily.cpp
index 213a1e2559..b411abc24b 100644
--- a/src/dxaml/xcp/core/text/Fonts/FontFamily.cpp
+++ b/src/dxaml/xcp/core/text/Fonts/FontFamily.cpp
@@ -136,7 +136,7 @@ _Check_return_ HRESULT CFontFamily::EnsureCompositeFontFamily(
 
 _Check_return_ HRESULT CFontFamily::GetFontTypeface(
     _In_            CFontContext         *pFontContext,
-    _In_            CWeightStyleStretch   weightStyleStretch,
+    _In_            CFontFaceCriteria         fontFaceCriteria,
     _Outptr_result_maybenull_ CFontTypeface       **ppFontTypeface
 )
 {
@@ -150,7 +150,7 @@ _Check_return_ HRESULT CFontFamily::GetFontTypeface(
 
     // The composite font family will handle the font typeface lookup
     // TODO: Oddly, the callers of this method don't assume an addref
-    *ppFontTypeface = m_pCompositeFontFamily->GetFontTypeface(weightStyleStretch).get();
+    *ppFontTypeface = m_pCompositeFontFamily->GetFontTypeface(fontFaceCriteria).get();
     return S_OK;
 }
 
diff --git a/src/dxaml/xcp/core/text/Fonts/FontTypeface.cpp b/src/dxaml/xcp/core/text/Fonts/FontTypeface.cpp
index 62f2a13e3d..ae8245a023 100644
--- a/src/dxaml/xcp/core/text/Fonts/FontTypeface.cpp
+++ b/src/dxaml/xcp/core/text/Fonts/FontTypeface.cpp
@@ -29,7 +29,7 @@ _Check_return_ HRESULT CFontTypeface::MapCharacters(
         pLocaleName,
         pLocaleNameList,
         pNumberSubstitutionData,
-        m_weightStyleStretch,
+        m_fontFaceCriteria,
         ppMappedFontFace,
         pMappedLength,
         pMappedScale
diff --git a/src/dxaml/xcp/core/text/Inc/DWriteTextRenderer.h b/src/dxaml/xcp/core/text/Inc/DWriteTextRenderer.h
index 837e4cfd15..4c1d859ba5 100644
--- a/src/dxaml/xcp/core/text/Inc/DWriteTextRenderer.h
+++ b/src/dxaml/xcp/core/text/Inc/DWriteTextRenderer.h
@@ -25,7 +25,7 @@ class DWriteTextRenderer final : public IDWriteTextRenderer
         _In_ DWRITE_GLYPH_RUN const* glyphRun,
         _In_ DWRITE_GLYPH_RUN_DESCRIPTION const* glyphRunDescription,
         _In_ IUnknown* clientDrawingEffects
-        ) throw() override;
+        ) noexcept override;
 
     HRESULT STDMETHODCALLTYPE DrawUnderline(
         _In_ void* clientDrawingContext,
@@ -33,7 +33,7 @@ class DWriteTextRenderer final : public IDWriteTextRenderer
         _In_ float baselineOriginY,
         _In_ DWRITE_UNDERLINE const* underline,
         _In_ IUnknown* clientDrawingEffects
-        ) throw() override;
+        ) noexcept override;
 
     HRESULT STDMETHODCALLTYPE DrawStrikethrough(
         _In_ void* clientDrawingContext,
@@ -41,7 +41,7 @@ class DWriteTextRenderer final : public IDWriteTextRenderer
         _In_ float baselineOriginY,
         _In_ DWRITE_STRIKETHROUGH const* strikethrough,
         _In_ IUnknown* clientDrawingEffects
-        ) throw() override;
+        ) noexcept override;
 
     HRESULT STDMETHODCALLTYPE DrawInlineObject(
         _In_ void* clientDrawingContext,
@@ -51,24 +51,24 @@ class DWriteTextRenderer final : public IDWriteTextRenderer
         _In_ BOOL isSideways,
         _In_ BOOL isRightToLeft,
         _In_ IUnknown* clientDrawingEffects
-        ) throw() override;
+        ) noexcept override;
 
     HRESULT STDMETHODCALLTYPE IsPixelSnappingDisabled(
         _In_opt_ void* clientDrawingContext,
         _Out_ BOOL* isDisabled
-        ) throw() override;
+        ) noexcept override;
 
     HRESULT STDMETHODCALLTYPE GetCurrentTransform(
         _In_opt_ void* clientDrawingContext,
         _Out_ DWRITE_MATRIX* transform
-        ) throw() override;
+        ) noexcept override;
 
     HRESULT STDMETHODCALLTYPE GetPixelsPerDip(
         _In_opt_ void* clientDrawingContext,
         _Out_ float* pixelsPerDip
-        ) throw() override;
+        ) noexcept override;
 
-    HRESULT STDMETHODCALLTYPE QueryInterface(IID const& iid, _Out_ void** object) throw() override
+    HRESULT STDMETHODCALLTYPE QueryInterface(IID const& iid, _Out_ void** object) noexcept override
     {
         if (iid == __uuidof(IUnknown)
         ||  iid == __uuidof(IDWriteTextRenderer)
@@ -86,12 +86,12 @@ class DWriteTextRenderer final : public IDWriteTextRenderer
         return S_OK;
     }
 
-    unsigned long STDMETHODCALLTYPE AddRef() throw() override
+    unsigned long STDMETHODCALLTYPE AddRef() noexcept override
     {
         return 1; // Static stack class
     }
 
-    unsigned long STDMETHODCALLTYPE Release() throw() override
+    unsigned long STDMETHODCALLTYPE Release() noexcept override
     {
         return 1; // Static stack class
     }
diff --git a/src/dxaml/xcp/core/text/Inc/Fonts.h b/src/dxaml/xcp/core/text/Inc/Fonts.h
index 0f3af70b7e..74cbd462c6 100644
--- a/src/dxaml/xcp/core/text/Inc/Fonts.h
+++ b/src/dxaml/xcp/core/text/Inc/Fonts.h
@@ -51,13 +51,11 @@
 //  Fast lookup of a cached glyph:
 //
 //      The class CFontTypeface is instantiated by the TextBreaker to
-//      correspond to a combination of font family, weight, style, stretch
-//      and locale.
+//      correspond to a combination of font face criteria and locale.
 //
 //      The CFontTypeface also contains a pointer to the CFontFamily that
-//      represents the clients FontFamily property, and the values of
-//      weight, style, stretch and locale to use when calling the fontfamily
-//      lookup.
+//      represents the clients FontFamily property, font face criteria
+//      and locale to use when calling the fontfamily lookup.
 //
 //      CFontTypeface exposes its functionality through its LookupGlyph
 //      method.
@@ -94,8 +92,8 @@
 //      needs to know what GlyphTypeface to use for each character.
 //
 //      TextBreaker calls CFontFamily::GetFontTypeface once for each
-//      change of family, weight, style, stretch or locale to obtain a
-//      CFontTypeface corresponding to a Family, weight, style, stretch
+//      change of family, font face criteria or locale to obtain a
+//      CFontTypeface corresponding to a Family, set of font face criteria
 //      and langauge. CFontFamily caches CFontTypefaces as they contain
 //      the expensively constructed codepoint to glyph/typeface map.
 //
@@ -212,7 +210,7 @@ friend class CTextBlock;
     XUINT32                   m_cFontLookups;
     SpanBase<IFssFontFamily*>*m_pFontLookups;
     CSharedName              *m_pFontFamilyName;
-    std::unordered_map<CWeightStyleStretch, xref_ptr<CFontTypeface>> m_fontTypefaces;
+    std::unordered_map<CFontFaceCriteria, xref_ptr<CFontTypeface>> m_fontTypefaces;
     XINT32                    m_cReferences;
     XFLOAT                    m_eBaseline;
     XFLOAT                    m_eLineSpacing;
@@ -278,19 +276,19 @@ friend class CTextBlock;
         _In_z_ const WCHAR *pLocaleName,
         _In_z_ const WCHAR *pLocaleNameList,
         _In_opt_ const NumberSubstitutionData* pNumberSubstitutionData,
-        CWeightStyleStretch weightStyleStretch,
+        CFontFaceCriteria fontFaceCriteria,
         _Outptr_ IFssFontFace **ppMappedFontFace,
         _Out_ XUINT32 *pMappedLength,
         _Out_ XFLOAT *pMappedScale
     );
 
     _Check_return_ HRESULT LookupNominalFontFace(
-        _In_        CWeightStyleStretch weightStyleStretch,
+        _In_        CFontFaceCriteria fontFaceCriteria,
         _Outptr_ IFssFontFace      **ppFontFace
     );
 
     const xref_ptr<CFontTypeface>& GetFontTypeface(
-        _In_            CWeightStyleStretch   weightStyleStretch
+        _In_            CFontFaceCriteria   fontFaceCriteria
     );
 
     _Check_return_ HRESULT GetLineMetrics(
diff --git a/src/dxaml/xcp/core/text/Inc/InputProcessor.h b/src/dxaml/xcp/core/text/Inc/InputProcessor.h
index b0eafdaae6..b460b659c7 100644
--- a/src/dxaml/xcp/core/text/Inc/InputProcessor.h
+++ b/src/dxaml/xcp/core/text/Inc/InputProcessor.h
@@ -12,10 +12,10 @@ namespace TouchTextSelection
     public:
         StartingPoint();
         unsigned __int64 timestamp;      
-        POINT pt;                 
+        POINT pt{};                 
         int dyContactCenterAnchor;  // The distance from anchor the contact started at.
-        POINT ptAnchor;
-        POINT ptGripperCenterOffsetFromAnchor; 
+        POINT ptAnchor{};
+        POINT ptGripperCenterOffsetFromAnchor{}; 
         int cGripperDiameter;
         int dyExpandedInitialZone;
     };
@@ -25,7 +25,7 @@ namespace TouchTextSelection
     public:
         LastPoint();
         unsigned __int64 timestamp;      // timestamp the gripper was here
-        POINT pt;                        // the screen location
+        POINT pt{};                      // the screen location
         unsigned int cCurrentLineHeight;
     };
 
diff --git a/src/dxaml/xcp/core/text/Inc/TextBoxHelpers.h b/src/dxaml/xcp/core/text/Inc/TextBoxHelpers.h
index 30ca432335..ea54252517 100644
--- a/src/dxaml/xcp/core/text/Inc/TextBoxHelpers.h
+++ b/src/dxaml/xcp/core/text/Inc/TextBoxHelpers.h
@@ -120,6 +120,10 @@ class CTextBoxHelpers
         _In_ XUINT32 iTextPosition1,
         _In_ XUINT32 iTextPosition2);
 
+    static
+    XUINT32 GetMaxTextPosition(
+        _In_ ITextContainer* pTextContainer);
+
     static 
     _Check_return_ HRESULT GetText(
         _In_ ITextContainer *pTextContainer,
diff --git a/src/dxaml/xcp/core/text/Inc/TouchSelectionSnappingCalculator.h b/src/dxaml/xcp/core/text/Inc/TouchSelectionSnappingCalculator.h
index e21cbbd9fa..dcbfa892a6 100644
--- a/src/dxaml/xcp/core/text/Inc/TouchSelectionSnappingCalculator.h
+++ b/src/dxaml/xcp/core/text/Inc/TouchSelectionSnappingCalculator.h
@@ -201,7 +201,7 @@ class CSnappingCalculator
 
 private:
     SelectionRange<Position> _selectionRange;
-    Position _lastShrinkingPosition;
+    Position _lastShrinkingPosition{};
     GripperSide _lastActiveGripperSide;
 
     // The framework class must outlive this class, as this class references but does not own it
diff --git a/src/dxaml/xcp/core/text/RichTextServices/TextFormatter/InlineObjectHandlers.h b/src/dxaml/xcp/core/text/RichTextServices/TextFormatter/InlineObjectHandlers.h
index 23b4f95cc1..3db565c505 100644
--- a/src/dxaml/xcp/core/text/RichTextServices/TextFormatter/InlineObjectHandlers.h
+++ b/src/dxaml/xcp/core/text/RichTextServices/TextFormatter/InlineObjectHandlers.h
@@ -72,8 +72,8 @@ namespace RichTextServices
         PLSPARACLIENT plsparaclient;
         BRKCOND breakBefore;
         BRKCOND breakAfter;
-        LONG penPositionX;
-        LONG penPositionY;
+        LONG penPositionX{};
+        LONG penPositionY{};
         bool isPenPositionUsed;
     };
 }
diff --git a/src/dxaml/xcp/core/text/RichTextServices/TextFormatter/LsTextFormatter.h b/src/dxaml/xcp/core/text/RichTextServices/TextFormatter/LsTextFormatter.h
index 4d956cd2ac..0e04768f8e 100644
--- a/src/dxaml/xcp/core/text/RichTextServices/TextFormatter/LsTextFormatter.h
+++ b/src/dxaml/xcp/core/text/RichTextServices/TextFormatter/LsTextFormatter.h
@@ -87,7 +87,7 @@ namespace RichTextServices
             Ptls6::PLSC m_pLsContext;
                 // Context created by LS. It must be provided as explicit input parameter to all Line Services APIs.
 
-            Ptls6::LSCONTEXTINFO m_lsContextInfo;
+            Ptls6::LSCONTEXTINFO m_lsContextInfo{};
                 // Configuration information required to create LS context.
 
             LsHostContext m_lsHostContext;
diff --git a/src/dxaml/xcp/core/text/RichTextServices/TextFormatter/LsTextLine.h b/src/dxaml/xcp/core/text/RichTextServices/TextFormatter/LsTextLine.h
index ef03fa7dde..8a041d95b3 100644
--- a/src/dxaml/xcp/core/text/RichTextServices/TextFormatter/LsTextLine.h
+++ b/src/dxaml/xcp/core/text/RichTextServices/TextFormatter/LsTextLine.h
@@ -272,7 +272,7 @@ namespace RichTextServices
             Ptls6::PLSLINE m_pLsLine;
                 // Pointer to Line Services line wrapped by this object.
 
-            Ptls6::LSLINFO m_lsLineInfo;
+            Ptls6::LSLINFO m_lsLineInfo{};
                 // Line metrics for this line maintained by Line Services.
 
             XUINT32 m_startIndex;
diff --git a/src/dxaml/xcp/core/text/RichTextServices/TextFormatter/TextSegment.cpp b/src/dxaml/xcp/core/text/RichTextServices/TextFormatter/TextSegment.cpp
index 10ac3c0c9c..643ed0034b 100644
--- a/src/dxaml/xcp/core/text/RichTextServices/TextFormatter/TextSegment.cpp
+++ b/src/dxaml/xcp/core/text/RichTextServices/TextFormatter/TextSegment.cpp
@@ -687,55 +687,35 @@ Result::Enum TextSegment::AnalyzeComplexity(
                 bool isTextSimple;
                 XUINT32 textLengthRead;  
                 TextRunData *pNextRunData;
-                bool allAscii = false;
 
                 // Complexity Analysis must happen after font fallback
                 ASSERT(pFontFace != NULL);
 
-                if (pFontFace->CanOptimizeShaping())
-                {
-                    allAscii = TRUE;
-                    for (XUINT32 i = 0; i < runLength; i++)
-                    {
-                        // We include all the non-digits ASCII range in our "optimizable"
-                        // characters. 
-                        if (!IsAscii(pCharacters[i])
-                            || (IsNumber(pCharacters[i]) && pRunData->m_pNumberSubstitution))
-                        {
-                            allAscii = false;
-                            break;
-                        }
-                    }
-                }
-
-                if (!allAscii)
+                IFC_FROM_HRESULT_RTS(pTextAnalyzer->GetTextComplexity(
+                    pCharacters,
+                    runLength,
+                    pFontFace,
+                    &isTextSimple,
+                    &textLengthRead
+                    ));
+            
+                if (isTextSimple)
                 {
-                    IFC_FROM_HRESULT_RTS(pTextAnalyzer->GetTextComplexity(
-                        pCharacters,
-                        runLength,
-                        pFontFace,
-                        &isTextSimple,
-                        &textLengthRead
-                        ));
-                
-                    if (isTextSimple)
+                    if(textLengthRead < runLength)
                     {
-                        if(textLengthRead < runLength)
-                        {
-                            IFCTEXT(pRunData->Split(textLengthRead, &pNextRunData));
-                            pNextRunData->SetGlyphBased(TRUE);
-                            pRunData = pNextRunData;
-                        }
-                        if (pRunData->m_pNumberSubstitution)
-                        {
-                            pRunData->SetGlyphBased(TRUE);
-                        }
+                        IFCTEXT(pRunData->Split(textLengthRead, &pNextRunData));
+                        pNextRunData->SetGlyphBased(TRUE);
+                        pRunData = pNextRunData;
                     }
-                    else
+                    if (pRunData->m_pNumberSubstitution)
                     {
                         pRunData->SetGlyphBased(TRUE);
                     }
                 }
+                else
+                {
+                    pRunData->SetGlyphBased(TRUE);
+                }
             }
         }
 
diff --git a/src/dxaml/xcp/core/text/RichTextServices/TextFormatter/TextSegment.h b/src/dxaml/xcp/core/text/RichTextServices/TextFormatter/TextSegment.h
index ef61ae2466..b8c4a64134 100644
--- a/src/dxaml/xcp/core/text/RichTextServices/TextFormatter/TextSegment.h
+++ b/src/dxaml/xcp/core/text/RichTextServices/TextFormatter/TextSegment.h
@@ -43,7 +43,7 @@ namespace RichTextServices
                 uint32_t textPosition,
                 _Out_ wchar_t const** textString,
                 _Out_ uint32_t* textLength
-                ) throw() override
+                ) noexcept override
             {
                 *textString = &textString_[textPosition];
                 *textLength = textLength_ - textPosition;
@@ -55,7 +55,7 @@ namespace RichTextServices
                 uint32_t textPosition,
                 _Out_ wchar_t const** textString,
                 _Out_ uint32_t* textLength
-                ) throw() override
+                ) noexcept override
             {
                 *textString = &textString_[0];
                 *textLength = textPosition - 0; // text length is valid from current position backward
@@ -63,7 +63,7 @@ namespace RichTextServices
             }
 
 
-            DWRITE_READING_DIRECTION STDMETHODCALLTYPE GetParagraphReadingDirection() throw() override
+            DWRITE_READING_DIRECTION STDMETHODCALLTYPE GetParagraphReadingDirection() noexcept override
             {
                 return readingDirection_;
             }
@@ -73,7 +73,7 @@ namespace RichTextServices
                 uint32_t textPosition,
                 _Out_ uint32_t* textLength,
                 _Out_ wchar_t const** localeName
-                ) throw() override
+                ) noexcept override
             {
                 // The pointer returned should remain valid until the next call,
                 // or until analysis ends. Since only one locale name is supported,
@@ -91,7 +91,7 @@ namespace RichTextServices
                 uint32_t textPosition,
                 _Out_ uint32_t* textLength,
                 _COM_Outptr_ IDWriteNumberSubstitution** numberSubstitution
-                ) throw() override
+                ) noexcept override
             {
                 if (numberSubstitution_ != nullptr)
                     numberSubstitution_->AddRef();
@@ -111,23 +111,23 @@ namespace RichTextServices
                 uint32_t textPosition,
                 _Out_ uint32_t* textLength,
                 _Out_ wchar_t const** localeName
-                ) throw() override
+                ) noexcept override
             {
                 return E_NOTIMPL;
             }
 
             // This class is a stack local variable, so the count can only be one.
-            unsigned long STDMETHODCALLTYPE AddRef() throw() override
+            unsigned long STDMETHODCALLTYPE AddRef() noexcept override
             {
                 return 1;
             }
 
-            unsigned long STDMETHODCALLTYPE Release() throw() override
+            unsigned long STDMETHODCALLTYPE Release() noexcept override
             {
                 return 1;
             }
 
-            HRESULT STDMETHODCALLTYPE QueryInterface(IID const& iid, _Out_ void** object) throw() override
+            HRESULT STDMETHODCALLTYPE QueryInterface(IID const& iid, _Out_ void** object) noexcept override
             {
                 if (iid == __uuidof(IUnknown)
                 ||  iid == __uuidof(IDWriteTextAnalysisSource)
diff --git a/src/dxaml/xcp/core/text/RichTextServices/inc/TextLine.h b/src/dxaml/xcp/core/text/RichTextServices/inc/TextLine.h
index 7024c5f618..fe507e7a10 100644
--- a/src/dxaml/xcp/core/text/RichTextServices/inc/TextLine.h
+++ b/src/dxaml/xcp/core/text/RichTextServices/inc/TextLine.h
@@ -334,7 +334,7 @@ namespace RichTextServices
         TextLineBreak *m_pTextLineBreak;
             // The state of the line when broken by line breaking process.
 
-        bool m_alignmentFollowsReadingOrder;
+        bool m_alignmentFollowsReadingOrder{};
             // The flag to indicate whether the detected text reading order is different from the set flow direction.
     };
 }
diff --git a/src/dxaml/xcp/core/text/RichTextServices/xcp/PALFontAndScriptServices.cpp b/src/dxaml/xcp/core/text/RichTextServices/xcp/PALFontAndScriptServices.cpp
index f9a7062a3d..92ad2f50ea 100644
--- a/src/dxaml/xcp/core/text/RichTextServices/xcp/PALFontAndScriptServices.cpp
+++ b/src/dxaml/xcp/core/text/RichTextServices/xcp/PALFontAndScriptServices.cpp
@@ -15,6 +15,7 @@
 #include "PALResourceManager.h"
 #include "XStringBuilder.h"
 #include "corep.h"
+#include <RuntimeEnabledFeatures.h>
 
 PALFontAndScriptServices::PALFontAndScriptServices(
     _In_ CCoreServices *pCore,
@@ -199,7 +200,40 @@ HRESULT PALFontAndScriptServices::GetDefaultFontNameString(_Out_ xstring_ptr* ps
         }
         else
         {
-            m_strDefaultFontNameString = XSTRING_PTR_FROM_STORAGE(c_strUltimateFallbackFontNameTHStorage);
+            m_strDefaultFontNameString = XSTRING_PTR_FROM_STORAGE(c_strUltimateFallbackFontNameCobaltStorage);
+
+            // Windows does not use a version of RichEdit that will properly handle variable fonts, and the font fallback does not work as
+            // expected when it is passed a variable font name (e.g. SegoeUI Variable).  See:
+            //
+            // Bug 35560704: [HP][Quanta][Win11 21H2] The number displays unknown character in windows settings search bar when input number 0-9 on AR image.
+            //
+            // To combat this, it has been requested that we don't use SegoeUI Variable as the default font unless the current locale uses only latin script.
+            xstring_ptr defaultLanguageString;
+            IFC_RETURN(GetDefaultLanguageString(&defaultLanguageString));
+            WCHAR pszBuffer[6];
+            unsigned int cBuffer = ARRAYSIZE(pszBuffer);
+            if (::GetLocaleInfoEx(defaultLanguageString.GetBuffer(), LOCALE_SSCRIPTS, pszBuffer, cBuffer) <= 0 || CSTR_EQUAL != CompareStringOrdinal(pszBuffer, -1, L"Latn;", -1, TRUE))
+            {
+                m_strDefaultFontNameString = XSTRING_PTR_FROM_STORAGE(c_strUltimateFallbackFontNameTHStorage);
+            }
+            // For testing and debug purposes we will allow the ultimate fallback font to be specified via the registry
+            static const WCHAR XAML_KEY_NAME[] = L"Software\\Microsoft\\XAML";
+            static const WCHAR XAML_VALUE_NAME[] = L"AutoFontFamily";
+            WCHAR szAutoFontFamily[MAX_PATH];
+            DWORD cbData = sizeof(szAutoFontFamily);
+            if (RegGetValue(HKEY_LOCAL_MACHINE, XAML_KEY_NAME, XAML_VALUE_NAME, RRF_RT_REG_SZ, NULL, szAutoFontFamily, &cbData) == ERROR_SUCCESS)
+            {
+                IFC_RETURN(xstring_ptr::CloneBuffer(szAutoFontFamily, &m_strDefaultFontNameString));
+            }
+            else if (!RuntimeFeatureBehavior::GetRuntimeEnabledFeatureDetector()->IsFeatureEnabled(RuntimeFeatureBehavior::RuntimeEnabledFeature::ForceDWriteTypographicModel))
+            {
+                // The typographic model was not explicitly requested, so see if it is disabled or not applicable due to the quirk
+                if (RuntimeFeatureBehavior::GetRuntimeEnabledFeatureDetector()->IsFeatureEnabled(RuntimeFeatureBehavior::RuntimeEnabledFeature::DisableDWriteTypographicModel))
+                {
+                    // Since the topographic model is not enabled, don't use a variable default font.
+                m_strDefaultFontNameString = XSTRING_PTR_FROM_STORAGE(c_strUltimateFallbackFontNameTHStorage);
+                }
+            }
         }
     }
     *pstrDefaultFontNameString = m_strDefaultFontNameString;
diff --git a/src/dxaml/xcp/core/text/TextBlock/DWriteTextRenderer.cpp b/src/dxaml/xcp/core/text/TextBlock/DWriteTextRenderer.cpp
index 3a4d1c0918..23ff711615 100644
--- a/src/dxaml/xcp/core/text/TextBlock/DWriteTextRenderer.cpp
+++ b/src/dxaml/xcp/core/text/TextBlock/DWriteTextRenderer.cpp
@@ -24,7 +24,7 @@ _Check_return_ HRESULT DWriteTextRenderer::DrawGlyphRun(
     _In_ DWRITE_GLYPH_RUN const* glyphRun,
     _In_ DWRITE_GLYPH_RUN_DESCRIPTION const* glyphRunDescription,
     _In_ IUnknown* clientDrawingEffects
-    ) throw()
+    ) noexcept
 {
 
     xref_ptr<DWriteFontFace> pFontFace;
@@ -132,7 +132,7 @@ _Check_return_ HRESULT DWriteTextRenderer::DrawUnderline(
     _In_ float baselineOriginY,
     _In_ DWRITE_UNDERLINE const* underline,
     _In_ IUnknown* clientDrawingEffects
-    ) throw()
+    ) noexcept
 {
     XPOINTF baselineOrigin = {baselineOriginX, baselineOriginY + underline->offset};
     
@@ -153,7 +153,7 @@ _Check_return_ HRESULT DWriteTextRenderer::DrawStrikethrough(
     _In_ float baselineOriginY,
     _In_ DWRITE_STRIKETHROUGH const* strikethrough,
     _In_ IUnknown* clientDrawingEffects
-    ) throw()
+    ) noexcept
 {
     XPOINTF baselineOrigin = {baselineOriginX, baselineOriginY + strikethrough->offset};
     
@@ -176,7 +176,7 @@ _Check_return_ HRESULT DWriteTextRenderer::DrawInlineObject(
     _In_ BOOL isSideways,
     _In_ BOOL isRightToLeft,
     _In_ IUnknown* clientDrawingEffects
-    ) throw()
+    ) noexcept
 {
     RRETURN(inlineObject->Draw(clientDrawingContext,
         this,
@@ -190,7 +190,7 @@ _Check_return_ HRESULT DWriteTextRenderer::DrawInlineObject(
 _Check_return_ HRESULT DWriteTextRenderer::IsPixelSnappingDisabled(
     _In_opt_ void* clientDrawingContext,
     _Out_ BOOL* isDisabled
-    ) throw()
+    ) noexcept
 {
     *isDisabled = true; //Xaml handles pixel snapping in D2DTextDrawingContext.
     return S_OK;
@@ -199,7 +199,7 @@ _Check_return_ HRESULT DWriteTextRenderer::IsPixelSnappingDisabled(
 _Check_return_ HRESULT DWriteTextRenderer::GetCurrentTransform(
     _In_opt_ void* clientDrawingContext,
     _Out_ DWRITE_MATRIX* transform
-    ) throw()
+    ) noexcept
 {
     ASSERT(FALSE);
     return E_NOTIMPL;
@@ -208,7 +208,7 @@ _Check_return_ HRESULT DWriteTextRenderer::GetCurrentTransform(
 _Check_return_ HRESULT DWriteTextRenderer::GetPixelsPerDip(
     _In_opt_ void* clientDrawingContext,
     _Out_ float* pixelsPerDip
-    ) throw()
+    ) noexcept
 {
     *pixelsPerDip = 1.0;
     return S_OK;
diff --git a/src/dxaml/xcp/core/text/TextBlock/Hyperlink.cpp b/src/dxaml/xcp/core/text/TextBlock/Hyperlink.cpp
index 87fdba93f2..bdad4bfff3 100644
--- a/src/dxaml/xcp/core/text/TextBlock/Hyperlink.cpp
+++ b/src/dxaml/xcp/core/text/TextBlock/Hyperlink.cpp
@@ -897,7 +897,7 @@ _Check_return_ HRESULT CHyperlink::GetTextContentEnd(_Outptr_result_maybenull_ C
     if (pTempAsIn &&
         pTempAsIn->GetTypeIndex() == KnownTypeIndex::Run)
     {
-        pTempAsIn->GetContentEnd(ppTextPointerWrapper);
+        IFC_RETURN(pTempAsIn->GetContentEnd(ppTextPointerWrapper));
     }
     return S_OK;
 }
diff --git a/src/dxaml/xcp/core/text/TextBlock/LineBreak.cpp b/src/dxaml/xcp/core/text/TextBlock/LineBreak.cpp
index ee6933b21c..8421698189 100644
--- a/src/dxaml/xcp/core/text/TextBlock/LineBreak.cpp
+++ b/src/dxaml/xcp/core/text/TextBlock/LineBreak.cpp
@@ -10,13 +10,13 @@
 //------------------------------------------------------------------------
 
 _Check_return_ HRESULT CLineBreak::GetRun(
-    _In_                              XUINT32               characterPosition,
-    _Out_opt_                   const TextFormatting      **ppTextFormatting,
-    _Out_opt_                   const InheritedProperties **ppInheritedProperties,
-    _Out_opt_                         TextNestingType      *pNestingType,
-    _Out_opt_                         CTextElement        **ppNestedElement,
-    _Outptr_result_buffer_(*pcCharacters) const WCHAR         **ppCharacters,
-    _Out_                             XUINT32              *pcCharacters
+    _In_                              XUINT32                     characterPosition,
+    _Out_opt_                   const TextFormatting            **ppTextFormatting,
+    _Out_opt_                   const InheritedProperties       **ppInheritedProperties,
+    _Out_opt_                         TextNestingType            *pNestingType,
+    _Out_opt_                         CTextElement              **ppNestedElement,
+    _Outptr_result_buffer_maybenull_(*pcCharacters) const WCHAR **ppCharacters,
+    _Out_                             XUINT32                    *pcCharacters
 )
 {
     // LineBreak only has 2 positions - Open/Close.
diff --git a/src/dxaml/xcp/core/text/TextBlock/TextBlock.cpp b/src/dxaml/xcp/core/text/TextBlock/TextBlock.cpp
index e84a1352bd..01c0af0fe5 100644
--- a/src/dxaml/xcp/core/text/TextBlock/TextBlock.cpp
+++ b/src/dxaml/xcp/core/text/TextBlock/TextBlock.cpp
@@ -27,7 +27,7 @@
 #include <textsegment.h>
 #include <compositortree.h>
 #include <dwrite_2.h>
-#include <dwrite.h>
+#include <dwrite_3.h>
 #include <paltext.h>
 #include <DWriteFontAndScriptServices.h>
 #include <PALFontAndScriptServices.h>
@@ -1201,10 +1201,19 @@ _Check_return_ HRESULT CTextBlock::ConfigureDWriteTextLayout(
     DWRITE_FONT_STRETCH dwriteFontStretch = MIN(MAX(DWRITE_FONT_STRETCH_ULTRA_CONDENSED, static_cast<DWRITE_FONT_STRETCH>(pTextFormatting->m_nFontStretch)), DWRITE_FONT_STRETCH_ULTRA_EXPANDED);
 
     xstring_ptr strFontFamilyName;
-    Microsoft::WRL::ComPtr<IDWriteFactory> dwriteFactory;
+    Microsoft::WRL::ComPtr<IDWriteFactory6> dwriteFactory;
     DWriteFontAndScriptServices *pDWriteFontServices = nullptr;
 
     IFC_RETURN(pTextFormatting->m_pFontFamily->get_Source(&strFontFamilyName));
+    if (wcscmp(strFontFamilyName.GetBuffer(), L"Global User Interface") == 0)
+    {
+        strFontFamilyName.Reset();
+        CTextCore* pTextCore = nullptr;
+        IFC_RETURN(GetContext()->GetTextCore(&pTextCore));
+        IFontAndScriptServices* pFontAndScriptServices = nullptr;
+        IFC_RETURN(pTextCore->GetFontAndScriptServices(&pFontAndScriptServices));
+        IFC_RETURN(pFontAndScriptServices->GetDefaultFontNameString(&strFontFamilyName));
+    }
 
     IFC_RETURN(GetDWriteFontAndScriptServices(&pDWriteFontServices));
 
@@ -1250,7 +1259,7 @@ _Check_return_ HRESULT CTextBlock::ConfigureDWriteTextLayout(
     if (m_pTextLayout == nullptr) // If there is no DWriteTextLayout object available, we need to create one.
     {
         Microsoft::WRL::ComPtr<IDWriteTextFormat> pTextFormat;
-        IFC_RETURN(pDWriteFontServices->GetDefaultDWriteTextFormat(&pTextFormat));
+        IFC_RETURN(pDWriteFontServices->GetDefaultDWriteTextFormat(&pTextFormat, DWriteFontCollection::IsTypographicCollection(systemFontCollection)));
 
         IGNOREHR(::TextAnalysis_SetLocaleNameList(pTextFormat.Get(), pTextFormatting->GetResolvedLanguageListStringNoRef().GetBuffer()));
 
@@ -1272,17 +1281,28 @@ _Check_return_ HRESULT CTextBlock::ConfigureDWriteTextLayout(
         IFC_RETURN(m_pTextLayout->SetMaxHeight(availableSize.height));
     }
 
-    IFC_RETURN(m_pTextLayout->SetFontFamilyName(wcscmp(strFontFamilyName.GetBuffer(), L"Global User Interface") ? strFontFamilyName.GetBuffer() : L"Segoe UI", textRange));
-    IFC_RETURN(m_pTextLayout->SetFontCollection(static_cast<DWriteFontCollection*>(systemFontCollection.get())->m_pDWriteFontCollection, textRange));
-    IFC_RETURN(m_pTextLayout->SetFontWeight(dwriteFontWeight, textRange));
-    IFC_RETURN(m_pTextLayout->SetFontStyle(dwriteFontStyle, textRange));
-    IFC_RETURN(m_pTextLayout->SetFontStretch(dwriteFontStretch, textRange));
+    IFC_RETURN(m_pTextLayout->SetFontFamilyName(strFontFamilyName.GetBuffer(), textRange));
+    IFC_RETURN(m_pTextLayout->SetFontCollection(DWriteFontCollection::GetInternalCollection(systemFontCollection.get()), textRange));
     IFC_RETURN(m_pTextLayout->SetFontSize(scaledFontSize, textRange));
     IFC_RETURN(m_pTextLayout->SetLocaleName(pTextFormatting->m_strLanguageString.GetBuffer(), textRange));
     IFC_RETURN(m_pTextLayout->SetReadingDirection(dwriteReadingDirection));
     IFC_RETURN(m_pTextLayout->SetTextAlignment(dwriteTextAlignment));
     IFC_RETURN(m_pTextLayout->SetWordWrapping(dwriteWrapping));
 
+    if (DWriteFontCollection::IsTypographicCollection(systemFontCollection.get()))
+    {
+        Microsoft::WRL::ComPtr<IDWriteTextLayout4> textLayout4;
+        IFC_RETURN(m_pTextLayout.As(&textLayout4));
+        auto axisValues = DWriteFontAndScriptServices::CreateFontAxisValueArray(pTextFormatting->m_eFontSize, dwriteFontWeight, dwriteFontStyle, dwriteFontStretch);
+        IFC_RETURN(textLayout4->SetFontAxisValues(axisValues.data(), static_cast<UINT32>(axisValues.size()), textRange));
+    }
+    else
+    {
+        IFC_RETURN(m_pTextLayout->SetFontWeight(dwriteFontWeight, textRange));
+        IFC_RETURN(m_pTextLayout->SetFontStyle(dwriteFontStyle, textRange));
+        IFC_RETURN(m_pTextLayout->SetFontStretch(dwriteFontStretch, textRange));
+    }
+
     ASSERT (m_textTrimming != DirectUI::TextTrimming::Clip);
     if (m_textTrimming != DirectUI::TextTrimming::None)
     {
@@ -1293,18 +1313,39 @@ _Check_return_ HRESULT CTextBlock::ConfigureDWriteTextLayout(
         // For example, when font size = 30, even we call  m_pTextLayout->SetFontSize(30, {0, UINT_MAX}),
         // the trimming sign created will still have the default font size = 15.
         // In this case, we have to create a new IDWriteTextFormat object with all properties (font name, font size, weight, style, stretch) that could affect the trimming sign.
+        // Note: Although the original reason for hardcoding en-us here is lost to history, it is believed by the dwrite team that the
+        //       language of the trimming string doesn't matter and this provides consistent behavior.
         // TODO: consider caching the trimming sign.
         Microsoft::WRL::ComPtr<IDWriteTextFormat> trimmingFormat;
+        if (DWriteFontCollection::IsTypographicCollection(systemFontCollection.get()))
+        {
+            Microsoft::WRL::ComPtr<IDWriteTextFormat3> trimmingFormat6;
+            auto axisValues = DWriteFontAndScriptServices::CreateFontAxisValueArray(pTextFormatting->m_eFontSize, dwriteFontWeight, dwriteFontStyle, dwriteFontStretch);
+
         IFC_RETURN(dwriteFactory->CreateTextFormat(
-            wcscmp(strFontFamilyName.GetBuffer(), L"Global User Interface") ? strFontFamilyName.GetBuffer() : L"Segoe UI",
-            static_cast<DWriteFontCollection*>(systemFontCollection.get())->m_pDWriteFontCollection,
-            dwriteFontWeight,
-            dwriteFontStyle,
-            dwriteFontStretch,
-            scaledFontSize,
-            L"en-us",
-            &trimmingFormat
+                strFontFamilyName.GetBuffer(),
+                DWriteFontCollection::GetInternalCollection(systemFontCollection.get()),
+                axisValues.data(),
+                static_cast<UINT32>(axisValues.size()),
+                scaledFontSize,
+                L"en-us",
+                &trimmingFormat6
+            ));
+            IFC_RETURN(trimmingFormat6.As(&trimmingFormat));
+        }
+        else
+        {
+            IFC_RETURN(dwriteFactory->CreateTextFormat(
+                strFontFamilyName.GetBuffer(),
+                DWriteFontCollection::GetInternalCollection(systemFontCollection.get()),
+                dwriteFontWeight,
+                dwriteFontStyle,
+                dwriteFontStretch,
+                scaledFontSize,
+                L"en-us",
+                &trimmingFormat
             ));
+        }
         IFC_RETURN(dwriteFactory->CreateEllipsisTrimmingSign(trimmingFormat.Get(), &pTrimmingSign));
         IFC_RETURN(m_pTextLayout->SetTrimming(&trimmingOptions, pTrimmingSign.Get()));
     }
@@ -1332,14 +1373,14 @@ _Check_return_ HRESULT CTextBlock::ConfigureDWriteTextLayout(
         IFC_RETURN(pTextFormatting->m_pFontFamily->EnsureCompositeFontFamily(GetFontContext()));
         if (pTextFormatting->m_pFontFamily->m_pCompositeFontFamily->m_pFontFallback)
         {
-            IDWriteFontFallback* fontFallback = static_cast<FontFallbackWrapper*>(pTextFormatting->m_pFontFamily->m_pCompositeFontFamily->m_pFontFallback)->m_pFontFallback;
+            IDWriteFontFallback* fontFallback = static_cast<FontFallbackWrapper*>(pTextFormatting->m_pFontFamily->m_pCompositeFontFamily->m_pFontFallback)->m_fontFallback.Get();
             Microsoft::WRL::ComPtr<IDWriteTextLayout2> spTextLayout2;
             IFC_RETURN(m_pTextLayout.As(&spTextLayout2));
             IFC_RETURN(spTextLayout2->SetFontFallback(fontFallback));
         }
         if (pTextFormatting->m_pFontFamily->m_pCompositeFontFamily->m_pBaseFontCollection)
         {
-            IDWriteFontCollection* dwriteFontCollection = static_cast<DWriteFontCollection*>(pTextFormatting->m_pFontFamily->m_pCompositeFontFamily->m_pBaseFontCollection)->m_pDWriteFontCollection;
+            IDWriteFontCollection* dwriteFontCollection = DWriteFontCollection::GetInternalCollection(pTextFormatting->m_pFontFamily->m_pCompositeFontFamily->m_pBaseFontCollection);
             IFC_RETURN(m_pTextLayout->SetFontCollection(dwriteFontCollection, textRange));
         }
         if (pTextFormatting->m_pFontFamily->m_pCompositeFontFamily->m_pBaseFontName)
@@ -1537,6 +1578,7 @@ _Check_return_ HRESULT CTextBlock::GetLineHeight(_Out_ float* baseline, _Out_ fl
     ASSERT(fontLineAdvance > 0);
 
     float scaledFontSize = pTextFormatting->GetScaledFontSize(GetContext()->GetFontScale());
+
     // When LineHeight is 0, all Linestackstrategies behave identical.
     if (m_eLineHeight <= 0)
     {
@@ -2235,7 +2277,7 @@ void CTextBlock::UpdateSelectionHighlightColor()
         {
             selectionHighlightColor = GetDefaultSelectionHighlightColor();
         }
-        m_pSelectionManager->SetSelectionHighlightColor(selectionHighlightColor);
+        VERIFYHR(m_pSelectionManager->SetSelectionHighlightColor(selectionHighlightColor));
         InvalidateRender();
     }
 }
diff --git a/src/dxaml/xcp/core/text/TextBox/PlainTextPosition.cpp b/src/dxaml/xcp/core/text/TextBox/PlainTextPosition.cpp
index 2b8435a6f6..11ec5d59e8 100644
--- a/src/dxaml/xcp/core/text/TextBox/PlainTextPosition.cpp
+++ b/src/dxaml/xcp/core/text/TextBox/PlainTextPosition.cpp
@@ -187,21 +187,7 @@ _Check_return_ HRESULT CPlainTextPosition::GetVisualParent(
 //------------------------------------------------------------------------
 _Check_return_ bool CPlainTextPosition::IsValid() const
 {
-    bool isValid = false;
-
-    if (m_pContainer)
-    {
-        XUINT32 numPositions = 0;
-        m_pContainer->GetPositionCount(&numPositions);
-
-        // this condition fails in case of empty linked RichTextBlock with offset being 1 and num position being 0.
-        if (m_offset <= numPositions + 1)
-        {
-            isValid = true;
-        }
-    }
-
-    return isValid;
+    return m_pContainer && m_offset <= CTextBoxHelpers::GetMaxTextPosition(m_pContainer);
 }
 
 //------------------------------------------------------------------------
diff --git a/src/dxaml/xcp/core/text/TextBox/TextBoxHelpers.cpp b/src/dxaml/xcp/core/text/TextBox/TextBoxHelpers.cpp
index 5afdff2a69..7554aa4dd0 100644
--- a/src/dxaml/xcp/core/text/TextBox/TextBoxHelpers.cpp
+++ b/src/dxaml/xcp/core/text/TextBox/TextBoxHelpers.cpp
@@ -745,9 +745,27 @@ _Check_return_ HRESULT CTextBoxHelpers::VerifyPositionPair(
         _In_ XUINT32 iTextPosition2
     )
 {
-    XUINT32 cPositions = 0;
+    const XUINT32 cPositions = GetMaxTextPosition(pTextContainer);
 
     // Verify that their offset is within the range of the container.
+    IFCEXPECT_RETURN(iTextPosition1 <= cPositions);
+    IFCEXPECT_RETURN(iTextPosition2 <= cPositions);
+
+    // Verify that the positions are ordered.
+    IFCEXPECT_RETURN(iTextPosition1 <= iTextPosition2);
+
+    return S_OK;
+}
+
+//------------------------------------------------------------------------
+//  Summary:
+//  Returns the maximum valid text position taking into account the 
+//  special empty RichTextBlock case.
+//------------------------------------------------------------------------
+XUINT32 CTextBoxHelpers::GetMaxTextPosition(
+    _In_ ITextContainer* pTextContainer)
+{
+    XUINT32 cPositions = 0;
 
     pTextContainer->GetPositionCount(&cPositions);
 
@@ -760,13 +778,7 @@ _Check_return_ HRESULT CTextBoxHelpers::VerifyPositionPair(
         cPositions = 1;
     }
 
-    IFCEXPECT_RETURN(iTextPosition1 <= cPositions);
-    IFCEXPECT_RETURN(iTextPosition2 <= cPositions);
-
-    // Verify that the positions are ordered.
-    IFCEXPECT_RETURN(iTextPosition1 <= iTextPosition2);
-
-    return S_OK;
+    return cPositions;
 }
 
 //------------------------------------------------------------------------
diff --git a/src/dxaml/xcp/core/text/common/TextNavigationHelper.cpp b/src/dxaml/xcp/core/text/common/TextNavigationHelper.cpp
index 7c323907f4..0509cca6a1 100644
--- a/src/dxaml/xcp/core/text/common/TextNavigationHelper.cpp
+++ b/src/dxaml/xcp/core/text/common/TextNavigationHelper.cpp
@@ -91,7 +91,7 @@ _Check_return_ HRESULT TextNavigationHelper::MoveToStartOrEndOfLine(
     xref_ptr<CTextRangeAdapter> textRangeAdapter;
     IFC_RETURN(CTextAdapter::Create((CDependencyObject**)textAdapter.ReleaseAndGetAddressOf(), &cp));
     IFC_RETURN(textAdapter->GetDocumentRange(textRangeAdapter.ReleaseAndGetAddressOf()));
-    CTextRangeAdapter::MoveToLine(isMoveToEnd, textRangeAdapter, plainTextPosition);
+    IFC_RETURN(CTextRangeAdapter::MoveToLine(isMoveToEnd, textRangeAdapter, plainTextPosition));
     return S_OK;
 }
 
diff --git a/src/dxaml/xcp/core/text/common/TextSelectionManager.cpp b/src/dxaml/xcp/core/text/common/TextSelectionManager.cpp
index f9dec89c37..84d78851db 100644
--- a/src/dxaml/xcp/core/text/common/TextSelectionManager.cpp
+++ b/src/dxaml/xcp/core/text/common/TextSelectionManager.cpp
@@ -3803,7 +3803,7 @@ void TextSelectionManager::CaretOnKeyDown(
             else if (startOffset != endOffset && !pKeyEventArgs->IsShiftPressed())
             {
                 textPosition = CTextPosition(plainTextPosition);
-                m_pTextSelection->GetStartTextPosition(&textPosition);
+                IFCFAILFAST(m_pTextSelection->GetStartTextPosition(&textPosition));
                 plainTextPosition = textPosition.GetPlainPosition();
             }
             else
diff --git a/src/dxaml/xcp/core/xcpcore.vcxproj b/src/dxaml/xcp/core/xcpcore.vcxproj
index 69c14fc86b..3b8f5bb1d8 100644
--- a/src/dxaml/xcp/core/xcpcore.vcxproj
+++ b/src/dxaml/xcp/core/xcpcore.vcxproj
@@ -71,6 +71,7 @@
         <ClCompile Include="compositor\CompositorDirectManipulationViewport.cpp"/>
         <ClCompile Include="compositor\UIThreadScheduler.cpp"/>
         <ClCompile Include="compositor\RefreshAlignedClock.cpp"/>
+        <ClCompile Include="compositor\RefreshRateInfo.cpp"/>
 
         <ClCompile Include="dll\eventmgr.cpp"/>
         <ClCompile Include="dll\focusmgr.cpp"/>
diff --git a/src/dxaml/xcp/dxaml/dllsrv/exts/module.cpp b/src/dxaml/xcp/dxaml/dllsrv/exts/module.cpp
index bfc61f1033..4bb7901893 100644
--- a/src/dxaml/xcp/dxaml/dllsrv/exts/module.cpp
+++ b/src/dxaml/xcp/dxaml/dllsrv/exts/module.cpp
@@ -60,6 +60,7 @@ DllGetClassObject(
     return module.GetClassObject(rclsid, riid, ppv);
 }
 
+__control_entrypoint(DllExport)
 STDAPI
 DllCanUnloadNow()
 {
diff --git a/src/dxaml/xcp/dxaml/idl/winrt/controls/microsoft.ui.xaml.controls.controls.idl b/src/dxaml/xcp/dxaml/idl/winrt/controls/microsoft.ui.xaml.controls.controls.idl
index 3f4f77e0ba..1810ff1ade 100644
--- a/src/dxaml/xcp/dxaml/idl/winrt/controls/microsoft.ui.xaml.controls.controls.idl
+++ b/src/dxaml/xcp/dxaml/idl/winrt/controls/microsoft.ui.xaml.controls.controls.idl
@@ -114,26 +114,6 @@ namespace Microsoft.UI.Xaml.Controls
         Edge,
     };
 
-    [contract(Microsoft.UI.Xaml.WinUIContract, 1)]
-    [feature(Feature_InputValidation)]
-    [webhosthidden]
-    enum InputValidationKind
-    {
-        Auto,
-        Compact,
-        Inline,
-    };
-
-    [contract(Microsoft.UI.Xaml.WinUIContract, 1)]
-    [feature(Feature_InputValidation)]
-    [webhosthidden]
-    enum InputValidationMode
-    {
-        Auto,
-        Default,
-        Disabled,
-    };
-
     [contract(Microsoft.UI.Xaml.WinUIContract, 1)]
     [webhosthidden]
     enum ItemsUpdatingScrollMode
@@ -419,8 +399,6 @@ namespace Microsoft.UI.Xaml
         interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Controls.ComboBoxSelectionChangedTrigger>;
         interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Controls.DisabledFormattingAccelerators>;
         interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Controls.IncrementalLoadingTrigger>;
-        interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Controls.InputValidationKind>;
-        interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Controls.InputValidationMode>;
         interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Controls.ItemsUpdatingScrollMode>;
         interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Controls.ListViewReorderMode>;
         interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Controls.ListViewSelectionMode>;
@@ -987,21 +965,6 @@ namespace Microsoft.UI.Xaml.Documents
 }
 namespace Microsoft.UI.Xaml.Controls
 {
-    [contract(Microsoft.UI.Xaml.WinUIContract, 1)]
-    [feature(Feature_InputValidation)]
-    [webhosthidden]
-    interface IInputValidationControl 
-    {
-        Windows.Foundation.Collections.IObservableVector<Microsoft.UI.Xaml.Controls.InputValidationError> ValidationErrors{ get; };
-        Boolean HasValidationErrors{ get; };
-        Microsoft.UI.Xaml.Controls.InputValidationContext ValidationContext;
-        Microsoft.UI.Xaml.DataTemplate ErrorTemplate;
-        Microsoft.UI.Xaml.Controls.InputValidationMode InputValidationMode;
-        Microsoft.UI.Xaml.Controls.InputValidationKind InputValidationKind;
-        event Windows.Foundation.TypedEventHandler<Microsoft.UI.Xaml.Controls.IInputValidationControl,Microsoft.UI.Xaml.Controls.HasValidationErrorsChangedEventArgs> HasValidationErrorsChanged;
-        event Windows.Foundation.TypedEventHandler<Microsoft.UI.Xaml.Controls.IInputValidationControl,Microsoft.UI.Xaml.Controls.InputValidationErrorEventArgs> ValidationError;
-    };
-
     [contract(Microsoft.UI.Xaml.WinUIContract, 1)]
     [webhosthidden]
     interface IInsertionPanel 
@@ -1174,34 +1137,6 @@ namespace Microsoft.UI.Xaml.Controls
         Boolean NewValue{ get; };
     };
 
-    [contract(Microsoft.UI.Xaml.WinUIContract, 1)]
-    [feature(Feature_InputValidation)]
-    [webhosthidden]
-    unsealed runtimeclass InputValidationContext
-    {
-        [method_name("CreateInstance")] InputValidationContext(String memberName, Boolean isRequired);
-        Boolean IsInputRequired{ get; };
-        String MemberName{ get; };
-    };
-
-    [contract(Microsoft.UI.Xaml.WinUIContract, 1)]
-    [feature(Feature_InputValidation)]
-    [webhosthidden]
-    unsealed runtimeclass InputValidationError
-    {
-        [method_name("CreateInstance")] InputValidationError(String errorMessage);
-        String ErrorMessage{ get; };
-    };
-
-    [contract(Microsoft.UI.Xaml.WinUIContract, 1)]
-    [feature(Feature_InputValidation)]
-    [webhosthidden]
-    runtimeclass InputValidationErrorEventArgs
-    {
-        Microsoft.UI.Xaml.Controls.InputValidationErrorEventAction Action{ get; };
-        Microsoft.UI.Xaml.Controls.InputValidationError Error{ get; };
-    };
-
     [contract(Microsoft.UI.Xaml.WinUIContract, 1)]
     [webhosthidden]
     [default_interface]
@@ -2011,9 +1946,6 @@ namespace Microsoft.UI.Xaml.Controls
     [inputproperty("Password")]
     runtimeclass PasswordBox
         : Microsoft.UI.Xaml.Controls.Control
-        , [feature(Feature_InputValidation)]
-        [contract(Microsoft.UI.Xaml.WinUIContract, 1)]
-        Microsoft.UI.Xaml.Controls.IInputValidationControl
     {
         PasswordBox();
         String Password;
@@ -2063,15 +1995,6 @@ namespace Microsoft.UI.Xaml.Controls
             Microsoft.UI.Xaml.Controls.ControlHeaderPlacement HeaderPlacement;
             static Microsoft.UI.Xaml.DependencyProperty HeaderPlacementProperty{ get; };
         }
-    
-        [contract(Microsoft.UI.Xaml.WinUIContract, 1)]
-        [feature(Feature_InputValidation)]
-        [static_name("Microsoft.UI.Xaml.Controls.IPasswordBoxStaticsFeature_InputValidation")]
-        {
-            static Microsoft.UI.Xaml.DependencyProperty ErrorTemplateProperty{ get; };
-            static Microsoft.UI.Xaml.DependencyProperty InputValidationModeProperty{ get; };
-            static Microsoft.UI.Xaml.DependencyProperty InputValidationKindProperty{ get; };
-        }
     };
 
     [contract(Microsoft.UI.Xaml.WinUIContract, 1)]
@@ -2195,9 +2118,6 @@ namespace Microsoft.UI.Xaml.Controls
     [inputproperty("Text")]
     unsealed runtimeclass TextBox
         : Microsoft.UI.Xaml.Controls.Control
-        , [feature(Feature_InputValidation)]
-        [contract(Microsoft.UI.Xaml.WinUIContract, 1)]
-        Microsoft.UI.Xaml.Controls.IInputValidationControl
     {
         [method_name("CreateInstance")] TextBox();
         String Text;
@@ -2289,15 +2209,6 @@ namespace Microsoft.UI.Xaml.Controls
             Microsoft.UI.Xaml.Controls.ControlHeaderPlacement HeaderPlacement;
             static Microsoft.UI.Xaml.DependencyProperty HeaderPlacementProperty{ get; };
         }
-    
-        [contract(Microsoft.UI.Xaml.WinUIContract, 1)]
-        [feature(Feature_InputValidation)]
-        [static_name("Microsoft.UI.Xaml.Controls.ITextBoxStaticsFeature_InputValidation")]
-        {
-            static Microsoft.UI.Xaml.DependencyProperty ErrorTemplateProperty{ get; };
-            static Microsoft.UI.Xaml.DependencyProperty InputValidationModeProperty{ get; };
-            static Microsoft.UI.Xaml.DependencyProperty InputValidationKindProperty{ get; };
-        }
     };
 
     [contract(Microsoft.UI.Xaml.WinUIContract, 1)]
@@ -2485,9 +2396,6 @@ namespace Microsoft.UI.Xaml.Controls
     [inputproperty("Text")]
     unsealed runtimeclass ComboBox
         : Microsoft.UI.Xaml.Controls.Primitives.Selector
-        , [feature(Feature_InputValidation)]
-        [contract(Microsoft.UI.Xaml.WinUIContract, 1)]
-        Microsoft.UI.Xaml.Controls.IInputValidationControl
     {
         [method_name("CreateInstance")] ComboBox();
         Boolean IsDropDownOpen;
@@ -2534,15 +2442,6 @@ namespace Microsoft.UI.Xaml.Controls
             Microsoft.UI.Xaml.Controls.ControlHeaderPlacement HeaderPlacement;
             static Microsoft.UI.Xaml.DependencyProperty HeaderPlacementProperty{ get; };
         }
-    
-        [contract(Microsoft.UI.Xaml.WinUIContract, 1)]
-        [feature(Feature_InputValidation)]
-        [static_name("Microsoft.UI.Xaml.Controls.IComboBoxStaticsFeature_InputValidation")]
-        {
-            static Microsoft.UI.Xaml.DependencyProperty ErrorTemplateProperty{ get; };
-            static Microsoft.UI.Xaml.DependencyProperty InputValidationModeProperty{ get; };
-            static Microsoft.UI.Xaml.DependencyProperty InputValidationKindProperty{ get; };
-        }
     };
 
     [contract(Microsoft.UI.Xaml.WinUIContract, 1)]
diff --git a/src/dxaml/xcp/dxaml/idl/winrt/controls/microsoft.ui.xaml.controls.controls2.idl b/src/dxaml/xcp/dxaml/idl/winrt/controls/microsoft.ui.xaml.controls.controls2.idl
index 849ac60e78..5a7c9c1287 100644
--- a/src/dxaml/xcp/dxaml/idl/winrt/controls/microsoft.ui.xaml.controls.controls2.idl
+++ b/src/dxaml/xcp/dxaml/idl/winrt/controls/microsoft.ui.xaml.controls.controls2.idl
@@ -129,7 +129,7 @@ namespace Microsoft.UI.Xaml.Controls
         Popup,
         InPlace,
         [feature(Feature_ExperimentalApi)]
-        [contract(Microsoft.UI.Xaml.WinUIContract, 6)]
+        [contract(Microsoft.UI.Xaml.WinUIContract, 7)]
         UnconstrainedPopup,
     };
 
@@ -1421,10 +1421,10 @@ namespace Microsoft.UI.Xaml.Controls
 
     [contract(Microsoft.UI.Xaml.WinUIContract, 1)]
     [webhosthidden]
-    runtimeclass ItemsWrapGrid
+    unsealed runtimeclass ItemsWrapGrid
         : Microsoft.UI.Xaml.Controls.Panel
     {
-        ItemsWrapGrid();
+        [method_name("CreateInstance")] ItemsWrapGrid();
         Microsoft.UI.Xaml.Thickness GroupPadding;
         Microsoft.UI.Xaml.Controls.Orientation Orientation;
         Int32 MaximumRowsOrColumns;
@@ -1728,9 +1728,6 @@ namespace Microsoft.UI.Xaml.Controls
     [inputproperty("Text")]
     runtimeclass AutoSuggestBox
         : Microsoft.UI.Xaml.Controls.ItemsControl
-        , [feature(Feature_InputValidation)]
-        [contract(Microsoft.UI.Xaml.WinUIContract, 1)]
-        Microsoft.UI.Xaml.Controls.IInputValidationControl
     {
         AutoSuggestBox();
         Double MaxSuggestionListHeight;
@@ -1769,15 +1766,6 @@ namespace Microsoft.UI.Xaml.Controls
             Microsoft.UI.Xaml.Controls.ControlHeaderPlacement HeaderPlacement;
             static Microsoft.UI.Xaml.DependencyProperty HeaderPlacementProperty{ get; };
         }
-    
-        [contract(Microsoft.UI.Xaml.WinUIContract, 1)]
-        [feature(Feature_InputValidation)]
-        [static_name("Microsoft.UI.Xaml.Controls.IAutoSuggestBoxStaticsFeature_InputValidation")]
-        {
-            static Microsoft.UI.Xaml.DependencyProperty ErrorTemplateProperty{ get; };
-            static Microsoft.UI.Xaml.DependencyProperty InputValidationModeProperty{ get; };
-            static Microsoft.UI.Xaml.DependencyProperty InputValidationKindProperty{ get; };
-        }
     };
 
     [contract(Microsoft.UI.Xaml.WinUIContract, 1)]
diff --git a/src/dxaml/xcp/dxaml/idl/winrt/core/microsoft.ui.xaml.coretypes.idl b/src/dxaml/xcp/dxaml/idl/winrt/core/microsoft.ui.xaml.coretypes.idl
index a168f16b03..6d72484e63 100644
--- a/src/dxaml/xcp/dxaml/idl/winrt/core/microsoft.ui.xaml.coretypes.idl
+++ b/src/dxaml/xcp/dxaml/idl/winrt/core/microsoft.ui.xaml.coretypes.idl
@@ -39,9 +39,9 @@ cpp_quote("#undef GetCurrentTime")
 
 namespace Microsoft.UI.Xaml
 {
-    [contractversion(6)]
+    [contractversion(7)]
     apicontract WinUIContract{};
-    [contractversion(6)]
+    [contractversion(7)]
     apicontract XamlContract{};
 }
 
@@ -525,15 +525,6 @@ namespace Microsoft.UI.Xaml.Controls
         Left,
     };
 
-    [contract(Microsoft.UI.Xaml.WinUIContract, 1)]
-    [feature(Feature_InputValidation)]
-    [webhosthidden]
-    enum InputValidationErrorEventAction
-    {
-        Added,
-        Removed,
-    };
-
     [contract(Microsoft.UI.Xaml.WinUIContract, 1)]
     [webhosthidden]
     enum LightDismissOverlayMode
@@ -1343,7 +1334,6 @@ namespace Microsoft.UI.Xaml
         interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Automation.Text.TextUnit>;
         interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Controls.BackgroundSizing>;
         interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Controls.ControlHeaderPlacement>;
-        interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Controls.InputValidationErrorEventAction>;
         interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Controls.LightDismissOverlayMode>;
         interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Controls.RequiresPointer>;
         interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Controls.Primitives.AnimationDirection>;
@@ -1903,12 +1893,12 @@ namespace Microsoft.UI.Xaml
         Microsoft.UI.Xaml.Controls.Control Control;
     };
 
-    [contract(Microsoft.UI.Xaml.WinUIContract, 6)]
+    [contract(Microsoft.UI.Xaml.WinUIContract, 7)]
     [feature(Feature_ExperimentalApi)]
     [webhosthidden]
     unsealed runtimeclass XamlIsland
         : [feature(Feature_ExperimentalApi)]
-        [contract(Microsoft.UI.Xaml.WinUIContract, 6)]
+        [contract(Microsoft.UI.Xaml.WinUIContract, 7)]
         Windows.Foundation.IClosable
     {
         [method_name("CreateInstance")] XamlIsland();
@@ -1931,6 +1921,14 @@ namespace Microsoft.UI.Xaml
         {
             Microsoft.UI.Content.ContentIslandEnvironment ContentIslandEnvironment{ get; };
         }
+    
+        [contract(Microsoft.UI.Xaml.WinUIContract, 7)]
+        [feature(Feature_ExperimentalApi)]
+        [interface_name("Microsoft.UI.Xaml.IXamlRootFeature_ExperimentalApi")]
+        {
+            Microsoft.UI.Content.ContentCoordinateConverter CoordinateConverter{ get; };
+            Microsoft.UI.Content.ContentIsland TryGetContentIsland();
+        }
     };
 
     [contract(Microsoft.UI.Xaml.WinUIContract, 1)]
diff --git a/src/dxaml/xcp/dxaml/idl/winrt/core/microsoft.ui.xaml.coretypes2.idl b/src/dxaml/xcp/dxaml/idl/winrt/core/microsoft.ui.xaml.coretypes2.idl
index e946f80cbd..faf7462fb5 100644
--- a/src/dxaml/xcp/dxaml/idl/winrt/core/microsoft.ui.xaml.coretypes2.idl
+++ b/src/dxaml/xcp/dxaml/idl/winrt/core/microsoft.ui.xaml.coretypes2.idl
@@ -37,11 +37,6 @@ import "windows.foundation.customattributes.idl";
 import "windows.ui.xaml.interop.idl";
 
 
-namespace Microsoft.UI.Xaml.Core.Direct
-{
-    [contractversion(1)]
-    apicontract XamlDirectContract{};
-}
 
 namespace Windows.UI.Text
 {
@@ -513,1931 +508,6 @@ namespace Microsoft.UI.Xaml.Hosting
         Down,
     };
 }
-namespace Microsoft.UI.Xaml.Core.Direct
-{
-
-    [contract(Microsoft.UI.Xaml.Core.Direct.XamlDirectContract, 1)]
-    [feature(Feature_XamlDirect)]
-    [webhosthidden]
-    enum XamlEventIndex
-    {
-        FrameworkElement_DataContextChanged = 16,
-        FrameworkElement_SizeChanged,
-        FrameworkElement_LayoutUpdated,
-        UIElement_KeyUp = 22,
-        UIElement_KeyDown,
-        UIElement_GotFocus,
-        UIElement_LostFocus,
-        UIElement_DragStarting,
-        UIElement_DropCompleted,
-        UIElement_CharacterReceived,
-        UIElement_DragEnter,
-        UIElement_DragLeave,
-        UIElement_DragOver,
-        UIElement_Drop,
-        UIElement_PointerPressed = 38,
-        UIElement_PointerMoved,
-        UIElement_PointerReleased,
-        UIElement_PointerEntered,
-        UIElement_PointerExited,
-        UIElement_PointerCaptureLost,
-        UIElement_PointerCanceled,
-        UIElement_PointerWheelChanged,
-        UIElement_Tapped,
-        UIElement_DoubleTapped,
-        UIElement_Holding,
-        UIElement_ContextRequested,
-        UIElement_ContextCanceled,
-        UIElement_RightTapped,
-        UIElement_ManipulationStarting,
-        UIElement_ManipulationInertiaStarting,
-        UIElement_ManipulationStarted,
-        UIElement_ManipulationDelta,
-        UIElement_ManipulationCompleted,
-        UIElement_ProcessKeyboardAccelerators = 60,
-        UIElement_GettingFocus,
-        UIElement_LosingFocus,
-        UIElement_NoFocusCandidateFound,
-        UIElement_PreviewKeyDown,
-        UIElement_PreviewKeyUp,
-        UIElement_BringIntoViewRequested,
-        AppBar_Opening = 109,
-        AppBar_Opened,
-        AppBar_Closing,
-        AppBar_Closed,
-        AutoSuggestBox_SuggestionChosen,
-        AutoSuggestBox_TextChanged,
-        AutoSuggestBox_QuerySubmitted,
-        CalendarDatePicker_CalendarViewDayItemChanging,
-        CalendarDatePicker_DateChanged,
-        CalendarDatePicker_Opened,
-        CalendarDatePicker_Closed,
-        CalendarView_CalendarViewDayItemChanging,
-        CalendarView_SelectedDatesChanged,
-        ComboBox_DropDownClosed,
-        ComboBox_DropDownOpened,
-        CommandBar_DynamicOverflowItemsChanging,
-        ContentDialog_Closing = 126,
-        ContentDialog_Closed,
-        ContentDialog_Opened,
-        ContentDialog_PrimaryButtonClick,
-        ContentDialog_SecondaryButtonClick,
-        ContentDialog_CloseButtonClick,
-        Control_FocusEngaged,
-        Control_FocusDisengaged,
-        DatePicker_DateChanged = 135,
-        Frame_Navigated,
-        Frame_Navigating,
-        Frame_NavigationFailed,
-        Frame_NavigationStopped,
-        Hub_SectionHeaderClick = 143,
-        Hub_SectionsInViewChanged,
-        ItemsPresenter_HorizontalSnapPointsChanged = 148,
-        ItemsPresenter_VerticalSnapPointsChanged,
-        ListViewBase_ItemClick,
-        ListViewBase_DragItemsStarting,
-        ListViewBase_DragItemsCompleted,
-        ListViewBase_ContainerContentChanging,
-        ListViewBase_ChoosingItemContainer,
-        ListViewBase_ChoosingGroupHeaderContainer,
-        MediaTransportControls_ThumbnailRequested = 167,
-        MenuFlyoutItem_Click,
-        RichEditBox_TextChanging = 177,
-        ScrollViewer_ViewChanging = 192,
-        ScrollViewer_ViewChanged,
-        ScrollViewer_DirectManipulationStarted,
-        ScrollViewer_DirectManipulationCompleted,
-        SemanticZoom_ViewChangeStarted = 201,
-        SemanticZoom_ViewChangeCompleted,
-        StackPanel_HorizontalSnapPointsChanged = 208,
-        StackPanel_VerticalSnapPointsChanged,
-        TimePicker_TimeChanged = 227,
-        ToggleSwitch_Toggled,
-        ToolTip_Closed,
-        ToolTip_Opened,
-        VirtualizingStackPanel_CleanUpVirtualizedItemEvent,
-        ButtonBase_Click = 256,
-        CarouselPanel_HorizontalSnapPointsChanged,
-        CarouselPanel_VerticalSnapPointsChanged,
-        OrientedVirtualizingPanel_HorizontalSnapPointsChanged = 263,
-        OrientedVirtualizingPanel_VerticalSnapPointsChanged,
-        RangeBase_ValueChanged = 267,
-        ScrollBar_Scroll,
-        Selector_SelectionChanged,
-        Thumb_DragStarted,
-        Thumb_DragDelta,
-        Thumb_DragCompleted,
-        ToggleButton_Checked,
-        ToggleButton_Unchecked,
-        ToggleButton_Indeterminate,
-        ScrollViewer_AnchorRequested = 291,
-        DatePicker_SelectedDateChanged = 322,
-        TimePicker_SelectedTimeChanged,
-    };
-
-    [contract(Microsoft.UI.Xaml.Core.Direct.XamlDirectContract, 1)]
-    [feature(Feature_XamlDirect)]
-    [webhosthidden]
-    enum XamlPropertyIndex
-    {
-        AutomationProperties_AcceleratorKey = 5,
-        AutomationProperties_AccessibilityView,
-        AutomationProperties_AccessKey,
-        AutomationProperties_AutomationId,
-        AutomationProperties_ControlledPeers,
-        AutomationProperties_HelpText,
-        AutomationProperties_IsRequiredForForm,
-        AutomationProperties_ItemStatus,
-        AutomationProperties_ItemType,
-        AutomationProperties_LabeledBy,
-        AutomationProperties_LiveSetting,
-        AutomationProperties_Name,
-        ToolTipService_Placement = 24,
-        ToolTipService_PlacementTarget,
-        ToolTipService_ToolTip,
-        Typography_AnnotationAlternates = 28,
-        Typography_Capitals,
-        Typography_CapitalSpacing,
-        Typography_CaseSensitiveForms,
-        Typography_ContextualAlternates,
-        Typography_ContextualLigatures,
-        Typography_ContextualSwashes,
-        Typography_DiscretionaryLigatures,
-        Typography_EastAsianExpertForms,
-        Typography_EastAsianLanguage,
-        Typography_EastAsianWidths,
-        Typography_Fraction,
-        Typography_HistoricalForms,
-        Typography_HistoricalLigatures,
-        Typography_Kerning,
-        Typography_MathematicalGreek,
-        Typography_NumeralAlignment,
-        Typography_NumeralStyle,
-        Typography_SlashedZero,
-        Typography_StandardLigatures,
-        Typography_StandardSwashes,
-        Typography_StylisticAlternates,
-        Typography_StylisticSet1,
-        Typography_StylisticSet10,
-        Typography_StylisticSet11,
-        Typography_StylisticSet12,
-        Typography_StylisticSet13,
-        Typography_StylisticSet14,
-        Typography_StylisticSet15,
-        Typography_StylisticSet16,
-        Typography_StylisticSet17,
-        Typography_StylisticSet18,
-        Typography_StylisticSet19,
-        Typography_StylisticSet2,
-        Typography_StylisticSet20,
-        Typography_StylisticSet3,
-        Typography_StylisticSet4,
-        Typography_StylisticSet5,
-        Typography_StylisticSet6,
-        Typography_StylisticSet7,
-        Typography_StylisticSet8,
-        Typography_StylisticSet9,
-        Typography_Variants,
-        AutomationPeer_EventsSource = 75,
-        AutoSuggestBoxSuggestionChosenEventArgs_SelectedItem,
-        AutoSuggestBoxTextChangedEventArgs_Reason,
-        Brush_Opacity,
-        Brush_RelativeTransform,
-        Brush_Transform,
-        CollectionViewSource_IsSourceGrouped,
-        CollectionViewSource_ItemsPath,
-        CollectionViewSource_Source,
-        CollectionViewSource_View,
-        ColorKeyFrame_KeyTime = 90,
-        ColorKeyFrame_Value,
-        ColumnDefinition_ActualWidth,
-        ColumnDefinition_MaxWidth,
-        ColumnDefinition_MinWidth,
-        ColumnDefinition_Width,
-        ComboBoxTemplateSettings_DropDownClosedHeight,
-        ComboBoxTemplateSettings_DropDownOffset,
-        ComboBoxTemplateSettings_DropDownOpenedHeight,
-        ComboBoxTemplateSettings_SelectedItemDirection,
-        DoubleKeyFrame_KeyTime = 107,
-        DoubleKeyFrame_Value,
-        EasingFunctionBase_EasingMode = 111,
-        FlyoutBase_AttachedFlyout = 114,
-        FlyoutBase_Placement,
-        Geometry_Bounds = 118,
-        Geometry_Transform,
-        GradientStop_Color,
-        GradientStop_Offset,
-        GroupStyle_ContainerStyle = 124,
-        GroupStyle_ContainerStyleSelector,
-        GroupStyle_HeaderContainerStyle,
-        GroupStyle_HeaderTemplate,
-        GroupStyle_HeaderTemplateSelector,
-        GroupStyle_HidesIfEmpty,
-        GroupStyle_Panel,
-        InertiaExpansionBehavior_DesiredDeceleration = 144,
-        InertiaExpansionBehavior_DesiredExpansion,
-        InertiaRotationBehavior_DesiredDeceleration,
-        InertiaRotationBehavior_DesiredRotation,
-        InertiaTranslationBehavior_DesiredDeceleration,
-        InertiaTranslationBehavior_DesiredDisplacement,
-        InputScope_Names,
-        InputScopeName_NameValue,
-        KeySpline_ControlPoint1 = 153,
-        KeySpline_ControlPoint2,
-        ManipulationPivot_Center = 159,
-        ManipulationPivot_Radius,
-        ObjectKeyFrame_KeyTime = 183,
-        ObjectKeyFrame_Value,
-        PageStackEntry_SourcePageType,
-        PathFigure_IsClosed = 192,
-        PathFigure_IsFilled,
-        PathFigure_Segments,
-        PathFigure_StartPoint,
-        Pointer_IsInContact = 199,
-        Pointer_IsInRange,
-        Pointer_PointerDeviceType,
-        Pointer_PointerId,
-        PointKeyFrame_KeyTime = 205,
-        PointKeyFrame_Value,
-        PrintDocument_DocumentSource = 209,
-        PropertyPath_Path = 221,
-        RowDefinition_ActualHeight = 226,
-        RowDefinition_Height,
-        RowDefinition_MaxHeight,
-        RowDefinition_MinHeight,
-        SetterBase_IsSealed = 233,
-        Style_BasedOn = 244,
-        Style_IsSealed,
-        Style_Setters,
-        Style_TargetType,
-        TextElement_CharacterSpacing = 249,
-        TextElement_FontFamily,
-        TextElement_FontSize,
-        TextElement_FontStretch,
-        TextElement_FontStyle,
-        TextElement_FontWeight,
-        TextElement_Foreground,
-        TextElement_IsTextScaleFactorEnabled,
-        TextElement_Language,
-        Timeline_AutoReverse = 263,
-        Timeline_BeginTime,
-        Timeline_Duration,
-        Timeline_FillBehavior,
-        Timeline_RepeatBehavior,
-        Timeline_SpeedRatio,
-        ToggleSwitchTemplateSettings_CurtainCurrentToOffOffset = 273,
-        ToggleSwitchTemplateSettings_CurtainCurrentToOnOffset,
-        ToggleSwitchTemplateSettings_CurtainOffToOnOffset,
-        ToggleSwitchTemplateSettings_CurtainOnToOffOffset,
-        ToggleSwitchTemplateSettings_KnobCurrentToOffOffset,
-        ToggleSwitchTemplateSettings_KnobCurrentToOnOffset,
-        ToggleSwitchTemplateSettings_KnobOffToOnOffset,
-        ToggleSwitchTemplateSettings_KnobOnToOffOffset,
-        ToolTipTemplateSettings_FromHorizontalOffset,
-        ToolTipTemplateSettings_FromVerticalOffset,
-        UIElement_AllowDrop = 292,
-        UIElement_CacheMode,
-        UIElement_Clip = 295,
-        UIElement_CompositeMode,
-        UIElement_IsDoubleTapEnabled,
-        UIElement_IsHitTestVisible,
-        UIElement_IsHoldingEnabled,
-        UIElement_IsRightTapEnabled,
-        UIElement_IsTapEnabled,
-        UIElement_ManipulationMode,
-        UIElement_Opacity,
-        UIElement_PointerCaptures,
-        UIElement_Projection,
-        UIElement_RenderSize,
-        UIElement_RenderTransform,
-        UIElement_RenderTransformOrigin,
-        UIElement_Transitions,
-        UIElement_UseLayoutRounding = 311,
-        UIElement_Visibility,
-        VisualState_Storyboard = 322,
-        VisualStateGroup_States,
-        VisualStateGroup_Transitions,
-        VisualStateManager_CustomVisualStateManager,
-        VisualStateManager_VisualStateGroups,
-        VisualTransition_From,
-        VisualTransition_GeneratedDuration,
-        VisualTransition_GeneratedEasingFunction,
-        VisualTransition_Storyboard,
-        VisualTransition_To,
-        ArcSegment_IsLargeArc,
-        ArcSegment_Point,
-        ArcSegment_RotationAngle,
-        ArcSegment_Size,
-        ArcSegment_SweepDirection,
-        BackEase_Amplitude,
-        BeginStoryboard_Storyboard,
-        BezierSegment_Point1,
-        BezierSegment_Point2,
-        BezierSegment_Point3,
-        BitmapSource_PixelHeight,
-        BitmapSource_PixelWidth,
-        Block_LineHeight,
-        Block_LineStackingStrategy,
-        Block_Margin,
-        Block_TextAlignment,
-        BounceEase_Bounces,
-        BounceEase_Bounciness,
-        ColorAnimation_By,
-        ColorAnimation_EasingFunction,
-        ColorAnimation_EnableDependentAnimation,
-        ColorAnimation_From,
-        ColorAnimation_To,
-        ColorAnimationUsingKeyFrames_EnableDependentAnimation,
-        ColorAnimationUsingKeyFrames_KeyFrames,
-        ContentThemeTransition_HorizontalOffset,
-        ContentThemeTransition_VerticalOffset,
-        ControlTemplate_TargetType,
-        DispatcherTimer_Interval = 362,
-        DoubleAnimation_By,
-        DoubleAnimation_EasingFunction,
-        DoubleAnimation_EnableDependentAnimation,
-        DoubleAnimation_From,
-        DoubleAnimation_To,
-        DoubleAnimationUsingKeyFrames_EnableDependentAnimation,
-        DoubleAnimationUsingKeyFrames_KeyFrames,
-        EasingColorKeyFrame_EasingFunction = 372,
-        EasingDoubleKeyFrame_EasingFunction,
-        EasingPointKeyFrame_EasingFunction,
-        EdgeUIThemeTransition_Edge,
-        ElasticEase_Oscillations,
-        ElasticEase_Springiness,
-        EllipseGeometry_Center,
-        EllipseGeometry_RadiusX,
-        EllipseGeometry_RadiusY,
-        EntranceThemeTransition_FromHorizontalOffset,
-        EntranceThemeTransition_FromVerticalOffset,
-        EntranceThemeTransition_IsStaggeringEnabled,
-        EventTrigger_Actions,
-        EventTrigger_RoutedEvent,
-        ExponentialEase_Exponent,
-        Flyout_Content,
-        Flyout_FlyoutPresenterStyle,
-        FrameworkElement_ActualHeight,
-        FrameworkElement_ActualWidth,
-        FrameworkElement_DataContext,
-        FrameworkElement_FlowDirection,
-        FrameworkElement_Height,
-        FrameworkElement_HorizontalAlignment,
-        FrameworkElement_Language = 396,
-        FrameworkElement_Margin,
-        FrameworkElement_MaxHeight,
-        FrameworkElement_MaxWidth,
-        FrameworkElement_MinHeight,
-        FrameworkElement_MinWidth,
-        FrameworkElement_Parent,
-        FrameworkElement_RequestedTheme,
-        FrameworkElement_Resources,
-        FrameworkElement_Style,
-        FrameworkElement_Tag,
-        FrameworkElement_Triggers,
-        FrameworkElement_VerticalAlignment,
-        FrameworkElement_Width,
-        FrameworkElementAutomationPeer_Owner,
-        GeometryGroup_Children,
-        GeometryGroup_FillRule,
-        GradientBrush_ColorInterpolationMode,
-        GradientBrush_GradientStops,
-        GradientBrush_MappingMode,
-        GradientBrush_SpreadMethod,
-        GridViewItemTemplateSettings_DragItemsCount,
-        ItemAutomationPeer_Item = 419,
-        ItemAutomationPeer_ItemsControlAutomationPeer,
-        LineGeometry_EndPoint = 422,
-        LineGeometry_StartPoint,
-        LineSegment_Point,
-        ListViewItemTemplateSettings_DragItemsCount,
-        Matrix3DProjection_ProjectionMatrix,
-        MenuFlyout_Items,
-        MenuFlyout_MenuFlyoutPresenterStyle,
-        ObjectAnimationUsingKeyFrames_EnableDependentAnimation,
-        ObjectAnimationUsingKeyFrames_KeyFrames,
-        PaneThemeTransition_Edge,
-        PathGeometry_Figures,
-        PathGeometry_FillRule,
-        PlaneProjection_CenterOfRotationX,
-        PlaneProjection_CenterOfRotationY,
-        PlaneProjection_CenterOfRotationZ,
-        PlaneProjection_GlobalOffsetX,
-        PlaneProjection_GlobalOffsetY,
-        PlaneProjection_GlobalOffsetZ,
-        PlaneProjection_LocalOffsetX,
-        PlaneProjection_LocalOffsetY,
-        PlaneProjection_LocalOffsetZ,
-        PlaneProjection_ProjectionMatrix,
-        PlaneProjection_RotationX,
-        PlaneProjection_RotationY,
-        PlaneProjection_RotationZ,
-        PointAnimation_By,
-        PointAnimation_EasingFunction,
-        PointAnimation_EnableDependentAnimation,
-        PointAnimation_From,
-        PointAnimation_To,
-        PointAnimationUsingKeyFrames_EnableDependentAnimation,
-        PointAnimationUsingKeyFrames_KeyFrames,
-        PolyBezierSegment_Points = 456,
-        PolyLineSegment_Points,
-        PolyQuadraticBezierSegment_Points,
-        PopupThemeTransition_FromHorizontalOffset,
-        PopupThemeTransition_FromVerticalOffset,
-        PowerEase_Power,
-        QuadraticBezierSegment_Point1 = 466,
-        QuadraticBezierSegment_Point2,
-        RectangleGeometry_Rect = 470,
-        RelativeSource_Mode,
-        RenderTargetBitmap_PixelHeight,
-        RenderTargetBitmap_PixelWidth,
-        Setter_Property,
-        Setter_Value,
-        SolidColorBrush_Color,
-        SplineColorKeyFrame_KeySpline,
-        SplineDoubleKeyFrame_KeySpline,
-        SplinePointKeyFrame_KeySpline,
-        TileBrush_AlignmentX = 483,
-        TileBrush_AlignmentY,
-        TileBrush_Stretch,
-        Binding_Converter = 487,
-        Binding_ConverterLanguage,
-        Binding_ConverterParameter,
-        Binding_ElementName,
-        Binding_FallbackValue,
-        Binding_Mode,
-        Binding_Path,
-        Binding_RelativeSource,
-        Binding_Source,
-        Binding_TargetNullValue,
-        Binding_UpdateSourceTrigger,
-        BitmapImage_CreateOptions,
-        BitmapImage_DecodePixelHeight,
-        BitmapImage_DecodePixelType,
-        BitmapImage_DecodePixelWidth,
-        BitmapImage_UriSource,
-        Border_Background,
-        Border_BorderBrush,
-        Border_BorderThickness,
-        Border_Child,
-        Border_ChildTransitions,
-        Border_CornerRadius,
-        Border_Padding,
-        CompositeTransform_CenterX = 514,
-        CompositeTransform_CenterY,
-        CompositeTransform_Rotation,
-        CompositeTransform_ScaleX,
-        CompositeTransform_ScaleY,
-        CompositeTransform_SkewX,
-        CompositeTransform_SkewY,
-        CompositeTransform_TranslateX,
-        CompositeTransform_TranslateY,
-        ContentPresenter_CharacterSpacing,
-        ContentPresenter_Content,
-        ContentPresenter_ContentTemplate,
-        ContentPresenter_ContentTemplateSelector,
-        ContentPresenter_ContentTransitions,
-        ContentPresenter_FontFamily,
-        ContentPresenter_FontSize,
-        ContentPresenter_FontStretch,
-        ContentPresenter_FontStyle,
-        ContentPresenter_FontWeight,
-        ContentPresenter_Foreground,
-        ContentPresenter_IsTextScaleFactorEnabled,
-        ContentPresenter_LineStackingStrategy,
-        ContentPresenter_MaxLines,
-        ContentPresenter_OpticalMarginAlignment,
-        ContentPresenter_TextLineBounds = 539,
-        ContentPresenter_TextWrapping,
-        Control_Background,
-        Control_BorderBrush,
-        Control_BorderThickness,
-        Control_CharacterSpacing,
-        Control_FontFamily = 547,
-        Control_FontSize,
-        Control_FontStretch,
-        Control_FontStyle,
-        Control_FontWeight,
-        Control_Foreground,
-        Control_HorizontalContentAlignment,
-        Control_IsEnabled,
-        Control_IsTextScaleFactorEnabled = 556,
-        Control_Padding,
-        Control_TabNavigation = 559,
-        Control_Template,
-        Control_VerticalContentAlignment,
-        DragItemThemeAnimation_TargetName = 565,
-        DragOverThemeAnimation_Direction,
-        DragOverThemeAnimation_TargetName,
-        DragOverThemeAnimation_ToOffset,
-        DropTargetItemThemeAnimation_TargetName,
-        FadeInThemeAnimation_TargetName,
-        FadeOutThemeAnimation_TargetName,
-        Glyphs_Fill = 574,
-        Glyphs_FontRenderingEmSize,
-        Glyphs_FontUri,
-        Glyphs_Indices,
-        Glyphs_OriginX,
-        Glyphs_OriginY,
-        Glyphs_StyleSimulations,
-        Glyphs_UnicodeString,
-        IconElement_Foreground = 584,
-        Image_NineGrid = 586,
-        Image_Source = 588,
-        Image_Stretch,
-        ImageBrush_ImageSource = 591,
-        InlineUIContainer_Child,
-        ItemsPresenter_Footer = 594,
-        ItemsPresenter_FooterTemplate,
-        ItemsPresenter_FooterTransitions,
-        ItemsPresenter_Header,
-        ItemsPresenter_HeaderTemplate,
-        ItemsPresenter_HeaderTransitions,
-        ItemsPresenter_Padding = 601,
-        LinearGradientBrush_EndPoint,
-        LinearGradientBrush_StartPoint,
-        MatrixTransform_Matrix,
-        Panel_Background = 647,
-        Panel_Children,
-        Panel_ChildrenTransitions,
-        Panel_IsItemsHost = 651,
-        Paragraph_Inlines,
-        Paragraph_TextIndent,
-        PointerDownThemeAnimation_TargetName = 660,
-        PointerUpThemeAnimation_TargetName = 662,
-        PopInThemeAnimation_FromHorizontalOffset = 664,
-        PopInThemeAnimation_FromVerticalOffset,
-        PopInThemeAnimation_TargetName,
-        PopOutThemeAnimation_TargetName,
-        Popup_Child,
-        Popup_ChildTransitions,
-        Popup_HorizontalOffset,
-        Popup_IsLightDismissEnabled = 673,
-        Popup_IsOpen,
-        Popup_VerticalOffset = 676,
-        RepositionThemeAnimation_FromHorizontalOffset = 683,
-        RepositionThemeAnimation_FromVerticalOffset,
-        RepositionThemeAnimation_TargetName,
-        ResourceDictionary_MergedDictionaries = 687,
-        ResourceDictionary_Source,
-        ResourceDictionary_ThemeDictionaries,
-        RichTextBlock_Blocks = 691,
-        RichTextBlock_CharacterSpacing,
-        RichTextBlock_FontFamily,
-        RichTextBlock_FontSize,
-        RichTextBlock_FontStretch,
-        RichTextBlock_FontStyle,
-        RichTextBlock_FontWeight,
-        RichTextBlock_Foreground,
-        RichTextBlock_HasOverflowContent,
-        RichTextBlock_IsColorFontEnabled,
-        RichTextBlock_IsTextScaleFactorEnabled,
-        RichTextBlock_IsTextSelectionEnabled,
-        RichTextBlock_LineHeight,
-        RichTextBlock_LineStackingStrategy,
-        RichTextBlock_MaxLines,
-        RichTextBlock_OpticalMarginAlignment,
-        RichTextBlock_OverflowContentTarget,
-        RichTextBlock_Padding,
-        RichTextBlock_SelectedText,
-        RichTextBlock_SelectionHighlightColor,
-        RichTextBlock_TextAlignment,
-        RichTextBlock_TextIndent,
-        RichTextBlock_TextLineBounds,
-        RichTextBlock_TextReadingOrder,
-        RichTextBlock_TextTrimming,
-        RichTextBlock_TextWrapping,
-        RichTextBlockOverflow_HasOverflowContent,
-        RichTextBlockOverflow_MaxLines,
-        RichTextBlockOverflow_OverflowContentTarget,
-        RichTextBlockOverflow_Padding,
-        RotateTransform_Angle,
-        RotateTransform_CenterX,
-        RotateTransform_CenterY,
-        Run_FlowDirection = 725,
-        Run_Text,
-        ScaleTransform_CenterX,
-        ScaleTransform_CenterY,
-        ScaleTransform_ScaleX,
-        ScaleTransform_ScaleY,
-        SetterBaseCollection_IsSealed = 732,
-        Shape_Fill,
-        Shape_GeometryTransform,
-        Shape_Stretch,
-        Shape_Stroke,
-        Shape_StrokeDashArray,
-        Shape_StrokeDashCap,
-        Shape_StrokeDashOffset,
-        Shape_StrokeEndLineCap,
-        Shape_StrokeLineJoin,
-        Shape_StrokeMiterLimit,
-        Shape_StrokeStartLineCap,
-        Shape_StrokeThickness,
-        SkewTransform_AngleX,
-        SkewTransform_AngleY,
-        SkewTransform_CenterX,
-        SkewTransform_CenterY,
-        Span_Inlines,
-        SplitCloseThemeAnimation_ClosedLength,
-        SplitCloseThemeAnimation_ClosedTarget,
-        SplitCloseThemeAnimation_ClosedTargetName,
-        SplitCloseThemeAnimation_ContentTarget,
-        SplitCloseThemeAnimation_ContentTargetName,
-        SplitCloseThemeAnimation_ContentTranslationDirection,
-        SplitCloseThemeAnimation_ContentTranslationOffset,
-        SplitCloseThemeAnimation_OffsetFromCenter,
-        SplitCloseThemeAnimation_OpenedLength,
-        SplitCloseThemeAnimation_OpenedTarget,
-        SplitCloseThemeAnimation_OpenedTargetName,
-        SplitOpenThemeAnimation_ClosedLength,
-        SplitOpenThemeAnimation_ClosedTarget,
-        SplitOpenThemeAnimation_ClosedTargetName,
-        SplitOpenThemeAnimation_ContentTarget,
-        SplitOpenThemeAnimation_ContentTargetName,
-        SplitOpenThemeAnimation_ContentTranslationDirection,
-        SplitOpenThemeAnimation_ContentTranslationOffset,
-        SplitOpenThemeAnimation_OffsetFromCenter,
-        SplitOpenThemeAnimation_OpenedLength,
-        SplitOpenThemeAnimation_OpenedTarget,
-        SplitOpenThemeAnimation_OpenedTargetName,
-        Storyboard_Children,
-        Storyboard_TargetName = 774,
-        Storyboard_TargetProperty,
-        SwipeBackThemeAnimation_FromHorizontalOffset,
-        SwipeBackThemeAnimation_FromVerticalOffset,
-        SwipeBackThemeAnimation_TargetName,
-        SwipeHintThemeAnimation_TargetName,
-        SwipeHintThemeAnimation_ToHorizontalOffset,
-        SwipeHintThemeAnimation_ToVerticalOffset,
-        TextBlock_CharacterSpacing,
-        TextBlock_FontFamily,
-        TextBlock_FontSize,
-        TextBlock_FontStretch,
-        TextBlock_FontStyle,
-        TextBlock_FontWeight,
-        TextBlock_Foreground,
-        TextBlock_Inlines,
-        TextBlock_IsColorFontEnabled,
-        TextBlock_IsTextScaleFactorEnabled,
-        TextBlock_IsTextSelectionEnabled,
-        TextBlock_LineHeight,
-        TextBlock_LineStackingStrategy,
-        TextBlock_MaxLines,
-        TextBlock_OpticalMarginAlignment,
-        TextBlock_Padding,
-        TextBlock_SelectedText,
-        TextBlock_SelectionHighlightColor,
-        TextBlock_Text,
-        TextBlock_TextAlignment,
-        TextBlock_TextDecorations,
-        TextBlock_TextLineBounds,
-        TextBlock_TextReadingOrder,
-        TextBlock_TextTrimming,
-        TextBlock_TextWrapping,
-        TransformGroup_Children = 811,
-        TransformGroup_Value,
-        TranslateTransform_X = 814,
-        TranslateTransform_Y,
-        Viewbox_Child = 819,
-        Viewbox_Stretch,
-        Viewbox_StretchDirection,
-        AppBarSeparator_IsCompact = 826,
-        BitmapIcon_UriSource,
-        Canvas_Left,
-        Canvas_Top,
-        Canvas_ZIndex,
-        ContentControl_Content = 832,
-        ContentControl_ContentTemplate,
-        ContentControl_ContentTemplateSelector,
-        ContentControl_ContentTransitions,
-        DatePicker_CalendarIdentifier = 837,
-        DatePicker_Date,
-        DatePicker_DayFormat,
-        DatePicker_DayVisible,
-        DatePicker_Header,
-        DatePicker_HeaderTemplate,
-        DatePicker_MaxYear,
-        DatePicker_MinYear,
-        DatePicker_MonthFormat,
-        DatePicker_MonthVisible,
-        DatePicker_Orientation,
-        DatePicker_YearFormat,
-        DatePicker_YearVisible,
-        FontIcon_FontFamily = 851,
-        FontIcon_FontSize,
-        FontIcon_FontStyle,
-        FontIcon_FontWeight,
-        FontIcon_Glyph,
-        FontIcon_IsTextScaleFactorEnabled,
-        Grid_Column,
-        Grid_ColumnDefinitions,
-        Grid_ColumnSpan,
-        Grid_Row,
-        Grid_RowDefinitions,
-        Grid_RowSpan,
-        Hub_DefaultSectionIndex,
-        Hub_Header,
-        Hub_HeaderTemplate,
-        Hub_IsActiveView,
-        Hub_IsZoomedInView,
-        Hub_Orientation,
-        Hub_SectionHeaders,
-        Hub_Sections,
-        Hub_SectionsInView,
-        Hub_SemanticZoomOwner,
-        HubSection_ContentTemplate,
-        HubSection_Header,
-        HubSection_HeaderTemplate,
-        HubSection_IsHeaderInteractive,
-        Hyperlink_NavigateUri,
-        ItemsControl_DisplayMemberPath = 879,
-        ItemsControl_GroupStyle,
-        ItemsControl_GroupStyleSelector,
-        ItemsControl_IsGrouping,
-        ItemsControl_ItemContainerStyle = 884,
-        ItemsControl_ItemContainerStyleSelector,
-        ItemsControl_ItemContainerTransitions,
-        ItemsControl_Items,
-        ItemsControl_ItemsPanel = 889,
-        ItemsControl_ItemsSource,
-        ItemsControl_ItemTemplate,
-        ItemsControl_ItemTemplateSelector,
-        Line_X1,
-        Line_X2,
-        Line_Y1,
-        Line_Y2,
-        MediaTransportControls_IsFastForwardButtonVisible = 898,
-        MediaTransportControls_IsFastRewindButtonVisible = 900,
-        MediaTransportControls_IsPlaybackRateButtonVisible = 904,
-        MediaTransportControls_IsSeekBarVisible,
-        MediaTransportControls_IsStopButtonVisible = 908,
-        MediaTransportControls_IsVolumeButtonVisible = 910,
-        MediaTransportControls_IsZoomButtonVisible = 912,
-        PasswordBox_Header,
-        PasswordBox_HeaderTemplate,
-        PasswordBox_IsPasswordRevealButtonEnabled,
-        PasswordBox_MaxLength,
-        PasswordBox_Password,
-        PasswordBox_PasswordChar,
-        PasswordBox_PlaceholderText,
-        PasswordBox_PreventKeyboardDisplayOnProgrammaticFocus,
-        PasswordBox_SelectionHighlightColor,
-        Path_Data,
-        PathIcon_Data,
-        Polygon_FillRule,
-        Polygon_Points,
-        Polyline_FillRule,
-        Polyline_Points,
-        RangeBase_LargeChange = 930,
-        RangeBase_Maximum,
-        RangeBase_Minimum,
-        RangeBase_SmallChange,
-        RangeBase_Value,
-        Rectangle_RadiusX,
-        Rectangle_RadiusY,
-        RichEditBox_AcceptsReturn,
-        RichEditBox_Header,
-        RichEditBox_HeaderTemplate,
-        RichEditBox_InputScope,
-        RichEditBox_IsColorFontEnabled,
-        RichEditBox_IsReadOnly,
-        RichEditBox_IsSpellCheckEnabled,
-        RichEditBox_IsTextPredictionEnabled,
-        RichEditBox_PlaceholderText,
-        RichEditBox_PreventKeyboardDisplayOnProgrammaticFocus,
-        RichEditBox_SelectionHighlightColor,
-        RichEditBox_TextAlignment,
-        RichEditBox_TextWrapping,
-        SemanticZoom_CanChangeViews = 956,
-        SemanticZoom_IsZoomedInViewActive,
-        SemanticZoom_IsZoomOutButtonEnabled,
-        SemanticZoom_ZoomedInView,
-        SemanticZoom_ZoomedOutView,
-        StackPanel_AreScrollSnapPointsRegular,
-        StackPanel_Orientation,
-        SymbolIcon_Symbol,
-        TextBox_AcceptsReturn,
-        TextBox_Header,
-        TextBox_HeaderTemplate,
-        TextBox_InputScope,
-        TextBox_IsColorFontEnabled,
-        TextBox_IsReadOnly = 971,
-        TextBox_IsSpellCheckEnabled,
-        TextBox_IsTextPredictionEnabled,
-        TextBox_MaxLength,
-        TextBox_PlaceholderText,
-        TextBox_PreventKeyboardDisplayOnProgrammaticFocus,
-        TextBox_SelectedText,
-        TextBox_SelectionHighlightColor,
-        TextBox_SelectionLength,
-        TextBox_SelectionStart,
-        TextBox_Text,
-        TextBox_TextAlignment,
-        TextBox_TextWrapping,
-        Thumb_IsDragging,
-        TickBar_Fill,
-        TimePicker_ClockIdentifier,
-        TimePicker_Header,
-        TimePicker_HeaderTemplate,
-        TimePicker_MinuteIncrement,
-        TimePicker_Time,
-        ToggleSwitch_Header,
-        ToggleSwitch_HeaderTemplate,
-        ToggleSwitch_IsOn,
-        ToggleSwitch_OffContent,
-        ToggleSwitch_OffContentTemplate,
-        ToggleSwitch_OnContent,
-        ToggleSwitch_OnContentTemplate,
-        ToggleSwitch_TemplateSettings,
-        UserControl_Content,
-        VariableSizedWrapGrid_ColumnSpan,
-        VariableSizedWrapGrid_HorizontalChildrenAlignment,
-        VariableSizedWrapGrid_ItemHeight,
-        VariableSizedWrapGrid_ItemWidth,
-        VariableSizedWrapGrid_MaximumRowsOrColumns,
-        VariableSizedWrapGrid_Orientation,
-        VariableSizedWrapGrid_RowSpan,
-        VariableSizedWrapGrid_VerticalChildrenAlignment,
-        AppBar_ClosedDisplayMode = 1016,
-        AppBar_IsOpen,
-        AppBar_IsSticky,
-        AutoSuggestBox_AutoMaximizeSuggestionArea,
-        AutoSuggestBox_Header,
-        AutoSuggestBox_IsSuggestionListOpen,
-        AutoSuggestBox_MaxSuggestionListHeight,
-        AutoSuggestBox_PlaceholderText,
-        AutoSuggestBox_Text,
-        AutoSuggestBox_TextBoxStyle,
-        AutoSuggestBox_TextMemberPath,
-        AutoSuggestBox_UpdateTextOnSelect,
-        ButtonBase_ClickMode = 1029,
-        ButtonBase_Command,
-        ButtonBase_CommandParameter,
-        ButtonBase_IsPointerOver,
-        ButtonBase_IsPressed,
-        ContentDialog_FullSizeDesired,
-        ContentDialog_IsPrimaryButtonEnabled,
-        ContentDialog_IsSecondaryButtonEnabled,
-        ContentDialog_PrimaryButtonCommand,
-        ContentDialog_PrimaryButtonCommandParameter,
-        ContentDialog_PrimaryButtonText,
-        ContentDialog_SecondaryButtonCommand,
-        ContentDialog_SecondaryButtonCommandParameter,
-        ContentDialog_SecondaryButtonText,
-        ContentDialog_Title,
-        ContentDialog_TitleTemplate,
-        Frame_BackStack,
-        Frame_BackStackDepth,
-        Frame_CacheSize,
-        Frame_CanGoBack,
-        Frame_CanGoForward,
-        Frame_CurrentSourcePageType,
-        Frame_ForwardStack,
-        Frame_SourcePageType,
-        GridViewItemPresenter_CheckBrush,
-        GridViewItemPresenter_CheckHintBrush,
-        GridViewItemPresenter_CheckSelectingBrush,
-        GridViewItemPresenter_ContentMargin,
-        GridViewItemPresenter_DisabledOpacity,
-        GridViewItemPresenter_DragBackground,
-        GridViewItemPresenter_DragForeground,
-        GridViewItemPresenter_DragOpacity,
-        GridViewItemPresenter_FocusBorderBrush,
-        GridViewItemPresenter_GridViewItemPresenterHorizontalContentAlignment,
-        GridViewItemPresenter_GridViewItemPresenterPadding,
-        GridViewItemPresenter_PlaceholderBackground,
-        GridViewItemPresenter_PointerOverBackground,
-        GridViewItemPresenter_PointerOverBackgroundMargin,
-        GridViewItemPresenter_ReorderHintOffset,
-        GridViewItemPresenter_SelectedBackground,
-        GridViewItemPresenter_SelectedBorderThickness,
-        GridViewItemPresenter_SelectedForeground,
-        GridViewItemPresenter_SelectedPointerOverBackground,
-        GridViewItemPresenter_SelectedPointerOverBorderBrush,
-        GridViewItemPresenter_SelectionCheckMarkVisualEnabled,
-        GridViewItemPresenter_GridViewItemPresenterVerticalContentAlignment,
-        ItemsStackPanel_CacheLength = 1076,
-        ItemsStackPanel_GroupHeaderPlacement,
-        ItemsStackPanel_GroupPadding,
-        ItemsStackPanel_ItemsUpdatingScrollMode,
-        ItemsStackPanel_Orientation,
-        ItemsWrapGrid_CacheLength,
-        ItemsWrapGrid_GroupHeaderPlacement,
-        ItemsWrapGrid_GroupPadding,
-        ItemsWrapGrid_ItemHeight,
-        ItemsWrapGrid_ItemWidth,
-        ItemsWrapGrid_MaximumRowsOrColumns,
-        ItemsWrapGrid_Orientation,
-        ListViewItemPresenter_CheckBrush,
-        ListViewItemPresenter_CheckHintBrush,
-        ListViewItemPresenter_CheckSelectingBrush,
-        ListViewItemPresenter_ContentMargin,
-        ListViewItemPresenter_DisabledOpacity,
-        ListViewItemPresenter_DragBackground,
-        ListViewItemPresenter_DragForeground,
-        ListViewItemPresenter_DragOpacity,
-        ListViewItemPresenter_FocusBorderBrush,
-        ListViewItemPresenter_ListViewItemPresenterHorizontalContentAlignment,
-        ListViewItemPresenter_ListViewItemPresenterPadding,
-        ListViewItemPresenter_PlaceholderBackground,
-        ListViewItemPresenter_PointerOverBackground,
-        ListViewItemPresenter_PointerOverBackgroundMargin,
-        ListViewItemPresenter_ReorderHintOffset,
-        ListViewItemPresenter_SelectedBackground,
-        ListViewItemPresenter_SelectedBorderThickness,
-        ListViewItemPresenter_SelectedForeground,
-        ListViewItemPresenter_SelectedPointerOverBackground,
-        ListViewItemPresenter_SelectedPointerOverBorderBrush,
-        ListViewItemPresenter_SelectionCheckMarkVisualEnabled,
-        ListViewItemPresenter_ListViewItemPresenterVerticalContentAlignment,
-        MenuFlyoutItem_Command,
-        MenuFlyoutItem_CommandParameter,
-        MenuFlyoutItem_Text,
-        Page_BottomAppBar = 1114,
-        Page_Frame,
-        Page_NavigationCacheMode,
-        Page_TopAppBar,
-        ScrollBar_IndicatorMode = 1122,
-        ScrollBar_Orientation,
-        ScrollBar_ViewportSize,
-        Selector_IsSynchronizedWithCurrentItem = 1126,
-        Selector_SelectedIndex,
-        Selector_SelectedItem,
-        Selector_SelectedValue,
-        Selector_SelectedValuePath,
-        SelectorItem_IsSelected,
-        Slider_Header = 1137,
-        Slider_HeaderTemplate,
-        Slider_IntermediateValue,
-        Slider_IsDirectionReversed,
-        Slider_IsThumbToolTipEnabled,
-        Slider_Orientation,
-        Slider_SnapsTo,
-        Slider_StepFrequency,
-        Slider_ThumbToolTipValueConverter,
-        Slider_TickFrequency,
-        Slider_TickPlacement,
-        SwapChainPanel_CompositionScaleX,
-        SwapChainPanel_CompositionScaleY,
-        ToolTip_HorizontalOffset,
-        ToolTip_IsOpen,
-        ToolTip_Placement,
-        ToolTip_PlacementTarget,
-        ToolTip_TemplateSettings,
-        ToolTip_VerticalOffset,
-        Button_Flyout,
-        ComboBox_Header,
-        ComboBox_HeaderTemplate,
-        ComboBox_IsDropDownOpen,
-        ComboBox_IsEditable,
-        ComboBox_IsSelectionBoxHighlighted,
-        ComboBox_MaxDropDownHeight,
-        ComboBox_PlaceholderText,
-        ComboBox_SelectionBoxItem,
-        ComboBox_SelectionBoxItemTemplate,
-        ComboBox_TemplateSettings,
-        CommandBar_PrimaryCommands,
-        CommandBar_SecondaryCommands,
-        FlipView_UseTouchAnimationsForAllNavigation,
-        HyperlinkButton_NavigateUri,
-        ListBox_SelectedItems,
-        ListBox_SelectionMode,
-        ListViewBase_CanDragItems,
-        ListViewBase_CanReorderItems,
-        ListViewBase_DataFetchSize,
-        ListViewBase_Footer,
-        ListViewBase_FooterTemplate,
-        ListViewBase_FooterTransitions,
-        ListViewBase_Header,
-        ListViewBase_HeaderTemplate,
-        ListViewBase_HeaderTransitions,
-        ListViewBase_IncrementalLoadingThreshold,
-        ListViewBase_IncrementalLoadingTrigger,
-        ListViewBase_IsActiveView,
-        ListViewBase_IsItemClickEnabled,
-        ListViewBase_IsSwipeEnabled,
-        ListViewBase_IsZoomedInView,
-        ListViewBase_ReorderMode,
-        ListViewBase_SelectedItems,
-        ListViewBase_SelectionMode,
-        ListViewBase_SemanticZoomOwner,
-        ListViewBase_ShowsScrollingPlaceholders,
-        RepeatButton_Delay,
-        RepeatButton_Interval,
-        ScrollViewer_BringIntoViewOnFocusChange,
-        ScrollViewer_ComputedHorizontalScrollBarVisibility,
-        ScrollViewer_ComputedVerticalScrollBarVisibility,
-        ScrollViewer_ExtentHeight,
-        ScrollViewer_ExtentWidth,
-        ScrollViewer_HorizontalOffset,
-        ScrollViewer_HorizontalScrollBarVisibility,
-        ScrollViewer_HorizontalScrollMode,
-        ScrollViewer_HorizontalSnapPointsAlignment,
-        ScrollViewer_HorizontalSnapPointsType,
-        ScrollViewer_IsDeferredScrollingEnabled,
-        ScrollViewer_IsHorizontalRailEnabled,
-        ScrollViewer_IsHorizontalScrollChainingEnabled,
-        ScrollViewer_IsScrollInertiaEnabled,
-        ScrollViewer_IsVerticalRailEnabled,
-        ScrollViewer_IsVerticalScrollChainingEnabled,
-        ScrollViewer_IsZoomChainingEnabled,
-        ScrollViewer_IsZoomInertiaEnabled,
-        ScrollViewer_LeftHeader,
-        ScrollViewer_MaxZoomFactor,
-        ScrollViewer_MinZoomFactor,
-        ScrollViewer_ScrollableHeight,
-        ScrollViewer_ScrollableWidth,
-        ScrollViewer_TopHeader,
-        ScrollViewer_TopLeftHeader,
-        ScrollViewer_VerticalOffset,
-        ScrollViewer_VerticalScrollBarVisibility,
-        ScrollViewer_VerticalScrollMode,
-        ScrollViewer_VerticalSnapPointsAlignment,
-        ScrollViewer_VerticalSnapPointsType,
-        ScrollViewer_ViewportHeight,
-        ScrollViewer_ViewportWidth,
-        ScrollViewer_ZoomFactor,
-        ScrollViewer_ZoomMode,
-        ScrollViewer_ZoomSnapPoints,
-        ScrollViewer_ZoomSnapPointsType,
-        ToggleButton_IsChecked,
-        ToggleButton_IsThreeState,
-        ToggleMenuFlyoutItem_IsChecked,
-        VirtualizingStackPanel_AreScrollSnapPointsRegular,
-        VirtualizingStackPanel_IsVirtualizing = 1236,
-        VirtualizingStackPanel_Orientation,
-        VirtualizingStackPanel_VirtualizationMode,
-        WrapGrid_HorizontalChildrenAlignment,
-        WrapGrid_ItemHeight,
-        WrapGrid_ItemWidth,
-        WrapGrid_MaximumRowsOrColumns,
-        WrapGrid_Orientation,
-        WrapGrid_VerticalChildrenAlignment,
-        AppBarButton_Icon,
-        AppBarButton_IsCompact,
-        AppBarButton_Label,
-        AppBarToggleButton_Icon,
-        AppBarToggleButton_IsCompact,
-        AppBarToggleButton_Label,
-        GridViewItem_TemplateSettings,
-        ListViewItem_TemplateSettings,
-        RadioButton_GroupName,
-        Glyphs_ColorFontPaletteIndex = 1267,
-        Glyphs_IsColorFontEnabled,
-        CalendarViewTemplateSettings_HasMoreContentAfter = 1274,
-        CalendarViewTemplateSettings_HasMoreContentBefore,
-        CalendarViewTemplateSettings_HasMoreViews,
-        CalendarViewTemplateSettings_HeaderText,
-        CalendarViewTemplateSettings_WeekDay1 = 1280,
-        CalendarViewTemplateSettings_WeekDay2,
-        CalendarViewTemplateSettings_WeekDay3,
-        CalendarViewTemplateSettings_WeekDay4,
-        CalendarViewTemplateSettings_WeekDay5,
-        CalendarViewTemplateSettings_WeekDay6,
-        CalendarViewTemplateSettings_WeekDay7,
-        CalendarView_CalendarIdentifier = 1291,
-        CalendarView_DayOfWeekFormat = 1299,
-        CalendarView_DisplayMode = 1302,
-        CalendarView_FirstDayOfWeek,
-        CalendarView_IsOutOfScopeEnabled = 1317,
-        CalendarView_IsTodayHighlighted,
-        CalendarView_MaxDate = 1320,
-        CalendarView_MinDate,
-        CalendarView_NumberOfWeeksInView = 1327,
-        CalendarView_SelectedDates = 1333,
-        CalendarView_SelectionMode = 1335,
-        CalendarView_TemplateSettings,
-        CalendarViewDayItem_Date = 1339,
-        CalendarViewDayItem_IsBlackout,
-        MediaTransportControls_IsFastForwardEnabled = 1382,
-        MediaTransportControls_IsFastRewindEnabled,
-        MediaTransportControls_IsPlaybackRateEnabled = 1385,
-        MediaTransportControls_IsSeekEnabled,
-        MediaTransportControls_IsStopEnabled,
-        MediaTransportControls_IsVolumeEnabled,
-        MediaTransportControls_IsZoomEnabled,
-        ContentPresenter_LineHeight = 1425,
-        CalendarViewTemplateSettings_MinViewWidth = 1435,
-        ListViewBase_SelectedRanges = 1459,
-        SplitViewTemplateSettings_CompactPaneGridLength = 1462,
-        SplitViewTemplateSettings_NegativeOpenPaneLength,
-        SplitViewTemplateSettings_NegativeOpenPaneLengthMinusCompactLength,
-        SplitViewTemplateSettings_OpenPaneGridLength,
-        SplitViewTemplateSettings_OpenPaneLengthMinusCompactLength,
-        SplitView_CompactPaneLength,
-        SplitView_Content,
-        SplitView_DisplayMode,
-        SplitView_IsPaneOpen,
-        SplitView_OpenPaneLength,
-        SplitView_Pane,
-        SplitView_PanePlacement,
-        SplitView_TemplateSettings,
-        UIElement_Transform3D,
-        CompositeTransform3D_CenterX,
-        CompositeTransform3D_CenterY = 1478,
-        CompositeTransform3D_CenterZ = 1480,
-        CompositeTransform3D_RotationX = 1482,
-        CompositeTransform3D_RotationY = 1484,
-        CompositeTransform3D_RotationZ = 1486,
-        CompositeTransform3D_ScaleX = 1488,
-        CompositeTransform3D_ScaleY = 1490,
-        CompositeTransform3D_ScaleZ = 1492,
-        CompositeTransform3D_TranslateX = 1494,
-        CompositeTransform3D_TranslateY = 1496,
-        CompositeTransform3D_TranslateZ = 1498,
-        PerspectiveTransform3D_Depth = 1500,
-        PerspectiveTransform3D_OffsetX,
-        PerspectiveTransform3D_OffsetY,
-        RelativePanel_Above = 1508,
-        RelativePanel_AlignBottomWith,
-        RelativePanel_AlignLeftWith,
-        RelativePanel_AlignRightWith = 1515,
-        RelativePanel_AlignTopWith,
-        RelativePanel_Below,
-        RelativePanel_LeftOf = 1520,
-        RelativePanel_RightOf,
-        SplitViewTemplateSettings_OpenPaneLength = 1524,
-        PasswordBox_PasswordRevealMode = 1527,
-        SplitView_PaneBackground,
-        ItemsStackPanel_AreStickyGroupHeadersEnabled,
-        ItemsWrapGrid_AreStickyGroupHeadersEnabled,
-        MenuFlyoutSubItem_Items,
-        MenuFlyoutSubItem_Text,
-        UIElement_CanDrag = 1534,
-        DataTemplate_ExtensionInstance,
-        RelativePanel_AlignHorizontalCenterWith = 1552,
-        RelativePanel_AlignVerticalCenterWith,
-        TargetPropertyPath_Path = 1555,
-        TargetPropertyPath_Target,
-        VisualState_Setters = 1558,
-        VisualState_StateTriggers,
-        AdaptiveTrigger_MinWindowHeight,
-        AdaptiveTrigger_MinWindowWidth,
-        Setter_Target,
-        CalendarView_BlackoutForeground = 1565,
-        CalendarView_CalendarItemBackground,
-        CalendarView_CalendarItemBorderBrush,
-        CalendarView_CalendarItemBorderThickness,
-        CalendarView_CalendarItemForeground,
-        CalendarView_CalendarViewDayItemStyle,
-        CalendarView_DayItemFontFamily,
-        CalendarView_DayItemFontSize,
-        CalendarView_DayItemFontStyle,
-        CalendarView_DayItemFontWeight,
-        CalendarView_FirstOfMonthLabelFontFamily,
-        CalendarView_FirstOfMonthLabelFontSize,
-        CalendarView_FirstOfMonthLabelFontStyle,
-        CalendarView_FirstOfMonthLabelFontWeight,
-        CalendarView_FirstOfYearDecadeLabelFontFamily,
-        CalendarView_FirstOfYearDecadeLabelFontSize,
-        CalendarView_FirstOfYearDecadeLabelFontStyle,
-        CalendarView_FirstOfYearDecadeLabelFontWeight,
-        CalendarView_FocusBorderBrush,
-        CalendarView_HorizontalDayItemAlignment,
-        CalendarView_HorizontalFirstOfMonthLabelAlignment,
-        CalendarView_HoverBorderBrush,
-        CalendarView_MonthYearItemFontFamily = 1588,
-        CalendarView_MonthYearItemFontSize,
-        CalendarView_MonthYearItemFontStyle,
-        CalendarView_MonthYearItemFontWeight,
-        CalendarView_OutOfScopeBackground,
-        CalendarView_OutOfScopeForeground,
-        CalendarView_PressedBorderBrush,
-        CalendarView_PressedForeground,
-        CalendarView_SelectedBorderBrush,
-        CalendarView_SelectedForeground,
-        CalendarView_SelectedHoverBorderBrush,
-        CalendarView_SelectedPressedBorderBrush,
-        CalendarView_TodayFontWeight,
-        CalendarView_TodayForeground,
-        CalendarView_VerticalDayItemAlignment,
-        CalendarView_VerticalFirstOfMonthLabelAlignment,
-        MediaTransportControls_IsCompact = 1605,
-        RelativePanel_AlignBottomWithPanel,
-        RelativePanel_AlignHorizontalCenterWithPanel,
-        RelativePanel_AlignLeftWithPanel,
-        RelativePanel_AlignRightWithPanel,
-        RelativePanel_AlignTopWithPanel,
-        RelativePanel_AlignVerticalCenterWithPanel,
-        ListViewBase_IsMultiSelectCheckBoxEnabled,
-        AutomationProperties_Level = 1614,
-        AutomationProperties_PositionInSet,
-        AutomationProperties_SizeOfSet,
-        ListViewItemPresenter_CheckBoxBrush,
-        ListViewItemPresenter_CheckMode,
-        ListViewItemPresenter_PressedBackground = 1620,
-        ListViewItemPresenter_SelectedPressedBackground,
-        Control_IsTemplateFocusTarget = 1623,
-        ListViewItemPresenter_FocusSecondaryBorderBrush = 1628,
-        ListViewItemPresenter_PointerOverForeground = 1630,
-        FontIcon_MirroredWhenRightToLeft,
-        CalendarViewTemplateSettings_CenterX,
-        CalendarViewTemplateSettings_CenterY,
-        CalendarViewTemplateSettings_ClipRect,
-        PasswordBox_TextReadingOrder = 1650,
-        RichEditBox_TextReadingOrder,
-        TextBox_TextReadingOrder,
-        RichEditBox_DesiredCandidateWindowAlignment = 1660,
-        TextBox_DesiredCandidateWindowAlignment = 1662,
-        CalendarDatePicker_CalendarIdentifier,
-        CalendarDatePicker_CalendarViewStyle,
-        CalendarDatePicker_Date,
-        CalendarDatePicker_DateFormat,
-        CalendarDatePicker_DayOfWeekFormat,
-        CalendarDatePicker_DisplayMode,
-        CalendarDatePicker_FirstDayOfWeek,
-        CalendarDatePicker_Header,
-        CalendarDatePicker_HeaderTemplate,
-        CalendarDatePicker_IsCalendarOpen,
-        CalendarDatePicker_IsGroupLabelVisible,
-        CalendarDatePicker_IsOutOfScopeEnabled,
-        CalendarDatePicker_IsTodayHighlighted,
-        CalendarDatePicker_MaxDate,
-        CalendarDatePicker_MinDate,
-        CalendarDatePicker_PlaceholderText,
-        CalendarView_IsGroupLabelVisible,
-        ContentPresenter_Background,
-        ContentPresenter_BorderBrush,
-        ContentPresenter_BorderThickness,
-        ContentPresenter_CornerRadius,
-        ContentPresenter_Padding,
-        Grid_BorderBrush,
-        Grid_BorderThickness,
-        Grid_CornerRadius,
-        Grid_Padding,
-        RelativePanel_BorderBrush,
-        RelativePanel_BorderThickness,
-        RelativePanel_CornerRadius,
-        RelativePanel_Padding,
-        StackPanel_BorderBrush,
-        StackPanel_BorderThickness,
-        StackPanel_CornerRadius,
-        StackPanel_Padding,
-        PasswordBox_InputScope,
-        MediaTransportControlsHelper_DropoutOrder,
-        AutoSuggestBoxQuerySubmittedEventArgs_ChosenSuggestion,
-        AutoSuggestBoxQuerySubmittedEventArgs_QueryText,
-        AutoSuggestBox_QueryIcon,
-        StateTrigger_IsActive,
-        ContentPresenter_HorizontalContentAlignment,
-        ContentPresenter_VerticalContentAlignment,
-        AppBarTemplateSettings_ClipRect,
-        AppBarTemplateSettings_CompactRootMargin,
-        AppBarTemplateSettings_CompactVerticalDelta,
-        AppBarTemplateSettings_HiddenRootMargin,
-        AppBarTemplateSettings_HiddenVerticalDelta,
-        AppBarTemplateSettings_MinimalRootMargin,
-        AppBarTemplateSettings_MinimalVerticalDelta,
-        CommandBarTemplateSettings_ContentHeight,
-        CommandBarTemplateSettings_NegativeOverflowContentHeight,
-        CommandBarTemplateSettings_OverflowContentClipRect,
-        CommandBarTemplateSettings_OverflowContentHeight,
-        CommandBarTemplateSettings_OverflowContentHorizontalOffset,
-        CommandBarTemplateSettings_OverflowContentMaxHeight,
-        CommandBarTemplateSettings_OverflowContentMinWidth,
-        AppBar_TemplateSettings,
-        CommandBar_CommandBarOverflowPresenterStyle,
-        CommandBar_CommandBarTemplateSettings,
-        DrillInThemeAnimation_EntranceTarget,
-        DrillInThemeAnimation_EntranceTargetName,
-        DrillInThemeAnimation_ExitTarget,
-        DrillInThemeAnimation_ExitTargetName,
-        DrillOutThemeAnimation_EntranceTarget,
-        DrillOutThemeAnimation_EntranceTargetName,
-        DrillOutThemeAnimation_ExitTarget,
-        DrillOutThemeAnimation_ExitTargetName,
-        XamlBindingHelper_DataTemplateComponent,
-        AutomationProperties_Annotations = 1732,
-        AutomationAnnotation_Element,
-        AutomationAnnotation_Type,
-        AutomationPeerAnnotation_Peer,
-        AutomationPeerAnnotation_Type,
-        Hyperlink_UnderlineStyle = 1741,
-        CalendarView_DisabledForeground,
-        CalendarView_TodayBackground,
-        CalendarView_TodayBlackoutBackground,
-        CalendarView_TodaySelectedInnerBorderBrush = 1747,
-        Control_IsFocusEngaged = 1749,
-        Control_IsFocusEngagementEnabled = 1752,
-        RichEditBox_ClipboardCopyFormat = 1754,
-        CommandBarTemplateSettings_OverflowContentMaxWidth = 1757,
-        ComboBoxTemplateSettings_DropDownContentMinWidth,
-        MenuFlyoutPresenterTemplateSettings_FlyoutContentMinWidth = 1762,
-        MenuFlyoutPresenter_TemplateSettings,
-        AutomationProperties_LandmarkType = 1766,
-        AutomationProperties_LocalizedLandmarkType,
-        RepositionThemeTransition_IsStaggeringEnabled = 1769,
-        ListBox_SingleSelectionFollowsFocus,
-        ListViewBase_SingleSelectionFollowsFocus,
-        BitmapImage_AutoPlay = 1773,
-        BitmapImage_IsAnimatedBitmap,
-        BitmapImage_IsPlaying,
-        AutomationProperties_FullDescription,
-        AutomationProperties_IsDataValidForForm,
-        AutomationProperties_IsPeripheral,
-        AutomationProperties_LocalizedControlType,
-        FlyoutBase_AllowFocusOnInteraction,
-        TextElement_AllowFocusOnInteraction,
-        FrameworkElement_AllowFocusOnInteraction,
-        Control_RequiresPointer,
-        UIElement_ContextFlyout = 1785,
-        TextElement_AccessKey,
-        UIElement_AccessKeyScopeOwner,
-        UIElement_IsAccessKeyScope,
-        AutomationProperties_DescribedBy = 1790,
-        UIElement_AccessKey = 1803,
-        Hyperlink_XYFocusDown = 1808,
-        Hyperlink_XYFocusLeft,
-        Hyperlink_XYFocusRight,
-        Hyperlink_XYFocusUp,
-        CommandBarTemplateSettings_EffectiveOverflowButtonVisibility = 1816,
-        AppBarSeparator_IsInOverflow,
-        CommandBar_DefaultLabelPosition,
-        CommandBar_IsDynamicOverflowEnabled,
-        CommandBar_OverflowButtonVisibility,
-        AppBarButton_IsInOverflow,
-        AppBarButton_LabelPosition,
-        AppBarToggleButton_IsInOverflow,
-        AppBarToggleButton_LabelPosition,
-        FlyoutBase_LightDismissOverlayMode,
-        Popup_LightDismissOverlayMode = 1827,
-        CalendarDatePicker_LightDismissOverlayMode = 1829,
-        DatePicker_LightDismissOverlayMode,
-        SplitView_LightDismissOverlayMode,
-        TimePicker_LightDismissOverlayMode,
-        AppBar_LightDismissOverlayMode,
-        AutoSuggestBox_LightDismissOverlayMode,
-        ComboBox_LightDismissOverlayMode,
-        AppBarSeparator_DynamicOverflowOrder,
-        AppBarButton_DynamicOverflowOrder,
-        AppBarToggleButton_DynamicOverflowOrder,
-        FrameworkElement_FocusVisualMargin,
-        FrameworkElement_FocusVisualPrimaryBrush,
-        FrameworkElement_FocusVisualPrimaryThickness,
-        FrameworkElement_FocusVisualSecondaryBrush,
-        FrameworkElement_FocusVisualSecondaryThickness,
-        FlyoutBase_AllowFocusWhenDisabled = 1846,
-        FrameworkElement_AllowFocusWhenDisabled,
-        ComboBox_IsTextSearchEnabled,
-        TextElement_ExitDisplayModeOnAccessKeyInvoked,
-        UIElement_ExitDisplayModeOnAccessKeyInvoked,
-        MediaPlayerPresenter_IsFullWindow,
-        MediaPlayerPresenter_MediaPlayer,
-        MediaPlayerPresenter_Stretch,
-        MediaPlayerElement_AreTransportControlsEnabled,
-        MediaPlayerElement_AutoPlay,
-        MediaPlayerElement_IsFullWindow,
-        MediaPlayerElement_MediaPlayer,
-        MediaPlayerElement_PosterSource,
-        MediaPlayerElement_Source,
-        MediaPlayerElement_Stretch,
-        MediaPlayerElement_TransportControls,
-        MediaTransportControls_FastPlayFallbackBehaviour,
-        MediaTransportControls_IsNextTrackButtonVisible,
-        MediaTransportControls_IsPreviousTrackButtonVisible,
-        MediaTransportControls_IsSkipBackwardButtonVisible,
-        MediaTransportControls_IsSkipBackwardEnabled,
-        MediaTransportControls_IsSkipForwardButtonVisible,
-        MediaTransportControls_IsSkipForwardEnabled,
-        FlyoutBase_ElementSoundMode,
-        Control_ElementSoundMode,
-        Hyperlink_ElementSoundMode,
-        AutomationProperties_FlowsFrom = 1876,
-        AutomationProperties_FlowsTo,
-        TextElement_TextDecorations = 1879,
-        RichTextBlock_TextDecorations = 1881,
-        Control_DefaultStyleResourceUri,
-        ContentDialog_PrimaryButtonStyle = 1884,
-        ContentDialog_SecondaryButtonStyle,
-        TextElement_KeyTipHorizontalOffset = 1890,
-        TextElement_KeyTipPlacementMode,
-        TextElement_KeyTipVerticalOffset,
-        UIElement_KeyTipHorizontalOffset,
-        UIElement_KeyTipPlacementMode,
-        UIElement_KeyTipVerticalOffset,
-        FlyoutBase_OverlayInputPassThroughElement,
-        UIElement_XYFocusKeyboardNavigation,
-        AutomationProperties_Culture,
-        UIElement_XYFocusDownNavigationStrategy = 1918,
-        UIElement_XYFocusLeftNavigationStrategy,
-        UIElement_XYFocusRightNavigationStrategy,
-        UIElement_XYFocusUpNavigationStrategy,
-        Hyperlink_XYFocusDownNavigationStrategy,
-        Hyperlink_XYFocusLeftNavigationStrategy,
-        Hyperlink_XYFocusRightNavigationStrategy,
-        Hyperlink_XYFocusUpNavigationStrategy,
-        TextElement_AccessKeyScopeOwner,
-        TextElement_IsAccessKeyScope,
-        Hyperlink_FocusState = 1934,
-        ContentDialog_CloseButtonCommand = 1936,
-        ContentDialog_CloseButtonCommandParameter,
-        ContentDialog_CloseButtonStyle,
-        ContentDialog_CloseButtonText,
-        ContentDialog_DefaultButton,
-        RichEditBox_SelectionHighlightColorWhenNotFocused,
-        TextBox_SelectionHighlightColorWhenNotFocused,
-        SvgImageSource_RasterizePixelHeight = 1948,
-        SvgImageSource_RasterizePixelWidth,
-        SvgImageSource_UriSource,
-        LoadedImageSurface_DecodedPhysicalSize = 1955,
-        LoadedImageSurface_DecodedSize,
-        LoadedImageSurface_NaturalSize,
-        ComboBox_SelectionChangedTrigger,
-        XamlCompositionBrushBase_FallbackColor = 1960,
-        UIElement_Lights = 1962,
-        MenuFlyoutItem_Icon,
-        MenuFlyoutSubItem_Icon,
-        BitmapIcon_ShowAsMonochrome,
-        UIElement_HighContrastAdjustment = 1967,
-        RichEditBox_MaxLength,
-        UIElement_TabFocusNavigation,
-        Control_IsTemplateKeyTipTarget,
-        Hyperlink_IsTabStop = 1972,
-        Hyperlink_TabIndex,
-        MediaTransportControls_IsRepeatButtonVisible,
-        MediaTransportControls_IsRepeatEnabled,
-        MediaTransportControls_ShowAndHideAutomatically,
-        RichEditBox_DisabledFormattingAccelerators,
-        RichEditBox_CharacterCasing,
-        TextBox_CharacterCasing,
-        RichTextBlock_IsTextTrimmed,
-        RichTextBlockOverflow_IsTextTrimmed,
-        TextBlock_IsTextTrimmed,
-        TextHighlighter_Background = 1985,
-        TextHighlighter_Foreground,
-        TextHighlighter_Ranges,
-        RichTextBlock_TextHighlighters,
-        TextBlock_TextHighlighters,
-        FrameworkElement_ActualTheme = 1992,
-        Grid_ColumnSpacing,
-        Grid_RowSpacing,
-        StackPanel_Spacing,
-        Block_HorizontalTextAlignment,
-        RichTextBlock_HorizontalTextAlignment,
-        TextBlock_HorizontalTextAlignment,
-        RichEditBox_HorizontalTextAlignment,
-        TextBox_HorizontalTextAlignment,
-        TextBox_PlaceholderForeground,
-        ComboBox_PlaceholderForeground,
-        KeyboardAccelerator_IsEnabled,
-        KeyboardAccelerator_Key,
-        KeyboardAccelerator_Modifiers,
-        KeyboardAccelerator_ScopeOwner,
-        UIElement_KeyboardAccelerators,
-        ListViewItemPresenter_RevealBackground = 2009,
-        ListViewItemPresenter_RevealBackgroundShowsAboveContent,
-        ListViewItemPresenter_RevealBorderBrush,
-        ListViewItemPresenter_RevealBorderThickness,
-        UIElement_KeyTipTarget = 2014,
-        AppBarButtonTemplateSettings_KeyboardAcceleratorTextMinWidth,
-        AppBarToggleButtonTemplateSettings_KeyboardAcceleratorTextMinWidth,
-        MenuFlyoutItemTemplateSettings_KeyboardAcceleratorTextMinWidth,
-        MenuFlyoutItem_TemplateSettings = 2019,
-        AppBarButton_TemplateSettings = 2021,
-        AppBarToggleButton_TemplateSettings = 2023,
-        UIElement_KeyboardAcceleratorPlacementMode = 2028,
-        UIElement_KeyboardAcceleratorPlacementTarget = 2061,
-        UIElement_CenterPoint,
-        UIElement_Rotation,
-        UIElement_RotationAxis,
-        UIElement_Scale,
-        UIElement_TransformMatrix,
-        UIElement_Translation,
-        AutomationProperties_HeadingLevel = 2069,
-        MenuFlyoutItem_KeyboardAcceleratorTextOverride = 2090,
-        AppBarButton_KeyboardAcceleratorTextOverride,
-        AppBarToggleButton_KeyboardAcceleratorTextOverride,
-        IconSource_Foreground = 2112,
-        BitmapIconSource_ShowAsMonochrome,
-        BitmapIconSource_UriSource,
-        FontIconSource_FontFamily,
-        FontIconSource_FontSize,
-        FontIconSource_FontStyle,
-        FontIconSource_FontWeight,
-        FontIconSource_Glyph,
-        FontIconSource_IsTextScaleFactorEnabled,
-        FontIconSource_MirroredWhenRightToLeft,
-        PathIconSource_Data,
-        SymbolIconSource_Symbol,
-        UIElement_Shadow = 2130,
-        IconSourceElement_IconSource,
-        PasswordBox_CanPasteClipboardContent = 2137,
-        TextBox_CanPasteClipboardContent,
-        TextBox_CanRedo,
-        TextBox_CanUndo,
-        FlyoutBase_ShowMode,
-        FlyoutBase_Target,
-        Control_CornerRadius,
-        AutomationProperties_IsDialog = 2149,
-        AppBarElementContainer_DynamicOverflowOrder,
-        AppBarElementContainer_IsCompact,
-        AppBarElementContainer_IsInOverflow,
-        ScrollContentPresenter_CanContentRenderOutsideBounds = 2157,
-        ScrollViewer_CanContentRenderOutsideBounds,
-        RichEditBox_SelectionFlyout,
-        TextBox_SelectionFlyout,
-        Border_BackgroundSizing,
-        ContentPresenter_BackgroundSizing,
-        Control_BackgroundSizing,
-        Grid_BackgroundSizing,
-        RelativePanel_BackgroundSizing,
-        StackPanel_BackgroundSizing,
-        ScrollViewer_HorizontalAnchorRatio = 2170,
-        ScrollViewer_VerticalAnchorRatio,
-        ComboBox_Text = 2208,
-        TextBox_Description = 2217,
-        ToolTip_PlacementRect,
-        RichTextBlock_SelectionFlyout,
-        TextBlock_SelectionFlyout,
-        PasswordBox_SelectionFlyout,
-        Border_BackgroundTransition,
-        ContentPresenter_BackgroundTransition,
-        Panel_BackgroundTransition,
-        ColorPaletteResources_Accent = 2227,
-        ColorPaletteResources_AltHigh,
-        ColorPaletteResources_AltLow,
-        ColorPaletteResources_AltMedium,
-        ColorPaletteResources_AltMediumHigh,
-        ColorPaletteResources_AltMediumLow,
-        ColorPaletteResources_BaseHigh,
-        ColorPaletteResources_BaseLow,
-        ColorPaletteResources_BaseMedium,
-        ColorPaletteResources_BaseMediumHigh,
-        ColorPaletteResources_BaseMediumLow,
-        ColorPaletteResources_ChromeAltLow,
-        ColorPaletteResources_ChromeBlackHigh,
-        ColorPaletteResources_ChromeBlackLow,
-        ColorPaletteResources_ChromeBlackMedium,
-        ColorPaletteResources_ChromeBlackMediumLow,
-        ColorPaletteResources_ChromeDisabledHigh,
-        ColorPaletteResources_ChromeDisabledLow,
-        ColorPaletteResources_ChromeGray,
-        ColorPaletteResources_ChromeHigh,
-        ColorPaletteResources_ChromeLow,
-        ColorPaletteResources_ChromeMedium,
-        ColorPaletteResources_ChromeMediumLow,
-        ColorPaletteResources_ChromeWhite,
-        ColorPaletteResources_ErrorText = 2252,
-        ColorPaletteResources_ListLow,
-        ColorPaletteResources_ListMedium,
-        UIElement_TranslationTransition,
-        UIElement_OpacityTransition,
-        UIElement_RotationTransition,
-        UIElement_ScaleTransition,
-        BrushTransition_Duration = 2261,
-        ScalarTransition_Duration,
-        Vector3Transition_Duration,
-        Vector3Transition_Components = 2266,
-        FlyoutBase_IsOpen,
-        StandardUICommand_Kind = 2275,
-        UIElement_CanBeScrollAnchor,
-        ThemeShadow_Receivers = 2279,
-        ScrollContentPresenter_SizesContentToTemplatedParent,
-        ComboBox_TextBoxStyle,
-        Frame_IsNavigationStackEnabled,
-        RichEditBox_ProofingMenuFlyout,
-        TextBox_ProofingMenuFlyout,
-        ScrollViewer_ReduceViewportForCoreInputViewOcclusions = 2295,
-        FlyoutBase_AreOpenCloseAnimationsEnabled,
-        FlyoutBase_InputDevicePrefersPrimaryCommands,
-        CalendarDatePicker_Description = 2300,
-        PasswordBox_Description = 2308,
-        RichEditBox_Description = 2316,
-        AutoSuggestBox_Description = 2331,
-        ComboBox_Description = 2339,
-        XamlUICommand_AccessKey = 2347,
-        XamlUICommand_Command,
-        XamlUICommand_Description,
-        XamlUICommand_IconSource,
-        XamlUICommand_KeyboardAccelerators,
-        XamlUICommand_Label,
-        DatePicker_SelectedDate = 2355,
-        TimePicker_SelectedTime,
-        AppBarTemplateSettings_NegativeCompactVerticalDelta = 2367,
-        AppBarTemplateSettings_NegativeHiddenVerticalDelta,
-        AppBarTemplateSettings_NegativeMinimalVerticalDelta,
-        FlyoutBase_ShouldConstrainToRootBounds = 2378,
-        Popup_ShouldConstrainToRootBounds,
-        FlyoutPresenter_IsDefaultShadowEnabled,
-        MenuFlyoutPresenter_IsDefaultShadowEnabled,
-        UIElement_ActualOffset,
-        UIElement_ActualSize,
-        CommandBarTemplateSettings_OverflowContentCompactYTranslation,
-        CommandBarTemplateSettings_OverflowContentHiddenYTranslation,
-        CommandBarTemplateSettings_OverflowContentMinimalYTranslation,
-        UIElement_RasterizationScale = 2394,
-        UIElement_FocusState = 2399,
-        UIElement_IsTabStop,
-        UIElement_TabIndex = 2402,
-        UIElement_UseSystemFocusVisuals,
-        UIElement_XYFocusDown,
-        UIElement_XYFocusLeft,
-        UIElement_XYFocusRight,
-        UIElement_XYFocusUp,
-        Window_Content,
-        CalendarView_BlackoutBackground,
-        CalendarView_BlackoutStrikethroughBrush,
-        CalendarView_CalendarItemCornerRadius,
-        CalendarView_CalendarItemDisabledBackground,
-        CalendarView_CalendarItemHoverBackground,
-        CalendarView_CalendarItemPressedBackground,
-        CalendarView_DayItemMargin,
-        CalendarView_FirstOfMonthLabelMargin,
-        CalendarView_FirstOfYearDecadeLabelMargin,
-        CalendarView_MonthYearItemMargin,
-        CalendarView_OutOfScopeHoverForeground,
-        CalendarView_OutOfScopePressedForeground,
-        CalendarView_SelectedDisabledBorderBrush,
-        CalendarView_SelectedDisabledForeground,
-        CalendarView_SelectedHoverForeground,
-        CalendarView_SelectedPressedForeground,
-        CalendarView_TodayBlackoutForeground,
-        CalendarView_TodayDisabledBackground,
-        CalendarView_TodayHoverBackground,
-        CalendarView_TodayPressedBackground,
-        ListViewItemPresenter_CheckBoxBorderBrush = 2430,
-        ListViewItemPresenter_CheckBoxCornerRadius,
-        ListViewItemPresenter_CheckBoxDisabledBorderBrush,
-        ListViewItemPresenter_CheckBoxDisabledBrush,
-        ListViewItemPresenter_CheckBoxPointerOverBorderBrush,
-        ListViewItemPresenter_CheckBoxPointerOverBrush,
-        ListViewItemPresenter_CheckBoxPressedBorderBrush,
-        ListViewItemPresenter_CheckBoxPressedBrush,
-        ListViewItemPresenter_CheckBoxSelectedBrush,
-        ListViewItemPresenter_CheckBoxSelectedDisabledBrush,
-        ListViewItemPresenter_CheckBoxSelectedPointerOverBrush,
-        ListViewItemPresenter_CheckBoxSelectedPressedBrush,
-        ListViewItemPresenter_CheckDisabledBrush,
-        ListViewItemPresenter_CheckPressedBrush,
-        ListViewItemPresenter_PointerOverBorderBrush,
-        ListViewItemPresenter_SelectedBorderBrush,
-        ListViewItemPresenter_SelectedDisabledBackground,
-        ListViewItemPresenter_SelectedDisabledBorderBrush,
-        ListViewItemPresenter_SelectedInnerBorderBrush,
-        ListViewItemPresenter_SelectedPressedBorderBrush,
-        ListViewItemPresenter_SelectionIndicatorBrush,
-        ListViewItemPresenter_SelectionIndicatorCornerRadius,
-        ListViewItemPresenter_SelectionIndicatorDisabledBrush,
-        ListViewItemPresenter_SelectionIndicatorMode,
-        ListViewItemPresenter_SelectionIndicatorPointerOverBrush,
-        ListViewItemPresenter_SelectionIndicatorPressedBrush,
-        ListViewItemPresenter_SelectionIndicatorVisualEnabled,
-        AutomationProperties_AutomationControlType,
-        Popup_ActualPlacement,
-        Popup_DesiredPlacement,
-        Popup_PlacementTarget,
-        Popup_SystemBackdrop,
-        FlyoutBase_SystemBackdrop,
-        MenuFlyoutPresenter_SystemBackdrop,
-        Window_SystemBackdrop,
-        Window_Title,
-    };
-
-    [contract(Microsoft.UI.Xaml.Core.Direct.XamlDirectContract, 1)]
-    [feature(Feature_XamlDirect)]
-    [webhosthidden]
-    enum XamlTypeIndex
-    {
-        AutoSuggestBoxSuggestionChosenEventArgs = 34,
-        AutoSuggestBoxTextChangedEventArgs,
-        CollectionViewSource = 41,
-        ColumnDefinition = 44,
-        GradientStop = 64,
-        InputScope = 74,
-        InputScopeName,
-        KeySpline = 78,
-        PathFigure = 93,
-        PrintDocument = 100,
-        RowDefinition = 106,
-        Style = 114,
-        VisualState = 137,
-        VisualStateGroup,
-        VisualStateManager,
-        VisualTransition,
-        AddDeleteThemeTransition = 177,
-        ArcSegment,
-        BackEase,
-        BeginStoryboard,
-        BezierSegment,
-        BindingBase,
-        BitmapCache,
-        BounceEase = 186,
-        CircleEase,
-        ColorAnimation,
-        ColorAnimationUsingKeyFrames,
-        ContentThemeTransition,
-        ControlTemplate,
-        CubicEase,
-        DataTemplate = 194,
-        DiscreteColorKeyFrame,
-        DiscreteDoubleKeyFrame,
-        DiscreteObjectKeyFrame,
-        DiscretePointKeyFrame,
-        DoubleAnimation = 200,
-        DoubleAnimationUsingKeyFrames,
-        EasingColorKeyFrame = 204,
-        EasingDoubleKeyFrame,
-        EasingPointKeyFrame,
-        EdgeUIThemeTransition,
-        ElasticEase,
-        EllipseGeometry,
-        EntranceThemeTransition,
-        EventTrigger,
-        ExponentialEase,
-        Flyout,
-        GeometryGroup = 216,
-        ItemsPanelTemplate = 227,
-        LinearColorKeyFrame = 230,
-        LinearDoubleKeyFrame,
-        LinearPointKeyFrame,
-        LineGeometry,
-        LineSegment,
-        Matrix3DProjection = 236,
-        MenuFlyout = 238,
-        ObjectAnimationUsingKeyFrames = 240,
-        PaneThemeTransition,
-        PathGeometry = 243,
-        PlaneProjection,
-        PointAnimation,
-        PointAnimationUsingKeyFrames,
-        PolyBezierSegment = 248,
-        PolyLineSegment,
-        PolyQuadraticBezierSegment,
-        PopupThemeTransition,
-        PowerEase,
-        QuadraticBezierSegment = 254,
-        QuadraticEase,
-        QuarticEase,
-        QuinticEase,
-        RectangleGeometry,
-        RelativeSource,
-        RenderTargetBitmap,
-        ReorderThemeTransition,
-        RepositionThemeTransition,
-        Setter,
-        SineEase,
-        SolidColorBrush,
-        SplineColorKeyFrame,
-        SplineDoubleKeyFrame,
-        SplinePointKeyFrame,
-        BitmapImage = 285,
-        Border,
-        CompositeTransform = 295,
-        ContentPresenter,
-        DragItemThemeAnimation = 302,
-        DragOverThemeAnimation,
-        DropTargetItemThemeAnimation,
-        FadeInThemeAnimation = 306,
-        FadeOutThemeAnimation,
-        Glyphs = 312,
-        Image = 326,
-        ImageBrush = 328,
-        InlineUIContainer,
-        ItemsPresenter = 332,
-        LinearGradientBrush = 334,
-        LineBreak,
-        MatrixTransform = 340,
-        Paragraph = 349,
-        PointerDownThemeAnimation = 357,
-        PointerUpThemeAnimation = 359,
-        PopInThemeAnimation = 361,
-        PopOutThemeAnimation,
-        Popup,
-        RepositionThemeAnimation = 370,
-        ResourceDictionary,
-        RichTextBlock = 374,
-        RichTextBlockOverflow = 376,
-        RotateTransform = 378,
-        Run = 380,
-        ScaleTransform,
-        SkewTransform = 389,
-        Span,
-        SplitCloseThemeAnimation,
-        SplitOpenThemeAnimation,
-        Storyboard,
-        SwipeBackThemeAnimation,
-        SwipeHintThemeAnimation,
-        TextBlock,
-        TransformGroup = 411,
-        TranslateTransform = 413,
-        Viewbox = 417,
-        AppBarSeparator = 427,
-        BitmapIcon = 429,
-        Bold,
-        Canvas = 432,
-        ContentControl = 435,
-        DatePicker,
-        DependencyObjectCollection,
-        Ellipse,
-        FontIcon = 440,
-        Grid = 442,
-        Hub = 445,
-        HubSection,
-        Hyperlink,
-        Italic = 449,
-        ItemsControl = 451,
-        Line,
-        MediaTransportControls = 458,
-        PasswordBox = 462,
-        Path,
-        PathIcon,
-        Polygon,
-        Polyline,
-        Rectangle = 470,
-        RichEditBox = 473,
-        ScrollContentPresenter = 476,
-        SemanticZoom = 479,
-        StackPanel = 481,
-        SymbolIcon,
-        TextBox,
-        Thumb = 485,
-        TickBar,
-        TimePicker,
-        ToggleSwitch = 489,
-        Underline,
-        UserControl,
-        VariableSizedWrapGrid,
-        AppBar = 495,
-        AutoSuggestBox = 499,
-        CarouselPanel = 502,
-        ContentDialog = 506,
-        FlyoutPresenter = 508,
-        Frame,
-        GridViewItemPresenter = 511,
-        GroupItem,
-        ItemsStackPanel = 514,
-        ItemsWrapGrid,
-        ListViewItemPresenter = 520,
-        MenuFlyoutItem,
-        MenuFlyoutPresenter,
-        MenuFlyoutSeparator,
-        Page = 525,
-        ScrollBar = 530,
-        Slider = 534,
-        SwapChainBackgroundPanel,
-        SwapChainPanel,
-        ToolTip = 538,
-        Button = 540,
-        ComboBoxItem,
-        CommandBar,
-        FlipViewItem,
-        GridViewHeaderItem = 545,
-        HyperlinkButton,
-        ListBoxItem,
-        ListViewHeaderItem = 550,
-        RepeatButton,
-        ScrollViewer,
-        ToggleButton,
-        ToggleMenuFlyoutItem,
-        VirtualizingStackPanel,
-        WrapGrid,
-        AppBarButton,
-        AppBarToggleButton,
-        CheckBox,
-        GridViewItem,
-        ListViewItem,
-        RadioButton,
-        Binding = 564,
-        ComboBox = 566,
-        FlipView,
-        ListBox,
-        GridView = 570,
-        ListView,
-        CalendarView = 707,
-        CalendarViewDayItem = 709,
-        CalendarPanel = 723,
-        SplitView = 728,
-        CompositeTransform3D = 732,
-        PerspectiveTransform3D,
-        RelativePanel = 744,
-        MenuFlyoutSubItem = 749,
-        AdaptiveTrigger = 757,
-        SoftwareBitmapSource = 761,
-        StateTrigger = 767,
-        CalendarDatePicker = 774,
-        AutoSuggestBoxQuerySubmittedEventArgs = 778,
-        CommandBarOverflowPresenter = 781,
-        DrillInThemeAnimation,
-        DrillOutThemeAnimation,
-        AutomationAnnotation = 789,
-        AutomationPeerAnnotation,
-        MediaPlayerPresenter = 828,
-        MediaPlayerElement,
-        XamlLight = 855,
-        SvgImageSource = 860,
-        KeyboardAccelerator = 897,
-        BitmapIconSource = 929,
-        FontIconSource,
-        PathIconSource,
-        SymbolIconSource = 933,
-        IconSourceElement = 939,
-        AppBarElementContainer = 945,
-        ColorPaletteResources = 952,
-        StandardUICommand = 961,
-        ThemeShadow = 964,
-        XamlUICommand = 969,
-    };
-}
 
 namespace Microsoft.UI.Xaml
 {
@@ -2520,9 +590,6 @@ namespace Microsoft.UI.Xaml
         interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Automation.AutomationOutlineStyles>;
         interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Automation.AutomationStyleId>;
         interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Automation.AutomationTextDecorationLineStyle>;
-        interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Core.Direct.XamlEventIndex>;
-        interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex>;
-        interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Core.Direct.XamlTypeIndex>;
         interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Hosting.XamlSourceFocusNavigationReason>;
         interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Media.AlignmentX>;
         interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Media.AlignmentY>;
@@ -4239,75 +2306,4 @@ namespace Microsoft.UI.Xaml.Hosting
     };
 
 }
-namespace Microsoft.UI.Xaml.Core.Direct
-{
-    [contract(Microsoft.UI.Xaml.Core.Direct.XamlDirectContract, 1)]
-    [feature(Feature_XamlDirect)]
-    [uuid(f94d4ea9-e795-4425-a8c8-498990fce9c7)]
-    [webhosthidden]
-    interface IXamlDirectObject 
-    {
-    };
-
-    [contract(Microsoft.UI.Xaml.Core.Direct.XamlDirectContract, 1)]
-    [feature(Feature_XamlDirect)]
-    [webhosthidden]
-    runtimeclass XamlDirect
-    {
-        Object GetObject(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject);
-        Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject GetXamlDirectObject(Object object);
-        Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject CreateInstance(Microsoft.UI.Xaml.Core.Direct.XamlTypeIndex typeIndex);
-        void SetObjectProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex, Object value);
-        void SetXamlDirectObjectProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex, Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject value);
-        void SetBooleanProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex, Boolean value);
-        void SetDoubleProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex, Double value);
-        void SetInt32Property(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex, Int32 value);
-        void SetStringProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex, String value);
-        void SetDateTimeProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex, Windows.Foundation.DateTime value);
-        void SetPointProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex, Windows.Foundation.Point value);
-        void SetRectProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex, Windows.Foundation.Rect value);
-        void SetSizeProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex, Windows.Foundation.Size value);
-        void SetTimeSpanProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex, Windows.Foundation.TimeSpan value);
-        void SetColorProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex, Windows.UI.Color value);
-        void SetCornerRadiusProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex, Microsoft.UI.Xaml.CornerRadius value);
-        void SetDurationProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex, Microsoft.UI.Xaml.Duration value);
-        void SetGridLengthProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex, Microsoft.UI.Xaml.GridLength value);
-        void SetThicknessProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex, Microsoft.UI.Xaml.Thickness value);
-        void SetMatrixProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex, Microsoft.UI.Xaml.Media.Matrix value);
-        void SetMatrix3DProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex, Microsoft.UI.Xaml.Media.Media3D.Matrix3D value);
-        void SetEnumProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex, UInt32 value);
-        Object GetObjectProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex);
-        Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject GetXamlDirectObjectProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex);
-        Boolean GetBooleanProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex);
-        Double GetDoubleProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex);
-        Int32 GetInt32Property(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex);
-        String GetStringProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex);
-        Windows.Foundation.DateTime GetDateTimeProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex);
-        Windows.Foundation.Point GetPointProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex);
-        Windows.Foundation.Rect GetRectProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex);
-        Windows.Foundation.Size GetSizeProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex);
-        Windows.Foundation.TimeSpan GetTimeSpanProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex);
-        Windows.UI.Color GetColorProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex);
-        Microsoft.UI.Xaml.CornerRadius GetCornerRadiusProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex);
-        Microsoft.UI.Xaml.Duration GetDurationProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex);
-        Microsoft.UI.Xaml.GridLength GetGridLengthProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex);
-        Microsoft.UI.Xaml.Thickness GetThicknessProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex);
-        Microsoft.UI.Xaml.Media.Matrix GetMatrixProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex);
-        Microsoft.UI.Xaml.Media.Media3D.Matrix3D GetMatrix3DProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex);
-        UInt32 GetEnumProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex);
-        void ClearProperty(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlPropertyIndex propertyIndex);
-        UInt32 GetCollectionCount(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject);
-        Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject GetXamlDirectObjectFromCollectionAt(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, UInt32 index);
-        void AddToCollection(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject value);
-        void InsertIntoCollectionAt(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, UInt32 index, Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject value);
-        Boolean RemoveFromCollection(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject value);
-        void RemoveFromCollectionAt(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, UInt32 index);
-        void ClearCollection(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject);
-        [method_name("AddEventHandler"), default_overload] void AddEventHandler(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlEventIndex eventIndex, Object handler);
-        [method_name("AddEventHandler_HandledEventsToo")] void AddEventHandler(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlEventIndex eventIndex, Object handler, Boolean handledEventsToo);
-        void RemoveEventHandler(Microsoft.UI.Xaml.Core.Direct.IXamlDirectObject xamlDirectObject, Microsoft.UI.Xaml.Core.Direct.XamlEventIndex eventIndex, Object handler);
-        static Microsoft.UI.Xaml.Core.Direct.XamlDirect GetDefault();
-    };
-
-}
 
diff --git a/src/dxaml/xcp/dxaml/idl/winrt/main/microsoft.ui.xaml.private.idl b/src/dxaml/xcp/dxaml/idl/winrt/main/microsoft.ui.xaml.private.idl
index 268f81d93f..3f9188466d 100644
--- a/src/dxaml/xcp/dxaml/idl/winrt/main/microsoft.ui.xaml.private.idl
+++ b/src/dxaml/xcp/dxaml/idl/winrt/main/microsoft.ui.xaml.private.idl
@@ -120,6 +120,35 @@ namespace Microsoft.UI.Xaml.Controls
         SearchForwards,
     };
 
+    [contract(Microsoft.UI.Xaml.PrivateApiContract, 1)]
+    [feature(Feature_InputValidation)]
+    [webhosthidden]
+    enum InputValidationErrorEventAction
+    {
+        Added,
+        Removed,
+    };
+
+    [contract(Microsoft.UI.Xaml.PrivateApiContract, 1)]
+    [feature(Feature_InputValidation)]
+    [webhosthidden]
+    enum InputValidationKind
+    {
+        Auto,
+        Compact,
+        Inline,
+    };
+
+    [contract(Microsoft.UI.Xaml.PrivateApiContract, 1)]
+    [feature(Feature_InputValidation)]
+    [webhosthidden]
+    enum InputValidationMode
+    {
+        Auto,
+        Default,
+        Disabled,
+    };
+
     [contract(Microsoft.UI.Xaml.PrivateApiContract, 1)]
     [webhosthidden]
     enum KeyNavigationAction
@@ -194,6 +223,9 @@ namespace Microsoft.UI.Xaml
         interface Windows.Foundation.IReference<Microsoft.UI.Xaml.TransitionTrigger>;
         interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Controls.ElementType>;
         interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Controls.IndexSearchHint>;
+        interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Controls.InputValidationErrorEventAction>;
+        interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Controls.InputValidationKind>;
+        interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Controls.InputValidationMode>;
         interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Controls.KeyNavigationAction>;
         interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Controls.ReferenceIdentity>;
         interface Windows.Foundation.IReference<Microsoft.UI.Xaml.Data.EffectiveSourceType>;
@@ -477,6 +509,21 @@ namespace Microsoft.UI.Xaml.Controls
         void SetNavigationTransitionInfoOverride(Microsoft.UI.Xaml.Media.Animation.NavigationTransitionInfo infoOverride);
     };
 
+    [contract(Microsoft.UI.Xaml.PrivateApiContract, 1)]
+    [feature(Feature_InputValidation)]
+    [webhosthidden]
+    interface IInputValidationControl 
+    {
+        Windows.Foundation.Collections.IObservableVector<Microsoft.UI.Xaml.Controls.InputValidationError> ValidationErrors{ get; };
+        Boolean HasValidationErrors{ get; };
+        Microsoft.UI.Xaml.Controls.InputValidationContext ValidationContext;
+        Microsoft.UI.Xaml.DataTemplate ErrorTemplate;
+        Microsoft.UI.Xaml.Controls.InputValidationMode InputValidationMode;
+        Microsoft.UI.Xaml.Controls.InputValidationKind InputValidationKind;
+        event Windows.Foundation.TypedEventHandler<Microsoft.UI.Xaml.Controls.IInputValidationControl,Microsoft.UI.Xaml.Controls.HasValidationErrorsChangedEventArgs> HasValidationErrorsChanged;
+        event Windows.Foundation.TypedEventHandler<Microsoft.UI.Xaml.Controls.IInputValidationControl,Microsoft.UI.Xaml.Controls.InputValidationErrorEventArgs> ValidationError;
+    };
+
     [contract(Microsoft.UI.Xaml.PrivateApiContract, 1)]
     [feature(Feature_InputValidation)]
     [webhosthidden]
@@ -615,6 +662,34 @@ namespace Microsoft.UI.Xaml.Controls
         overridable void ValidateCore(Microsoft.UI.Xaml.Controls.IInputValidationControl validationControl);
     };
 
+    [contract(Microsoft.UI.Xaml.PrivateApiContract, 1)]
+    [feature(Feature_InputValidation)]
+    [webhosthidden]
+    unsealed runtimeclass InputValidationContext
+    {
+        [method_name("CreateInstance")] InputValidationContext(String memberName, Boolean isRequired);
+        Boolean IsInputRequired{ get; };
+        String MemberName{ get; };
+    };
+
+    [contract(Microsoft.UI.Xaml.PrivateApiContract, 1)]
+    [feature(Feature_InputValidation)]
+    [webhosthidden]
+    unsealed runtimeclass InputValidationError
+    {
+        [method_name("CreateInstance")] InputValidationError(String errorMessage);
+        String ErrorMessage{ get; };
+    };
+
+    [contract(Microsoft.UI.Xaml.PrivateApiContract, 1)]
+    [feature(Feature_InputValidation)]
+    [webhosthidden]
+    runtimeclass InputValidationErrorEventArgs
+    {
+        Microsoft.UI.Xaml.Controls.InputValidationErrorEventAction Action{ get; };
+        Microsoft.UI.Xaml.Controls.InputValidationError Error{ get; };
+    };
+
 }
 namespace Microsoft.UI.Xaml.Internal
 {
diff --git a/src/dxaml/xcp/dxaml/lib/AccessKeyEvents.h b/src/dxaml/xcp/dxaml/lib/AccessKeyEvents.h
index 3d54ddbfc2..95f0ed90f6 100644
--- a/src/dxaml/xcp/dxaml/lib/AccessKeyEvents.h
+++ b/src/dxaml/xcp/dxaml/lib/AccessKeyEvents.h
@@ -14,7 +14,7 @@ class AKEvents
     typedef wf::ITypedEventHandler<IInspectable*, IInspectable*> HandlerType;
     typedef DirectUI::CEventSource<HandlerType, IInspectable, IInspectable> EventSourceType;
 
-    _Check_return_ HRESULT RaiseIsActiveChanged(_In_ IInspectable* sender, _Out_ IInspectable* args)
+    _Check_return_ HRESULT RaiseIsActiveChanged(_In_ IInspectable* sender, _In_ IInspectable* args)
     {
         if (isActiveChangedEventSource != nullptr)
         {
diff --git a/src/dxaml/xcp/dxaml/lib/AccessKeyManager_partial.cpp b/src/dxaml/xcp/dxaml/lib/AccessKeyManager_partial.cpp
index 804f9ccfff..a84909e8e7 100644
--- a/src/dxaml/xcp/dxaml/lib/AccessKeyManager_partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/AccessKeyManager_partial.cpp
@@ -59,7 +59,7 @@ namespace AccessKeys {
         return S_OK;
     }
 
-    _Check_return_ HRESULT AKOnIsActiveChanged(_In_opt_ CFocusManager* focusManager,_In_ IInspectable* sender, _Out_ IInspectable* args)
+    _Check_return_ HRESULT AKOnIsActiveChanged(_In_opt_ CFocusManager* focusManager,_In_ IInspectable* sender, _In_ IInspectable* args)
     {
         DXamlCore* const dxamlCore = DXamlCore::GetCurrent();
         CCoreServices* const core = dxamlCore->GetHandle();
diff --git a/src/dxaml/xcp/dxaml/lib/AppBarButton_Partial.h b/src/dxaml/xcp/dxaml/lib/AppBarButton_Partial.h
index 708587c0be..8a9882cea0 100644
--- a/src/dxaml/xcp/dxaml/lib/AppBarButton_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/AppBarButton_Partial.h
@@ -138,6 +138,6 @@ namespace DirectUI
 
         // Holds the last position that its flyout was opened at.
         // Used to reposition the flyout on size changed.
-        wf::Point m_lastFlyoutPosition;
+        wf::Point m_lastFlyoutPosition{};
     };
 }
diff --git a/src/dxaml/xcp/dxaml/lib/AppBarToggleButton_Partial.h b/src/dxaml/xcp/dxaml/lib/AppBarToggleButton_Partial.h
index 2c4c9570fe..c748829393 100644
--- a/src/dxaml/xcp/dxaml/lib/AppBarToggleButton_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/AppBarToggleButton_Partial.h
@@ -68,7 +68,7 @@ namespace DirectUI
         // Animate the width to NaN if width is not overrided and right-aligned labels and no LabelOnRightStyle. 
         TrackerPtr<xaml_animation::IStoryboard> m_widthAdjustmentsForLabelOnRightStyleStoryboard;
 
-        xaml_controls::CommandBarDefaultLabelPosition m_defaultLabelPosition;
+        xaml_controls::CommandBarDefaultLabelPosition m_defaultLabelPosition{};
         DirectUI::InputDeviceType m_inputDeviceTypeUsedToOpenOverflow;
 
         TrackerPtr<xaml_controls::ITextBlock> m_tpKeyboardAcceleratorTextLabel;
diff --git a/src/dxaml/xcp/dxaml/lib/ApplicationBarService_Partial.cpp b/src/dxaml/xcp/dxaml/lib/ApplicationBarService_Partial.cpp
index 361af0ccb1..494fa896a5 100644
--- a/src/dxaml/xcp/dxaml/lib/ApplicationBarService_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/ApplicationBarService_Partial.cpp
@@ -1479,7 +1479,7 @@ _Check_return_ HRESULT ApplicationBarService::CleanupOpenEventHooks()
         IFC(pRootVisual->remove_KeyDown(m_KeyPressedEventToken));
     }
 
-    CleanupWindowActivatedEventHook();
+    IFC(CleanupWindowActivatedEventHook());
 
 Cleanup:
     ReleaseInterface(pRootVisual);
diff --git a/src/dxaml/xcp/dxaml/lib/ApplicationBarService_Partial.h b/src/dxaml/xcp/dxaml/lib/ApplicationBarService_Partial.h
index d2e009db54..e049da9f56 100644
--- a/src/dxaml/xcp/dxaml/lib/ApplicationBarService_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/ApplicationBarService_Partial.h
@@ -66,7 +66,7 @@ namespace DirectUI
             EventRegistrationToken m_DismissLayerRightTapToken;
 
             // Keyboard event token
-            EventRegistrationToken m_KeyPressedEventToken;
+            EventRegistrationToken m_KeyPressedEventToken{};
 
             // activation token
             EventRegistrationToken m_activationToken;
diff --git a/src/dxaml/xcp/dxaml/lib/AutoSuggestBox_Partial.cpp b/src/dxaml/xcp/dxaml/lib/AutoSuggestBox_Partial.cpp
index 744447db6b..cc66ad9d9f 100644
--- a/src/dxaml/xcp/dxaml/lib/AutoSuggestBox_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/AutoSuggestBox_Partial.cpp
@@ -384,7 +384,8 @@ _Check_return_ HRESULT AutoSuggestBox::OnPropertyChanged2(_In_ const PropertyCha
             IFC_RETURN(CValueBoxer::UnboxValue(args.m_pNewValue, &isOpen));
 
             // Only proceed if there is at least one island that's still alive. Otherwise we can crash when opening the
-            // windowed popup when it tries to get its island in CPopup::EnsureWindowForWindowedPopup to check hwnds.
+            // windowed popup when it tries to get its island in CPopup::EnsureWindowForWindowedPopup to check that the
+            // popup didn't move between main Xaml islands.
             // Note: Tests running in UWP mode don't need this check, so count them as having islands.
             CCoreServices* core = DXamlCore::GetCurrent()->GetHandle();
             if (core->GetInitializationType() != InitializationType::IslandsOnly || core->HasXamlIslandRoots())
diff --git a/src/dxaml/xcp/dxaml/lib/AutomationProperty_Partial.h b/src/dxaml/xcp/dxaml/lib/AutomationProperty_Partial.h
index cf4cf19268..66bbfffdba 100644
--- a/src/dxaml/xcp/dxaml/lib/AutomationProperty_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/AutomationProperty_Partial.h
@@ -36,6 +36,6 @@ namespace DirectUI
             }
 
         private:
-            DirectUI::AutomationPropertiesEnum m_eProperty;
+            DirectUI::AutomationPropertiesEnum m_eProperty{};
     };
 }
diff --git a/src/dxaml/xcp/dxaml/lib/BindingExpression_Partial.cpp b/src/dxaml/xcp/dxaml/lib/BindingExpression_Partial.cpp
index ffa17c6ad2..f8bfb04331 100644
--- a/src/dxaml/xcp/dxaml/lib/BindingExpression_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/BindingExpression_Partial.cpp
@@ -1667,7 +1667,7 @@ _Check_return_ HRESULT BindingExpression::DataContextChanged(_In_ const DataCont
     // with a Content="{Binding}"?
     if (m_spPeggedTarget)
     {
-        m_spPeggedTarget.As<FrameworkElement>(&spPeggedTargetAsFE);
+        IGNOREHR(m_spPeggedTarget.As<FrameworkElement>(&spPeggedTargetAsFE));
     }
 
     const BOOLEAN bIsDataContextBound =
diff --git a/src/dxaml/xcp/dxaml/lib/BindingExpression_Partial.h b/src/dxaml/xcp/dxaml/lib/BindingExpression_Partial.h
index 6a911546bc..1c3448f4ba 100644
--- a/src/dxaml/xcp/dxaml/lib/BindingExpression_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/BindingExpression_Partial.h
@@ -288,7 +288,7 @@ namespace DirectUI
         TrackerPtr<BindingExpressionInheritanceContextChangedHandler> m_tpInheritanceContextChangedHandler;
         TrackerPtr<BindingExpressionTargetLoadedHandler> m_tpTargetLoadedHandler;
         TrackerPtr<BindingExpressionCVSViewChangedHandler> m_tpCVSViewChangedHandler;
-        EventRegistrationToken             m_lostFocusHandlerToken;
+        EventRegistrationToken             m_lostFocusHandlerToken{};
         ctl::WeakRefPtr m_spMentorRef;
         TrackerPtr<IValueConverterInternal> m_tpValueConverter;    // This is the internal value converter
         TrackerPtr<CollectionViewSource> m_tpCVS;
diff --git a/src/dxaml/xcp/dxaml/lib/BudgetManager_Partial.h b/src/dxaml/xcp/dxaml/lib/BudgetManager_Partial.h
index edf484762f..76fa369a9b 100644
--- a/src/dxaml/xcp/dxaml/lib/BudgetManager_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/BudgetManager_Partial.h
@@ -33,9 +33,9 @@ namespace DirectUI
         _Check_return_ HRESULT GetElapsedMilliSecondsSinceLastUITickImpl(_Out_ INT* returnValue);
 
     private:
-        LARGE_INTEGER m_freq;
-        LARGE_INTEGER m_startFrameTime;
-        LARGE_INTEGER m_endFrameTime;
+        LARGE_INTEGER m_freq{};
+        LARGE_INTEGER m_startFrameTime{};
+        LARGE_INTEGER m_endFrameTime{};
         
         // exceptionally set to True when (shift) tabbing into an unrealized item to give the BuildTreeService
         // enough time to prepare it to receive focus. This is specific to the Local/Cycle ListviewBase.TabNavigation.
diff --git a/src/dxaml/xcp/dxaml/lib/BuildTreeService_Partial.cpp b/src/dxaml/xcp/dxaml/lib/BuildTreeService_Partial.cpp
index 7b760266de..4cfee0b769 100644
--- a/src/dxaml/xcp/dxaml/lib/BuildTreeService_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/BuildTreeService_Partial.cpp
@@ -4,6 +4,7 @@
 #include "precomp.h"
 #include "BuildTreeService.g.h"
 #include <UIThreadScheduler.h>
+#include "XamlTelemetry.h"
 
 #pragma warning(disable:4267) //'var' : conversion from 'size_t' to 'type', possible loss of data
 
@@ -192,6 +193,10 @@ _Check_return_ HRESULT BuildTreeService::BuildTrees(_Out_ bool* pWorkLeft)
         {
             IFC(pCore->SetHasBuildTreeWorksEventSignaledStatus(FALSE /*bSignaled*/));
             IFC(pCore->SetBuildTreeServiceDrainedEvent());
+
+            TraceLoggingProviderWrite(
+                XamlTelemetry, "BuildTreeService_OutOfWork",
+                TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
         }
     }
 
diff --git a/src/dxaml/xcp/dxaml/lib/ButtonBase_Partial.h b/src/dxaml/xcp/dxaml/lib/ButtonBase_Partial.h
index 042c8ae5d3..8fd82d5839 100644
--- a/src/dxaml/xcp/dxaml/lib/ButtonBase_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/ButtonBase_Partial.h
@@ -153,7 +153,7 @@ namespace DirectUI
                 _In_ bool bLive,
                 _In_ bool bSkipNameRegistration,
                 _In_ bool bCoercedIsEnabled,
-                _In_ bool bUseLayoutRounding) final;
+                _In_ bool bUseLayoutRounding) override;
 
             // Called when the element leaves the tree. Detaches event handler from Command.CanExecuteChanged.
             _Check_return_ HRESULT LeaveImpl(
diff --git a/src/dxaml/xcp/dxaml/lib/CalendarView_Partial.cpp b/src/dxaml/xcp/dxaml/lib/CalendarView_Partial.cpp
index d515022cb9..702bf4ebda 100644
--- a/src/dxaml/xcp/dxaml/lib/CalendarView_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/CalendarView_Partial.cpp
@@ -242,7 +242,7 @@ _Check_return_ HRESULT CalendarView::OnPropertyChanged2(
     case KnownPropertyIndex::CalendarView_NumberOfWeeksInView:
         {
             int rows = 0;
-            args.m_pNewValue->GetSigned(rows);
+            IFC_RETURN(args.m_pNewValue->GetSigned(rows));
 
             if (rows < s_minNumberOfWeeks || rows > s_maxNumberOfWeeks)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/CollectionView_Partial.cpp b/src/dxaml/xcp/dxaml/lib/CollectionView_Partial.cpp
index fef8db6a89..2197f9e0b7 100644
--- a/src/dxaml/xcp/dxaml/lib/CollectionView_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/CollectionView_Partial.cpp
@@ -495,7 +495,7 @@ HRESULT CollectionView::SetCurrentIndexAt(
         IFC(RaisePropertyChanged(STR_LEN_PAIR(L"IsCurrentBeforeFirst")));
     }
 
-    RaiseCurrentChanged();
+    IFC(RaiseCurrentChanged());
 
     if (valid != NULL)
     {
diff --git a/src/dxaml/xcp/dxaml/lib/ComboBox_Partial.cpp b/src/dxaml/xcp/dxaml/lib/ComboBox_Partial.cpp
index fb892c0b61..a7dc4d20f4 100644
--- a/src/dxaml/xcp/dxaml/lib/ComboBox_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/ComboBox_Partial.cpp
@@ -502,13 +502,13 @@ _Check_return_ HRESULT ComboBox::SetupElementPopupChildCanvas()
         if (spElementPopupChildCanvasChildren)
         {
             //
-            // In the case of windowed popups, we don't want to put up a giant transparent hwnd over the entire desktop
+            // In the case of windowed popups, we don't want to put up a giant transparent window over the entire desktop
             // holding the light dismiss element, because that will block clicks targeted at the host app (in the case
             // of islands), clicks on other apps, or clicks meant to resize the window.
             //
             // Conveniently, the CComboBoxLightDismiss element is a Canvas, and its MeasureOverride reports 0x0 as the
-            // desired size (see CCanvas::MeasureOverride). Windowed popups look at desired size when sizing the hwnd,
-            // so it will ignore the giant CComboBoxLightDismiss element. We then end up with a small hwnd for the
+            // desired size (see CCanvas::MeasureOverride). Windowed popups look at desired size when sizing the island,
+            // so it will ignore the giant CComboBoxLightDismiss element. We then end up with a small island for the
             // ComboBox popup as desired.
             //
             // When it comes time to hit test, a click over the Xaml island will pass the point through the Xaml tree,
@@ -4007,7 +4007,7 @@ _Check_return_ HRESULT ComboBox::ProcessSearch(_In_ WCHAR keyCode)
     return S_OK;
 }
 
-_Check_return_ HRESULT ComboBox::SearchItemSourceIndex(_In_ WCHAR keyCode, _In_ bool startSearchFromCurrentIndex, _In_ bool searchExactMatch, _Outptr_ int& foundIndex)
+_Check_return_ HRESULT ComboBox::SearchItemSourceIndex(_In_ WCHAR keyCode, _In_ bool startSearchFromCurrentIndex, _In_ bool searchExactMatch, _Out_ int& foundIndex)
 {
     // Get all of the ComboBox items; we'll try to convert them to strings later.
     UINT itemCount = 0;
@@ -5299,7 +5299,7 @@ _Check_return_ HRESULT ComboBox::ArrangePopup(
     IFC_RETURN(m_tpElementPopupChild.Get()->get_ActualHeight(&childHeight));
 
     // In ActualBounds mode, the bound size is determined by ActualWidth&ActualHeight of popup child, so we need to explicitly set width&height on canvas here.
-    // If popup border has negative margins, content will be pushed out of HWND bound, so we need to increase the bound size to include the out of scope content.
+    // If popup border has negative margins, content will be pushed out of island bounds, so we need to increase the bound size to include the out of scope content.
     // We don't really need to worry about positive margins since they will be completely transparent and safe to clip.
     xaml::Thickness borderMargin = { 0, 0, 0, 0 };
     m_tpElementPopupChild.Get()->get_Margin(&borderMargin);
@@ -5458,7 +5458,7 @@ _Check_return_ HRESULT ComboBox::ArrangePopup(
         IFC_RETURN(LayoutRound(popupLeft, &popupLeft));
     }
 
-    // In ActualBounds mode, the position of the HWND does not include Popup.Child.Margin, move margin values to popup's offset properties instead.
+    // In ActualBounds mode, the position of the island does not include Popup.Child.Margin, move margin values to popup's offset properties instead.
     DOUBLE verticalOffset = popupTop + borderMargin.Top;
     DOUBLE horizontalOffset = popupLeft + borderMargin.Left;
     IFC_RETURN(m_tpPopupPart.Get()->put_VerticalOffset(verticalOffset));
@@ -5476,7 +5476,7 @@ _Check_return_ HRESULT ComboBox::ArrangePopup(
     IFC_RETURN(translateTransform->put_Y(-verticalOffset - p00t.Y));
     IFC_RETURN(m_tpElementOutsidePopup.Cast<Canvas>()->put_RenderTransform(translateTransform.Get()));
 
-    // PopupBorder has a negative {0,-1,0,-1} margin, that will push the content out of the HWND bound.
+    // PopupBorder has a negative {0,-1,0,-1} margin, that will push the content out of the island bounds.
     // We do an extra check to set opposite values on canvas margin to compensate the negatives.
     if (borderMargin.Top < 0)
     {
@@ -6442,7 +6442,7 @@ _Check_return_ HRESULT ComboBox::CreateEditableContentPresenterTextBlock()
         IFC_RETURN(ActivationAPI::ActivateInstance(pTextBlockTypeInfo, &spTextBlock));
 
         ctl::ComPtr<xaml_controls::ITextBlock> spEditableContentPresenterTextBlockAsI;
-        spTextBlock.As(&spEditableContentPresenterTextBlockAsI);
+        IFC_RETURN(spTextBlock.As(&spEditableContentPresenterTextBlockAsI));
 
         SetPtrValue(m_tpEditableContentPresenterTextBlock, spEditableContentPresenterTextBlockAsI.Get());
     }
diff --git a/src/dxaml/xcp/dxaml/lib/ComboBox_Partial.h b/src/dxaml/xcp/dxaml/lib/ComboBox_Partial.h
index 763d981802..7a156bb9d3 100644
--- a/src/dxaml/xcp/dxaml/lib/ComboBox_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/ComboBox_Partial.h
@@ -252,7 +252,7 @@ namespace DirectUI
         // The worker method that does TypeAhead work and overall search.
         _Check_return_ HRESULT ProcessSearch(_In_ WCHAR keyCode);
         // Searches for an item inside the ItemSource.
-        _Check_return_ HRESULT SearchItemSourceIndex(_In_ WCHAR keyCode, _In_ bool startSearchFromCurrentIndex, _In_ bool searchExactMatch, _Outptr_ int& foundIndex);
+        _Check_return_ HRESULT SearchItemSourceIndex(_In_ WCHAR keyCode, _In_ bool startSearchFromCurrentIndex, _In_ bool searchExactMatch, _Out_ int& foundIndex);
 
         _Check_return_ HRESULT CommitRevertEditableSearch(_In_ bool restoreValue);
 
@@ -540,17 +540,17 @@ namespace DirectUI
         TrackerPtr<xaml::IFrameworkElement> m_tpElementPopupChild;
         TrackerPtr<xaml::IFrameworkElement> m_tpElementPopupContent;
         xaml::Thickness popupContentMargin;
-        EventRegistrationToken m_pElementPopupChildKeyDownToken;
-        EventRegistrationToken m_pElementPopupChildKeyUpToken;
-        EventRegistrationToken m_pElementPopupChildGotFocusToken;
-        EventRegistrationToken m_pElementPopupChildLostFocusToken;
-        EventRegistrationToken m_pElementPopupChildPointerEnteredToken;
-        EventRegistrationToken m_pElementPopupChildPointerExitedToken;
-        EventRegistrationToken m_pElementPopupChildISizeChangedToken;
-        EventRegistrationToken m_pElementOutSidePopupPointerPressedToken;
-        EventRegistrationToken m_closedStateStoryboardCompletedToken;
-        EventRegistrationToken m_pElementPopupChildCharacterReceivedToken;
-        EventRegistrationToken m_pElementPopupChildLoadedToken;
+        EventRegistrationToken m_pElementPopupChildKeyDownToken{};
+        EventRegistrationToken m_pElementPopupChildKeyUpToken{};
+        EventRegistrationToken m_pElementPopupChildGotFocusToken{};
+        EventRegistrationToken m_pElementPopupChildLostFocusToken{};
+        EventRegistrationToken m_pElementPopupChildPointerEnteredToken{};
+        EventRegistrationToken m_pElementPopupChildPointerExitedToken{};
+        EventRegistrationToken m_pElementPopupChildISizeChangedToken{};
+        EventRegistrationToken m_pElementOutSidePopupPointerPressedToken{};
+        EventRegistrationToken m_closedStateStoryboardCompletedToken{};
+        EventRegistrationToken m_pElementPopupChildCharacterReceivedToken{};
+        EventRegistrationToken m_pElementPopupChildLoadedToken{};
 
         ctl::ComPtr<xaml_input::IPointerEventHandler> m_spEditableTextPointerPressedEventHandler;
         ctl::ComPtr<xaml_input::ITappedEventHandler> m_spEditableTextTappedEventHandler;
diff --git a/src/dxaml/xcp/dxaml/lib/CommandBar_Partial.cpp b/src/dxaml/xcp/dxaml/lib/CommandBar_Partial.cpp
index 62506474e0..4d5c3822c5 100644
--- a/src/dxaml/xcp/dxaml/lib/CommandBar_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/CommandBar_Partial.cpp
@@ -3651,7 +3651,7 @@ CommandBar::GetSizeOfSet(
             if (interactableElementCount != m_automationSizeOfSet)
             {
                 // Set size has changed since the last update.
-                UpdateOverflowButtonAutomationSetNumbers(interactableElementCount /*sizeOfSet*/);
+                IFC_RETURN(UpdateOverflowButtonAutomationSetNumbers(interactableElementCount /*sizeOfSet*/));
             }
         }
 
diff --git a/src/dxaml/xcp/dxaml/lib/ContentDialog_Partial.cpp b/src/dxaml/xcp/dxaml/lib/ContentDialog_Partial.cpp
index 1771b95544..be2e91094b 100644
--- a/src/dxaml/xcp/dxaml/lib/ContentDialog_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/ContentDialog_Partial.cpp
@@ -62,7 +62,6 @@ static const DOUBLE ContentDialog_SIP_Bottom_Margin = 12.0;
 ContentDialog::~ContentDialog()
 {
     VERIFYHR(DetachEventHandlers());
-    VERIFYHR(DetachEventHandlersForOpenDialog());
 
     auto xamlRoot = XamlRoot::GetForElementStatic(this);
     if (m_xamlRootChangedEventHandler && xamlRoot)
@@ -84,11 +83,8 @@ ContentDialog::OnPropertyChanged2(_In_ const PropertyChangedParams& args)
 {
     IFC_RETURN(__super::OnPropertyChanged2(args));
 
-    // We only react to property changes if we have a complete
-    // control template and a ContentDialog is currently visible or in design mode
-    // Else what's the point?
-    if (m_templateVersion == TemplateVersion::Unsupported || // Template is not complete
-        (!m_tpCurrentAsyncOperation && !DesignerInterop::GetDesignerMode(DesignerMode::V2Only)) || // or no active ShowAsync operation and not under the designer
+    // We only react to property changes in a ContentDialog is currently visible or in design mode
+    if ((!m_tpCurrentAsyncOperation && !DesignerInterop::GetDesignerMode(DesignerMode::V2Only)) || // or no active ShowAsync operation and not under the designer
         !m_hasPreparedContent || // or content hasn't been prepared
         m_hideInProgress
         )
@@ -99,72 +95,8 @@ ContentDialog::OnPropertyChanged2(_In_ const PropertyChangedParams& args)
     switch (args.m_pDP->GetIndex())
     {
     case KnownPropertyIndex::ContentDialog_FullSizeDesired:
-        IFC_RETURN(UpdateVisualState());
-        break;
-
     case KnownPropertyIndex::ContentDialog_PrimaryButtonText:
-        if (m_templateVersion < TemplateVersion::Redstone2)
-        {
-            wrl_wrappers::HString newString;
-            wrl_wrappers::HString oldString;
-
-            IFC_RETURN(IValueBoxer::UnboxValue(args.m_pNewValue->AsIInspectable(), newString.ReleaseAndGetAddressOf()));
-            IFC_RETURN(IValueBoxer::UnboxValue(args.m_pNewValue->AsIInspectable(), oldString.ReleaseAndGetAddressOf()));
-
-            if (oldString.Get() == nullptr || newString.Get() == nullptr)
-            {
-                IFC_RETURN(ResetAndPrepareContent());
-            }
-            else
-            {
-                ctl::ComPtr<xaml_primitives::IButtonBase> primaryButton;
-                IFC_RETURN(GetButtonHelper(xaml_controls::ContentDialogButton_Primary, primaryButton.GetAddressOf()));
-                ASSERT(primaryButton);
-
-                ctl::ComPtr<IContentControl> spContentControl;
-                IFC_RETURN(primaryButton.As(&spContentControl));
-                IFC_RETURN(spContentControl->put_Content(args.m_pNewValue->AsIInspectable()));
-            }
-        }
-        else
-        {
-            IFC_RETURN(UpdateVisualState());
-        }
-        break;
-
     case KnownPropertyIndex::ContentDialog_SecondaryButtonText:
-        if (m_templateVersion < TemplateVersion::Redstone2)
-        {
-            wrl_wrappers::HString newString;
-            wrl_wrappers::HString oldString;
-
-            IFC_RETURN(IValueBoxer::UnboxValue(args.m_pNewValue->AsIInspectable(), newString.ReleaseAndGetAddressOf()));
-            IFC_RETURN(IValueBoxer::UnboxValue(args.m_pNewValue->AsIInspectable(), oldString.ReleaseAndGetAddressOf()));
-
-            // Going to or from a null value (blank string) causes a change in the content
-            // of the button so we rebuild.
-
-            if (oldString.Get() == nullptr || newString.Get() == nullptr)
-            {
-                IFC_RETURN(ResetAndPrepareContent());
-            }
-            else
-            {
-                ctl::ComPtr<xaml_primitives::IButtonBase> secondaryButton;
-                IFC_RETURN(GetButtonHelper(xaml_controls::ContentDialogButton_Secondary, secondaryButton.GetAddressOf()));
-                ASSERT(secondaryButton);
-
-                ctl::ComPtr<IContentControl> spContentControl;
-                IFC_RETURN(secondaryButton.As(&spContentControl));
-                IFC_RETURN(spContentControl->put_Content(args.m_pNewValue->AsIInspectable()));
-            }
-        }
-        else
-        {
-            IFC_RETURN(UpdateVisualState());
-        }
-        break;
-
     case KnownPropertyIndex::ContentDialog_CloseButtonText:
     case KnownPropertyIndex::ContentDialog_DefaultButton:
         IFC_RETURN(UpdateVisualState());
@@ -172,17 +104,6 @@ ContentDialog::OnPropertyChanged2(_In_ const PropertyChangedParams& args)
 
     case KnownPropertyIndex::ContentDialog_IsPrimaryButtonEnabled:
     case KnownPropertyIndex::ContentDialog_IsSecondaryButtonEnabled:
-        if (m_templateVersion < TemplateVersion::Redstone2)
-        {
-            ctl::ComPtr<xaml_primitives::IButtonBase> button;
-            bool isPrimary = (args.m_pDP->GetIndex() == KnownPropertyIndex::ContentDialog_IsPrimaryButtonEnabled);
-
-            IFC_RETURN(GetButtonHelper(isPrimary ? xaml_controls::ContentDialogButton_Primary : xaml_controls::ContentDialogButton_Secondary, button.GetAddressOf()));
-            if (button)
-            {
-                IFC_RETURN(button.AsOrNull<xaml_controls::IControl>()->put_IsEnabled(args.m_pNewValue->As<valueBool>()));
-            }
-        }
         break;
 
     case KnownPropertyIndex::ContentDialog_PrimaryButtonCommand:
@@ -260,64 +181,48 @@ IFACEMETHODIMP ContentDialog::OnApplyTemplate()
 
     m_isLayoutRootTransplanted = false;
 
-    DetermineTemplateVersion();
+    m_isTemplateApplied = true;
 
-    if (m_templateVersion != TemplateVersion::Unsupported)
+    if (DesignerInterop::GetDesignerMode(DesignerMode::V2Only))
     {
-        if (DesignerInterop::GetDesignerMode(DesignerMode::V2Only))
-        {
-            // In designer mode the dialog is displayed in-place.  Do nothing special
-            // to display the popup, but only worry about the contents
-            m_isShowing = true;
-            m_placementMode = PlacementMode::InPlace;
-
-            IFC_RETURN(PrepareContent());
-        }
-        else if (m_templateVersion < TemplateVersion::Redstone3 &&
-            m_placementMode == PlacementMode::Undetermined || m_placementMode == PlacementMode::TransplantedRootInPopup)
-        {
-            m_placementMode = PlacementMode::TransplantedRootInPopup;
+        // In designer mode the dialog is displayed in-place.  Do nothing special
+        // to display the popup, but only worry about the contents
+        m_isShowing = true;
+        m_placementMode = PlacementMode::InPlace;
 
-            // HostDialogWithinPopup is called here to catch the case when
-            // this is part of the visual tree, at which point we
-            // will create the Popup and pull the contents out of
-            // the template.
-            IFC_RETURN(HostDialogWithinPopup(false /*wasSmokeLayerFoundAsTemplatePart*/));
+        IFC_RETURN(PrepareContent());
+    }
 
-            // At this point either a popup will have been created because
-            // the call above and ContentDialog is in the visual tree, or a ShowAsync
-            // call has happened and we're in LayoutMode_EntireControl mode.
-            ASSERT(m_tpPopup);
-        }
+    // For dialogs that were shown when not in the visual tree, since we couldn't prepare
+    // their content during the ShowAsync() call, do it now that it's loaded.
+    if (m_placementMode == PlacementMode::EntireControlInPopup)
+    {
+        IFC_RETURN(PrepareContent());
+    }
 
-        // For dialogs that were shown when not in the visual tree, since we couldn't prepare
-        // their content during the ShowAsync() call, do it now that it's loaded.
-        if (m_placementMode == PlacementMode::EntireControlInPopup)
-        {
-            IFC_RETURN(PrepareContent());
-        }
+    // On non-PhoneBlue templates, it is possible to resize the app, in which case we would like to reposition the
+    // ContentDialog. FullSize behavior also needs to be checked as the window height might become smaller than
+    // the MaxHeight, in which case positioning behavior changes.
+    auto xamlRoot = XamlRoot::GetForElementStatic(this);
+    if (xamlRoot)
+    {
+        ctl::WeakRefPtr weakInstance;
+        IFC_RETURN(ctl::AsWeak(this, &weakInstance));
 
-        // On non-PhoneBlue templates, it is possible to resize the app, in which case we would like to reposition the
-        // ContentDialog. FullSize behavior also needs to be checked as the window height might become smaller than
-        // the MaxHeight, in which case positioning behavior changes.
-        auto xamlRoot = XamlRoot::GetForElementStatic(this);
-        if (m_templateVersion > TemplateVersion::PhoneBlue && xamlRoot)
+        auto handler = [weakInstance](xaml::IXamlRoot* sender, xaml::IXamlRootChangedEventArgs* args) mutable
         {
-            ctl::WeakRefPtr weakInstance;
-            IFC_RETURN(ctl::AsWeak(this, &weakInstance));
-
-            auto handler = [weakInstance](xaml::IXamlRoot* sender, xaml::IXamlRootChangedEventArgs* args) mutable
+            if (auto instance = weakInstance.AsOrNull<IContentDialog>())
             {
-                if (auto instance = weakInstance.AsOrNull<IContentDialog>())
-                {
-                    IFC_RETURN(instance.Cast<ContentDialog>()->OnXamlRootChanged(sender, args));
-                }
-                return S_OK;
-            };
+                IFC_RETURN(instance.Cast<ContentDialog>()->OnXamlRootChanged(sender, args));
+            }
+            return S_OK;
+        };
 
-            IFC_RETURN(m_xamlRootChangedEventHandler.AttachEventHandler(xamlRoot.Get(), handler));
-        }
+        IFC_RETURN(m_xamlRootChangedEventHandler.AttachEventHandler(xamlRoot.Get(), handler));
+    }
 
+    if (m_tpLayoutRootPart)
+    {
         IFC_RETURN(m_epLayoutRootLoadedHandler.AttachEventHandler(
             m_tpLayoutRootPart.AsOrNull<IFrameworkElement>().Get(),
             std::bind(&ContentDialog::OnLayoutRootLoaded, this, _1, _2)));
@@ -341,24 +246,24 @@ IFACEMETHODIMP ContentDialog::OnApplyTemplate()
         IFC_RETURN(m_epLayoutRootProcessKeyboardAcceleratorsHandler.AttachEventHandler(
             m_tpLayoutRootPart.AsOrNull<IUIElement>().Get(),
             std::bind(&ContentDialog::OnLayoutRootProcessKeyboardAccelerators, this, _1, _2)));
+    }
 
+    if (m_tpBackgroundElementPart)
+    {
         IFC_RETURN(m_dialogSizeChangedHandler.AttachEventHandler(
             m_tpBackgroundElementPart.AsOrNull<IFrameworkElement>().Get(),
             std::bind(&ContentDialog::OnDialogSizeChanged, this, _1, _2)));
     }
 
-    if (m_templateVersion >= TemplateVersion::Redstone2)
-    {
-        IFC_RETURN(AttachButtonEvents());
+    IFC_RETURN(AttachButtonEvents());
 
-        // In case the commands were set before the template was applied, we won't have responded to the property-change event.
-        // We should set the button properties from the commands at this point to ensure they're set properly.
-        // If they've already been set before, this will be a no-op, since we check to make sure that the properties
-        // are unset before we set them.
-        IFC_RETURN(SetButtonPropertiesFromCommand(xaml_controls::ContentDialogButton_Primary));
-        IFC_RETURN(SetButtonPropertiesFromCommand(xaml_controls::ContentDialogButton_Secondary));
-        IFC_RETURN(SetButtonPropertiesFromCommand(xaml_controls::ContentDialogButton_Close));
-    }
+    // In case the commands were set before the template was applied, we won't have responded to the property-change event.
+    // We should set the button properties from the commands at this point to ensure they're set properly.
+    // If they've already been set before, this will be a no-op, since we check to make sure that the properties
+    // are unset before we set them.
+    IFC_RETURN(SetButtonPropertiesFromCommand(xaml_controls::ContentDialogButton_Primary));
+    IFC_RETURN(SetButtonPropertiesFromCommand(xaml_controls::ContentDialogButton_Secondary));
+    IFC_RETURN(SetButtonPropertiesFromCommand(xaml_controls::ContentDialogButton_Close));
 
     // If the template changes while the dialog is showing, we need to re-attached to the
     // dialog showing states changed event so that we can fire the hiding event at the
@@ -373,32 +278,7 @@ IFACEMETHODIMP ContentDialog::OnApplyTemplate()
             SetPtrValue(m_tpDialogShowingStates, dialogShowingStates);
         }
     }
-
-    // Lookup value of ContentDialogMinHeight, which is used when adjusting the dialog's layout
-    // in response to a visible input pane.
-    {
-        ctl::ComPtr<xaml::IResourceDictionary> resourceDictionary;
-        IFC_RETURN(get_Resources(&resourceDictionary));
-
-        ctl::ComPtr<wfc::IMap<IInspectable*, IInspectable*>> resourceMap;
-        IFC_RETURN(resourceDictionary.As(&resourceMap));
-
-        ctl::ComPtr<IInspectable> resourceKey;
-        IFC_RETURN(PropertyValue::CreateFromString(wrl_wrappers::HStringReference(L"ContentDialogMinHeight").Get(), &resourceKey));
-
-        BOOLEAN hasKey = FALSE;
-        IFC_RETURN(resourceMap->HasKey(resourceKey.Get(), &hasKey));
-
-        if (hasKey)
-        {
-            ctl::ComPtr<IInspectable> resource;
-            IFC_RETURN(resourceMap->Lookup(resourceKey.Get(), &resource));
-
-            auto doubleReference = ctl::query_interface_cast<wf::IReference<double>>(resource.Get());
-            IFC_RETURN(doubleReference->get_Value(&m_dialogMinHeight));
-        }
-    }
-
+     
     // Attempt to set the m_tpSmokeLayer field as a FrameworkElement template part, in Popup placement.
     if (m_tpLayoutRootPart)
     {
@@ -464,7 +344,7 @@ _Check_return_ HRESULT ContentDialog::ChangeVisualState(_In_ bool useTransitions
 {
     IFC_RETURN(__super::ChangeVisualState(useTransitions));
 
-    if (m_templateVersion == TemplateVersion::Unsupported)
+    if (!m_isTemplateApplied)
     {
         return S_OK;
     }
@@ -472,249 +352,136 @@ _Check_return_ HRESULT ContentDialog::ChangeVisualState(_In_ bool useTransitions
     BOOLEAN fullSizeDesired = FALSE;
     IFC_RETURN(get_FullSizeDesired(&fullSizeDesired));
 
-    // Orientation
-    if (m_templateVersion == TemplateVersion::PhoneBlue)
+    // ButtonsVisibilityStates
     {
-        ctl::ComPtr<wgrd::IDisplayInformationStatics> spDisplayInformationStatics;
-        IFC_RETURN(ctl::GetActivationFactory(wrl_wrappers::HStringReference(
-            RuntimeClass_Windows_Graphics_Display_DisplayInformation).Get(),
-            &spDisplayInformationStatics));
+        wrl_wrappers::HString primaryText;
+        IFC_RETURN(get_PrimaryButtonText(primaryText.ReleaseAndGetAddressOf()));
 
-        ctl::ComPtr<wgrd::IDisplayInformation> spDisplayInformation;
-        IFC_RETURN(spDisplayInformationStatics->GetForCurrentView(&spDisplayInformation));
+        wrl_wrappers::HString secondaryText;
+        IFC_RETURN(get_SecondaryButtonText(secondaryText.ReleaseAndGetAddressOf()));
 
-        auto orientation = wgrd::DisplayOrientations_None;
-        IFC_RETURN(spDisplayInformation->get_CurrentOrientation(&orientation));
+        wrl_wrappers::HString closeText;
+        IFC_RETURN(get_CloseButtonText(closeText.ReleaseAndGetAddressOf()));
 
-        // Note: When ContentDialog supports desktop windows, we may want to take the
-        // width/height of the application window into account. For phone we only need
-        // to consider device orientation.
+        bool hasPrimary = !primaryText.IsEmpty();
+        bool hasSecondary = !secondaryText.IsEmpty();
+        bool hasClose = !closeText.IsEmpty();
 
-        const wchar_t* newStateName = nullptr;
-        switch (orientation)
+        const wchar_t* buttonVisibilityState = L"NoneVisible";
+        if (hasPrimary && hasSecondary && hasClose)
         {
-        case wgrd::DisplayOrientations_Landscape:
-        case wgrd::DisplayOrientations_LandscapeFlipped:
-            newStateName = L"Landscape";
-            break;
-        case wgrd::DisplayOrientations_Portrait:
-        case wgrd::DisplayOrientations_PortraitFlipped:
-            newStateName = L"Portrait";
-            break;
-        default:
-            ASSERT(FALSE);
-            break;
+            buttonVisibilityState = L"AllVisible";
+        }
+        else if (hasPrimary && hasSecondary)
+        {
+            buttonVisibilityState = L"PrimaryAndSecondaryVisible";
+        }
+        else if (hasPrimary && hasClose)
+        {
+            buttonVisibilityState = L"PrimaryAndCloseVisible";
+        }
+        else if (hasSecondary && hasClose)
+        {
+            buttonVisibilityState = L"SecondaryAndCloseVisible";
+        }
+        else if (hasPrimary)
+        {
+            buttonVisibilityState = L"PrimaryVisible";
+        }
+        else if (hasSecondary)
+        {
+            buttonVisibilityState = L"SecondaryVisible";
+        }
+        else if (hasClose)
+        {
+            buttonVisibilityState = L"CloseVisible";
         }
 
         BOOLEAN ignored = FALSE;
-        IFC_RETURN(GoToState(useTransitions, newStateName, &ignored));
+        IFC_RETURN(GoToState(useTransitions, buttonVisibilityState, &ignored));
     }
 
-    if (m_templateVersion >= TemplateVersion::Redstone2)
+    // DefaultButtonStates
     {
-        // ButtonsVisibilityStates
-        {
-            wrl_wrappers::HString primaryText;
-            IFC_RETURN(get_PrimaryButtonText(primaryText.ReleaseAndGetAddressOf()));
-
-            wrl_wrappers::HString secondaryText;
-            IFC_RETURN(get_SecondaryButtonText(secondaryText.ReleaseAndGetAddressOf()));
-
-            wrl_wrappers::HString closeText;
-            IFC_RETURN(get_CloseButtonText(closeText.ReleaseAndGetAddressOf()));
-
-            bool hasPrimary = !primaryText.IsEmpty();
-            bool hasSecondary = !secondaryText.IsEmpty();
-            bool hasClose = !closeText.IsEmpty();
-
-            const wchar_t* buttonVisibilityState = L"NoneVisible";
-            if (hasPrimary && hasSecondary && hasClose)
-            {
-                buttonVisibilityState = L"AllVisible";
-            }
-            else if (hasPrimary && hasSecondary)
-            {
-                buttonVisibilityState = L"PrimaryAndSecondaryVisible";
-            }
-            else if (hasPrimary && hasClose)
-            {
-                buttonVisibilityState = L"PrimaryAndCloseVisible";
-            }
-            else if (hasSecondary && hasClose)
-            {
-                buttonVisibilityState = L"SecondaryAndCloseVisible";
-            }
-            else if (hasPrimary)
-            {
-                buttonVisibilityState = L"PrimaryVisible";
-            }
-            else if (hasSecondary)
-            {
-                buttonVisibilityState = L"SecondaryVisible";
-            }
-            else if (hasClose)
-            {
-                buttonVisibilityState = L"CloseVisible";
-            }
+        const wchar_t* defaultButtonState = L"NoDefaultButton";
 
-            BOOLEAN ignored = FALSE;
-            IFC_RETURN(GoToState(useTransitions, buttonVisibilityState, &ignored));
-        }
+        auto defaultButton = xaml_controls::ContentDialogButton_None;
+        IFC_RETURN(get_DefaultButton(&defaultButton));
 
-        // DefaultButtonStates
+        if (defaultButton != xaml_controls::ContentDialogButton_None)
         {
-            const wchar_t* defaultButtonState = L"NoDefaultButton";
+            ctl::ComPtr<DependencyObject> focusedElement;
+            IFC_RETURN(GetFocusedElement(&focusedElement));
 
-            auto defaultButton = xaml_controls::ContentDialogButton_None;
-            IFC_RETURN(get_DefaultButton(&defaultButton));
+            BOOLEAN isFocusInCommandArea = FALSE;
+            IFC_RETURN(m_tpCommandSpacePart.Cast<Grid>()->IsAncestorOf(focusedElement.Get(), &isFocusInCommandArea));
 
-            if (defaultButton != xaml_controls::ContentDialogButton_None)
+            // If focus is not in the command area, set the default button visualization just based on the property value.
+            // If focus is in the command area, set the default button visualization only if it has focus.
+            if (defaultButton == xaml_controls::ContentDialogButton_Primary)
             {
-                ctl::ComPtr<DependencyObject> focusedElement;
-                IFC_RETURN(GetFocusedElement(&focusedElement));
-
-                BOOLEAN isFocusInCommandArea = FALSE;
-                IFC_RETURN(m_tpCommandSpacePart.Cast<Grid>()->IsAncestorOf(focusedElement.Get(), &isFocusInCommandArea));
-
-                // If focus is not in the command area, set the default button visualization just based on the property value.
-                // If focus is in the command area, set the default button visualization only if it has focus.
-                if (defaultButton == xaml_controls::ContentDialogButton_Primary)
+                if (!isFocusInCommandArea || ctl::are_equal(m_tpPrimaryButtonPart.Get(), focusedElement.Get()))
                 {
-                    if (!isFocusInCommandArea || ctl::are_equal(m_tpPrimaryButtonPart.Get(), focusedElement.Get()))
-                    {
-                        defaultButtonState = L"PrimaryAsDefaultButton";
-                    }
+                    defaultButtonState = L"PrimaryAsDefaultButton";
                 }
-                else if (defaultButton == xaml_controls::ContentDialogButton_Secondary)
+            }
+            else if (defaultButton == xaml_controls::ContentDialogButton_Secondary)
+            {
+                if (!isFocusInCommandArea || ctl::are_equal(m_tpSecondaryButtonPart.Get(), focusedElement.Get()))
                 {
-                    if (!isFocusInCommandArea || ctl::are_equal(m_tpSecondaryButtonPart.Get(), focusedElement.Get()))
-                    {
-                        defaultButtonState = L"SecondaryAsDefaultButton";
-                    }
+                    defaultButtonState = L"SecondaryAsDefaultButton";
                 }
-                else if (defaultButton == xaml_controls::ContentDialogButton_Close)
+            }
+            else if (defaultButton == xaml_controls::ContentDialogButton_Close)
+            {
+                if (!isFocusInCommandArea || ctl::are_equal(m_tpCloseButtonPart.Get(), focusedElement.Get()))
                 {
-                    if (!isFocusInCommandArea || ctl::are_equal(m_tpCloseButtonPart.Get(), focusedElement.Get()))
-                    {
-                        defaultButtonState = L"CloseAsDefaultButton";
-                    }
+                    defaultButtonState = L"CloseAsDefaultButton";
                 }
             }
-
-            BOOLEAN ignored = FALSE;
-            IFC_RETURN(GoToState(useTransitions, defaultButtonState, &ignored));
         }
+
+        BOOLEAN ignored = FALSE;
+        IFC_RETURN(GoToState(useTransitions, defaultButtonState, &ignored));
     }
 
-    if (m_templateVersion >= TemplateVersion::Redstone3)
+    // DialogShowingStates
+    if (m_placementMode == PlacementMode::InPlace)
     {
-        // DialogShowingStates
-        if (m_placementMode == PlacementMode::InPlace)
+        if (m_tpDialogShowingStates)
         {
             BOOLEAN ignored = FALSE;
             IFC_RETURN(GoToState(true, m_isShowing && !m_hideInProgress ? L"DialogShowing" : L"DialogHidden", &ignored));
         }
-        else if (m_placementMode != PlacementMode::Undetermined)
-        {
-            // For ContentDialog's shown in the popup, set the state to always showing since the opened
-            // state of the popup effectively controls whether its showing it not.
-            BOOLEAN ignored = FALSE;
-            IFC_RETURN(GoToState(false, L"DialogShowingWithoutSmokeLayer", &ignored));
-        }
-
-        // DialogSizingStates
+        else if (m_tpLayoutRootPart)
         {
-            BOOLEAN ignored = FALSE;
-            IFC_RETURN(GoToState(useTransitions, fullSizeDesired ? L"FullDialogSizing" : L"DefaultDialogSizing", &ignored));
+            // We don't have a state transition defined so brute force it.
+            IFC_RETURN(m_tpLayoutRootPart.AsOrNull<IUIElement>()->put_Visibility(m_isShowing && !m_hideInProgress ? xaml::Visibility_Visible : xaml::Visibility_Collapsed));
         }
+    }
+    else if (m_placementMode != PlacementMode::Undetermined)
+    {
+        // For ContentDialog's shown in the popup, set the state to always showing since the opened
+        // state of the popup effectively controls whether its showing it not.
+        BOOLEAN ignored = FALSE;
+        IFC_RETURN(GoToState(false, L"DialogShowingWithoutSmokeLayer", &ignored));
+    }
 
-        // DialogBorderStates
-        {
-            BOOLEAN ignored = FALSE;
-            IFC_RETURN(GoToState(useTransitions, L"NoBorder", &ignored));
-        }
+    // DialogSizingStates
+    {
+        BOOLEAN ignored = FALSE;
+        IFC_RETURN(GoToState(useTransitions, fullSizeDesired ? L"FullDialogSizing" : L"DefaultDialogSizing", &ignored));
     }
 
-    // On PhoneBlue, the dialog did not move out of the way of the input pane.
-    if (m_templateVersion > TemplateVersion::PhoneBlue)
+    // DialogBorderStates
     {
-        IFC_RETURN(AdjustVisualStateForInputPane());
+        BOOLEAN ignored = FALSE;
+        IFC_RETURN(GoToState(useTransitions, L"NoBorder", &ignored));
     }
 
     return S_OK;
 }
 
-void ContentDialog::DetermineTemplateVersion()
-{
-    if (m_tpButton1HostPart &&
-        m_tpButton2HostPart &&
-        m_tpLayoutRootPart &&
-        m_tpContainerPart &&
-        m_tpContentPanelPart &&
-        m_tpContentPart &&
-        m_tpTitlePart &&
-        m_tpBackgroundElementPart &&
-        !m_tpCommandSpacePart &&
-        !m_tpDialogSpacePart &&
-        !m_tpContentScrollViewerPart &&
-        !m_tpPrimaryButtonPart &&
-        !m_tpSecondaryButtonPart &&
-        !m_tpCloseButtonPart &&
-        !m_tpScaleTransformPart)
-    {
-        m_templateVersion = TemplateVersion::PhoneBlue;
-    }
-    else if (m_tpButton1HostPart &&
-        m_tpButton2HostPart &&
-        m_tpLayoutRootPart &&
-        m_tpContainerPart &&
-        m_tpContentPart &&
-        m_tpTitlePart &&
-        m_tpBackgroundElementPart &&
-        m_tpCommandSpacePart &&
-        m_tpDialogSpacePart &&
-        m_tpContentScrollViewerPart &&
-        !m_tpPrimaryButtonPart &&
-        !m_tpSecondaryButtonPart &&
-        !m_tpCloseButtonPart &&
-        !m_tpScaleTransformPart)
-    {
-        m_templateVersion = TemplateVersion::Threshold;
-    }
-    else if (m_tpContainerPart &&
-        m_tpLayoutRootPart &&
-        m_tpBackgroundElementPart &&
-        m_tpContentScrollViewerPart &&
-        m_tpTitlePart &&
-        m_tpContentPart &&
-        m_tpCommandSpacePart &&
-        m_tpPrimaryButtonPart &&
-        m_tpSecondaryButtonPart &&
-        m_tpCloseButtonPart &&
-        !m_tpButton1HostPart &&
-        !m_tpButton2HostPart &&
-        !m_tpScaleTransformPart)
-    {
-        m_templateVersion = TemplateVersion::Redstone2;
-    }
-    else if (m_tpContainerPart &&
-        m_tpLayoutRootPart &&
-        m_tpBackgroundElementPart &&
-        m_tpContentScrollViewerPart &&
-        m_tpTitlePart &&
-        m_tpContentPart &&
-        m_tpCommandSpacePart &&
-        m_tpPrimaryButtonPart &&
-        m_tpSecondaryButtonPart &&
-        m_tpCloseButtonPart &&
-        m_tpScaleTransformPart &&
-        !m_tpButton1HostPart &&
-        !m_tpButton2HostPart)
-    {
-        m_templateVersion = TemplateVersion::Redstone3;
-    }
-}
-
 _Check_return_ HRESULT
 ContentDialog::HideImpl()
 {
@@ -919,13 +686,20 @@ ContentDialog::ShowAsyncWithPlacementImpl(
 
         if (IsInLiveTree())
         {
-            // Make sure the template has been applied so that m_templateVersion is accurate.
+            // Ensure the template is applied so that we can get to the parts.
             BOOLEAN ignore = FALSE;
             IFC_RETURN(ApplyTemplate(&ignore));
 
-            m_placementMode =
-                (placement == xaml_controls::ContentDialogPlacement_InPlace && m_templateVersion >= TemplateVersion::Redstone3 ?
-                    PlacementMode::InPlace : PlacementMode::TransplantedRootInPopup);
+            m_placementMode = placement == xaml_controls::ContentDialogPlacement_InPlace ? PlacementMode::InPlace : PlacementMode::TransplantedRootInPopup;
+        
+            // In order to actually move to a popup we need the container and layout root parts.  There is no current
+            // check for this (using version) and we will crash if you attempt to host a content dialog in a popup with
+            // one of these parts missing.  This continues that behavior, but we will fail here instead of at some random
+            // point in the future when we attempt to use one of those parts.  
+            //
+            // Alternately, we could forcibly switch to inplace mode if one of the parts are missing or we could try to 
+            // to use the dialogs content as the LayoutRoot and the Dialog itself as the Container.
+            IFCCHECK_RETURN(m_placementMode == PlacementMode::InPlace || (m_tpContainerPart && m_tpLayoutRootPart));
         }
     }
 
@@ -940,7 +714,6 @@ ContentDialog::ShowAsyncWithPlacementImpl(
         IFC_RETURN(DirectUI::ErrorHelper::OriginateErrorUsingResourceID(E_UNEXPECTED, ERROR_POPUP_XAMLROOT_NOT_SET));
     }
 
-
     // See if there is already an open dialog and return an error if that is the case.
     // For InPlace dialogs, multiple can be shown at the same time, provided that they
     // are each under different parents.
@@ -982,9 +755,6 @@ ContentDialog::ShowAsyncWithPlacementImpl(
 
     if (m_placementMode == PlacementMode::InPlace)
     {
-        // Support for inline dialogs depends on visual states added in RS3.
-        ASSERT(m_templateVersion >= TemplateVersion::Redstone3);
-
         // If the dialog had previously been open, then this should have been cleared after
         // it finished closing.
         ASSERT(!m_dialogShowingStateChangedEventHandler);
@@ -1011,15 +781,11 @@ ContentDialog::ShowAsyncWithPlacementImpl(
         // in their entirety), wait until they are loaded before preparing their content.
         // Template version is determined in OnApplyTemplate, so we can test against that
         // to see whether the control has been loaded before ShowAsync() was called.
-        if (m_templateVersion != TemplateVersion::Unsupported)
+        if (m_isTemplateApplied)
         {
             IFC_RETURN(PrepareContent());
         }
 
-        // Make sure the template has been applied so that m_tpSmokeLayer can potentially be found in the control template.
-        BOOLEAN ignore = FALSE;
-        IFC_RETURN(ApplyTemplate(&ignore))
-
         IFC_RETURN(HostDialogWithinPopup(false /*wasSmokeLayerFoundAsTemplatePart*/));
 
         // Defer actually opening the ContentDialog's popup by a tick to enable
@@ -1125,7 +891,7 @@ _Check_return_ HRESULT ContentDialog::EnsureDeferralManagers()
 
 _Check_return_ HRESULT ContentDialog::ResetAndPrepareContent()
 {
-    if (m_templateVersion != TemplateVersion::Unsupported && m_tpCurrentAsyncOperation && m_hasPreparedContent)
+    if (m_isTemplateApplied && m_tpCurrentAsyncOperation && m_hasPreparedContent)
     {
         m_hasPreparedContent = false;
         IFC_RETURN(PrepareContent());
@@ -1360,8 +1126,6 @@ _Check_return_ HRESULT ContentDialog::DeferredOpenPopup()
 _Check_return_ HRESULT
 ContentDialog::PrepareContent()
 {
-    ASSERT(m_templateVersion != TemplateVersion::Unsupported);
-
     if (!m_hasPreparedContent)
     {
         if (m_placementMode == PlacementMode::TransplantedRootInPopup)
@@ -1384,14 +1148,6 @@ ContentDialog::PrepareContent()
             m_isLayoutRootTransplanted = false;
         }
 
-        // For Pre-Redstone2 templates, we need to build the buttons in code
-        // behind because they don't exist as template parts.
-        if (m_templateVersion < TemplateVersion::Redstone2)
-        {
-            IFC_RETURN(BuildAndConfigureButtons());
-            IFC_RETURN(AttachButtonEvents());
-        }
-
         IFC_RETURN(UpdateVisualState());
         IFC_RETURN(UpdateTitleSpaceVisibility());
 
@@ -1400,15 +1156,18 @@ ContentDialog::PrepareContent()
             IFC_RETURN(SizeAndPositionContentInPopup());
         }
 
-        // Cast a shadow
-        if (CThemeShadow::IsDropShadowMode())
-        {
-            // Under drop shadows, ContentDialog has a larger shadow than normal
-            IFC_RETURN(ApplyElevationEffect(m_tpBackgroundElementPart.AsOrNull<IUIElement>().Get(), 0 /* depth */, 128 /* baseElevation */));
-        }
-        else
+        // Cast a shadow if we have a background part
+        if (m_tpBackgroundElementPart)
         {
-            IFC_RETURN(ApplyElevationEffect(m_tpBackgroundElementPart.AsOrNull<IUIElement>().Get()));
+            if (CThemeShadow::IsDropShadowMode())
+            {
+                // Under drop shadows, ContentDialog has a larger shadow than normal
+                IFC_RETURN(ApplyElevationEffect(m_tpBackgroundElementPart.AsOrNull<IUIElement>().Get(), 0 /* depth */, 128 /* baseElevation */));
+            }
+            else
+            {
+                IFC_RETURN(ApplyElevationEffect(m_tpBackgroundElementPart.AsOrNull<IUIElement>().Get()));
+            }
         }
 
         m_hasPreparedContent = true;
@@ -1420,7 +1179,15 @@ ContentDialog::PrepareContent()
 _Check_return_ HRESULT
 ContentDialog::SizeAndPositionContentInPopup()
 {
-    if (!m_tpPopup || m_templateVersion == TemplateVersion::Unsupported)
+    if (!m_tpPopup)
+    {
+        return S_OK;
+    }
+
+    // Eventually, I think we want to center the popup, rather than make the popup full window size and then
+    // center the content.  For now, to handle invalid templates, we just won't position if we don't have
+    // the right parts.
+    if (!m_tpBackgroundElementPart || !m_tpLayoutRootPart)
     {
         return S_OK;
     }
@@ -1462,37 +1229,6 @@ ContentDialog::SizeAndPositionContentInPopup()
     double popupHeight = 0;
     IFC_RETURN(spBackgroundAsFE->get_ActualHeight(&popupHeight));
 
-    if (m_templateVersion < TemplateVersion::Redstone3 &&
-        m_templateVersion > TemplateVersion::PhoneBlue &&
-        !m_layoutAdjustmentsForInputPaneStoryboard)
-    {
-        IFC_RETURN(spBackgroundAsFE->put_VerticalAlignment(fullSizeDesired ?
-            xaml::VerticalAlignment::VerticalAlignment_Stretch :
-            xaml::VerticalAlignment::VerticalAlignment_Top));
-    }
-
-    if (m_templateVersion == TemplateVersion::PhoneBlue)
-    {
-        ctl::ComPtr<wfc::IVector<xaml_controls::RowDefinition*>> spRowDefs;
-        IFC_RETURN(m_tpLayoutRootPart->get_RowDefinitions(&spRowDefs));
-
-        ctl::ComPtr<IRowDefinition> spContentRow;
-        IFC_RETURN(spRowDefs->GetAt(0, &spContentRow));
-
-        // Collapse and expand parts of the grid
-        // depending on mode.
-        if (fullSizeDesired)
-        {
-            xaml::GridLength starGridLength = { 1.0, xaml::GridUnitType_Star };
-            IFC_RETURN(spContentRow->put_Height(starGridLength));
-        }
-        else
-        {
-            xaml::GridLength autoGridLength = { 1.0, xaml::GridUnitType_Auto };
-            IFC_RETURN(spContentRow->put_Height(autoGridLength));
-        }
-    }
-
     // Here we shamelessly contour ourselves to the Layout system and the whims of
     // the implementers of Popup. The following truths must be known to understand
     // this code:
@@ -1516,7 +1252,7 @@ ContentDialog::SizeAndPositionContentInPopup()
     // - When a parented Popup is in RTL mode its position is determined by its right edge and not the left edge.
     // - The Arrange pass is busted for RTL mode in Popup so don't expect any autosizing
     //   to work correctly. We force feed Popup its Width and Height instead of using Stretch.
-    if (m_templateVersion >= TemplateVersion::Redstone3 && m_placementMode == PlacementMode::EntireControlInPopup)
+    if (m_placementMode == PlacementMode::EntireControlInPopup)
     {
         IFC_RETURN(put_Height(windowBounds.Height));
         IFC_RETURN(put_Width(windowBounds.Width));
@@ -1527,103 +1263,7 @@ ContentDialog::SizeAndPositionContentInPopup()
         IFC_RETURN(m_tpLayoutRootPart.AsOrNull<IFrameworkElement>()->put_Width(windowBounds.Width));
     }
 
-    if (m_templateVersion > TemplateVersion::PhoneBlue)
-    {
-        // Apply the available width/height with the layout width/height
-        double availableWidth = adjustedLayoutBounds.Width;
-        double availableHeight = adjustedLayoutBounds.Height;
-
-        if (m_templateVersion >= TemplateVersion::Redstone3)
-        {
-            xOffset = (flowDirection == xaml::FlowDirection_LeftToRight ? 0 : availableWidth);
-
-            // Set inner margin based on display regions
-            xaml::Thickness layoutInnerMargin = {};
-            IFC_RETURN(GetDialogInnerMargin(adjustedLayoutBounds, &layoutInnerMargin));
-            auto layoutRoot = m_tpLayoutRootPart.Get();
-            if (layoutRoot)
-            {
-                IFC_RETURN(layoutRoot->put_Padding(layoutInnerMargin));
-            }
-        }
-        else
-        {
-            // Center the popup horizontally and vertically
-            double dialogMinHeight = 0;
-            double commandSpaceHeight = 0;
-            double nonContentSpaceHeight = 0;
-            double pageTop = 0;
-            xaml::Thickness borderThickness = {};
-            xaml::Thickness contentScrollViewerMargin = {};
-            xaml::Thickness dialogSpacePadding = {};
-
-            ctl::ComPtr<IFrameworkElement> spContentScrollViewerAsFE;
-            ctl::ComPtr<IFrameworkElement> spCommandSpaceAsFE;
-
-            IFC_RETURN(m_tpBackgroundElementPart->get_BorderThickness(&borderThickness));
-            IFC_RETURN(m_tpCommandSpacePart.As(&spCommandSpaceAsFE));
-            IFC_RETURN(m_tpContentScrollViewerPart.As(&spContentScrollViewerAsFE));
-
-            if (m_templateVersion == TemplateVersion::Redstone2)
-            {
-                // In RS2, we set MinHeight on the background template part
-                // instead of the ContentDialog itself.
-                IFC_RETURN(spBackgroundAsFE->get_MinHeight(&dialogMinHeight));
-            }
-            else
-            {
-                IFC_RETURN(get_MinHeight(&dialogMinHeight));
-            }
-
-            // Initialize the ContentDialog horizontal and vertical position.
-            // The window and layout bounds base on the screen coordinate which is the same
-            // on the desktop, but phone can be different because the layout bound left/top
-            // is applying the system tray's width/height in case of opaque status.
-            xOffset = std::max(0.0f, adjustedLayoutBounds.X - windowBounds.X);
-            yOffset = std::max(0.0f, adjustedLayoutBounds.Y - windowBounds.Y);
-
-            // Set the page top position that excludes the system tray
-            pageTop = yOffset;
-
-            // Set the ContentDialog horizontal position at the center from the available width
-            xOffset +=
-                flowDirection == xaml::FlowDirection_LeftToRight ?
-                static_cast<FLOAT>((availableWidth - popupWidth) / 2) :
-                adjustedLayoutBounds.Width - static_cast<FLOAT>((availableWidth - popupWidth) / 2);
-
-            if (popupWidth > availableWidth)
-            {
-                IFC_RETURN(spBackgroundAsFE->put_Width(availableWidth));
-                popupWidth = availableWidth;
-            }
-
-            // Limit the scroll viewer max height in order to prevent it being on top of CommandSpace.
-            IFC_RETURN(spCommandSpaceAsFE->get_ActualHeight(&commandSpaceHeight));
-
-            IFC_RETURN(spContentScrollViewerAsFE->get_Margin(&contentScrollViewerMargin));
-
-            IFC_RETURN(m_tpDialogSpacePart.Get()->get_Padding(&dialogSpacePadding));
-
-            // Calculate the height that is excluded from the content space height.
-            nonContentSpaceHeight =
-                commandSpaceHeight +
-                borderThickness.Top + borderThickness.Bottom +
-                contentScrollViewerMargin.Top + contentScrollViewerMargin.Bottom +
-                dialogSpacePadding.Top + dialogSpacePadding.Bottom;
-
-            if (fullSizeDesired)
-            {
-                IFC_RETURN(spContentScrollViewerAsFE->put_Height(std::max(0.0, std::min(dialogMaxHeight, static_cast<DOUBLE>(availableHeight)) - nonContentSpaceHeight)));
-            }
-            else
-            {
-                IFC_RETURN(spContentScrollViewerAsFE->put_MaxHeight(std::max(0.0, std::min(dialogMaxHeight, static_cast<DOUBLE>(availableHeight)) - nonContentSpaceHeight)));
-            }
-
-            // Align the dialog to the center.
-            yOffset += static_cast<FLOAT>((availableHeight - popupHeight) / 2);
-        }
-    }
+    xOffset = (flowDirection == xaml::FlowDirection_LeftToRight ? 0 : adjustedLayoutBounds.Width);
 
     // When the ContentDialog is in the visual tree, the popup offset has added
     // to it the top-left point of where layout measured and arranged it to.
@@ -1638,28 +1278,14 @@ ContentDialog::SizeAndPositionContentInPopup()
         IFC_RETURN(m_tpPopup.Cast<Popup>()->TransformToVisual(nullptr, &transformToRoot));
         IFC_RETURN(transformToRoot->TransformPoint({ 0, 0 }, &offsetFromRoot));
 
-        if (m_templateVersion == TemplateVersion::PhoneBlue && flowDirection == xaml::FlowDirection_RightToLeft)
-        {
-            xOffset -= windowBounds.Width - offsetFromRoot.X;
-        }
-        else
-        {
-            xOffset =
-                flowDirection == xaml::FlowDirection_LeftToRight ?
-                (xOffset - offsetFromRoot.X) :
-                (xOffset - offsetFromRoot.X) * -1;
-        }
+        xOffset =
+            flowDirection == xaml::FlowDirection_LeftToRight ?
+            (xOffset - offsetFromRoot.X) :
+            (xOffset - offsetFromRoot.X) * -1;
 
         yOffset = yOffset - offsetFromRoot.Y + smokeLayerYOffset;
     }
-    // The V1 template, and only the V1 template, requires us to
-    // add on the window bounds to position things correctly in RTL.
-    else if (m_templateVersion == TemplateVersion::PhoneBlue && flowDirection == xaml::FlowDirection_RightToLeft)
-    {
-        xOffset += windowBounds.Width;
-    }
-
-
+ 
     // Set the ContentDialog left and top position.
     IFC_RETURN(m_tpPopup->put_HorizontalOffset(xOffset));
     IFC_RETURN(m_tpPopup->put_VerticalOffset(yOffset));
@@ -1668,74 +1294,24 @@ ContentDialog::SizeAndPositionContentInPopup()
 }
 
 _Check_return_ HRESULT
-ContentDialog::GetDialogInnerMargin(
-    _In_ wf::Rect adjustedLayoutBounds,
-    _Out_ xaml::Thickness* innerMargin)
+ContentDialog::GetFocusedElementPosition(
+_Out_ wf::Point* focusedPosition)
 {
-    *innerMargin = { 0, 0, 0, 0 };
+    *focusedPosition = {};
+
+    ctl::ComPtr<IUIElement> focusedElement;
+    auto focusedElementAsDO = m_spFocusedElementBeforeContentDialogShows.AsOrNull<IDependencyObject>();
 
-    if (m_simulateRegions)
+    if (focusedElementAsDO)
     {
-        // Get the position of the focused element to determine which region it's in
-        wf::Point focusedPosition = {};
-        IFC_RETURN(GetFocusedElementPosition(&focusedPosition));
+        focusedElement = focusedElementAsDO.AsOrNull<IUIElement>();
 
-        if (adjustedLayoutBounds.Width > adjustedLayoutBounds.Height)
+        if (!focusedElement)
         {
-            // Regions are split left/right
-            float offsetWidth = adjustedLayoutBounds.Width / 2;
+            CDependencyObject* focusedDO = focusedElementAsDO.Cast<DependencyObject>()->GetHandle();
+            CTextElement* focusedTextElement = do_pointer_cast<CTextElement>(focusedDO);
 
-            if (focusedPosition.X < offsetWidth)
-            {
-                // Dialog should be positioned on the left
-                innerMargin->Right = offsetWidth;
-            }
-            else
-            {
-                // Dialog should be positioned on the right
-                innerMargin->Left = offsetWidth;
-            }
-        }
-        else
-        {
-            // Regions are split top/bottom
-            float offsetHeight = adjustedLayoutBounds.Height / 2;
-
-            if (focusedPosition.Y < offsetHeight)
-            {
-                // Dialog should be positioned at the top
-                innerMargin->Bottom = offsetHeight;
-            }
-            else
-            {
-                // Dialog should be positioned on the bottom
-                innerMargin->Top = offsetHeight;
-            }
-        }
-    }
-
-    return S_OK;
-}
-
-_Check_return_ HRESULT
-ContentDialog::GetFocusedElementPosition(
-_Out_ wf::Point* focusedPosition)
-{
-    *focusedPosition = {};
-
-    ctl::ComPtr<IUIElement> focusedElement;
-    auto focusedElementAsDO = m_spFocusedElementBeforeContentDialogShows.AsOrNull<IDependencyObject>();
-
-    if (focusedElementAsDO)
-    {
-        focusedElement = focusedElementAsDO.AsOrNull<IUIElement>();
-
-        if (!focusedElement)
-        {
-            CDependencyObject* focusedDO = focusedElementAsDO.Cast<DependencyObject>()->GetHandle();
-            CTextElement* focusedTextElement = do_pointer_cast<CTextElement>(focusedDO);
-
-            if (focusedTextElement)
+            if (focusedTextElement)
             {
                 CFrameworkElement* containingFE = focusedTextElement->GetContainingFrameworkElement();
 
@@ -1774,7 +1350,6 @@ _In_ IInspectable* /*pArgs*/)
     if (status != wf::AsyncStatus::Canceled)
     {
         IFC_RETURN(UpdateVisualState());
-        IFC_RETURN(AttachEventHandlersForOpenDialog());
 
         // Now that the popup is opened, allow an app to cancel the hiding the dialog.
         m_skipClosingEventOnHide = false;
@@ -1835,25 +1410,6 @@ ContentDialog::OnBackButtonPressedImpl(_Out_ BOOLEAN* handled)
     return S_OK;
 }
 
-_Check_return_ HRESULT
-ContentDialog::OnWindowActivated(
-    _In_ IInspectable* /*sender*/,
-    _In_ xaml::IWindowActivatedEventArgs* args)
-{
-    ASSERT(m_templateVersion == TemplateVersion::PhoneBlue);
-
-    auto state = xaml::WindowActivationState_CodeActivated;
-    IFC_RETURN(args->get_WindowActivationState(&state));
-
-    if (state == xaml::WindowActivationState_Deactivated)
-    {
-        m_skipClosingEventOnHide = true;
-        IFC_RETURN(HideInternal(xaml_controls::ContentDialogResult_None));
-    }
-
-    return S_OK;
-}
-
 _Check_return_ HRESULT ContentDialog::OnFinishedClosing()
 {
     auto asyncOperationNoRef = m_tpCurrentAsyncOperation.Cast<ContentDialogShowAsyncOperation>();
@@ -1874,8 +1430,6 @@ _Check_return_ HRESULT ContentDialog::OnFinishedClosing()
         IFC_RETURN(m_tpPopup->put_Child(nullptr));
     }
 
-    IFC_RETURN(DetachEventHandlersForOpenDialog());
-
     auto result = xaml_controls::ContentDialogResult_None;
     IFC_RETURN(asyncOperationNoRef->GetResults(&result));
 
@@ -1924,11 +1478,9 @@ _Check_return_ HRESULT ContentDialog::OnFinishedClosing()
 
 _Check_return_ HRESULT ContentDialog::AttachButtonEvents()
 {
-    ctl::ComPtr<xaml_primitives::IButtonBase> primaryButton;
-    IFC_RETURN(GetButtonHelper(xaml_controls::ContentDialogButton_Primary, primaryButton.GetAddressOf()));
-    if (primaryButton && !m_epPrimaryButtonClickHandler)
+    if (m_tpPrimaryButtonPart && !m_epPrimaryButtonClickHandler)
     {
-        IFC_RETURN(m_epPrimaryButtonClickHandler.AttachEventHandler(primaryButton.Get(),
+        IFC_RETURN(m_epPrimaryButtonClickHandler.AttachEventHandler(m_tpPrimaryButtonPart.Get(),
             [this](IInspectable* pSender, IRoutedEventArgs* pArgs)
             {
                 CommandClickEventSourceType* eventSource = nullptr;
@@ -1946,11 +1498,9 @@ _Check_return_ HRESULT ContentDialog::AttachButtonEvents()
             }));
     }
 
-    ctl::ComPtr<xaml_primitives::IButtonBase> secondaryButton;
-    IFC_RETURN(GetButtonHelper(xaml_controls::ContentDialogButton_Secondary, secondaryButton.GetAddressOf()));
-    if (secondaryButton && !m_epSecondaryButtonClickHandler)
+    if (m_tpSecondaryButtonPart && !m_epSecondaryButtonClickHandler)
     {
-        IFC_RETURN(m_epSecondaryButtonClickHandler.AttachEventHandler(secondaryButton.Get(),
+        IFC_RETURN(m_epSecondaryButtonClickHandler.AttachEventHandler(m_tpSecondaryButtonPart.Get(),
             [this](IInspectable* pSender, IRoutedEventArgs* pArgs)
             {
                 CommandClickEventSourceType* eventSource = nullptr;
@@ -1968,11 +1518,9 @@ _Check_return_ HRESULT ContentDialog::AttachButtonEvents()
             }));
     }
 
-    ctl::ComPtr<xaml_primitives::IButtonBase> closeButton;
-    IFC_RETURN(GetButtonHelper(xaml_controls::ContentDialogButton_Close, closeButton.GetAddressOf()));
-    if (closeButton && !m_epCloseButtonClickHandler)
+    if (m_tpCloseButtonPart && !m_epCloseButtonClickHandler)
     {
-        IFC_RETURN(m_epCloseButtonClickHandler.AttachEventHandler(closeButton.Get(),
+        IFC_RETURN(m_epCloseButtonClickHandler.AttachEventHandler(m_tpCloseButtonPart.Get(),
             [this](IInspectable* pSender, IRoutedEventArgs* pArgs)
             {
                 CommandClickEventSourceType* eventSource = nullptr;
@@ -1995,51 +1543,21 @@ _Check_return_ HRESULT ContentDialog::AttachButtonEvents()
 
 _Check_return_ HRESULT ContentDialog::GetButtonHelper(xaml_controls::ContentDialogButton buttonType, _Outptr_ xaml_primitives::IButtonBase** button)
 {
-    ASSERT(m_templateVersion != TemplateVersion::Unsupported);
-
     *button = nullptr;
 
-    if (m_templateVersion < TemplateVersion::Redstone2 && buttonType != xaml_controls::ContentDialogButton_Close)
+    switch (buttonType)
     {
-        // For Pre-Redstone2 templates, the buttons are constructed in code-behind as needed
-        // and hosted within borders, so query our border parts to find the actual buttons.
-        ctl::ComPtr<xaml::IUIElement> child;
-
-        wrl_wrappers::HString primaryText;
-        IFC_RETURN(get_PrimaryButtonText(primaryText.ReleaseAndGetAddressOf()));
-
-        wrl_wrappers::HString secondaryText;
-        IFC_RETURN(get_SecondaryButtonText(secondaryText.ReleaseAndGetAddressOf()));
-
-        if (!primaryText.IsEmpty() && !secondaryText.IsEmpty())
-        {
-            auto& buttonHost = (buttonType == xaml_controls::ContentDialogButton_Primary ? m_tpButton1HostPart : m_tpButton2HostPart);
-            IFC_RETURN(buttonHost->get_Child(&child));
-            IFC_RETURN(child.CopyTo(button));
-        }
-        else if ((!primaryText.IsEmpty() && buttonType == xaml_controls::ContentDialogButton_Primary) || (!secondaryText.IsEmpty() && buttonType == xaml_controls::ContentDialogButton_Secondary))
-        {
-            IFC_RETURN(m_tpButton2HostPart->get_Child(&child));
-            IFC_RETURN(child.CopyTo(button));
-        }
-    }
-    else
-    {
-        // For Redstone2+ templates, the buttons are simply template parts, so just return those.
-        switch (buttonType)
-        {
-        case xaml_controls::ContentDialogButton_Primary:
-            IFC_RETURN(m_tpPrimaryButtonPart.CopyTo(button));
-            break;
+    case xaml_controls::ContentDialogButton_Primary:
+        IFC_RETURN(m_tpPrimaryButtonPart.CopyTo(button));
+        break;
 
-        case xaml_controls::ContentDialogButton_Secondary:
-            IFC_RETURN(m_tpSecondaryButtonPart.CopyTo(button));
-            break;
+    case xaml_controls::ContentDialogButton_Secondary:
+        IFC_RETURN(m_tpSecondaryButtonPart.CopyTo(button));
+        break;
 
-        case xaml_controls::ContentDialogButton_Close:
-            IFC_RETURN(m_tpCloseButtonPart.CopyTo(button));
-            break;
-        }
+    case xaml_controls::ContentDialogButton_Close:
+        IFC_RETURN(m_tpCloseButtonPart.CopyTo(button));
+        break;
     }
 
     return S_OK;
@@ -2047,8 +1565,6 @@ _Check_return_ HRESULT ContentDialog::GetButtonHelper(xaml_controls::ContentDial
 
 _Check_return_ HRESULT ContentDialog::GetDefaultButtonHelper(_Outptr_ xaml_primitives::IButtonBase** button)
 {
-    ASSERT(m_templateVersion >= TemplateVersion::Redstone2);
-
     *button = nullptr;
 
     auto defaultButton = xaml_controls::ContentDialogButton_None;
@@ -2059,164 +1575,6 @@ _Check_return_ HRESULT ContentDialog::GetDefaultButtonHelper(_Outptr_ xaml_primi
     return S_OK;
 }
 
-_Check_return_ HRESULT ContentDialog::BuildAndConfigureButtons() noexcept
-{
-    ASSERT(m_templateVersion < TemplateVersion::Redstone2);
-
-    bool hasVisibleButtons = false;
-
-    ctl::ComPtr<xaml_primitives::IButtonBase> primaryButton;
-    ctl::ComPtr<xaml_primitives::IButtonBase> secondaryButton;
-
-    IFC_RETURN(DetachButtonEvents());
-
-    ctl::ComPtr<xaml_controls::IBorder> hostThatContainedFocusedButton;
-
-    // Determine which button, if any, has focus
-    {
-        ctl::ComPtr<DependencyObject> previouslyFocusedObject;
-        IFC_RETURN(GetFocusedElement(&previouslyFocusedObject));
-
-        if (previouslyFocusedObject)
-        {
-            ctl::ComPtr<IUIElement> elementInFirstHost;
-            ctl::ComPtr<IUIElement> elementInSecondHost;
-
-            IFC_RETURN(m_tpButton1HostPart->get_Child(&elementInFirstHost));
-            IFC_RETURN(m_tpButton2HostPart->get_Child(&elementInSecondHost));
-
-            if (ctl::are_equal(previouslyFocusedObject.Get(), elementInFirstHost.Get()))
-            {
-                hostThatContainedFocusedButton = m_tpButton1HostPart.Get();
-            }
-            else if (ctl::are_equal(previouslyFocusedObject.Get(), elementInSecondHost.Get()))
-            {
-                hostThatContainedFocusedButton = m_tpButton2HostPart.Get();
-            }
-        }
-    }
-
-    // Clear our button containers
-    {
-        IFC_RETURN(m_tpButton1HostPart->put_Child(nullptr));
-        IFC_RETURN(m_tpButton2HostPart->put_Child(nullptr));
-    }
-
-    // Build our buttons
-    {
-        wrl_wrappers::HString primaryText;
-        IFC_RETURN(get_PrimaryButtonText(primaryText.ReleaseAndGetAddressOf()));
-        if (!primaryText.IsEmpty())
-        {
-            IFC_RETURN(CreateButton(primaryText.Get(), &primaryButton));
-
-            BOOLEAN isEnabled = FALSE;
-            IFC_RETURN(get_IsPrimaryButtonEnabled(&isEnabled));
-            IFC_RETURN(primaryButton.AsOrNull<xaml_controls::IControl>()->put_IsEnabled(isEnabled));
-
-            if (m_templateVersion > TemplateVersion::PhoneBlue)
-            {
-                IFC_RETURN(primaryButton.AsOrNull<xaml::IFrameworkElement>()->put_HorizontalAlignment(xaml::HorizontalAlignment_Stretch));
-                IFC_RETURN(primaryButton.AsOrNull<xaml::IFrameworkElement>()->put_VerticalAlignment(xaml::VerticalAlignment_Stretch));
-            }
-
-            IFC_RETURN(primaryButton.AsOrNull<xaml_controls::IControl>()->put_ElementSoundMode(xaml::ElementSoundMode_FocusOnly));
-        }
-
-        wrl_wrappers::HString secondaryText;
-        IFC_RETURN(get_SecondaryButtonText(secondaryText.ReleaseAndGetAddressOf()));
-        if (!secondaryText.IsEmpty())
-        {
-            IFC_RETURN(CreateButton(secondaryText.Get(), &secondaryButton));
-
-            BOOLEAN isEnabled = FALSE;
-            IFC_RETURN(get_IsSecondaryButtonEnabled(&isEnabled));
-            IFC_RETURN(secondaryButton.AsOrNull<xaml_controls::IControl>()->put_IsEnabled(isEnabled));
-
-            if (m_templateVersion > TemplateVersion::PhoneBlue)
-            {
-                IFC_RETURN(secondaryButton.AsOrNull<xaml::IFrameworkElement>()->put_HorizontalAlignment(xaml::HorizontalAlignment_Stretch));
-                IFC_RETURN(secondaryButton.AsOrNull<xaml::IFrameworkElement>()->put_VerticalAlignment(xaml::VerticalAlignment_Stretch));
-            }
-
-            IFC_RETURN(secondaryButton.AsOrNull<xaml_controls::IControl>()->put_ElementSoundMode(xaml::ElementSoundMode_FocusOnly));
-        }
-    }
-
-    IFC_RETURN(PopulateButtonContainer(primaryButton.Get(), secondaryButton.Get()));
-
-    hasVisibleButtons = (primaryButton || secondaryButton);
-
-    // Update the CommandSpace visibility
-    {
-        auto visiblity = (hasVisibleButtons ? xaml::Visibility_Visible : xaml::Visibility_Collapsed);
-
-        IFC_RETURN(m_tpButton1HostPart.AsOrNull<IUIElement>()->put_Visibility(visiblity));
-        IFC_RETURN(m_tpButton2HostPart.AsOrNull<IUIElement>()->put_Visibility(visiblity))
-    }
-
-    // Set the focus back to where it was, if needed
-    if (hostThatContainedFocusedButton)
-    {
-        ctl::ComPtr<IUIElement> buttonToFocusAsUIE;
-        IFC_RETURN(hostThatContainedFocusedButton->get_Child(&buttonToFocusAsUIE));
-        if (buttonToFocusAsUIE)
-        {
-            BOOLEAN focusUpdatedUnused;
-            IFC_RETURN(buttonToFocusAsUIE->Focus(xaml::FocusState_Programmatic, &focusUpdatedUnused));
-        }
-    }
-
-    return S_OK;
-}
-
-_Check_return_ HRESULT
-ContentDialog::CreateButton(
-    _In_ HSTRING text,
-    _Outptr_ xaml_primitives::IButtonBase** ppButton) const
-{
-    ASSERT(m_templateVersion < TemplateVersion::Redstone2);
-
-    *ppButton = nullptr;
-
-    ctl::ComPtr<Button> button;
-    IFC_RETURN(ctl::make(&button));
-
-    ctl::ComPtr<IInspectable> textAsInspectable;
-    IFC_RETURN(PropertyValue::CreateFromString(text, &textAsInspectable));
-
-    IFC_RETURN(button->put_Content(textAsInspectable.Get()));
-    IFC_RETURN(button->put_HorizontalAlignment(xaml::HorizontalAlignment_Stretch));
-    IFC_RETURN(button.CopyTo(ppButton));
-
-    return S_OK;
-}
-
-_Check_return_ HRESULT
-ContentDialog::PopulateButtonContainer(
-    _In_ const ctl::ComPtr<xaml_primitives::IButtonBase>& primaryButton,
-    _In_ const ctl::ComPtr<xaml_primitives::IButtonBase>& secondaryButton
-    )
-{
-    ASSERT(m_templateVersion < TemplateVersion::Redstone2);
-
-    if (secondaryButton && primaryButton)
-    {
-        IFC_RETURN(m_tpButton2HostPart->put_Child(secondaryButton.AsOrNull<IUIElement>().Get()));
-        IFC_RETURN(m_tpButton1HostPart->put_Child(primaryButton.AsOrNull<IUIElement>().Get()));
-    }
-    else if (secondaryButton)
-    {
-        IFC_RETURN(m_tpButton2HostPart->put_Child(secondaryButton.AsOrNull<IUIElement>().Get()));
-    }
-    else if (primaryButton)
-    {
-        IFC_RETURN(m_tpButton2HostPart->put_Child(primaryButton.AsOrNull<IUIElement>().Get()));
-    }
-
-    return S_OK;
-}
-
 _Check_return_ HRESULT
 ContentDialog::DetachButtonEvents()
 {
@@ -2358,65 +1716,6 @@ ContentDialog::ShouldFireClosing(_Out_ bool* doFire)
     RRETURN(hr);
 }
 
-_Check_return_ HRESULT
-ContentDialog::AttachEventHandlersForOpenDialog()
-{
-    ctl::ComPtr<wgrd::IDisplayInformationStatics> displayInformationStatics;
-    IFC_RETURN(ctl::GetActivationFactory(wrl_wrappers::HStringReference(
-        RuntimeClass_Windows_Graphics_Display_DisplayInformation).Get(),
-        &displayInformationStatics));
-
-    if (m_templateVersion == TemplateVersion::PhoneBlue)
-    {
-        ctl::ComPtr<wgrd::IDisplayInformation> displayInformation;
-        IFC_RETURN(displayInformationStatics->GetForCurrentView(&displayInformation));
-        if (displayInformation)
-        {
-            IFC_RETURN(m_epOrientationChangedHandler.AttachEventHandler(
-                displayInformation.Get(),
-                [this](wgrd::IDisplayInformation* pSender, IInspectable* pArgs)
-                {
-                    if (!m_hideInProgress)
-                    {
-                        IFC_RETURN(UpdateVisualState());
-                        IFC_RETURN(ResetAndPrepareContent());
-                    }
-
-                    return S_OK;
-                }));
-        }
-    }
-
-    // Only support dismissing the dialog when the window is deactivated for dialogs using the phone-blue template
-    // for backwards compatability.
-    if (m_templateVersion == TemplateVersion::PhoneBlue)
-    {
-        Window* currentWindowNoRef = nullptr;
-        IFC_RETURN(DXamlCore::GetCurrent()->GetAssociatedWindowNoRef(this, &currentWindowNoRef));
-        if (currentWindowNoRef)
-        {
-            // Note: The weak ref protection shouldn't be needed here. Keeping it for now to avoid
-            // risky changes late in the ship cycle.
-            ctl::WeakRefPtr weakInstance;
-            IFC_RETURN(ctl::AsWeak(this, &weakInstance));
-
-            IFC_RETURN(m_windowActivatedHandler.AttachEventHandler(
-                currentWindowNoRef,
-                [weakInstance](IInspectable *sender, xaml::IWindowActivatedEventArgs *args) mutable
-            {
-                auto instance= weakInstance.AsOrNull<IContentDialog>();
-                if (instance)
-                {
-                    IFC_RETURN(instance.Cast<ContentDialog>()->OnWindowActivated(sender, args));
-                }
-                return S_OK;
-            }));
-        }
-    }
-
-    return S_OK;
-}
-
 _Check_return_ HRESULT
 ContentDialog::OnLayoutRootKeyDown(
     _In_ IInspectable* sender,
@@ -2438,49 +1737,46 @@ ContentDialog::ProcessLayoutRootKey(
     bool isKeyDown,
     _In_ xaml_input::IKeyRoutedEventArgs* args)
 {
-    if (m_templateVersion > TemplateVersion::PhoneBlue)
-    {
-        auto key = wsy::VirtualKey_None;
+    auto key = wsy::VirtualKey_None;
 
-        IFCPTR_RETURN(args);
-        IFC_RETURN(args->get_Key(&key));
+    IFCPTR_RETURN(args);
+    IFC_RETURN(args->get_Key(&key));
 
-        switch (key)
+    switch (key)
+    {
+        case wsy::VirtualKey_Escape:
         {
-            case wsy::VirtualKey_Escape:
-            {
-                auto originalKey = wsy::VirtualKey_None;
+            auto originalKey = wsy::VirtualKey_None;
 
-                IFC_RETURN(static_cast<KeyRoutedEventArgs*>(args)->get_OriginalKey(&originalKey));
+            IFC_RETURN(static_cast<KeyRoutedEventArgs*>(args)->get_OriginalKey(&originalKey));
 
-                if ((!isKeyDown && originalKey == wsy::VirtualKey_GamepadB) ||
-                    (isKeyDown && originalKey == wsy::VirtualKey_Escape))
-                {
-                    IFC_RETURN(ExecuteCloseAction());
-                    IFC_RETURN(args->put_Handled(TRUE));
-                }
-                break;
+            if ((!isKeyDown && originalKey == wsy::VirtualKey_GamepadB) ||
+                (isKeyDown && originalKey == wsy::VirtualKey_Escape))
+            {
+                IFC_RETURN(ExecuteCloseAction());
+                IFC_RETURN(args->put_Handled(TRUE));
             }
-            case wsy::VirtualKey_Enter:
+            break;
+        }
+        case wsy::VirtualKey_Enter:
+        {
+            if (isKeyDown)
             {
-                if (isKeyDown && m_templateVersion >= TemplateVersion::Redstone2)
-                {
-                    ctl::ComPtr<xaml_primitives::IButtonBase> defaultButton;
-                    IFC_RETURN(GetDefaultButtonHelper(defaultButton.GetAddressOf()));
+                ctl::ComPtr<xaml_primitives::IButtonBase> defaultButton;
+                IFC_RETURN(GetDefaultButtonHelper(defaultButton.GetAddressOf()));
 
-                    if (defaultButton)
+                if (defaultButton)
+                {
+                    BOOLEAN isDefaultButtonEnabled = FALSE;
+                    IFC_RETURN(defaultButton.Cast<ButtonBase>()->get_IsEnabled(&isDefaultButtonEnabled));
+                    if (isDefaultButtonEnabled)
                     {
-                        BOOLEAN isDefaultButtonEnabled = FALSE;
-                        IFC_RETURN(defaultButton.Cast<ButtonBase>()->get_IsEnabled(&isDefaultButtonEnabled));
-                        if (isDefaultButtonEnabled)
-                        {
-                            IFC_RETURN(defaultButton.Cast<ButtonBase>()->ProgrammaticClick());
-                            IFC_RETURN(args->put_Handled(TRUE));
-                        }
+                        IFC_RETURN(defaultButton.Cast<ButtonBase>()->ProgrammaticClick());
+                        IFC_RETURN(args->put_Handled(TRUE));
                     }
                 }
-                break;
             }
+            break;
         }
     }
 
@@ -2543,42 +1839,6 @@ _Check_return_ HRESULT ContentDialog::DetachEventHandlers()
     return S_OK;
 }
 
-_Check_return_ HRESULT
-ContentDialog::DetachEventHandlersForOpenDialog()
-{
-    if (m_epOrientationChangedHandler)
-    {
-        ctl::ComPtr<wgrd::IDisplayInformationStatics> displayInformationStatics;
-
-        IFC_RETURN(ctl::GetActivationFactory(wrl_wrappers::HStringReference(
-        RuntimeClass_Windows_Graphics_Display_DisplayInformation).Get(),
-            &displayInformationStatics));
-
-        if (displayInformationStatics)
-        {
-            ctl::ComPtr<wgrd::IDisplayInformation> displayInformation;
-
-            IFC_RETURN(displayInformationStatics->GetForCurrentView(&displayInformation));
-
-            if (displayInformation)
-            {
-                IFC_RETURN(m_epOrientationChangedHandler.DetachEventHandler(displayInformation.Get()));
-            }
-        }
-    }
-
-    if (DXamlCore* dxamlCore = DXamlCore::GetCurrent())
-    {
-        Window* currentWindowNoRef = nullptr;
-        IFC_RETURN(dxamlCore->GetAssociatedWindowNoRef(this, &currentWindowNoRef));
-        if (m_windowActivatedHandler && currentWindowNoRef)
-        {
-            IFC_RETURN(m_windowActivatedHandler.DetachEventHandler(ctl::iinspectable_cast(currentWindowNoRef)));
-        }
-    }
-    return S_OK;
-}
-
 _Check_return_ HRESULT ContentDialog::OnXamlRootChanged(
     _In_ xaml::IXamlRoot* /*sender*/,
     _In_ xaml::IXamlRootChangedEventArgs* args)
@@ -2601,7 +1861,6 @@ _Check_return_ HRESULT ContentDialog::OnXamlRootChanged(
 
     if (m_placementMode != PlacementMode::InPlace)
     {
-        IFC_RETURN(ResetContentProperties());
         IFC_RETURN(SizeAndPositionContentInPopup());
     }
 
@@ -2622,16 +1881,7 @@ ContentDialog::OnDialogSizeChanged(
 
     IFC_RETURN(UpdateVisualState());
 
-    // In case of PhoneBlue template, ensures the button position whether it stays on the content or
-    // CommandBar by resetting the content.
-    // In case of non-PhoneBlue template, do not reset the content by changing the size since the clicked
-    // button lost PointerCapture that couldn't raise the Click event on the button. The size
-    // changing can be triggered by showing or hiding the SIP status change in non-PhoneBlue template.
-    // For example, Sip hiding on the MoneyPenny's landscape mode.
-    if (m_templateVersion >= TemplateVersion::PhoneBlue)
-    {
-        IFC_RETURN(ResetAndPrepareContent());
-    }
+    IFC_RETURN(ResetAndPrepareContent());
 
     if (m_placementMode != PlacementMode::InPlace)
     {
@@ -2692,50 +1942,6 @@ ContentDialog::GetPlainText(
     return S_OK;
 }
 
-_Check_return_ HRESULT
-ContentDialog::NotifyInputPaneStateChange(
-    _In_ InputPaneState inputPaneState,
-    _In_ XRECTF inputPaneBounds)
-{
-    if (m_templateVersion >= TemplateVersion::Threshold)
-    {
-        IFC_RETURN(UpdateVisualState());
-    }
-
-    if (m_placementMode != PlacementMode::InPlace)
-    {
-        IFC_RETURN(ResetContentProperties());
-        IFC_RETURN(SizeAndPositionContentInPopup());
-    }
-
-    return S_OK;
-}
-
-_Check_return_ HRESULT
-ContentDialog::ResetContentProperties()
-{
-    if (m_templateVersion < TemplateVersion::Redstone3)
-    {
-        // Reset the content properties to recalculate the new width and height
-        // position with the original border thickness.
-        if (m_tpContentScrollViewerPart)
-        {
-            IFC_RETURN(m_tpContentScrollViewerPart.Cast<ScrollViewer>()->put_Height(DoubleUtil::NaN));
-        }
-
-        if (m_tpBackgroundElementPart)
-        {
-            IFC_RETURN(m_tpBackgroundElementPart.Cast<Border>()->put_Width(DoubleUtil::NaN));
-        }
-
-        // We need to Update the Layout after we reset the values, this ensures that we will use the correct values to adjust
-        // the ContentDialog size and position.
-        IFC_RETURN(UpdateLayout());
-    }
-
-    return S_OK;
-}
-
 _Check_return_ HRESULT
 ContentDialog::SetPopupAutomationProperties()
 {
@@ -2771,21 +1977,25 @@ _Check_return_ HRESULT ContentDialog::SetInitialFocusElement()
 {
     BOOLEAN wasFocusSet = FALSE;
 
-    if (m_templateVersion > TemplateVersion::PhoneBlue)
-    {
-        // Save the focused element in order to give focus back to that once the ContentDialog dismisses.
-        ctl::ComPtr<DependencyObject> previouslyFocusedObject;
-        IFC_RETURN(GetFocusedElement(&previouslyFocusedObject));
+    // Save the focused element in order to give focus back to that once the ContentDialog dismisses.
+    ctl::ComPtr<DependencyObject> previouslyFocusedObject;
+    IFC_RETURN(GetFocusedElement(&previouslyFocusedObject));
 
-        if (previouslyFocusedObject)
-        {
-            IFC_RETURN(previouslyFocusedObject.AsWeak(&m_spFocusedElementBeforeContentDialogShows));
-        }
+    if (previouslyFocusedObject)
+    {
+        IFC_RETURN(previouslyFocusedObject.AsWeak(&m_spFocusedElementBeforeContentDialogShows));
     }
 
     // Try to set focus to the first focusable element in the content area.
     if (m_tpContentPart)
     {
+        // We need to make sure all the nested templates of the ScrollViewer are expanded because that is where
+        // we will find focusable fields within the dialogs content.
+        if (m_tpContentScrollViewerPart)
+        {
+            m_tpContentScrollViewerPart.Cast<ScrollViewer>()->UpdateLayout();
+        }
+
         ctl::ComPtr<IDependencyObject> searchRoot;
         IFC_RETURN(m_tpContentPart.As(&searchRoot));
 
@@ -2807,7 +2017,7 @@ _Check_return_ HRESULT ContentDialog::SetInitialFocusElement()
     }
 
     // If not set, try to focus the default button.
-    if (!wasFocusSet && m_templateVersion >= TemplateVersion::Redstone2)
+    if (!wasFocusSet)
     {
         ctl::ComPtr<xaml_primitives::IButtonBase> defaultButton;
         IFC_RETURN(GetDefaultButtonHelper(defaultButton.GetAddressOf()));
@@ -2853,15 +2063,13 @@ _Check_return_ HRESULT ContentDialog::ExecuteCloseAction()
     // return a result of None.
     if (!closeButtonText.IsEmpty())
     {
-        ctl::ComPtr<xaml_primitives::IButtonBase> closeButton;
-        IFC_RETURN(GetButtonHelper(xaml_controls::ContentDialogButton_Close, closeButton.GetAddressOf()));
-        if (closeButton)
+        if (m_tpCloseButtonPart)
         {
             BOOLEAN isCloseButtonEnabled = FALSE;
             IFC_RETURN(m_tpCloseButtonPart.Cast<ButtonBase>()->get_IsEnabled(&isCloseButtonEnabled));
             if (isCloseButtonEnabled)
             {
-                IFC_RETURN(closeButton.Cast<ButtonBase>()->ProgrammaticClick());
+                IFC_RETURN(m_tpCloseButtonPart.Cast<ButtonBase>()->ProgrammaticClick());
                 didInvokeClose = true;
             }
         }
@@ -2876,200 +2084,6 @@ _Check_return_ HRESULT ContentDialog::ExecuteCloseAction()
     return S_OK;
 }
 
-_Check_return_ HRESULT ContentDialog::AdjustVisualStateForInputPane()
-{
-    ASSERT(m_templateVersion > TemplateVersion::PhoneBlue);
-    ASSERT(m_tpLayoutRootPart);
-    ASSERT(m_tpBackgroundElementPart);
-    ASSERT(m_tpContentScrollViewerPart);
-
-    if (XamlOneCoreTransforms::IsEnabled())
-    {
-        // TODO: 12179953 : XAML agrees on coordinate space with input pane
-        // For now we disable input rect occlusion in strict mode
-        return S_OK;
-    }
-
-    wf::Rect inputPaneRect = {};
-    IFC_RETURN(DXamlCore::GetCurrent()->GetInputPaneOccludeRect(this, &inputPaneRect));
-
-    if (m_isShowing && inputPaneRect.Height > 0)
-    {
-        // The rect we get is in screen coordinates, so translate it into client
-        // coordinates by subtracting our window's origin point (itself translated
-        // into screen coords) from it.
-        {
-            wf::Point point = { 0, 0 };
-            DXamlCore::GetCurrent()->ClientToScreen(&point);
-
-            inputPaneRect.X -= point.X;
-            inputPaneRect.Y -= point.Y;
-        }
-
-        auto getElementBounds = [](FrameworkElement* element, wf::Rect& bounds)
-        {
-            ctl::ComPtr<IGeneralTransform> transform;
-            IFC_RETURN(element->TransformToVisual(nullptr, &transform));
-
-            double width = 0;
-            IFC_RETURN(element->get_ActualWidth(&width));
-
-            double height = 0;
-            IFC_RETURN(element->get_ActualHeight(&height));
-
-            IFC_RETURN(transform->TransformBounds({ 0, 0, static_cast<float>(width), static_cast<float>(height) }, &bounds));
-
-            return S_OK;
-        };
-
-        wf::Rect layoutRootBounds = {};
-        IFC_RETURN(getElementBounds(m_tpLayoutRootPart.Cast<Grid>(), layoutRootBounds));
-
-        wf::Rect dialogBounds = {};
-        IFC_RETURN(getElementBounds(m_tpBackgroundElementPart.Cast<Border>(), dialogBounds));
-
-        // If the input pane overlaps the dialog (including a 12px bottom margin), the dialog will get translated
-        // up so that is not occluded, while also preserving a 12px margin between the bottom of the dialog
-        // and the top of the input pane (see redlines).
-        // We achieve this by aligning the dialog to the bottom of its parent panel, if not full-size, and
-        // then setting a bottom padding on the parent panel creating a reserved area that corresponds to the
-        // intersection of the parent panel's bounds and the input pane's bounds.
-        if (inputPaneRect.Y < (dialogBounds.Y + dialogBounds.Height + ContentDialog_SIP_Bottom_Margin))
-        {
-            xaml::Thickness layoutRootPadding = {};
-            auto contentVerticalScrollBarVisibility = xaml_controls::ScrollBarVisibility_Auto;
-            bool setDialogVisibility = false;
-            auto dialogVerticalAlignment = xaml::VerticalAlignment_Center;
-
-            layoutRootPadding = { 0, 0, 0, layoutRootBounds.Height - std::max(inputPaneRect.Y - layoutRootBounds.Y, static_cast<float>(m_dialogMinHeight)) + ContentDialog_SIP_Bottom_Margin };
-
-            BOOLEAN fullSizeDesired = FALSE;
-            IFC_RETURN(get_FullSizeDesired(&fullSizeDesired));
-            if (!fullSizeDesired)
-            {
-                dialogVerticalAlignment = xaml::VerticalAlignment_Bottom;
-                setDialogVisibility = true;
-            }
-
-            // Apply our layout adjustments using a storyboard so that we don't stomp over template or user
-            // provided values.  When we stop the storyboard, it will restore the previous values.
-            ctl::ComPtr<xaml_animation::IStoryboard> storyboard;
-            IFC_RETURN(CreateStoryboardForLayoutAdjustmentsForInputPane(layoutRootPadding, contentVerticalScrollBarVisibility, setDialogVisibility, dialogVerticalAlignment, &storyboard));
-
-            IFC_RETURN(storyboard->Begin());
-            IFC_RETURN(storyboard->SkipToFill());
-            IFC_RETURN(SetPtrValueWithQI(m_layoutAdjustmentsForInputPaneStoryboard, storyboard.Get()));
-        }
-    }
-    else if (m_layoutAdjustmentsForInputPaneStoryboard)
-    {
-        IFC_RETURN(m_layoutAdjustmentsForInputPaneStoryboard->Stop());
-        m_layoutAdjustmentsForInputPaneStoryboard.Clear();
-    }
-
-    return S_OK;
-}
-
-_Check_return_ HRESULT ContentDialog::CreateStoryboardForLayoutAdjustmentsForInputPane(
-    xaml::Thickness layoutRootPadding,
-    xaml_controls::ScrollBarVisibility contentVerticalScrollBarVisiblity,
-    bool setDialogVerticalAlignment,
-    xaml::VerticalAlignment dialogVerticalAlignment,
-    _Out_ xaml_animation::IStoryboard** storyboard)
-{
-    ctl::ComPtr<Storyboard> storyboardLocal;
-    IFC_RETURN(ctl::make(&storyboardLocal));
-
-    ctl::ComPtr<wfc::IVector<xaml_animation::Timeline*>> storyboardChildren;
-    IFC_RETURN(storyboardLocal->get_Children(&storyboardChildren));
-
-    // LayoutRoot Padding
-    {
-        ctl::ComPtr<ObjectAnimationUsingKeyFrames> objectAnimation;
-        IFC_RETURN(ctl::make(&objectAnimation));
-
-        IFC_RETURN(CoreImports::Storyboard_SetTarget(static_cast<CTimeline*>(objectAnimation->GetHandle()), m_tpBackgroundElementPart.Cast<Border>()->GetHandle()));
-        IFC_RETURN(StoryboardFactory::SetTargetPropertyStatic(objectAnimation.Get(), wrl_wrappers::HStringReference(L"Margin").Get()));
-
-        ctl::ComPtr<wfc::IVector<xaml_animation::ObjectKeyFrame*>> objectKeyFrames;
-        IFC_RETURN(objectAnimation->get_KeyFrames(&objectKeyFrames));
-
-        ctl::ComPtr<DiscreteObjectKeyFrame> discreteObjectKeyFrame;
-        IFC_RETURN(ctl::make(&discreteObjectKeyFrame));
-
-        xaml_animation::KeyTime keyTime = {};
-        keyTime.TimeSpan.Duration = 0;
-
-        ctl::ComPtr<IInspectable> value;
-        IFC_RETURN(IValueBoxer::BoxValue(&value, layoutRootPadding));
-
-        IFC_RETURN(discreteObjectKeyFrame->put_KeyTime(keyTime));
-        IFC_RETURN(discreteObjectKeyFrame->put_Value(value.Get()));
-
-        IFC_RETURN(objectKeyFrames->Append(discreteObjectKeyFrame.Cast<DiscreteObjectKeyFrame>()));
-        IFC_RETURN(storyboardChildren->Append(objectAnimation.Cast<ObjectAnimationUsingKeyFrames>()));
-    }
-
-    // ContentScrollViewer VerticalScrollBarVisibility
-    {
-        ctl::ComPtr<ObjectAnimationUsingKeyFrames> objectAnimation;
-        IFC_RETURN(ctl::make(&objectAnimation));
-
-        IFC_RETURN(CoreImports::Storyboard_SetTarget(static_cast<CTimeline*>(objectAnimation->GetHandle()), m_tpContentScrollViewerPart.Cast<ScrollViewer>()->GetHandle()));
-        IFC_RETURN(StoryboardFactory::SetTargetPropertyStatic(objectAnimation.Get(), wrl_wrappers::HStringReference(L"VerticalScrollBarVisibility").Get()));
-
-        ctl::ComPtr<wfc::IVector<xaml_animation::ObjectKeyFrame*>> objectKeyFrames;
-        IFC_RETURN(objectAnimation->get_KeyFrames(&objectKeyFrames));
-
-        ctl::ComPtr<DiscreteObjectKeyFrame> discreteObjectKeyFrame;
-        IFC_RETURN(ctl::make(&discreteObjectKeyFrame));
-
-        xaml_animation::KeyTime keyTime = {};
-        keyTime.TimeSpan.Duration = 0;
-
-        ctl::ComPtr<IInspectable> value;
-        IFC_RETURN(IValueBoxer::BoxValue(&value, contentVerticalScrollBarVisiblity));
-
-        IFC_RETURN(discreteObjectKeyFrame->put_KeyTime(keyTime));
-        IFC_RETURN(discreteObjectKeyFrame->put_Value(value.Get()));
-
-        IFC_RETURN(objectKeyFrames->Append(discreteObjectKeyFrame.Cast<DiscreteObjectKeyFrame>()));
-        IFC_RETURN(storyboardChildren->Append(objectAnimation.Cast<ObjectAnimationUsingKeyFrames>()));
-    }
-
-    // BackgroundElement VerticalAlignment
-    if (setDialogVerticalAlignment)
-    {
-        ctl::ComPtr<ObjectAnimationUsingKeyFrames> objectAnimation;
-        IFC_RETURN(ctl::make(&objectAnimation));
-
-        IFC_RETURN(CoreImports::Storyboard_SetTarget(static_cast<CTimeline*>(objectAnimation->GetHandle()), m_tpBackgroundElementPart.Cast<Border>()->GetHandle()));
-        IFC_RETURN(StoryboardFactory::SetTargetPropertyStatic(objectAnimation.Get(), wrl_wrappers::HStringReference(L"VerticalAlignment").Get()));
-
-        ctl::ComPtr<wfc::IVector<xaml_animation::ObjectKeyFrame*>> objectKeyFrames;
-        IFC_RETURN(objectAnimation->get_KeyFrames(&objectKeyFrames));
-
-        ctl::ComPtr<DiscreteObjectKeyFrame> discreteObjectKeyFrame;
-        IFC_RETURN(ctl::make(&discreteObjectKeyFrame));
-
-        xaml_animation::KeyTime keyTime = {};
-        keyTime.TimeSpan.Duration = 0;
-
-        ctl::ComPtr<IInspectable> value;
-        IFC_RETURN(IValueBoxer::BoxValue(&value, dialogVerticalAlignment));
-
-        IFC_RETURN(discreteObjectKeyFrame->put_KeyTime(keyTime));
-        IFC_RETURN(discreteObjectKeyFrame->put_Value(value.Get()));
-
-        IFC_RETURN(objectKeyFrames->Append(discreteObjectKeyFrame.Cast<DiscreteObjectKeyFrame>()));
-        IFC_RETURN(storyboardChildren->Append(objectAnimation.Cast<ObjectAnimationUsingKeyFrames>()));
-    }
-
-    *storyboard = storyboardLocal.Detach();
-
-    return S_OK;
-}
-
 _Check_return_ HRESULT ContentDialog::RaiseOpenedEvent()
 {
     ctl::ComPtr<ContentDialogOpenedEventArgs> args;
@@ -3097,13 +2111,6 @@ _Check_return_ HRESULT ContentDialog::RaiseClosedEvent(xaml_controls::ContentDia
     return S_OK;
 }
 
-// For testing purposes only. Invoked by IXamlTestHooks::SimulateRegionsForContentDialog implementation.
-void ContentDialog::SimulateRegionsForContentDialog()
-{
-    m_simulateRegions = true;
-    SizeAndPositionContentInPopup();
-}
-
 _Check_return_ HRESULT ContentDialog::SetButtonPropertiesFromCommand(xaml_controls::ContentDialogButton buttonType, _In_opt_ ICommand* oldCommand)
 {
     KnownPropertyIndex commandPropertyIndex;
diff --git a/src/dxaml/xcp/dxaml/lib/ContentDialog_Partial.h b/src/dxaml/xcp/dxaml/lib/ContentDialog_Partial.h
index 1138738065..7cb25cd2f4 100644
--- a/src/dxaml/xcp/dxaml/lib/ContentDialog_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/ContentDialog_Partial.h
@@ -136,15 +136,6 @@ namespace DirectUI
 
         _Check_return_ HRESULT GetPlainText(_Out_ HSTRING* strPlainText) override;
 
-        // React to the IHM (touch keyboard) showing or hiding by repositioning
-        // the ContentDialog or shifting its command buttons.
-        _Check_return_ HRESULT NotifyInputPaneStateChange(
-            _In_ InputPaneState inputPaneState,
-            _In_ XRECTF inputPaneBounds);
-
-        // For testing purposes only. Invoked by IXamlTestHooks::SimulateRegionsForContentDialog implementation.
-        void SimulateRegionsForContentDialog();
-
         _Check_return_ HRESULT put_XamlRootImpl(_In_ xaml::IXamlRoot* pValue) override;
 
     private:
@@ -171,15 +162,6 @@ namespace DirectUI
             Full
         };
 
-        enum class TemplateVersion
-        {
-            Unsupported = 0,
-            PhoneBlue = 1,
-            Threshold = 2,
-            Redstone2 = 3,
-            Redstone3 = 4
-        };
-
         _Check_return_ HRESULT OnPopupOpened(
             _In_ IInspectable* pSender,
             _In_ IInspectable* pArgs);
@@ -191,10 +173,6 @@ namespace DirectUI
             xaml_controls::ContentDialogResult result
             );
 
-        _Check_return_ HRESULT OnWindowActivated(
-            _In_ IInspectable* sender,
-            _In_ xaml::IWindowActivatedEventArgs* args);
-
         _Check_return_ HRESULT OnFinishedClosing();
 
         // User callable methods
@@ -215,12 +193,6 @@ namespace DirectUI
         // Helpers
         _Check_return_ HRESULT GetButtonHelper(xaml_controls::ContentDialogButton buttonType, _Outptr_ xaml_primitives::IButtonBase** button);
         _Check_return_ HRESULT GetDefaultButtonHelper(_Outptr_ xaml_primitives::IButtonBase** button);
-        _Check_return_ HRESULT BuildAndConfigureButtons() noexcept;
-        _Check_return_ HRESULT CreateButton(_In_ HSTRING text, _Outptr_ xaml_primitives::IButtonBase** ppButton) const;
-        _Check_return_ HRESULT PopulateButtonContainer(
-            _In_ const ctl::ComPtr<xaml_primitives::IButtonBase>& primaryButton,
-            _In_ const ctl::ComPtr<xaml_primitives::IButtonBase>& secondaryButton
-            );
 
         _Check_return_ HRESULT AttachButtonEvents();
         _Check_return_ HRESULT DetachButtonEvents();
@@ -231,8 +203,6 @@ namespace DirectUI
         _Check_return_ HRESULT EnsureDeferralManagers();
         _Check_return_ HRESULT ResetAndPrepareContent();
         _Check_return_ HRESULT DetachEventHandlers();
-        _Check_return_ HRESULT AttachEventHandlersForOpenDialog();
-        _Check_return_ HRESULT DetachEventHandlersForOpenDialog();
 
         _Check_return_ HRESULT OnPopupChildUnloaded(
             _In_ IInspectable* sender,
@@ -278,23 +248,9 @@ namespace DirectUI
 
         _Check_return_ HRESULT ExecuteCloseAction();
 
-        _Check_return_ HRESULT AdjustVisualStateForInputPane();
-
-        _Check_return_ HRESULT CreateStoryboardForLayoutAdjustmentsForInputPane(
-            xaml::Thickness layoutRootPadding,
-            xaml_controls::ScrollBarVisibility contentVerticalScrollBarVisiblity,
-            bool setDialogVerticalAlignment,
-            xaml::VerticalAlignment dialogVerticalAlignment,
-            _Out_ xaml_animation::IStoryboard** storyboard);
-
-        void DetermineTemplateVersion();
-
         _Check_return_ HRESULT RaiseOpenedEvent();
         _Check_return_ HRESULT RaiseClosedEvent(xaml_controls::ContentDialogResult result);
 
-        _Check_return_ HRESULT GetDialogInnerMargin(
-            _In_ wf::Rect adjustedLayoutBounds,
-            _Out_ xaml::Thickness* innerMargin);
         _Check_return_ HRESULT GetFocusedElementPosition(
             _Out_ wf::Point* focusedPosition);
 
@@ -331,7 +287,7 @@ namespace DirectUI
 
         ctl::WeakRefPtr m_spFocusedElementBeforeContentDialogShows;
 
-        TemplateVersion m_templateVersion{ TemplateVersion::Unsupported };
+        bool m_isTemplateApplied{ false };
 
         PlacementMode m_placementMode{ PlacementMode::Undetermined };
         bool m_isLayoutRootTransplanted{ false };
@@ -351,15 +307,6 @@ namespace DirectUI
         // want to hide without the ability to cancel it.
         bool m_skipClosingEventOnHide{ false };
 
-        // Apply our layout adjustments using a storyboard so that we don't stomp over template or user
-        // provided values.  When we stop the storyboard, it will restore the previous values.
-        TrackerPtr<xaml_animation::IStoryboard> m_layoutAdjustmentsForInputPaneStoryboard;
-
-        double m_dialogMinHeight = 0;
-
-        // This only gets set from the SimulateRegionsForContentDialog() test hook.
-        bool m_simulateRegions{ false };
-
         // Flag to indicate if the content dialog should be opened in windowed mode.
         bool m_isWindowed{ false };
 
diff --git a/src/dxaml/xcp/dxaml/lib/CoreImports.h b/src/dxaml/xcp/dxaml/lib/CoreImports.h
index 1fc9a98b70..94f13c28ae 100644
--- a/src/dxaml/xcp/dxaml/lib/CoreImports.h
+++ b/src/dxaml/xcp/dxaml/lib/CoreImports.h
@@ -507,6 +507,10 @@ namespace CoreImports
         _In_ const xstring_ptr& strText,
         _Out_ CValue* pValue);
 
+    // Keep these in sync with VisualTreeHelper::RelativeKind
+    const XINT32 VisualRelativeKind_Child = 0;
+    const XINT32 VisualRelativeKind_Parent = 1;
+    const XINT32 VisualRelativeKind_Root = 2;
     _Check_return_ HRESULT DependencyObject_GetVisualRelative(
         _In_ CUIElement* pElement,
         _In_ XINT32 iRelativeLinkKind,
diff --git a/src/dxaml/xcp/dxaml/lib/CueRenderer.h b/src/dxaml/xcp/dxaml/lib/CueRenderer.h
index 254d7a9b4e..df2ab69fe6 100644
--- a/src/dxaml/xcp/dxaml/lib/CueRenderer.h
+++ b/src/dxaml/xcp/dxaml/lib/CueRenderer.h
@@ -53,7 +53,7 @@ namespace DirectUI
             std::wstring Region;
             int AnimationStep;
             double AnimationDistance;
-            bool UseAnimation;
+            bool UseAnimation{};
         };
 
         _Check_return_ HRESULT AddCueContainerToVisualTree();
@@ -114,8 +114,8 @@ namespace DirectUI
         std::list<std::shared_ptr<CCueItem>> m_cueList;
         std::map<std::wstring, ctl::ComPtr<Border>> m_regionList;
         ctl::ComPtr<Storyboard> m_spStoryboard;
-        EventRegistrationToken m_tokLayoutBoundsChanged{0};
-        EventRegistrationToken m_tokSizeChanged;
-        EventRegistrationToken m_orientationChangedToken;
+        EventRegistrationToken m_tokLayoutBoundsChanged{};
+        EventRegistrationToken m_tokSizeChanged{};
+        EventRegistrationToken m_orientationChangedToken{};
     };
 }
diff --git a/src/dxaml/xcp/dxaml/lib/CueStyler.cpp b/src/dxaml/xcp/dxaml/lib/CueStyler.cpp
index 044096252f..676a9b9cb8 100644
--- a/src/dxaml/xcp/dxaml/lib/CueStyler.cpp
+++ b/src/dxaml/xcp/dxaml/lib/CueStyler.cpp
@@ -718,6 +718,11 @@ _Check_return_ HRESULT CCueStyler::SetTextBlockEffect(_In_ TextBlock* pTextBlock
             break;
     }
 
+    // For consistency, we render the caption via CVS regardless of what EdgeEffect (even for ClosedCaptionEdgeEffect_None).
+    // Run layout immediately to get the caption size and propagate it up to the parent wrappers/containers,
+    // as these will be determine the size of the SpriteVisual used for CVS rendering.
+    IFC_RETURN(pTextBlock->UpdateLayout());
+
     if (userEdgeEffect == wm::ClosedCaptioning::ClosedCaptionEdgeEffect::ClosedCaptionEdgeEffect_None)
     {
         // Nothing to do
@@ -752,7 +757,6 @@ _Check_return_ HRESULT CCueStyler::SetTextBlockEffect(_In_ TextBlock* pTextBlock
         // back into this method to get the updated size of the TextBlock. The alternative is to create an expression
         // that binds the copy's size to the size of the TextBlock visual, but that's overkill considering the TextBlock
         // isn't animated.
-        IFC_RETURN(pTextBlock->UpdateLayout());
         wfn::Vector2 textSize;
         IFC_RETURN(pTextBlock->get_ActualSize(&textSize));
 
@@ -797,7 +801,7 @@ _Check_return_ HRESULT CCueStyler::SetTextBlockEffect(_In_ TextBlock* pTextBlock
     //          |      
     //    BottomWrapper [Grid]    <-- Placeholder for sourcing CVS Snapshot. Provides handoff Visual used as CVS.SourceVisual
     //          |                          NOTE: Captures layout (eg margins) of TextContainer inside CueElement, so that snapshot size matches TopWrapper 
-    //          |                                and we don't need speical offsets/positioning of handin w/ CVS.
+    //          |                                and we don't need special offsets/positioning of handin w/ CVS.
     //          |                          NOTE: CVS Handoff needs to be from a different element than the one that has the Clip set,
     //          |                                otherwise it will capture the zero-sized clip and render nothing (this necessitates introduction of 'MiddleWrapper').
     //          |                      
diff --git a/src/dxaml/xcp/dxaml/lib/CustomProperty.h b/src/dxaml/xcp/dxaml/lib/CustomProperty.h
index b8688e0c5f..4102c18567 100644
--- a/src/dxaml/xcp/dxaml/lib/CustomProperty.h
+++ b/src/dxaml/xcp/dxaml/lib/CustomProperty.h
@@ -92,7 +92,7 @@ namespace DirectUI
         // This class is marked novtable, so must not be instantiated directly.
         CustomProperty() = default;
     private:
-        HSTRING m_hName;
+        HSTRING m_hName{};
         GetValueFunction m_funcGetValue;
     };
 
diff --git a/src/dxaml/xcp/dxaml/lib/DXamlCore.cpp b/src/dxaml/xcp/dxaml/lib/DXamlCore.cpp
index 429d911c8c..5f5e973ef1 100644
--- a/src/dxaml/xcp/dxaml/lib/DXamlCore.cpp
+++ b/src/dxaml/xcp/dxaml/lib/DXamlCore.cpp
@@ -95,7 +95,6 @@
 #include "BudgetManager.g.h"
 #include "FlyoutMetadata.h"
 #include "XcpAllocationDebug.h"
-#include "XamlDirect.g.h"
 #include "DebugSettings_Partial.h"
 #include <windowscollections.h>
 #include "RootScale.h"
@@ -899,11 +898,6 @@ _Check_return_ HRESULT DXamlCore::CommonShutdown()
 
     m_spCachedNullKeyedResource.Reset();
 
-    if (m_spDefaultXamlDirectInstance)
-    {
-        m_spDefaultXamlDirectInstance.Reset();
-    }
-
     CCoreServices* coreServices = GetHandle();
 
     if (coreServices)
@@ -4460,6 +4454,17 @@ DXamlCore::SetSystemFontCollectionOverride(_In_opt_ IDWriteFontCollection* pFont
     return S_OK;
 }
 
+_Check_return_ HRESULT
+DXamlCore::ShouldUseTypographicFontModel(_Out_ bool* useDWriteTypographicModel)
+{
+    CCoreServices* pCoreServices = GetHandle();
+    if (pCoreServices != nullptr)
+    {
+        IFC_RETURN(pCoreServices->ShouldUseTypographicFontModel(useDWriteTypographicModel));
+    }
+    return S_OK;
+}
+
 void DXamlCore::SetMockUIAClientsListening(bool isEnabledMockUIAClientsListening)
 {
     m_pControl->SetMockUIAClientsListening(isEnabledMockUIAClientsListening);
@@ -4678,9 +4683,7 @@ _Check_return_ HRESULT DXamlCore::RegistryUpdatedCallback()
 _Check_return_ HRESULT DXamlCore::OnAutoHideScrollbarsChanged()
 {
     DXamlCore::s_dynamicScrollbarsDirty = true;
-    UpdateVisualStateForConsciousScrollbar();
-
-
+    IFC_RETURN(UpdateVisualStateForConsciousScrollbar());
     return S_OK;
 }
 
@@ -4735,16 +4738,6 @@ ctl::ComPtr<DirectUI::NullKeyedResource> DXamlCore::GetCachedNullKeyedResource()
     return m_spCachedNullKeyedResource;
 }
 
-DirectUI::XamlDirect* DXamlCore::GetXamlDirectDefaultInstanceNoRef()
-{
-    if (!m_spDefaultXamlDirectInstance)
-    {
-        IFCFAILFAST(ctl::make<DirectUI::XamlDirect>(&m_spDefaultXamlDirectInstance));
-    }
-
-    return m_spDefaultXamlDirectInstance.Get();
-}
-
 bool DXamlCore::IsInBackgroundTask() const
 {
     return m_hCore->IsInBackgroundTask();
diff --git a/src/dxaml/xcp/dxaml/lib/DXamlCore.h b/src/dxaml/xcp/dxaml/lib/DXamlCore.h
index 5436e2f65a..0416959ef0 100644
--- a/src/dxaml/xcp/dxaml/lib/DXamlCore.h
+++ b/src/dxaml/xcp/dxaml/lib/DXamlCore.h
@@ -67,8 +67,6 @@ namespace DirectUI
     class TextControlFlyout;
     class XamlRoot;
 
-    class XamlDirect;
-
     class DXamlCore final : public IDXamlCore, public XAML::PLM::IPLMHandlerCallbacks
     {
         friend class ::AgCoreCallbacks;
@@ -582,6 +580,7 @@ namespace DirectUI
 
         // Set custom font collection in core text services for testing.
         _Check_return_ HRESULT SetSystemFontCollectionOverride(_In_opt_ IDWriteFontCollection* pFontCollection);
+        _Check_return_ HRESULT ShouldUseTypographicFontModel(_Out_ bool* useDWriteTypographicModel);
 
         void RequestReplayPreviousPointerUpdate_TempTestHook();
 
@@ -648,8 +647,6 @@ namespace DirectUI
         ctl::ComPtr<DxamlCoreTestHooks> GetTestHooks();
 #pragma endregion
 
-        XamlDirect* GetXamlDirectDefaultInstanceNoRef();
-
         static void DisableNotifyEndOfReferenceTrackingOnThread()
         {
             s_enableNotifyEndOfReferenceTrackingOnThread = false;
@@ -848,7 +845,6 @@ namespace DirectUI
         _Check_return_ HRESULT IsAnimationEnabled(_Out_ bool* result);
 
     private:
-        ctl::ComPtr<DirectUI::XamlDirect> m_spDefaultXamlDirectInstance;
         xref_ptr<StaticStore> m_staticStoreGuard;
         bool m_isAnimationEnabled = false;
         static bool s_enableNotifyEndOfReferenceTrackingOnThread;
diff --git a/src/dxaml/xcp/dxaml/lib/DependencyObjectPropertyAccess.h b/src/dxaml/xcp/dxaml/lib/DependencyObjectPropertyAccess.h
index 286f726db4..381313b491 100644
--- a/src/dxaml/xcp/dxaml/lib/DependencyObjectPropertyAccess.h
+++ b/src/dxaml/xcp/dxaml/lib/DependencyObjectPropertyAccess.h
@@ -142,7 +142,7 @@ class DependencyObjectPropertyAccess: public PropertyAccess
     IPropertyAccessHost* m_pOwner;
     const CClassInfo* m_pSourceType;
     
-    const CDependencyProperty* m_pProperty;
+    const CDependencyProperty* m_pProperty{};
     TrackerPtr<IInspectable> m_tpSource;
     
     ctl::EventPtr<PropertyAccessPathStepDPChangedCallback> m_epSyncHandler;
diff --git a/src/dxaml/xcp/dxaml/lib/DesktopWindowImpl.cpp b/src/dxaml/xcp/dxaml/lib/DesktopWindowImpl.cpp
index b54bb40846..7dccc8ae59 100644
--- a/src/dxaml/xcp/dxaml/lib/DesktopWindowImpl.cpp
+++ b/src/dxaml/xcp/dxaml/lib/DesktopWindowImpl.cpp
@@ -463,7 +463,7 @@ _Check_return_ HRESULT DesktopWindowImpl::CloseImpl()
         if (!m_bMinimizedOrHidden)
         {
             // if this call fails, we don't want to reset shutdown status
-            // beter to crash
+            // better to crash
             VERIFYHR(RaiseWindowVisibilityChangedEvent(FALSE));
         }
         // Close win32 window, cleanup, and unregister from hwnd mapping from DXamlCore
@@ -760,22 +760,25 @@ LRESULT DesktopWindowImpl::OnMessage(
 
 _Check_return_ HRESULT DesktopWindowImpl::OnActivate(WPARAM wParam, LPARAM lParam)
 {
-     //
-    // Fire the Window Activated event
-    //
-    if (WA_ACTIVE == LOWORD(wParam))
+    // https://learn.microsoft.com/en-us/windows/win32/inputdev/wm-activate
+    // higher bits mention if a window is minimized or not. non -zero value indicates that it is minimized.
+    const bool isWindowMinimized = HIWORD(wParam) != 0;
+    
+    // Fire the Window Activated event for Xaml listeners
+    // Don't raise xaml activation events if window is minimized
+    if (!isWindowMinimized && WA_ACTIVE == LOWORD(wParam))
     {
         // WA_ACTIVE  : The window has been activated programmatically.
         IFC_RETURN(RaiseWindowActivatedEvent(xaml::WindowActivationState_CodeActivated));
     }
-    else if (WA_CLICKACTIVE == LOWORD(wParam))
+    else if (!isWindowMinimized && WA_CLICKACTIVE == LOWORD(wParam))
     {
         // WA_CLICKACTIVE : The window has been activated by pointer.
         IFC_RETURN(RaiseWindowActivatedEvent(xaml::WindowActivationState_PointerActivated));
     }
-    else // WA_INACTIVE : The window has been deactivated.
+    else if (WA_INACTIVE == LOWORD(wParam))
     {
-        if (!m_bMinimizedOrHidden)
+        if (!isWindowMinimized)
         {
             // Save the handle of the child window that currently has Focus.  The child
             // window will be given focus the next time this window is activated.
@@ -790,12 +793,11 @@ _Check_return_ HRESULT DesktopWindowImpl::OnActivate(WPARAM wParam, LPARAM lPara
 
         IFC_RETURN(RaiseWindowActivatedEvent(xaml::WindowActivationState_Deactivated));
     }
-
     //
     // If the window has been activated and is not minimized, set focus on the last child window
     // that had focus.  If that child window is the composition island, restore focus.
     //
-    if (!m_bMinimizedOrHidden && (WA_INACTIVE != LOWORD(wParam)))
+    if (!isWindowMinimized && (WA_INACTIVE != LOWORD(wParam)))
     {
         // Set the focus to the child window that last had focus when this window was deactivated.
         // also enters when on such deactivation cases where m_lastFocusedWindowHandle didn't get set like in case of window minimize
@@ -816,8 +818,8 @@ _Check_return_ HRESULT DesktopWindowImpl::OnActivate(WPARAM wParam, LPARAM lPara
 
     //
     // If this is the first time the window has been activated, fire Window.Visible.
-    //
-    if (m_bInitialWindowActivation)
+    // a window can be activated to minimized state (ShowWindow SW_SHOWMINIMIZED), skip the below steps in that case
+    if (!isWindowMinimized && m_bInitialWindowActivation)
     {
         // Force focus on the island.
         SetFocusToContentIsland();
@@ -886,11 +888,15 @@ _Check_return_ HRESULT DesktopWindowImpl::OnNonClientRegionButtonUp(WPARAM wPara
 
 void DesktopWindowImpl::SetFocusToContentIsland()
 {
-    if (xaml_hosting::IXamlIslandRoot* island = m_desktopWindowXamlSource->GetXamlIslandRootNoRef())
+    // null check because it can be called quite early when DWXS is not yet initialized
+    if (m_desktopWindowXamlSource)
     {
-        boolean success = false;
-        VERIFYHR(island->TrySetFocus(&success));
-        ASSERT(success, L"Moving focus to content island failed");
+        if (xaml_hosting::IXamlIslandRoot* island = m_desktopWindowXamlSource->GetXamlIslandRootNoRef())
+        {
+            boolean success = false;
+            VERIFYHR(island->TrySetFocus(&success));
+            ASSERT(success, L"Moving focus to content island failed");
+        }
     }
 }
 
@@ -1308,7 +1314,7 @@ void DesktopWindowImpl::MakeWindowRTL()
     WindowHelpers::EnableRTL(m_hwnd.get());
 }
 
-
+// Appwindow can be null if called from "non" top-level HWND case. One such valid case is being called from Xaml Island.
 _Check_return_ HRESULT DesktopWindowImpl::get_AppWindowImpl(_Outptr_result_maybenull_ ixp::IAppWindow** ppValue)
 {
     mu::WindowId windowId;
diff --git a/src/dxaml/xcp/dxaml/lib/DesktopWindowXamlSource_Partial.cpp b/src/dxaml/xcp/dxaml/lib/DesktopWindowXamlSource_Partial.cpp
index 79377adb92..4a29feeea5 100644
--- a/src/dxaml/xcp/dxaml/lib/DesktopWindowXamlSource_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/DesktopWindowXamlSource_Partial.cpp
@@ -365,7 +365,7 @@ _Check_return_ HRESULT DesktopWindowXamlSource::put_SystemBackdropImpl(_In_opt_
 
             ctl::ComPtr<DirectUI::SystemBackdrop> systemBackdrop;
             IFC_RETURN(m_systemBackdrop.As(&systemBackdrop));
-            systemBackdrop->InvokeOnTargetConnected(this, xamlRoot.Get());
+            IFC_RETURN(systemBackdrop->InvokeOnTargetConnected(this, xamlRoot.Get()));
         }
     }
 
@@ -592,13 +592,15 @@ _Check_return_ HRESULT DesktopWindowXamlSource::ConnectToHwndIslandSite(_In_ HWN
     pXamlIslandCore->OnPostDesktopWindowContentBridgeInitialized(m_contentBridgeDW.Get());
 
     // Note: This can only happen after we've told the XamlIslandRoot about the bridge.
-    pXamlIslandCore->ForceLTRLayoutDirection();
+    IFC_RETURN(pXamlIslandCore->ForceLTRLayoutDirection());
 
     if (auto interop = Diagnostics::GetDiagnosticsInterop(false))
     {
         interop->SignalRootMutation(ctl::iinspectable_cast(this), VisualMutationType::Add);
     }
 
+    pXamlIslandCore->InitializeNonClientPointerSource(parentWindowId);
+
     ctl::ComPtr<xaml::IUIElement> content;
     IFC_RETURN(get_Content(&content));
 
@@ -675,7 +677,7 @@ HRESULT DesktopWindowXamlSource::get_HasFocusImpl(_Out_ boolean* pValue)
     return S_OK;
 }
 
-_Check_return_ HRESULT DesktopWindowXamlSource::get_ShouldConstrainPopupsToWorkAreaImpl(_Outptr_ boolean* pValue)
+_Check_return_ HRESULT DesktopWindowXamlSource::get_ShouldConstrainPopupsToWorkAreaImpl(_Out_ boolean* pValue)
 {
     *pValue = true;
 
diff --git a/src/dxaml/xcp/dxaml/lib/DesktopWindowXamlSource_Partial.h b/src/dxaml/xcp/dxaml/lib/DesktopWindowXamlSource_Partial.h
index de62045444..8c79c25446 100644
--- a/src/dxaml/xcp/dxaml/lib/DesktopWindowXamlSource_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/DesktopWindowXamlSource_Partial.h
@@ -47,7 +47,7 @@ namespace DirectUI
 
         _Check_return_ HRESULT get_HasFocusImpl(_Out_ boolean* pResult);
 
-        _Check_return_ HRESULT get_ShouldConstrainPopupsToWorkAreaImpl(_Outptr_ boolean* pValue);
+        _Check_return_ HRESULT get_ShouldConstrainPopupsToWorkAreaImpl(_Out_ boolean* pValue);
         _Check_return_ HRESULT put_ShouldConstrainPopupsToWorkAreaImpl(_In_opt_ boolean value);
 
         _Check_return_ HRESULT GetGotFocusEventSourceNoRef(_Outptr_ GotFocusEventSourceType** ppEventSource) override;
diff --git a/src/dxaml/xcp/dxaml/lib/DiagnosticsInterop.h b/src/dxaml/xcp/dxaml/lib/DiagnosticsInterop.h
index 9d438b2a17..a413381d41 100644
--- a/src/dxaml/xcp/dxaml/lib/DiagnosticsInterop.h
+++ b/src/dxaml/xcp/dxaml/lib/DiagnosticsInterop.h
@@ -320,7 +320,7 @@ namespace Diagnostics
         // Returns the core dictionary of the passed in dictionaries immediate parent, iff
         // the dictionary is part of a theme dictionary or merged dictionary collection
         static xref_ptr<CResourceDictionary> GetImmediateParentDictionary(
-            _In_ CResourceDictionary* resourceDictionary) throw();
+            _In_ CResourceDictionary* resourceDictionary) noexcept;
 
         // GetAllKeys uses ResourceGraphKeyWithParent because if the dictionary is removed from it's parent collection (if in one), it will
         // no longer be able to get it through CDependencyObject::GetParent
diff --git a/src/dxaml/xcp/dxaml/lib/DiagnosticsInteropModel.h b/src/dxaml/xcp/dxaml/lib/DiagnosticsInteropModel.h
index e402a54a42..400a2463aa 100644
--- a/src/dxaml/xcp/dxaml/lib/DiagnosticsInteropModel.h
+++ b/src/dxaml/xcp/dxaml/lib/DiagnosticsInteropModel.h
@@ -86,7 +86,7 @@ namespace DebugTool
 
             return *this;
         }
-        DebugEnumInfo2& operator=(DebugEnumInfo2&& other)
+        DebugEnumInfo2& operator=(DebugEnumInfo2&& other) noexcept
         {
             if (this != &other)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/Dispatcher.h b/src/dxaml/xcp/dxaml/lib/Dispatcher.h
index 1acae5f500..229fda6ef5 100644
--- a/src/dxaml/xcp/dxaml/lib/Dispatcher.h
+++ b/src/dxaml/xcp/dxaml/lib/Dispatcher.h
@@ -74,7 +74,7 @@ class DispatcherImpl : public ctl::ComBase, public IDispatcher
 
 private:
     DXamlCore* m_pCore;
-    DWORD      m_dwDispatcherThreadId;
+    DWORD      m_dwDispatcherThreadId{};
 
     _Check_return_ HRESULT Connect(_In_ DXamlCore* pCore);
     void Disconnect();
diff --git a/src/dxaml/xcp/dxaml/lib/DisplayOrientationHelper.cpp b/src/dxaml/xcp/dxaml/lib/DisplayOrientationHelper.cpp
index 1c89681aa0..219a1dfe2b 100644
--- a/src/dxaml/xcp/dxaml/lib/DisplayOrientationHelper.cpp
+++ b/src/dxaml/xcp/dxaml/lib/DisplayOrientationHelper.cpp
@@ -79,7 +79,7 @@ _Check_return_ HRESULT
 }
 
 _Check_return_ HRESULT 
-    GetIslandDisplayOrientation(_In_ CDependencyObject* dependencyObject, _Out_ ixp::ContentDisplayOrientations rotationValue)
+    GetIslandDisplayOrientation(_In_ CDependencyObject* dependencyObject, _Out_ ixp::ContentDisplayOrientations& rotationValue)
     {
         IFCPTR_RETURN(dependencyObject);
         CXamlIslandRoot* xamlIslandRoot = VisualTree::GetXamlIslandRootForElement(dependencyObject);
diff --git a/src/dxaml/xcp/dxaml/lib/DisplayOrientationHelper.h b/src/dxaml/xcp/dxaml/lib/DisplayOrientationHelper.h
index 08af87363d..e79f65ade1 100644
--- a/src/dxaml/xcp/dxaml/lib/DisplayOrientationHelper.h
+++ b/src/dxaml/xcp/dxaml/lib/DisplayOrientationHelper.h
@@ -20,7 +20,7 @@ namespace XamlDisplay
         GetDisplayOrientation(_In_ CDependencyObject* dependencyObject, _Out_ Orientation& orientation);
 
     _Check_return_ HRESULT 
-        GetIslandDisplayOrientation(_In_ CDependencyObject* dependencyObject, _Out_ ixp::ContentDisplayOrientations rotationValue);
+        GetIslandDisplayOrientation(_In_ CDependencyObject* dependencyObject, _Out_ ixp::ContentDisplayOrientations& rotationValue);
 
     _Check_return_ HRESULT 
         GetUWPDisplayInformation(_Out_ ctl::ComPtr<wgrd::IDisplayInformation>& displayInformation);
diff --git a/src/dxaml/xcp/dxaml/lib/DragDropInternal.h b/src/dxaml/xcp/dxaml/lib/DragDropInternal.h
index de35b98560..1a5ad69dd4 100644
--- a/src/dxaml/xcp/dxaml/lib/DragDropInternal.h
+++ b/src/dxaml/xcp/dxaml/lib/DragDropInternal.h
@@ -15,7 +15,7 @@ namespace DirectUI
             ctl::ComPtr<DragDropVisual> m_spDragDropVisual;
 
             // Current drag-drop position, relative to the root visual.
-            wf::Point m_userDragPosition;
+            wf::Point m_userDragPosition{};
 
             // A reference to the UIElement that is the source of the current drag and drop operation. Only valid if m_isDragDropInProgress is true.
             ctl::WeakRefPtr m_wrCurrentDragSourceWeakRef;
diff --git a/src/dxaml/xcp/dxaml/lib/DragDropVisual.h b/src/dxaml/xcp/dxaml/lib/DragDropVisual.h
index 9694081bee..49c853fa37 100644
--- a/src/dxaml/xcp/dxaml/lib/DragDropVisual.h
+++ b/src/dxaml/xcp/dxaml/lib/DragDropVisual.h
@@ -31,7 +31,7 @@ namespace DirectUI
             bool m_useSystemDefaultVisual;
             
             // Our ref count.
-            ULONG m_refCount;
+            ULONG m_refCount{};
             
             // The offset we apply to points given to SetPosition.
             wf::Point m_offsetPosition;
diff --git a/src/dxaml/xcp/dxaml/lib/DragStartingEventArgs_Partial.h b/src/dxaml/xcp/dxaml/lib/DragStartingEventArgs_Partial.h
index 6e53e60bd7..685bf706c9 100644
--- a/src/dxaml/xcp/dxaml/lib/DragStartingEventArgs_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/DragStartingEventArgs_Partial.h
@@ -51,7 +51,7 @@ namespace DirectUI
         ctl::ComPtr<xaml::IDragUI> m_spDragUI;
         ctl::ComPtr<xaml::IUIElement> m_spSource;
         ctl::ComPtr<wf::IAsyncOperation<wadt::DataPackageOperation>> m_spStartDragAsyncOperation;
-        wf::Point m_position;
+        wf::Point m_position{};
         bool m_wasDeferred = false;
         unsigned int m_deferralCount = 0;
         ctl::ComPtr<ixp::IPointerPoint> m_pointerPoint;
diff --git a/src/dxaml/xcp/dxaml/lib/DragVisualBuffer.h b/src/dxaml/xcp/dxaml/lib/DragVisualBuffer.h
index cd65a4844d..83b3e1c478 100644
--- a/src/dxaml/xcp/dxaml/lib/DragVisualBuffer.h
+++ b/src/dxaml/xcp/dxaml/lib/DragVisualBuffer.h
@@ -20,7 +20,7 @@ class DragVisualBuffer : public Microsoft::WRL::RuntimeClass<
         return E_NOTIMPL;
     }
 
-    HRESULT STDMETHODCALLTYPE GetTrustLevel(_Outptr_ TrustLevel *trustLevel) override
+    HRESULT STDMETHODCALLTYPE GetTrustLevel(_Out_ TrustLevel *trustLevel) override
     {    
         if(!trustLevel)
         {
@@ -31,13 +31,13 @@ class DragVisualBuffer : public Microsoft::WRL::RuntimeClass<
         return S_OK;
     }
 
-    HRESULT STDMETHODCALLTYPE get_Capacity(_Outptr_ UINT32 *capacity) override
+    HRESULT STDMETHODCALLTYPE get_Capacity(_Out_ UINT32 *capacity) override
     {
         *capacity = _capacity;
         return S_OK;
     }
 
-    HRESULT STDMETHODCALLTYPE get_Length(_Outptr_ UINT32 *length) override
+    HRESULT STDMETHODCALLTYPE get_Length(_Out_ UINT32 *length) override
     {
         // This is a fixed buffer, so length is capacity.
         *length = _capacity;
diff --git a/src/dxaml/xcp/dxaml/lib/DxamlCoreTestHooks_Partial.h b/src/dxaml/xcp/dxaml/lib/DxamlCoreTestHooks_Partial.h
index b802c800d8..2c2848a4ef 100644
--- a/src/dxaml/xcp/dxaml/lib/DxamlCoreTestHooks_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/DxamlCoreTestHooks_Partial.h
@@ -27,7 +27,7 @@ namespace DirectUI
         IFACEMETHOD_(void, GetDCompDevice)(_Outptr_ IDCompositionDesktopDevicePartner **ppDCompDevice) const override;
 
         IFACEMETHOD(MarkDeviceInstanceLost)() const override;
-        IFACEMETHOD(GetD3D11GraphicsDeviceAddress)(_Outptr_ INT64* ppCD3D11Device) const override;
+        IFACEMETHOD(GetD3D11GraphicsDeviceAddress)(_Out_ INT64* ppCD3D11Device) const override;
 
         IFACEMETHOD(SetWindowSizeOverride)(
             _In_ const wf::Size& size,
@@ -78,6 +78,7 @@ namespace DirectUI
         IFACEMETHOD(RemoveThemingOverrides)() override;
 
         IFACEMETHOD(SetSystemFontCollectionOverride)(_In_opt_ IDWriteFontCollection* pFontCollection) override;
+        IFACEMETHOD(ShouldUseTypographicFontModel)(_Out_ bool* useDWriteTypographicModel) override;
 
         IFACEMETHOD(GetGripperData)(_In_ IInspectable* textControl, _Inout_ JupiterGripperData* returnValue) override;
 
@@ -206,8 +207,6 @@ namespace DirectUI
         IFACEMETHOD_(void, GetAnimatedCenterPoint)(_In_ xaml::IUIElement* element, _Out_ wfn::Vector3* centerPoint) override;
         IFACEMETHOD_(void, ScheduleWaitForAnimatedFacadePropertyChanges)(int count) override;
 
-        IFACEMETHOD(SimulateRegionsForContentDialog)(_In_ xaml_controls::IContentDialog* dialog) override;
-
         IFACEMETHOD_(BOOLEAN, IsTrackingEffectiveVisibility)(_In_ xaml::IUIElement* element) override;
         IFACEMETHOD_(BOOLEAN, IsKeepingVisible)(_In_ xaml::IUIElement* element) override;
         IFACEMETHOD(RequestKeepAlive)(_In_ xaml::IUIElement* element) override;
@@ -225,7 +224,7 @@ namespace DirectUI
 
         IFACEMETHOD_(bool, IsStoryboardActive)(_In_ xaml_animation::IStoryboard* storyboard) override;
 
-        IFACEMETHOD(GetElementInputWindow)(_In_ xaml::IUIElement* element, _Out_ HWND* hwnd) override;
+        IFACEMETHOD(GetElementInputWindow)(_In_ xaml::IUIElement* element, _Out_ HWND* inputHwnd) override;
 
         IFACEMETHOD_(void, SetSuspendOffThreadDecoding)(bool isOffThreadDecodingSuspended) override;
 
diff --git a/src/dxaml/xcp/dxaml/lib/ElementSoundPlayerService_Partial.h b/src/dxaml/xcp/dxaml/lib/ElementSoundPlayerService_Partial.h
index d89a3d7406..0acfb63cb2 100644
--- a/src/dxaml/xcp/dxaml/lib/ElementSoundPlayerService_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/ElementSoundPlayerService_Partial.h
@@ -261,6 +261,6 @@ namespace DirectUI
         ctl::ComPtr<wm::Audio::IAudioNode> m_outputNode;
         ctl::ComPtr<wm::Audio::IAudioGraph> m_graph;
         EventRegistrationToken m_audioGraphUnrecoverableErrorOccurredEventToken{};
-        SRWLOCK m_audioLock;
+        SRWLOCK m_audioLock{};
     };
 }
diff --git a/src/dxaml/xcp/dxaml/lib/Factories.g.cpp b/src/dxaml/xcp/dxaml/lib/Factories.g.cpp
index 2ca9172150..df7308163a 100644
--- a/src/dxaml/xcp/dxaml/lib/Factories.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/Factories.g.cpp
@@ -221,7 +221,6 @@ namespace DirectUI
     _Check_return_ IActivationFactory* CreateActivationFactory_MarkupExtension();
     _Check_return_ IActivationFactory* CreateActivationFactory_PrintDocument();
     _Check_return_ IActivationFactory* CreateActivationFactory_XamlIslandRoot();
-    _Check_return_ IActivationFactory* CreateActivationFactory_XamlDirect();
     _Check_return_ IActivationFactory* CreateActivationFactory_TriggerActionCollection();
     _Check_return_ IActivationFactory* CreateActivationFactory_UIElementWeakCollection();
     _Check_return_ IActivationFactory* CreateActivationFactory_CompositionTarget();
@@ -876,7 +875,6 @@ ACTIVATION_FACTORY_MAP_BEGIN()
     ACTIVATION_FACTORY_ENTRY(XSTRING_PTR_STORAGE(L"Microsoft.UI.Xaml.Markup.MarkupExtension"), &DirectUI::CreateActivationFactory_MarkupExtension)
     ACTIVATION_FACTORY_ENTRY(XSTRING_PTR_STORAGE(L"Microsoft.UI.Xaml.Printing.PrintDocument"), &DirectUI::CreateActivationFactory_PrintDocument)
     ACTIVATION_FACTORY_ENTRY(XSTRING_PTR_STORAGE(L"Microsoft.UI.Xaml.Hosting.XamlIslandRoot"), &DirectUI::CreateActivationFactory_XamlIslandRoot)
-    ACTIVATION_FACTORY_ENTRY(XSTRING_PTR_STORAGE(L"Microsoft.UI.Xaml.Core.Direct.XamlDirect"), &DirectUI::CreateActivationFactory_XamlDirect)
     ACTIVATION_FACTORY_ENTRY(XSTRING_PTR_STORAGE(L"Microsoft.UI.Xaml.TriggerActionCollection"), &DirectUI::CreateActivationFactory_TriggerActionCollection)
     ACTIVATION_FACTORY_ENTRY(XSTRING_PTR_STORAGE(L"Microsoft.UI.Xaml.UIElementWeakCollection"), &DirectUI::CreateActivationFactory_UIElementWeakCollection)
     ACTIVATION_FACTORY_ENTRY(XSTRING_PTR_STORAGE(L"Microsoft.UI.Xaml.Media.CompositionTarget"), &DirectUI::CreateActivationFactory_CompositionTarget)
diff --git a/src/dxaml/xcp/dxaml/lib/FlipView_Partial.cpp b/src/dxaml/xcp/dxaml/lib/FlipView_Partial.cpp
index e7e12e01d7..a70c810287 100644
--- a/src/dxaml/xcp/dxaml/lib/FlipView_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/FlipView_Partial.cpp
@@ -1823,7 +1823,7 @@ _Check_return_ HRESULT FlipView::FixOffset(
     {
         // If we are in the middle of a manipulation (during the animation from one selected item to another) we
         // don't want to modify the offset. Postpone the fix via timer.
-        SetFixOffsetTimer();
+        IFC_RETURN(SetFixOffsetTimer());
     }
 
     return S_OK;
diff --git a/src/dxaml/xcp/dxaml/lib/FlyoutBase_partial.cpp b/src/dxaml/xcp/dxaml/lib/FlyoutBase_partial.cpp
index 16e8dd0d98..de26a412f0 100644
--- a/src/dxaml/xcp/dxaml/lib/FlyoutBase_partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/FlyoutBase_partial.cpp
@@ -824,6 +824,7 @@ FlyoutBase::~FlyoutBase()
     VERIFYHR(DetachHandler(m_epPresenterUnloadedHandler, m_tpPresenter));
     VERIFYHR(DetachHandler(m_epPopupLostFocusHandler, m_tpPopup));
     VERIFYHR(DetachHandler(m_epPlacementTargetUnloadedHandler, m_tpPlacementTarget));
+    VERIFYHR(DetachHandler(m_epPlacementTargetActualThemeChangedHandler, m_tpPlacementTarget));
 
     if (DXamlCore* core = DXamlCore::GetCurrent())
     {
@@ -932,7 +933,17 @@ _Check_return_ HRESULT FlyoutBase::ShowAtImpl(
     IFC_RETURN(placementTarget.As(&placementTargetAsDO));
 
     IFC_RETURN(EnsureAssociatedXamlRoot(placementTargetAsDO.Get()));
-    IFC_RETURN(ShowAtWithOptions(placementTargetAsDO.Get(), nullptr));
+
+    ctl::ComPtr<FlyoutShowOptions> showOptions;
+    IFC_RETURN(ctl::make(&showOptions));
+
+    xaml_primitives::FlyoutShowMode showMode = xaml_primitives::FlyoutShowMode_Standard;
+    IFC_RETURN(get_ShowMode(&showMode));
+    IFC_RETURN(showOptions->put_ShowMode(showMode));
+
+    ctl::ComPtr<IFlyoutShowOptions> showOptionsAsI;
+    IFC_RETURN(showOptions.As(&showOptionsAsI));
+    IFC_RETURN(ShowAtWithOptions(placementTargetAsDO.Get(), showOptionsAsI.Get()));
 
     return S_OK;
 }
@@ -1514,60 +1525,68 @@ _Check_return_ HRESULT FlyoutBase::ForwardTargetPropertiesToPresenter()
         IFC_RETURN(m_tpPlacementTarget.Cast<FrameworkElement>()->get_AllowFocusWhenDisabled(&allowFocusWhenDisabled));
     }
 
-    IFC_RETURN(spPresenterAsFE.Cast<FrameworkElement>()->put_AllowFocusWhenDisabled(allowFocusWhenDisabled))
+    IFC_RETURN(spPresenterAsFE.Cast<FrameworkElement>()->put_AllowFocusWhenDisabled(allowFocusWhenDisabled));
 
-    // Flyout matches the theme of its placement target.
-    {
-        const CDependencyProperty* requestedThemeProperty = MetadataAPI::GetDependencyPropertyByIndex(KnownPropertyIndex::FrameworkElement_RequestedTheme);
+    IFC_RETURN(ForwardThemeToPresenter());
+    
+    return S_OK;
+}
 
-        // We'll only override the requested theme on the presenter if its value hasn't been explicitly set.
-        // Otherwise, we'll abide by its existing value.
-        if (m_tpPresenter.Cast<Control>()->GetHandle()->IsPropertyDefault(requestedThemeProperty) ||
-            m_isFlyoutPresenterRequestedThemeOverridden)
-        {
-            xaml::ElementTheme currentFlyoutPresenterTheme;
-            xaml::ElementTheme requestedTheme = xaml::ElementTheme_Default;
-            ctl::ComPtr<IDependencyObject> spCurrent;
-            ctl::ComPtr<IDependencyObject> spParent;
-            ctl::ComPtr<IFrameworkElement> spCurrentAsFE;
+_Check_return_ HRESULT FlyoutBase::ForwardThemeToPresenter()
+{
+    ctl::ComPtr<IFrameworkElement> spPresenterAsFE;
+    IFC_RETURN(m_tpPresenter.As(&spPresenterAsFE));
 
-            IFC_RETURN(spPresenterAsFE->get_RequestedTheme(&currentFlyoutPresenterTheme));
+    // Ensure the Flyout matches the theme of its placement target.
+   const CDependencyProperty* requestedThemeProperty = MetadataAPI::GetDependencyPropertyByIndex(KnownPropertyIndex::FrameworkElement_RequestedTheme);
 
-            // Walk up the tree from the placement target until we find an element with a RequestedTheme.
-            IFC_RETURN(m_tpPlacementTarget.As(&spCurrent));
-            while (spCurrent)
-            {
-                IFC_RETURN(spCurrent.CopyTo(spCurrentAsFE.ReleaseAndGetAddressOf()));
+    // We'll only override the requested theme on the presenter if its value hasn't been explicitly set.
+    // Otherwise, we'll abide by its existing value.
+    if (m_tpPresenter.Cast<Control>()->GetHandle()->IsPropertyDefault(requestedThemeProperty) ||
+        m_isFlyoutPresenterRequestedThemeOverridden)
+    {
+        xaml::ElementTheme currentFlyoutPresenterTheme;
+        xaml::ElementTheme requestedTheme = xaml::ElementTheme_Default;
+        ctl::ComPtr<IDependencyObject> spCurrent;
+        ctl::ComPtr<IDependencyObject> spParent;
+        ctl::ComPtr<IFrameworkElement> spCurrentAsFE;
 
-                IFC_RETURN(spCurrentAsFE->get_RequestedTheme(&requestedTheme));
+        IFC_RETURN(spPresenterAsFE->get_RequestedTheme(&currentFlyoutPresenterTheme));
 
-                if (requestedTheme != xaml::ElementTheme_Default)
-                {
-                    break;
-                }
+        // Walk up the tree from the placement target until we find an element with a RequestedTheme.
+        IFC_RETURN(m_tpPlacementTarget.As(&spCurrent));
+        while (spCurrent)
+        {
+            IFC_RETURN(spCurrent.CopyTo(spCurrentAsFE.ReleaseAndGetAddressOf()));
 
-                IFC_RETURN(VisualTreeHelper::GetParentStatic(spCurrent.Get(), spParent.ReleaseAndGetAddressOf()));
-                if (spParent.AsOrNull<DirectUI::PopupRoot>())
-                {
-                    // If the target is in a Popup and the Popup is in the Visual Tree, we want to inherrit the theme
-                    // from that Popup's parent. Otherwise we will get the App's theme, which might not be what
-                    // is expected.
-                    IFC_RETURN(spCurrentAsFE->get_Parent(&spParent));
-                }
+            IFC_RETURN(spCurrentAsFE->get_RequestedTheme(&requestedTheme));
 
-                spCurrent = spParent;
+            if (requestedTheme != xaml::ElementTheme_Default)
+            {
+                break;
             }
 
-            if (requestedTheme != currentFlyoutPresenterTheme)
+            IFC_RETURN(VisualTreeHelper::GetParentStatic(spCurrent.Get(), spParent.ReleaseAndGetAddressOf()));
+            if (spParent.AsOrNull<DirectUI::PopupRoot>())
             {
-                IFC_RETURN(spPresenterAsFE->put_RequestedTheme(requestedTheme));
-                m_isFlyoutPresenterRequestedThemeOverridden = true;
+                // If the target is in a Popup and the Popup is in the Visual Tree, we want to inherrit the theme
+                // from that Popup's parent. Otherwise we will get the App's theme, which might not be what
+                // is expected.
+                IFC_RETURN(spCurrentAsFE->get_Parent(&spParent));
             }
 
-            // Also set the popup's theme. If there is a SystemBackdrop on the menu, it'll be watching the theme on the
-            // popup itself rather than the presenter set as the popup's child.
-            IFC_RETURN(m_tpPopup.Cast<DirectUI::PopupGenerated>()->put_RequestedTheme(requestedTheme));
+            spCurrent = spParent;
         }
+
+        if (requestedTheme != currentFlyoutPresenterTheme)
+        {
+            IFC_RETURN(spPresenterAsFE->put_RequestedTheme(requestedTheme));
+            m_isFlyoutPresenterRequestedThemeOverridden = true;
+        }
+
+        // Also set the popup's theme. If there is a SystemBackdrop on the menu, it'll be watching the theme on the
+        // popup itself rather than the presenter set as the popup's child.
+        IFC_RETURN(m_tpPopup.Cast<DirectUI::PopupGenerated>()->put_RequestedTheme(requestedTheme));
     }
 
     return S_OK;
@@ -2950,6 +2969,7 @@ FlyoutBase::SetPlacementTarget(_In_opt_ IFrameworkElement* pPlacementTarget)
     if (m_tpPlacementTarget)
     {
         IFC_RETURN(DetachHandler(m_epPlacementTargetUnloadedHandler, m_tpPlacementTarget));
+        IFC_RETURN(DetachHandler(m_epPlacementTargetActualThemeChangedHandler, m_tpPlacementTarget));
         m_tpPlacementTarget.Clear();
         IFC_RETURN(put_Target(nullptr));
     }
@@ -2968,6 +2988,13 @@ FlyoutBase::SetPlacementTarget(_In_opt_ IFrameworkElement* pPlacementTarget)
             {
                 RRETURN(Hide());
             }));
+
+        // Hook up an event handler that will forward any theme changes to the flyout.
+        IFC_RETURN(m_epPlacementTargetActualThemeChangedHandler.AttachEventHandler(m_tpPlacementTarget.Cast<FrameworkElement>(),
+            [this](auto&&, auto&&)
+            {
+                RRETURN(ForwardThemeToPresenter());
+            }));
     }
     return S_OK;
 }
@@ -3078,6 +3105,7 @@ _Check_return_ HRESULT FlyoutBase::RemoveRootVisualPointerMovedHandler()
         {
             IFC_RETURN(rootVisual->remove_PointerMoved(m_rootVisualPointerMovedToken));
         }
+        m_rootVisualPointerMovedToken.value = 0;
     }
 
     return S_OK;
diff --git a/src/dxaml/xcp/dxaml/lib/FlyoutBase_partial.h b/src/dxaml/xcp/dxaml/lib/FlyoutBase_partial.h
index f2f5b8b58d..3bacf868ff 100644
--- a/src/dxaml/xcp/dxaml/lib/FlyoutBase_partial.h
+++ b/src/dxaml/xcp/dxaml/lib/FlyoutBase_partial.h
@@ -251,6 +251,7 @@ namespace DirectUI
         // Forwards select property values set on the flyout to the presenter.
         _Check_return_ HRESULT ForwardTargetPropertiesToPresenter();
 
+        _Check_return_ HRESULT ForwardThemeToPresenter();
         _Check_return_ HRESULT ForwardSystemBackdropToPopup();
 
         // Sets offsets on entrance / exit transition to match placement mode.
@@ -316,6 +317,7 @@ namespace DirectUI
         ctl::EventPtr<FrameworkElementUnloadedEventCallback> m_epPresenterUnloadedHandler;
         ctl::EventPtr<UIElementLostFocusEventCallback> m_epPopupLostFocusHandler;
         ctl::EventPtr<FrameworkElementUnloadedEventCallback> m_epPlacementTargetUnloadedHandler;
+        ctl::EventPtr<FrameworkElementActualThemeChangedEventCallback> m_epPlacementTargetActualThemeChangedHandler;
 
         // Cached bounds of placement target. Used in cases where the placement target leaves the visual
         // tree before the flyout is displayed, for example, if the placement target was inside another flyout.
@@ -356,7 +358,7 @@ namespace DirectUI
 
         wf::Point m_targetPoint;
         wf::Rect m_exclusionRect;
-        DirectUI::InputDeviceType m_inputDeviceTypeUsedToOpen;
+        DirectUI::InputDeviceType m_inputDeviceTypeUsedToOpen{};
 
         // Old values of the target position properties to tell whether we should no-op
         // upon being told to re-show a flyout.
diff --git a/src/dxaml/xcp/dxaml/lib/FocusAsyncOperation.h b/src/dxaml/xcp/dxaml/lib/FocusAsyncOperation.h
index 4b6a258e86..845e621d93 100644
--- a/src/dxaml/xcp/dxaml/lib/FocusAsyncOperation.h
+++ b/src/dxaml/xcp/dxaml/lib/FocusAsyncOperation.h
@@ -91,6 +91,6 @@ namespace DirectUI
     private:
         ctl::ComPtr<FocusMovementResult> m_focusMovementResult;
         static ULONG m_uniqueAsyncActionId;
-        GUID m_correlationId;
+        GUID m_correlationId {};
     };
 }
\ No newline at end of file
diff --git a/src/dxaml/xcp/dxaml/lib/FocusManager.cpp b/src/dxaml/xcp/dxaml/lib/FocusManager.cpp
index 017826db73..3461b2d660 100644
--- a/src/dxaml/xcp/dxaml/lib/FocusManager.cpp
+++ b/src/dxaml/xcp/dxaml/lib/FocusManager.cpp
@@ -415,7 +415,9 @@ _Check_return_ HRESULT FocusManagerFactory::TryFocusAsyncImpl(
         spFocusAsyncOperation->StartOperation();
     }
 
-    focusManager->SetFocusedElement(movement);
+    // We ignore the result here because CFocusManager::UpdateFocus will take care of completing the async operation
+    // and propagating the result.
+    const auto ignored = focusManager->SetFocusedElement(movement);    
 
     // Async operation is not guaranteed to be released synchronously.
     // Therefore, we let UpdateFocus to handle the responsibility of releasing it.
@@ -1075,7 +1077,7 @@ FocusManagerFactory::FindNextElementWithOptionsImpl(
 }
 
 _Check_return_ HRESULT
-FocusManagerFactory::GetFocusedElementWithRootImpl(_In_ xaml::IXamlRoot* pXamlRoot, _Outptr_ IInspectable** ppReturnValue)
+FocusManagerFactory::GetFocusedElementWithRootImpl(_In_ xaml::IXamlRoot* pXamlRoot, _Outptr_result_maybenull_ IInspectable** ppReturnValue)
 {
     *ppReturnValue = nullptr;
 
diff --git a/src/dxaml/xcp/dxaml/lib/Frame_Partial.h b/src/dxaml/xcp/dxaml/lib/Frame_Partial.h
index cc6593bb80..28cd5c2f7e 100644
--- a/src/dxaml/xcp/dxaml/lib/Frame_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/Frame_Partial.h
@@ -35,7 +35,7 @@ namespace DirectUI
 
         BOOLEAN m_isLastNavigationBack = FALSE;
 
-        EventRegistrationToken m_nextClick;
+        EventRegistrationToken m_nextClick{};
 
         EventRegistrationToken m_previousClick;
 
diff --git a/src/dxaml/xcp/dxaml/lib/FrameworkElement_partial.cpp b/src/dxaml/xcp/dxaml/lib/FrameworkElement_partial.cpp
index a6bb948ed3..5bdab65c46 100644
--- a/src/dxaml/xcp/dxaml/lib/FrameworkElement_partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/FrameworkElement_partial.cpp
@@ -1436,7 +1436,7 @@ IFACEMETHODIMP FrameworkElement::OnCreateAutomationPeer(_Outptr_ xaml_automation
     if (nAutomationPeerFactoryIndex != 0)
     {
         ctl::ComPtr<IInspectable> spInner;
-        ActivationAPI::ActivateAutomationInstance(static_cast<KnownTypeIndex>(nAutomationPeerFactoryIndex), GetHandle(), nullptr, &spInner);
+        IFC_RETURN(ActivationAPI::ActivateAutomationInstance(static_cast<KnownTypeIndex>(nAutomationPeerFactoryIndex), GetHandle(), nullptr, &spInner));
         if (spInner)
         {
             ctl::ComPtr<xaml_automation_peers::IFrameworkElementAutomationPeer> spFEAutomationPeer;
diff --git a/src/dxaml/xcp/dxaml/lib/FxCallbacks.cpp b/src/dxaml/xcp/dxaml/lib/FxCallbacks.cpp
index e22d3467eb..0d6c783c9d 100644
--- a/src/dxaml/xcp/dxaml/lib/FxCallbacks.cpp
+++ b/src/dxaml/xcp/dxaml/lib/FxCallbacks.cpp
@@ -867,12 +867,6 @@ namespace FxCallbacks
     _Check_return_ HRESULT Popup_OnClosed(_In_ CDependencyObject* nativePopup)
         { return DirectUI::Popup::OnClosed(nativePopup); }
 
-    _Check_return_ HRESULT Popup_HookupWindowPositionChangedHandler(_In_ CDependencyObject* nativePopup)
-        { return DirectUI::Popup::HookupWindowPositionChangedHandler(nativePopup); }
-
-    void Popup_OnHostWindowPositionChanged(_In_ CDependencyObject* nativePopup)
-        { DirectUI::Popup::OnHostWindowPositionChanged(nativePopup); }
-
     void Popup_OnIslandLostFocus(_In_ CDependencyObject* nativePopup)
         { DirectUI::Popup::OnIslandLostFocus(nativePopup); }
 
@@ -984,9 +978,6 @@ namespace FxCallbacks
     _Check_return_ HRESULT FrameworkCallbacks_IsDXamlCoreShuttingDown(_Out_ bool* pIsDXamlCoreShuttingDown)
         { return AgCoreCallbacks::FrameworkCallbacks_IsDXamlCoreShuttingDown(pIsDXamlCoreShuttingDown); }
 
-    _Check_return_ HRESULT Core_ForwardWindowedPopupMessageToJupiterWindow(_In_ HWND window, _In_ UINT message, _In_ WPARAM wParam, _In_ LPARAM lParam, _In_opt_ CContentRoot* contentRoot, _Out_ LRESULT* pResult)
-        { return DXamlCore::ForwardWindowedPopupMessageToJupiterWindow(window, message, wParam, lParam, contentRoot, pResult); }
-
     _Check_return_ HRESULT XcpImports_ParticipateInTransition(_In_ CDependencyObject* nativeTransition, _In_ CDependencyObject* nativeUIElement, _In_ XINT32 transitionTrigger, _Out_ bool* DoesParticipate)
         { return DirectUI::Transition::ParticipateInTransition(nativeTransition, nativeUIElement, transitionTrigger, DoesParticipate); }
 
@@ -1044,10 +1035,10 @@ namespace FxCallbacks
     _Check_return_ HRESULT AutomationPeer_GetPattern(_In_ CDependencyObject* nativeTarget, _In_ CDependencyObject** nativeInterface, _In_ UIAXcp::APPatternInterface eInterface)
         { return DirectUI::AutomationPeer::GetPattern(nativeTarget, nativeInterface, eInterface); }
 
-    _Check_return_ HRESULT AutomationPeer_UIATextRangeInvoke(_In_ CDependencyObject* nativeTarget, _In_ XINT32 eFunction, _In_ XINT32 cParams, _In_ void* pvParams, _In_ Automation::CValue* pRetVal)
+    _Check_return_ HRESULT AutomationPeer_UIATextRangeInvoke(_In_ CDependencyObject* nativeTarget, _In_ XINT32 eFunction, _In_ XINT32 cParams, _In_opt_ void* pvParams, _In_opt_ Automation::CValue* pRetVal)
         { return DirectUI::AutomationPeer::UIATextRangeInvoke(nativeTarget, eFunction, cParams, pvParams, pRetVal); }
 
-    _Check_return_ HRESULT AutomationPeer_UIAPatternInvoke(_In_ CDependencyObject* nativeTarget, _In_ UIAXcp::APPatternInterface eInterface, _In_ XINT32 eFunction, _In_ XINT32 cParams, _In_ void* pvParams, _In_ Automation::CValue* pRetVal)
+    _Check_return_ HRESULT AutomationPeer_UIAPatternInvoke(_In_ CDependencyObject* nativeTarget, _In_ UIAXcp::APPatternInterface eInterface, _In_ XINT32 eFunction, _In_ XINT32 cParams, _In_opt_ void* pvParams, _In_opt_ Automation::CValue* pRetVal)
         { return DirectUI::AutomationPeer::UIAPatternInvoke(nativeTarget, eInterface, eFunction, cParams, pvParams, pRetVal); }
 
     _Check_return_ HRESULT AutomationPeer_NotifyNoUIAClientObjectForAP(_In_ CDependencyObject* nativeTarget)
@@ -1343,7 +1334,7 @@ namespace FxCallbacks
     {
         ctl::ComPtr<DirectUI::XamlRoot> xamlRoot;
         IGNOREHR(ctl::do_query_interface(xamlRoot, xamlRootInsp));
-        xamlRoot->RaiseChangedEvent();
+        VERIFYHR(xamlRoot->RaiseChangedEvent());
     }
 
     void XamlRoot_RaiseInputActivationChanged(_In_ IInspectable* xamlRootInsp)
@@ -1383,7 +1374,7 @@ namespace FxCallbacks
         return DirectUI::FlyoutPresenter::GetTargetIfOpenedAsTransientStatic(nativeControl, nativeTarget);
     }
 
-    _Check_return_ HRESULT 
+    _Check_return_ HRESULT
     FrameworkApplication_GetResourceManagerOverrideFromApp(_Out_ wrl::ComPtr<mwar::IResourceManager>& resourceManager)
     {
         if (auto frameworkApp = FrameworkApplication::GetCurrentNoRef())
diff --git a/src/dxaml/xcp/dxaml/lib/GroupItem_Partial.h b/src/dxaml/xcp/dxaml/lib/GroupItem_Partial.h
index 12113d8787..9a1166cbed 100644
--- a/src/dxaml/xcp/dxaml/lib/GroupItem_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/GroupItem_Partial.h
@@ -98,8 +98,8 @@ namespace DirectUI
         TrackerPtr<xaml_controls::IItemsControl> m_tpItemsControl;
         ctl::WeakRefPtr m_wrParentListViewBaseWeakRef;
         TrackerPtr<xaml_data::ICollectionViewGroup> m_tpCVG;
-        EventRegistrationToken m_itemsChangedToken;
-        EventRegistrationToken m_headerKeyDownToken;
+        EventRegistrationToken m_itemsChangedToken{};
+        EventRegistrationToken m_headerKeyDownToken{};
         xaml::Visibility m_previousVisibility;
         TrackerPtr<IControl> m_tpHeaderControl;
         BOOLEAN m_bWasHidden;
diff --git a/src/dxaml/xcp/dxaml/lib/Hub_Partial.h b/src/dxaml/xcp/dxaml/lib/Hub_Partial.h
index 94f3224ef0..845daeb2ad 100644
--- a/src/dxaml/xcp/dxaml/lib/Hub_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/Hub_Partial.h
@@ -342,7 +342,7 @@ namespace DirectUI
         // a SeZo view change to this Hub.
         xaml::FocusState m_semanticZoomCompletedFocusState;
 
-        EventRegistrationToken m_visibleIndicesUpdatedToken;
+        EventRegistrationToken m_visibleIndicesUpdatedToken{};
 
         // Loaded EventPtr for the m_tpPanel template part.
         ctl::EventPtr<FrameworkElementLoadedEventCallback> m_epPanelLoadedHandler;
diff --git a/src/dxaml/xcp/dxaml/lib/InternalDebugInteropModel.h b/src/dxaml/xcp/dxaml/lib/InternalDebugInteropModel.h
index e0bb0e1e49..0c30f5fcb8 100644
--- a/src/dxaml/xcp/dxaml/lib/InternalDebugInteropModel.h
+++ b/src/dxaml/xcp/dxaml/lib/InternalDebugInteropModel.h
@@ -186,7 +186,7 @@ namespace DebugTool
 
             return *this;
         }
-        DebugEnumInfo& operator=(DebugEnumInfo&& other)
+        DebugEnumInfo& operator=(DebugEnumInfo&& other) noexcept
         {
             if (this != &other)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/ItemContainerGenerator_Partial.cpp b/src/dxaml/xcp/dxaml/lib/ItemContainerGenerator_Partial.cpp
index 679eab343e..ea1ce5cdf9 100644
--- a/src/dxaml/xcp/dxaml/lib/ItemContainerGenerator_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/ItemContainerGenerator_Partial.cpp
@@ -90,7 +90,7 @@ ItemContainerGenerator::CreateGenerator(
 
     IFC(pHost->get_View(&spView));
     IFC(spView.As(&spObservableVector));
-    if(spObservableVector)
+    if (spObservableVector)
     {
         spItemCollectionVectorChangedHandler.Attach(
             new ClassMemberEventHandler<
@@ -536,7 +536,7 @@ _Check_return_ HRESULT ItemContainerGenerator::ClearBlocks(
                     // If we can't get a peg on the container, it means the container isn't reachable, and we needn't clean
                     // it up.
                     auto peggedContainer = ctl::try_make_autopeg(static_cast<DependencyObject*>(pContainerNoRef));
-                    if( peggedContainer )
+                    if (peggedContainer)
                     {
                         IFC(UnlinkContainerFromItem(pContainerNoRef, /*isRecycling*/FALSE));
                         if (bRecycle)
@@ -2209,7 +2209,7 @@ ItemContainerGenerator::NotifyOfSourceChanged(
     IFC(e->get_CollectionChange(&action));
 
     // if we get reset event from parent collection we should handle it to refresh items in the group.
-    if(wfc::CollectionChange_Reset != action && m_bIsGrouping && m_tpObservableItemsSource.Get() != pSender)
+    if (wfc::CollectionChange_Reset != action && m_bIsGrouping && m_tpObservableItemsSource.Get() != pSender)
     {
         goto Cleanup;
     }
@@ -2276,7 +2276,7 @@ ItemContainerGenerator::OnItemCollectionChanged(
     IFC(e->get_CollectionChange(&action));
 
     // if we get reset event from parent collection we should handle it to refresh items in the group.
-    if(wfc::CollectionChange_Reset != action && m_bIsGrouping && m_tpObservableItemsSource.Get() != pSender)
+    if (wfc::CollectionChange_Reset != action && m_bIsGrouping && m_tpObservableItemsSource.Get() != pSender)
     {
         goto Cleanup;
     }
@@ -2437,7 +2437,7 @@ ItemContainerGenerator::OnItemRemoved(_In_ UINT nIndex)
     }
 
     // remove the item, and remove the block if it's now empty
-    if( rib && rib->m_nItemCount-1 == offsetFromBlockStart )
+    if (rib && rib->m_nItemCount-1 == offsetFromBlockStart)
     {
         // There's no entries in the block behind this one with which to overwrite it.
         // Instead, we just need to clear it.
diff --git a/src/dxaml/xcp/dxaml/lib/ItemContainerGenerator_Partial.h b/src/dxaml/xcp/dxaml/lib/ItemContainerGenerator_Partial.h
index fe6cdd8104..a28652ddc6 100644
--- a/src/dxaml/xcp/dxaml/lib/ItemContainerGenerator_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/ItemContainerGenerator_Partial.h
@@ -480,7 +480,7 @@ namespace DirectUI
 
             ItemContainerGenerator* m_pFactory;
             xaml_primitives::GeneratorDirection m_direction;
-            BOOLEAN m_bDone;
+            BOOLEAN m_bDone{};
             GeneratorState m_cachedState;
 
         }* m_pGenerator;
diff --git a/src/dxaml/xcp/dxaml/lib/ItemsControl_Partial.cpp b/src/dxaml/xcp/dxaml/lib/ItemsControl_Partial.cpp
index f709afa393..7c5089ad77 100644
--- a/src/dxaml/xcp/dxaml/lib/ItemsControl_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/ItemsControl_Partial.cpp
@@ -227,11 +227,11 @@ _Check_return_
 
     // If we still haven't been able to get a usable source, and this is a CLR application, try to get
     // a wrapper around the input collection.
-    if( !spSource && pNewValue != nullptr )
+    if (!spSource && pNewValue != nullptr)
     {
         ctl::ComPtr<IInspectable> spWrapper;
         spWrapper.Attach(ReferenceTrackerManager::GetTrackerTarget(pNewValue));
-        if( spWrapper )
+        if (spWrapper)
         {
             if (auto spBindableIterable = spWrapper.AsOrNull<IBindableIterable>())
             {
@@ -243,7 +243,7 @@ _Check_return_
     // Update ItemCollection with new ItemsSource reference.
     // May be a null, which means clearing. But must be a IEnumerable derived instance.
 
-    if(pNewValue != nullptr && !spSource)
+    if (pNewValue != nullptr && !spSource)
     {
         IFC_RETURN(E_INVALIDARG);
     }
@@ -531,7 +531,7 @@ _Check_return_
     {
         IFC(IsItemItsOwnContainer(pItem, &isOwnContainer));
 
-        if(isOwnContainer)
+        if (isOwnContainer)
         {
             IFC(ctl::do_query_interface(*ppContainer, pItem));
         }
@@ -552,7 +552,7 @@ _Check_return_
             IFC(ContainerFromItem(pItem, &spContainerAsDO));
         }
 
-        if(spContainerAsDO)
+        if (spContainerAsDO)
         {
             IFC(spContainerAsDO.CopyTo(ppContainer));
         }
@@ -660,7 +660,6 @@ _Check_return_
         IFC(OnItemsHostAvailable());
     }
 
-
     if (!spItemsHost)
     {
         goto Cleanup;
@@ -690,6 +689,9 @@ _Check_return_
     }
 
     IFC(get_ItemContainerGenerator(&spItemContainerGenerator));
+
+    ASSERT(m_tpGenerator);
+
     IFC(m_tpGenerator->StartAt(position, xaml_primitives::GeneratorDirection::GeneratorDirection_Forward, TRUE));
 
     for (UINT nIndex = 0; nIndex < nCount ; ++nIndex)
@@ -1049,7 +1051,7 @@ _Check_return_
         // new style panels: the panel implements internal IICG2 interface
         IFC(spCustomItemsHost->NotifyOfItemsChanging(e));
     }
-    else
+    else if (m_tpGenerator)
     {
         // old style panels: m_tpGenerator is pointing to an ICG implementations
         IFC(m_tpGenerator.Cast<ItemContainerGenerator>()->NotifyOfSourceChanged(pSender, e));
@@ -1155,7 +1157,7 @@ _Check_return_ HRESULT ItemsControl::OnItemContainerStyleSelectorChangedImpl(
     HRESULT hr = S_OK;
     ctl::ComPtr<IStyle> spContainerStyle;
     IFC(get_ItemContainerStyle(&spContainerStyle));
-    if(!spContainerStyle)
+    if (!spContainerStyle)
     {
         IFC(RefreshContainers());
     }
@@ -1529,7 +1531,7 @@ _Check_return_
                 spItemsControl = static_cast<IItemsControl*>(spTemplatedParent.Cast<ItemsControl>());
                 spTemplatedParent.Reset();
 
-                if(!ignoreGrouping)
+                if (!ignoreGrouping)
                 {
                     IFC(spItemsControl.Cast<ItemsControl>()->get_TemplatedParent(&spTemplatedParent));
                     spGroupItem = spTemplatedParent.AsOrNull<IGroupItem>();
@@ -2201,8 +2203,9 @@ _Check_return_
     Trace(szTrace);
 #endif
 
-    // Different panel types can have different ICG setups, so we'd better make sure we have the right one
-    if (ctl::is<ICustomGeneratorItemsHost>(spItemsHost))
+    // Different panel types can have different ICG setups, so we'd better make sure we have the right one.
+    // m_tpGenerator can be null when changing the ItemsPanel property while the ItemsSource is null.
+    if (ctl::is<ICustomGeneratorItemsHost>(spItemsHost) || !m_tpGenerator)
     {
         IFC(InitializeItemContainerGenerator());
     }
@@ -2521,12 +2524,12 @@ IFACEMETHODIMP
 {
     HRESULT hr = S_OK;
 
-    if( m_tpItems )
+    if (m_tpItems)
     {
-        IFC( m_tpItems->DisconnectVisualChildrenRecursive() );
+        IFC(m_tpItems->DisconnectVisualChildrenRecursive());
     }
 
-    IFC( ItemsControlGenerated::OnDisconnectVisualChildren() );
+    IFC(ItemsControlGenerated::OnDisconnectVisualChildren());
 
 Cleanup:
 
@@ -2621,13 +2624,13 @@ _Check_return_ HRESULT
     *pGroupItemIndex = 0;
 
     // If groupItem is nullptr, return found= false
-    if(groupItem == nullptr)
+    if (groupItem == nullptr)
     {
         goto Cleanup;
     }
 
     IFC(get_IsGrouping(&isGrouping));
-    if(isGrouping)
+    if (isGrouping)
     {
         ctl::ComPtr<IPanel> spPanel;
 
diff --git a/src/dxaml/xcp/dxaml/lib/ItemsControl_Partial.h b/src/dxaml/xcp/dxaml/lib/ItemsControl_Partial.h
index f3cb66b632..1a0949ae9d 100644
--- a/src/dxaml/xcp/dxaml/lib/ItemsControl_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/ItemsControl_Partial.h
@@ -555,8 +555,8 @@ namespace DirectUI
         DataTemplateSelectorRecyclingContext m_dataSelectorRecyclingContext;
 
         ctl::EventPtr<VectorChangedEventCallback> m_epItemCollectionVectorChangedHandler;
-        EventRegistrationToken m_ItemsChangedToken;
-        EventRegistrationToken m_GroupStyleChangedToken;
+        EventRegistrationToken m_ItemsChangedToken{};
+        EventRegistrationToken m_GroupStyleChangedToken{};
 
         TrackerPtr<DirectUI::ItemCollection> m_tpItems;
         TrackerPtr<xaml_controls::IItemContainerGenerator> m_tpGenerator;
diff --git a/src/dxaml/xcp/dxaml/lib/ItemsStackPanel_Partial.cpp b/src/dxaml/xcp/dxaml/lib/ItemsStackPanel_Partial.cpp
index e8cd3f1e23..62ff045bd9 100644
--- a/src/dxaml/xcp/dxaml/lib/ItemsStackPanel_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/ItemsStackPanel_Partial.cpp
@@ -215,6 +215,48 @@ ItemsStackPanel::SetGroupHeaderStrategy(_In_ GroupHeaderStrategy strategy) /*ove
     RRETURN(hr);
 }
 
+// Returns the size of the potential GroupPadding in the virtualizing direction.
+_Check_return_ HRESULT ItemsStackPanel::GroupPaddingSizeInVirtualizingDirection(_Out_ double* groupPadding) /*override*/
+{
+    *groupPadding = 0.0;
+
+    xaml::Thickness thickness = {};
+
+    IFC_RETURN(get_GroupPadding(&thickness));
+
+    *groupPadding = SizeFromThicknessInVirtualizingDirection(thickness);
+
+    return S_OK;
+}
+
+// Used to estimate tracked element reposition during items source updates, when a group header is inserted.
+_Check_return_ HRESULT ItemsStackPanel::GetAverageHeaderSize(_Out_ float* averageHeaderSize) /*override*/
+{
+    *averageHeaderSize = -1.0f;
+
+    ctl::ComPtr<xaml_controls::ILayoutStrategy> stackingLayoutStrategy;
+
+    IFC_RETURN(GetLayoutStrategy(&stackingLayoutStrategy));
+    
+    *averageHeaderSize = stackingLayoutStrategy.Cast<StackingLayoutStrategy>()->GetAverageHeaderSize();
+
+    return S_OK;
+}
+
+// Used to estimate tracked element reposition during items source updates, when a container is inserted.
+_Check_return_ HRESULT ItemsStackPanel::GetAverageContainerSize(_Out_ float* averageContainerSize) /*override*/
+{
+    *averageContainerSize = -1.0f;
+
+    ctl::ComPtr<xaml_controls::ILayoutStrategy> stackingLayoutStrategy;
+
+    IFC_RETURN(GetLayoutStrategy(&stackingLayoutStrategy));
+
+    *averageContainerSize = stackingLayoutStrategy.Cast<StackingLayoutStrategy>()->GetAverageContainerSize();
+
+    return S_OK;
+}
+
 // Logical Orientation override
 _Check_return_ HRESULT ItemsStackPanel::get_LogicalOrientation(
     _Out_ xaml_controls::Orientation* pValue) 
diff --git a/src/dxaml/xcp/dxaml/lib/ItemsStackPanel_Partial.h b/src/dxaml/xcp/dxaml/lib/ItemsStackPanel_Partial.h
index c74e906a9b..d6d5ab2326 100644
--- a/src/dxaml/xcp/dxaml/lib/ItemsStackPanel_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/ItemsStackPanel_Partial.h
@@ -18,6 +18,9 @@ namespace DirectUI
         // OnPropertyChanged methods. 
         _Check_return_ HRESULT OnPropertyChanged2(_In_ const PropertyChangedParams& args) override;
         
+        // Returns the size of the potential GroupPadding in the virtualizing direction.
+        _Check_return_ HRESULT GroupPaddingSizeInVirtualizingDirection(_Out_ double* groupPadding) override;
+
         // Only ItemsStackPanel and CalendarPanel support the maintain viewport behavior.
         ItemsUpdatingScrollMode GetItemsUpdatingScrollMode() const override { return static_cast<ItemsUpdatingScrollMode>(m_itemsUpdatingScrollMode); }
 
@@ -34,6 +37,11 @@ namespace DirectUI
         // Notify the layout strategy of the new header placement.
         _Check_return_ HRESULT SetGroupHeaderStrategy(_In_ GroupHeaderStrategy strategy) override;
 
+        // Used to estimate tracked element reposition during items source updates. These should have been part of the 
+        // Microsoft.UI.Xaml.Controls.ILayoutStrategy interface.
+        _Check_return_ HRESULT GetAverageHeaderSize(_Out_ float* averageHeaderSize) override;
+        _Check_return_ HRESULT GetAverageContainerSize(_Out_ float* averageContainerSize) override;
+
     public:
         // implementation of IOrientedPanel
         IFACEMETHOD(get_LogicalOrientation)(_Out_ xaml_controls::Orientation* pValue) override;
diff --git a/src/dxaml/xcp/dxaml/lib/IterableWrappedCollection.h b/src/dxaml/xcp/dxaml/lib/IterableWrappedCollection.h
index a7d334065c..4370767981 100644
--- a/src/dxaml/xcp/dxaml/lib/IterableWrappedCollection.h
+++ b/src/dxaml/xcp/dxaml/lib/IterableWrappedCollection.h
@@ -342,7 +342,7 @@ namespace DirectUI
             wfc::IVectorChangedEventArgs> m_evtVectorChangedHandlers;
 
         // Registration for our wrapped vector's changed event.
-        EventRegistrationToken m_VectorChangedToken;
+        EventRegistrationToken m_VectorChangedToken{};
 
     }; // class IterableWrappedObservableCollection
 }
diff --git a/src/dxaml/xcp/dxaml/lib/JoltClasses.h b/src/dxaml/xcp/dxaml/lib/JoltClasses.h
index bca274ca53..e3b101b35f 100644
--- a/src/dxaml/xcp/dxaml/lib/JoltClasses.h
+++ b/src/dxaml/xcp/dxaml/lib/JoltClasses.h
@@ -1160,7 +1160,7 @@ namespace DirectUI
     private:
         ctl::ComBase* m_pTarget;
         KnownEventIndex m_hEventId;
-        bool m_bUseEventManager; // Whether the event is an event that uses CEventManager.
+        bool m_bUseEventManager{}; // Whether the event is an event that uses CEventManager.
     };
 
     template<class THANDLER, class TSENDER, class TARGS>
diff --git a/src/dxaml/xcp/dxaml/lib/JoltCollections.h b/src/dxaml/xcp/dxaml/lib/JoltCollections.h
index 111ac352d3..019f1d9723 100644
--- a/src/dxaml/xcp/dxaml/lib/JoltCollections.h
+++ b/src/dxaml/xcp/dxaml/lib/JoltCollections.h
@@ -213,7 +213,7 @@ namespace DirectUI
             ReleaseInterface(current);
         }
 
-        TrackerPtr<T_abi_ptrRemoved> m_current;
+        TrackerPtr<T_abi_ptrRemoved> m_current{};
     };
 
     template<>
@@ -234,7 +234,7 @@ namespace DirectUI
         }
 
     private:
-        FLOAT m_current;
+        FLOAT m_current{};
     };
 
     template<>
@@ -255,7 +255,7 @@ namespace DirectUI
         }
 
     private:
-        DOUBLE m_current;
+        DOUBLE m_current{};
     };
 
     template<>
@@ -276,7 +276,7 @@ namespace DirectUI
         }
 
     private:
-        wf::Point m_current;
+        wf::Point m_current{};
     };
 
 
@@ -298,7 +298,7 @@ namespace DirectUI
         }
 
     private:
-        xaml_docs::TextRange m_current;
+        xaml_docs::TextRange m_current{};
     };
 #pragma endregion
 
@@ -1201,7 +1201,7 @@ namespace DirectUI
             m_current = current;
         }
 
-        T m_current;
+        T m_current{};
     };
 
     template <typename T>
diff --git a/src/dxaml/xcp/dxaml/lib/JupiterControl.cpp b/src/dxaml/xcp/dxaml/lib/JupiterControl.cpp
index 0ed305bfbe..f767d2d039 100644
--- a/src/dxaml/xcp/dxaml/lib/JupiterControl.cpp
+++ b/src/dxaml/xcp/dxaml/lib/JupiterControl.cpp
@@ -158,7 +158,7 @@ void CJupiterControl::DisconnectUIA()
     {
         m_pUIAWindow->UIADisconnectAllProviders();
         m_pUIAWindow->Deinit();
-        ReleaseInterface(m_pUIAWindow);
+        m_pUIAWindow = nullptr;
     }
 }
 
@@ -607,11 +607,30 @@ bool CJupiterControl::HandlePointerMessage(
     return bHandled;
 }
 
+void CJupiterControl::HandleNonClientPointerMessage(
+    _In_ UINT uMsg,
+    _In_ UINT32 pointerId,
+    _In_opt_ CContentRoot* contentRoot,
+    bool isGeneratedMessage,
+    _In_opt_ ixp::IPointerPoint* pointerPoint)
+{
+    if (m_pBH)
+    {
+        MsgPacket msgPack;
+        msgPack.m_wParam = pointerId;
+        msgPack.m_hwnd = m_pWindow->GetWindowHandle();
+        msgPack.m_pPointerPointNoRef = pointerPoint;
+        msgPack.m_isNonClientPointerMessage = true;
+
+        bool bHandled = false;
+        m_pBH->HandleInputMessage(uMsg, &msgPack, contentRoot, isGeneratedMessage, bHandled);
+    }
+}
+
 LRESULT CJupiterControl::HandleGetObjectMessage(_In_ UINT uMsg, _In_ WPARAM wParam, _In_ LPARAM lParam)
 {
     HRESULT hr = S_OK; // WARNING_IGNORES_FAILURES
     LRESULT lResult = 0;
-    ::IRawElementProviderSimple* pProvider = nullptr;
 
     if (m_pBH)
     {
@@ -621,26 +640,32 @@ LRESULT CJupiterControl::HandleGetObjectMessage(_In_ UINT uMsg, _In_ WPARAM wPar
 
         if (m_pUIAWindow == nullptr)
         {
-            IFC(CUIAHostWindow::Create(
-                UIAHostEnvironmentInfo(hWnd, hWnd),
-                this,
-                nullptr,  // pRootVisual
-                &m_pUIAWindow));
+            IFC(CreateUIAHostWindowForHwnd(hWnd));
         }
 
         IFCPTR(m_pUIAWindow);
-        IFC(m_pUIAWindow->QueryInterface(__uuidof(::IRawElementProviderSimple), reinterpret_cast<void**>(&pProvider)));
-        lResult = ::UiaReturnRawElementProvider(hWnd, wParam, lParam, pProvider);
+
+        wrl::ComPtr<::IRawElementProviderSimple> uiaWindowAsRawElementProviderSimple;
+        IFC(m_pUIAWindow.As(&uiaWindowAsRawElementProviderSimple));
+        lResult = ::UiaReturnRawElementProvider(hWnd, wParam, lParam, uiaWindowAsRawElementProviderSimple.Get());
 
         m_pUIAWindow->SetMockUIAClientsListening(m_isEnabledMockUIAClientsListening);
     }
 
 Cleanup:
-    ReleaseInterface(pProvider);
-
     return lResult;
 }
 
+HRESULT CJupiterControl::CreateUIAHostWindowForHwnd(_In_ HWND hwnd)
+{
+    RETURN_IF_FAILED(CUIAHostWindow::Create(
+                        UIAHostEnvironmentInfo(hwnd, hwnd),
+                        this,
+                        nullptr,  // pRootVisual
+                        &m_pUIAWindow));
+    return S_OK;
+}
+
 _Check_return_ HRESULT CJupiterControl::CreateProviderForAP(_In_ CAutomationPeer* pAP, _Outptr_result_maybenull_ CUIAWrapper** ppRet)
 {
     *ppRet = nullptr;
@@ -829,13 +854,9 @@ _Check_return_ HRESULT CJupiterControl::GetUIAWindow(
     // Create/Get UI Automation provider object for plugin window
     if (!m_pUIAWindow && !onlyGet)
     {
-        IFC_RETURN(CUIAHostWindow::Create(
-            UIAHostEnvironmentInfo(static_cast<HWND>(hWnd), static_cast<HWND>(hWnd)),
-            this,
-            nullptr,  // pRootVisual
-            &m_pUIAWindow));
+        IFC_RETURN(CreateUIAHostWindowForHwnd(static_cast<HWND>(hWnd)));
     }
-    *uiaWindowNoRef = m_pUIAWindow;
+    *uiaWindowNoRef = m_pUIAWindow.Get();
 
     return S_OK;
 }
diff --git a/src/dxaml/xcp/dxaml/lib/JupiterControl.h b/src/dxaml/xcp/dxaml/lib/JupiterControl.h
index 67e7bf1baf..bc0bf4f226 100644
--- a/src/dxaml/xcp/dxaml/lib/JupiterControl.h
+++ b/src/dxaml/xcp/dxaml/lib/JupiterControl.h
@@ -54,6 +54,8 @@ class CJupiterControl final : public CControlBase, public CReferenceCount
     bool HandleWindowMessage(UINT uMsg, _In_ WPARAM wParam, _In_ LPARAM lParam, _In_ CContentRoot* contentRoot);
 
     LRESULT HandleGetObjectMessage(_In_ UINT uMsg, _In_ WPARAM wParam, _In_ LPARAM lParam);
+    HRESULT CreateUIAHostWindowForHwnd(_In_ HWND hwnd);
+    wrl::ComPtr<CUIAHostWindow> GetUIAHostWindow() { return m_pUIAWindow; }
 
     void OnDisplayChanged();
     static HRESULT NotifyImmersiveColorSetChanged();
@@ -174,6 +176,14 @@ class CJupiterControl final : public CControlBase, public CReferenceCount
         _In_opt_ ixp::IPointerEventArgs* pointerEventArgs = nullptr
         );
 
+    void HandleNonClientPointerMessage(
+        _In_ UINT uMsg,
+        _In_ UINT32 pointerId,
+        _In_opt_ CContentRoot* contentRoot,
+        bool isGeneratedMessage = false,
+        _In_opt_ ixp::IPointerPoint* pointerPoint = nullptr
+        );
+
     // Test hooks
     void SetHdrOutputOverride(bool isHdrOutputOverride);
 
@@ -188,7 +198,7 @@ class CJupiterControl final : public CControlBase, public CReferenceCount
     bool HandleUpdateUIStateMessage(_In_ UINT uMsg, _In_ WPARAM wParam, _In_ LPARAM lParam, _In_opt_ CContentRoot* contentRoot);
 
     CJupiterWindow* m_pWindow;
-    CUIAHostWindow* m_pUIAWindow;
+    wrl::ComPtr<CUIAHostWindow> m_pUIAWindow;
 
     bool m_isEnabledMockUIAClientsListening;
 
diff --git a/src/dxaml/xcp/dxaml/lib/JupiterWindow.cpp b/src/dxaml/xcp/dxaml/lib/JupiterWindow.cpp
index 3008bd517f..e1a823be21 100644
--- a/src/dxaml/xcp/dxaml/lib/JupiterWindow.cpp
+++ b/src/dxaml/xcp/dxaml/lib/JupiterWindow.cpp
@@ -200,7 +200,7 @@ _Check_return_ HRESULT CJupiterWindow::Create(_In_ HWND hwnd, WindowType::Enum w
     *ppWindow = nullptr;
 
     ctl::ComPtr<CJupiterWindow> spWindow;
-    ctl::make(hwnd, windowType, &spWindow);
+    IFC_RETURN(ctl::make(hwnd, windowType, &spWindow));
 
     spWindow->SetControl(pControl);
 
@@ -302,6 +302,8 @@ CJupiterWindow::~CJupiterWindow()
 
     IGNOREHR(UnregisterDropTargetRequested());
 
+    UninitializeInputSiteAdapterForCoreWindow();
+
     ReleaseInterface(m_pCoreWindow);
 }
 
@@ -394,8 +396,21 @@ LRESULT CALLBACK CJupiterWindow::CoreWindowSubclassProc(_In_ HWND hwnd, UINT uMs
                     // (If it doesn't, we're only showing islands; don't hook up UIA to the main window.
                     // Each island's UIA tree will get hooked up separately.)
 
-                    lresult = m_pControl->HandleGetObjectMessage(uMsg, wParam, lParam);
-                    fHandled = true;
+                    if (m_inputSiteAdapterHwndHandlesWmGetObject)
+                    {
+                        // Automation is handled via the Island infrastructure and a different HWND entrypoint for WM_GETOBJECT.
+                        // See CJupiterWindow::OnContentAutomationProviderRequested and CJupiterWindow::EnsureInputSiteAdapterForCoreWindow.
+                        // Handle this the same way we handle input above by doing nothing.
+                        return (m_subclassedWndProc) ? 
+                            CallWindowProc(m_subclassedWndProc, hwnd, uMsg, wParam, lParam) :
+                            DefWindowProc(hwnd, uMsg, wParam, lParam);
+                    }
+                    else
+                    {
+                        lresult = m_pControl->HandleGetObjectMessage(uMsg, wParam, lParam);
+                        fHandled = true;
+                        m_legacyCoreWindowUiaProviderSet = true;
+                    }
                 }
             }
             fDefaultToControl = false;
@@ -1299,6 +1314,25 @@ _Check_return_ HRESULT CJupiterWindow::OnIslandPointerMessage(
     return S_OK;
 }
 
+_Check_return_ HRESULT CJupiterWindow::OnIslandNonClientPointerMessage(
+    const UINT msg,
+    _In_opt_ CContentRoot* contentRoot,
+    _In_ ixp::IPointerPoint* pointerPoint,
+    const bool isReplayedMessage)
+{
+    if (!contentRoot)
+    {
+        return S_OK;
+    }
+
+    UINT32 pointerId = 0;
+    IFCFAILFAST(pointerPoint->get_PointerId(&pointerId));
+
+    m_pControl->HandleNonClientPointerMessage(msg, pointerId, contentRoot, isReplayedMessage, pointerPoint);
+
+    return S_OK;
+}
+
 _Check_return_ HRESULT CJupiterWindow::OnIslandMessage(
     _In_ UINT uMsg,
     _In_ WPARAM wParam,
@@ -1424,6 +1458,24 @@ _Check_return_ HRESULT CJupiterWindow::RegisterCoreWindowEvents()
     return S_OK;
 }
 
+_Check_return_ HRESULT
+CJupiterWindow::OnContentAutomationProviderRequested(
+    _In_ ixp::IContentIsland* content,
+    _In_ ixp::IContentIslandAutomationProviderRequestedEventArgs* e)
+{
+    auto uiaWindow = m_pControl->GetUIAHostWindow();
+    if (nullptr == uiaWindow)
+    {
+        IFC_RETURN(m_pControl->CreateUIAHostWindowForHwnd(m_hwnd));
+        uiaWindow = m_pControl->GetUIAHostWindow();
+    }
+
+    IFC_RETURN(e->put_AutomationProvider(uiaWindow.Get()));
+    IFC_RETURN(e->put_Handled(true));
+
+    return S_OK;
+}
+
 void CJupiterWindow::EnsureInputSiteAdapterForCoreWindow(_In_ ixp::IContentIsland* const coreWindowContentIsland)
 {
     if (m_inputSiteAdapter != nullptr)
@@ -1431,13 +1483,49 @@ void CJupiterWindow::EnsureInputSiteAdapterForCoreWindow(_In_ ixp::IContentIslan
         return;
     }
 
+    m_contentIsland = coreWindowContentIsland;
     m_inputSiteAdapter = std::make_unique<InputSiteAdapter>();
-    m_inputSiteAdapter->Initialize(coreWindowContentIsland, GetCoreWindowContentRootNoRef(), this);
+    m_inputSiteAdapter->Initialize(m_contentIsland.Get(), GetCoreWindowContentRootNoRef(), this);
+
+    // If the InputSiteAdapter has a different underlying Input HWND, then automation is expected to flow
+    // only via the ContentIsland AutomationProviderRequested event.
+    if (CInputServices::GetUnderlyingInputHwndFromIslandInputSite(m_inputSiteAdapter->GetIslandInputSite().Get()) != m_hwnd)
+    {
+        FAIL_FAST_IF_FAILED(m_contentIsland->add_AutomationProviderRequested(WRLHelper::MakeAgileCallback<wf::ITypedEventHandler<
+            ixp::ContentIsland*,
+            ixp::ContentIslandAutomationProviderRequestedEventArgs*>>([&](
+                ixp::IContentIsland* content,
+                ixp::IContentIslandAutomationProviderRequestedEventArgs* args) -> HRESULT
+                {
+                    return OnContentAutomationProviderRequested(content, args);
+                }).Get(),
+                &m_automationProviderRequestedToken));
+
+        if (m_legacyCoreWindowUiaProviderSet)
+        {
+            // If a WM_GETOBJECT was received before the ContentIsland was set up, remove the legacy provider.
+            ::UiaReturnRawElementProvider(m_hwnd, 0, 0, nullptr);
+            m_legacyCoreWindowUiaProviderSet = false;
+        }
+
+        m_inputSiteAdapterHwndHandlesWmGetObject = true;
+    }
 }
 
 void CJupiterWindow::UninitializeInputSiteAdapterForCoreWindow()
 {
+    if (nullptr != m_inputSiteAdapter)
+    {
+        if (0 != m_automationProviderRequestedToken.value)
+        {
+            VERIFYHR(m_contentIsland->remove_AutomationProviderRequested(m_automationProviderRequestedToken));
+            m_automationProviderRequestedToken = {};
+            m_inputSiteAdapterHwndHandlesWmGetObject = false;
+        }
+    }
+
     m_inputSiteAdapter = nullptr;
+    m_contentIsland = nullptr;
 }
 
 _Check_return_ HRESULT CJupiterWindow::UnregisterCoreWindowEvents()
diff --git a/src/dxaml/xcp/dxaml/lib/JupiterWindow.h b/src/dxaml/xcp/dxaml/lib/JupiterWindow.h
index c0ac7b117d..6fd8ca1831 100644
--- a/src/dxaml/xcp/dxaml/lib/JupiterWindow.h
+++ b/src/dxaml/xcp/dxaml/lib/JupiterWindow.h
@@ -128,6 +128,12 @@ class CJupiterWindow : public ::ABI::Microsoft::Internal::FrameworkUdk::ICoreWin
         const bool isReplayedMessage,
         _Out_opt_ bool* handled);
 
+    _Check_return_ HRESULT OnIslandNonClientPointerMessage(
+        const UINT msg,
+        _In_opt_ CContentRoot* contentRoot,
+        _In_ ixp::IPointerPoint* pointerPoint,
+        const bool isReplayedMessage);
+
     _Check_return_ HRESULT OnIslandMessage(
         _In_ UINT uMsg,
         _In_ WPARAM wParam,
@@ -253,6 +259,10 @@ class CJupiterWindow : public ::ABI::Microsoft::Internal::FrameworkUdk::ICoreWin
         _In_ wsy::VirtualKey virtualKey,
         _Inout_ bool* handled);
 
+    _Check_return_ HRESULT OnContentAutomationProviderRequested(
+        _In_ ixp::IContentIsland* content,
+        _In_ ixp::IContentIslandAutomationProviderRequestedEventArgs* e);
+
     HWND                m_hwnd;
     WindowType::Enum    m_windowType;
     CJupiterControl*    m_pControl;
@@ -283,6 +293,11 @@ class CJupiterWindow : public ::ABI::Microsoft::Internal::FrameworkUdk::ICoreWin
     bool m_useCoreDragDrop = false;
 
     std::unique_ptr<InputSiteAdapter> m_inputSiteAdapter{nullptr};
+    bool m_inputSiteAdapterHwndHandlesWmGetObject{false};
+    bool m_legacyCoreWindowUiaProviderSet{false};
+
+    wrl::ComPtr<ixp::IContentIsland> m_contentIsland{nullptr};
+    EventRegistrationToken m_automationProviderRequestedToken = {};
 
 #pragma warning(push)
 #pragma warning(disable:4996) // IApplicationViewStatics is marked as [[deprecated]]
diff --git a/src/dxaml/xcp/dxaml/lib/ListViewBaseHeaderItem_Partial.h b/src/dxaml/xcp/dxaml/lib/ListViewBaseHeaderItem_Partial.h
index 9b7a33cb23..33e86b9d4f 100644
--- a/src/dxaml/xcp/dxaml/lib/ListViewBaseHeaderItem_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/ListViewBaseHeaderItem_Partial.h
@@ -112,7 +112,7 @@ namespace DirectUI
 
 private:
         ctl::WeakRefPtr m_wrParentListViewBase;
-        XRECTF_RB m_rectGroupBoundsCache;
+        XRECTF_RB m_rectGroupBoundsCache{};
         BOOL m_invalidateGroupBoundsCache;
 
         bool m_IsPressed;
diff --git a/src/dxaml/xcp/dxaml/lib/ListViewBaseItemPresenter_Partial.h b/src/dxaml/xcp/dxaml/lib/ListViewBaseItemPresenter_Partial.h
index fa470cd247..97b434d23a 100644
--- a/src/dxaml/xcp/dxaml/lib/ListViewBaseItemPresenter_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/ListViewBaseItemPresenter_Partial.h
@@ -73,14 +73,14 @@ PARTIAL_CLASS(ListViewBaseItemPresenter), private ListViewBaseItemAnimationComma
         // Private state
         AnimationState m_pointerPressedAnimation;
         AnimationState m_reorderHintAnimation;
-        EventRegistrationToken m_reorderHintBackCompletedToken;
+        EventRegistrationToken m_reorderHintBackCompletedToken{};
         AnimationState m_dragDropAnimation;
         AnimationState m_multiSelectAnimation;
-        EventRegistrationToken m_multiSelectCompletedToken;
+        EventRegistrationToken m_multiSelectCompletedToken{};
         AnimationState m_indicatorSelectAnimation;
-        EventRegistrationToken m_indicatorSelectCompletedToken;
+        EventRegistrationToken m_indicatorSelectCompletedToken{};
         AnimationState m_selectionIndicatorAnimation;
-        EventRegistrationToken m_selectionIndicatorCompletedToken;
+        EventRegistrationToken m_selectionIndicatorCompletedToken{};
 };
 
 }
diff --git a/src/dxaml/xcp/dxaml/lib/ListViewBase_Partial.cpp b/src/dxaml/xcp/dxaml/lib/ListViewBase_Partial.cpp
index e507a2e104..83b22c25ce 100644
--- a/src/dxaml/xcp/dxaml/lib/ListViewBase_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/ListViewBase_Partial.cpp
@@ -2925,7 +2925,7 @@ ListViewBase::OnGettingFocus(_In_ xaml::IUIElement* sender, _In_ xaml_input::IGe
             BOOLEAN isFocusable = FALSE;
 
             IFC_RETURN(GetItemContainerMapping(&itemMapping));
-            IFC_RETURN(IsItemFocusable(itemMapping.Get(), focusIndex, &isFocusable));
+            IFC_RETURN(IsItemFocusable(itemMapping.Get(), focusIndex, true /*unrealizedItemsAssumedFocusable*/, &isFocusable));
 
             if (isFocusable)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/ListViewBase_Partial.h b/src/dxaml/xcp/dxaml/lib/ListViewBase_Partial.h
index 2fdf894501..37d292df28 100644
--- a/src/dxaml/xcp/dxaml/lib/ListViewBase_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/ListViewBase_Partial.h
@@ -224,7 +224,7 @@ namespace DirectUI
             // If asked to scroll too soon, we delay the scroll until the template is applied.
             // This can happen with semantic zoom and list UI deserialization.
             TrackerPtr<IInspectable> m_tpDeferredScrollToItem;
-            xaml_controls::ScrollIntoViewAlignment m_deferredAlignment;
+            xaml_controls::ScrollIntoViewAlignment m_deferredAlignment{};
 
             std::function<HRESULT(IInspectable*)> m_deferredScrollCommand;
 
@@ -1144,6 +1144,7 @@ namespace DirectUI
             static _Check_return_ HRESULT IsItemFocusable(
                 _In_ xaml_controls::IItemContainerMapping* pMapping,
                 _In_ UINT itemIndex,
+                _In_ bool unrealizedItemsAssumedFocusable,
                 _Out_ BOOLEAN* pIsFocusable);
 
         #pragma endregion
diff --git a/src/dxaml/xcp/dxaml/lib/ListViewBase_Partial_Interaction.cpp b/src/dxaml/xcp/dxaml/lib/ListViewBase_Partial_Interaction.cpp
index 3bafea209b..7758954dcc 100644
--- a/src/dxaml/xcp/dxaml/lib/ListViewBase_Partial_Interaction.cpp
+++ b/src/dxaml/xcp/dxaml/lib/ListViewBase_Partial_Interaction.cpp
@@ -1164,7 +1164,7 @@ IFACEMETHODIMP ListViewBase::OnKeyDown(
         if (spCurrentAsLVBI)
         {
             BOOLEAN hasFocus = FALSE;
-            spCurrentAsLVBI->HasFocus(&hasFocus);
+            IFC_RETURN(spCurrentAsLVBI->HasFocus(&hasFocus));
 
             if (!hasFocus || focusMoved)
             {
@@ -1867,7 +1867,7 @@ _Check_return_ HRESULT ListViewBase::OnKeyboardNavigation(
                         }
                         else
                         {
-                            IFC(ListViewBase::IsItemFocusable(spMapping.Get(), panelStartIndexInCollection + index, pIsFocusable));
+                            IFC(ListViewBase::IsItemFocusable(spMapping.Get(), panelStartIndexInCollection + index, true /*unrealizedItemsAssumedFocusable*/, pIsFocusable));
                         }
 
                     Cleanup:
@@ -2227,7 +2227,7 @@ _Check_return_ HRESULT ListViewBase::GetClosestIndexToItemInGroupPanel(
                 targetIndexInCollection = targetElementInfoInTargetPanel.m_childIndex + targetGroupStartIndex;
 
                 // See if the target is selectable.
-                IFC(ListViewBase::IsItemFocusable(spMapping.Get(), targetIndexInCollection, &isTargetFocusable))
+                IFC(ListViewBase::IsItemFocusable(spMapping.Get(), targetIndexInCollection, true /*unrealizedItemsAssumedFocusable*/, &isTargetFocusable))
 
                 if (isTargetFocusable)
                 {
@@ -2362,7 +2362,7 @@ _Check_return_ HRESULT ListViewBase::FindFirstSelectableItemInGroup(
                 IFC(GetItemContainerMapping(&spMapping));
             }
 
-            IFC(ListViewBase::IsItemFocusable(spMapping.Get(), currentItemIndex, &isFocusable));
+            IFC(ListViewBase::IsItemFocusable(spMapping.Get(), currentItemIndex, true /*unrealizedItemsAssumedFocusable*/, &isFocusable));
             if (isFocusable)
             {
                 *pFoundSelectableItem = TRUE;
@@ -3262,24 +3262,33 @@ _Check_return_ HRESULT ListViewBase::IsGroupItemFocusable(
 }
 
 // Checks whether the item container returned for the given index
-// by pGenerator is Selectable.
+// by pGenerator is focusable.
 _Check_return_ HRESULT ListViewBase::IsItemFocusable(
     _In_ IItemContainerMapping* pMapping,
     _In_ UINT itemIndex,
+    _In_ bool unrealizedItemsAssumedFocusable,
     _Out_ BOOLEAN* pIsFocusable)
 {
     HRESULT hr = S_OK;
     ctl::ComPtr<xaml::IDependencyObject> spContainerAsIDO;
-    ctl::ComPtr<IInspectable> spContainerAsI;
-    BOOLEAN isFocusable = FALSE;
 
     *pIsFocusable = FALSE;
 
     IFC(pMapping->ContainerFromIndex(itemIndex, &spContainerAsIDO));
 
-    spContainerAsI = spContainerAsIDO.AsOrNull<IInspectable>();
-    IFC(ItemsControl::IsFocusableHelper(spContainerAsI.Get(), isFocusable));
-    *pIsFocusable = isFocusable;
+    if (spContainerAsIDO)
+    {
+        ctl::ComPtr<IInspectable> spContainerAsI;
+        BOOLEAN isFocusable = FALSE;
+
+        spContainerAsI = spContainerAsIDO.AsOrNull<IInspectable>();
+        IFC(ItemsControl::IsFocusableHelper(spContainerAsI.Get(), isFocusable));
+        *pIsFocusable = isFocusable;
+    }
+    else if (unrealizedItemsAssumedFocusable)
+    {
+        *pIsFocusable = TRUE;
+    }
 
 Cleanup:
     RRETURN(hr);
diff --git a/src/dxaml/xcp/dxaml/lib/MediaPlayerElement_partial.cpp b/src/dxaml/xcp/dxaml/lib/MediaPlayerElement_partial.cpp
index b7b667daaf..f25d2b97f1 100644
--- a/src/dxaml/xcp/dxaml/lib/MediaPlayerElement_partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/MediaPlayerElement_partial.cpp
@@ -835,7 +835,7 @@ _Check_return_ HRESULT MediaPlayerElement::UpdatePosterImageVisibility()
             EventName##EventSourceType::HandlerType,\
                 EventName##EventSourceType::SenderType,\
                 EventName##EventSourceType::ArgsType>> spHandler;\
-        ctl::make(pValue, spSender.Get(), &spHandler);\
+        IFC_RETURN(ctl::make(pValue, spSender.Get(), &spHandler));\
         ctl::ComPtr<EventName##EventSourceType::HandlerType> spValue;\
         IFC_RETURN(spHandler.As(&spValue));\
         IFC_RETURN(__super::add_##EventName(spValue.Get(), ptToken));\
diff --git a/src/dxaml/xcp/dxaml/lib/MediaTransportControls_Partial.h b/src/dxaml/xcp/dxaml/lib/MediaTransportControls_Partial.h
index d5f9ca0e9a..8f9ef679d3 100644
--- a/src/dxaml/xcp/dxaml/lib/MediaTransportControls_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/MediaTransportControls_Partial.h
@@ -50,7 +50,7 @@ namespace DirectUI
         wrl_wrappers::HString id;
         wrl_wrappers::HString subtype;
         wrl_wrappers::HString channelCount;
-        int trackIndex;
+        int trackIndex{};
 
         TrackFields() { }
         TrackFields(const TrackFields& fields)
@@ -897,7 +897,7 @@ namespace DirectUI
         EventRegistrationToken m_mediaBreakCurrentStateChangeToken;
         EventRegistrationToken m_mediaBreakPositionChangeToken;
         EventRegistrationToken m_mediaBreakDownloadProgressChangeToken;
-        EventRegistrationToken m_mediaPlayerIsLoopingEnabledToken;
+        EventRegistrationToken m_mediaPlayerIsLoopingEnabledToken{};
         ctl::ComPtr<wmp::IMediaPlayer> m_spMediaPlayer;
         ctl::ComPtr<wmp::IMediaPlaybackList> m_spMediaPlaybackList;
         ctl::ComPtr<wmp::IMediaPlaybackList> m_spMediaBreakPlaybackList;
diff --git a/src/dxaml/xcp/dxaml/lib/MediaTransportControls_partial.cpp b/src/dxaml/xcp/dxaml/lib/MediaTransportControls_partial.cpp
index 166e1e83c0..89d4c011cc 100644
--- a/src/dxaml/xcp/dxaml/lib/MediaTransportControls_partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/MediaTransportControls_partial.cpp
@@ -42,6 +42,7 @@
 #include "localizedResource.h"
 #include <windows.foundation.metadata.h>
 #include "XamlRoot.g.h"
+#include <windowing.h>
 
 using namespace ctl;
 using namespace DirectUI;
@@ -5895,15 +5896,19 @@ MediaTransportControls::GetCastingDevicePicker(_Out_ ctl::ComPtr<wm::Casting::IC
             ctl::ComPtr<XamlRoot> xamlRoot = XamlRoot::GetImplementationForElementStatic(spOwnerElement.Get());
             IFCEXPECTRC_RETURN(xamlRoot, S_FALSE);
 
-            HWND xamlHwnd;
-            IFC_RETURN(xamlRoot->get_HostWindow(&xamlHwnd));
-            if (xamlHwnd)
+            ctl::ComPtr<ixp::IContentIslandEnvironment> environment;
+            IFC_RETURN(xamlRoot->get_ContentIslandEnvironmentImpl(&environment));
+            ABI::Microsoft::UI::WindowId environmentWindowId;
+            IFC_RETURN(environment->get_AppWindowId(&environmentWindowId));
+            HWND environmentHwnd = nullptr;
+            IFCFAILFAST(Windowing_GetWindowFromWindowId(environmentWindowId, &environmentHwnd));
+            if (environmentHwnd)
             {
                 // We need to set the HWND on the picker by QI'ing it for IInitializeWithWindow.
                 // The reason is that the picker will eventually be modal to that window
                 ctl::ComPtr<IInitializeWithWindow> spInitialize;
                 IFC_RETURN(m_spCastingDevicePicker.As(&spInitialize));
-                IFC_RETURN(spInitialize->Initialize(xamlHwnd));
+                IFC_RETURN(spInitialize->Initialize(environmentHwnd));
             }
 
             // Set the MediaElement Casting Source in the Supported List.
diff --git a/src/dxaml/xcp/dxaml/lib/MenuFlyoutSubItem_Partial.cpp b/src/dxaml/xcp/dxaml/lib/MenuFlyoutSubItem_Partial.cpp
index 8e8f3f6c60..38124f164a 100644
--- a/src/dxaml/xcp/dxaml/lib/MenuFlyoutSubItem_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/MenuFlyoutSubItem_Partial.cpp
@@ -1044,7 +1044,7 @@ MenuFlyoutSubItem::QueueRefreshItemsSource()
 
                 if (thisMenuFlyoutSubItem)
                 {
-                    thisMenuFlyoutSubItem.Cast<MenuFlyoutSubItem>()->RefreshItemsSource();
+                    IFC_RETURN(thisMenuFlyoutSubItem.Cast<MenuFlyoutSubItem>()->RefreshItemsSource());
                 }
 
                 return S_OK;
diff --git a/src/dxaml/xcp/dxaml/lib/ModernCollectionBasePanel_CacheManager_Partial.cpp b/src/dxaml/xcp/dxaml/lib/ModernCollectionBasePanel_CacheManager_Partial.cpp
index 5c4fa0a8e7..9e9a24ddb5 100644
--- a/src/dxaml/xcp/dxaml/lib/ModernCollectionBasePanel_CacheManager_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/ModernCollectionBasePanel_CacheManager_Partial.cpp
@@ -39,7 +39,7 @@ ModernCollectionBasePanel::CacheManager::~CacheManager()
 
 }
 
-ModernCollectionBasePanel::CacheManager::GroupCache::GroupCache()
+ModernCollectionBasePanel::CacheManager::GroupCache::GroupCache() noexcept
     : startItemIndex(-1)
     , endItemIndex(-1)
     , indexOfGroup(-1)
diff --git a/src/dxaml/xcp/dxaml/lib/ModernCollectionBasePanel_ContainerMapper_Partial.cpp b/src/dxaml/xcp/dxaml/lib/ModernCollectionBasePanel_ContainerMapper_Partial.cpp
index aa6b3443f5..5006d2da2b 100644
--- a/src/dxaml/xcp/dxaml/lib/ModernCollectionBasePanel_ContainerMapper_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/ModernCollectionBasePanel_ContainerMapper_Partial.cpp
@@ -1360,28 +1360,6 @@ _Check_return_ HRESULT ModernCollectionBasePanel::ContainerManager::FilterPinned
     RRETURN(hr);
 }
 
-_Check_return_ HRESULT ModernCollectionBasePanel::ContainerManager::EnsureContainerPinned(_In_ INT index, _In_ const ctl::ComPtr<xaml::IUIElement>& spContainer)
-{
-    HRESULT hr = S_OK;
-
-    auto& pinnedContainers = m_pinnedElements[xaml_controls::ElementType_ItemContainer];
-    auto foundPinnedContainerInfo = std::find_if(
-        begin(pinnedContainers),
-        end(pinnedContainers),
-        [&spContainer](const PinnedElementInfo& pinnedContainer) -> bool
-    {
-        return pinnedContainer.GetElement() == spContainer;
-    });
-
-    if (foundPinnedContainerInfo == end(pinnedContainers))
-    {
-        IFC(RegisterPinnedContainer(index, spContainer));
-    }
-
-Cleanup:
-    RRETURN(hr);
-}
-
 // Is the given element pinned?
 bool ModernCollectionBasePanel::ContainerManager::GetIsElementPinned(
     _In_ xaml_controls::ElementType type,
diff --git a/src/dxaml/xcp/dxaml/lib/ModernCollectionBasePanel_IICG2_Partial.cpp b/src/dxaml/xcp/dxaml/lib/ModernCollectionBasePanel_IICG2_Partial.cpp
index 2df799bb4a..e0430e3158 100644
--- a/src/dxaml/xcp/dxaml/lib/ModernCollectionBasePanel_IICG2_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/ModernCollectionBasePanel_IICG2_Partial.cpp
@@ -7,10 +7,6 @@
 #include "ScrollViewer.g.h"
 #include "VisualTreeHelper.h"
 #include "DataTemplate.g.h"
-#include <FrameworkUdk/Containment.h>
-
-// Bug 49618076: [1.5 servicing] File Explorer crashes when Home directory is selected in address bar and hitting Enter
-#define WINAPPSDK_CHANGEID_49618076 49618076
 
 #pragma warning(disable:4267) //'var' : conversion from 'size_t' to 'type', possible loss of data
 
@@ -791,15 +787,12 @@ _Check_return_ HRESULT ModernCollectionBasePanel::RecycleLinkedContainer(_In_ xa
     // focus to jump when the container gets reused.
     IFC_RETURN(spContainer.Cast<UIElement>()->put_IsGamepadFocusCandidate(FALSE));
 
-    if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_49618076>())
-    {
-        // Declare the container not focusable in general so that it cannot be selected as
-        // a focus candidate. This is to handle the rare case where a focus selection is 
-        // imminently made before the next measure pass (i.e. before the next execution of
-        // ModernCollectionBasePanel::MeasureElementsInGarbageSection() where recycled items are
-        // marked unfocusable in the common cases via a SetElementSizeInGarbageSection call).
-        SetElementEmptySizeInGarbageSection(spContainer);
-    }
+    // Declare the container not focusable in general so that it cannot be selected as
+    // a focus candidate. This is to handle the rare case where a focus selection is 
+    // imminently made before the next measure pass (i.e. before the next execution of
+    // ModernCollectionBasePanel::MeasureElementsInGarbageSection() where recycled items are
+    // marked unfocusable in the common cases via a SetElementSizeInGarbageSection call).
+    SetElementEmptySizeInGarbageSection(spContainer);
 
     TraceVirtualizedItemRemovedInfo((UINT64)spContainer.Cast<UIElement>()->GetHandle());
 
diff --git a/src/dxaml/xcp/dxaml/lib/ModernCollectionBasePanel_Partial.cpp b/src/dxaml/xcp/dxaml/lib/ModernCollectionBasePanel_Partial.cpp
index 4a7c2bb2fc..b743a4ffe5 100644
--- a/src/dxaml/xcp/dxaml/lib/ModernCollectionBasePanel_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/ModernCollectionBasePanel_Partial.cpp
@@ -211,7 +211,7 @@ ModernCollectionBasePanel::RegisterItemsHostImpl(_In_ IGeneratorHost* pHost)
     // it's time to get some caching setup and letting our strategy know about grouping
     {
         // we might have switched sources. discard our cache and rebuild from scratch.
-        m_cacheManager.ResetGroupCache();
+        IFC(m_cacheManager.ResetGroupCache());
 
         // re-evaluate
         auto strongCache = m_cacheManager.CacheStrongRefs(&hr); // Releases when it goes out of scope at the end of block
@@ -342,55 +342,78 @@ _Check_return_ HRESULT ModernCollectionBasePanel::SetGroupHeaderPlacement(_In_ x
     RRETURN(ReevaluateGroupHeaderStrategy());
 }
 
-// Set the strategy's header strategy based on whether or not we're grouping.
-_Check_return_ HRESULT ModernCollectionBasePanel::ReevaluateGroupHeaderStrategy()
+// Returns the group header strategy enum value based on virtualization direction and group header placement.
+_Check_return_ HRESULT ModernCollectionBasePanel::GetGroupHeaderStrategy(_Out_ GroupHeaderStrategy* headerStrategy)
 {
-    ctl::ComPtr<xaml_controls::ILayoutStrategy> spStrategy;
-    xaml_controls::Orientation orientation;
-
-    IFC_RETURN(GetLayoutStrategy(&spStrategy));
-    IFC_RETURN(spStrategy->GetVirtualizationDirection(&orientation));
-
-    // Only apiset + vertical Orientation + Headerplacement!=Left can set it to TRUE
-    BOOL bOldUseStickyHeaders = m_bUseStickyHeaders;
-    m_bUseStickyHeaders = FALSE;
-
-    GroupHeaderStrategy headerStrategy = GroupHeaderStrategy::None;
+    *headerStrategy = GroupHeaderStrategy::None;
 
     if (m_cacheManager.IsGrouping())
     {
+        ctl::ComPtr<xaml_controls::ILayoutStrategy> layoutStrategy;
+        xaml_controls::Orientation orientation;
+
+        IFC_RETURN(GetLayoutStrategy(&layoutStrategy));
+        IFC_RETURN(layoutStrategy->GetVirtualizationDirection(&orientation));
+
         switch (orientation)
         {
         case xaml_controls::Orientation::Orientation_Horizontal:
             if (xaml_primitives::GroupHeaderPlacement_Left == m_groupHeaderPlacement)
             {
-                headerStrategy = GroupHeaderStrategy::Inline;
+                *headerStrategy = GroupHeaderStrategy::Inline;
             }
             else
             {
-                headerStrategy = GroupHeaderStrategy::Parallel;
+                *headerStrategy = GroupHeaderStrategy::Parallel;
             }
             break;
 
         case xaml_controls::Orientation::Orientation_Vertical:
             if (xaml_primitives::GroupHeaderPlacement_Left == m_groupHeaderPlacement)
             {
-                headerStrategy = GroupHeaderStrategy::Parallel;
+                *headerStrategy = GroupHeaderStrategy::Parallel;
             }
             else
             {
-                headerStrategy = GroupHeaderStrategy::Inline;
-                // get the BOOLEAN value from the public property AreStickyGroupHeadersEnabled
-                IFC_RETURN(get_AreStickyGroupHeadersEnabledBase(&m_bUseStickyHeaders));
+                *headerStrategy = GroupHeaderStrategy::Inline;
             }
             break;
 
         default:
-            ASSERT(FALSE);
+            ASSERT(false);
             break;
         }
     }
 
+    return S_OK;
+}
+
+// Set the strategy's header strategy based on whether or not we're grouping.
+_Check_return_ HRESULT ModernCollectionBasePanel::ReevaluateGroupHeaderStrategy()
+{
+    ctl::ComPtr<xaml_controls::ILayoutStrategy> spStrategy;
+    xaml_controls::Orientation orientation;
+
+    IFC_RETURN(GetLayoutStrategy(&spStrategy));
+    IFC_RETURN(spStrategy->GetVirtualizationDirection(&orientation));
+
+    // Only apiset + vertical Orientation + Headerplacement!=Left can set it to TRUE
+    BOOL bOldUseStickyHeaders = m_bUseStickyHeaders;
+    m_bUseStickyHeaders = FALSE;
+    m_lastVisibleWindowClippingHeight = 0.0f;
+
+    GroupHeaderStrategy headerStrategy = GroupHeaderStrategy::None;
+
+    IFC_RETURN(GetGroupHeaderStrategy(&headerStrategy));
+
+    if (m_cacheManager.IsGrouping() &&
+        xaml_primitives::GroupHeaderPlacement_Left != m_groupHeaderPlacement &&
+        orientation == xaml_controls::Orientation::Orientation_Vertical)
+    {
+        // get the BOOLEAN value from the public property AreStickyGroupHeadersEnabled
+        IFC_RETURN(get_AreStickyGroupHeadersEnabledBase(&m_bUseStickyHeaders));
+    }
+
     IFC_RETURN(SetGroupHeaderStrategy(headerStrategy));
 
     // Only apiset + vertical Orientation + Headerplacement!=Left can set bOldUseStickyHeaders to TRUE
@@ -519,7 +542,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::RunVirtualization()
 
         // Protected by Apiset
         // Sticky headers : TRUE only for Vertical Orientation + Headerplacement!=Left
-        // MaintainViewprt : needs ItemsStackPanel AND m_itemsUpdatingScrollMode == ItemsUpdatingScrollMode_KeepItemsInView
+        // MaintainViewprt : needs ItemsStackPanel AND m_itemsUpdatingScrollMode != ItemsUpdatingScrollMode::KeepScrollOffset
 
         if (m_bUseStickyHeaders || IsMaintainViewportSupportedAndEnabled())
         {
@@ -786,7 +809,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::RunGenerate()
         CollectionIterator iterator(m_cacheManager);
 
         // Set the starting location.
-        if(m_viewportBehavior.isTracking)
+        if (m_viewportBehavior.isTracking)
         {
             // We need to shift all the elements to go under the realization window that accounts
             // for the virtualization shift.
@@ -859,10 +882,10 @@ _Check_return_ HRESULT ModernCollectionBasePanel::RemoveMeasureLeftOvers(
     INT leftOverContainerCount = 0;
     INT leftOverHeaderCount = 0;
 
-    if(goForward)
+    if (goForward)
     {
         // We stopped at a sentinel header. lastValidHeaderIndex is already correct.
-        if(current.isHeader())
+        if (current.isHeader())
         {
         }
         // We stopped at a sentinel container. lastValidContainerIndex is already correct.
@@ -882,7 +905,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::RemoveMeasureLeftOvers(
             ASSERT(lastValidContainerIndex == -1);
         }
 
-        if(m_cacheManager.IsGrouping())
+        if (m_cacheManager.IsGrouping())
         {
             leftOverHeaderCount = m_containerManager.GetValidHeaderCount() - lastValidHeaderIndex;
         }
@@ -892,7 +915,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::RemoveMeasureLeftOvers(
     else
     {
         // We stopped at a sentinel header.
-        if(current.isHeader())
+        if (current.isHeader())
         {
             // We always generate the floating header while going backwards
             // So we always lay it out if we successfully iterated through all of its items
@@ -913,7 +936,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::RemoveMeasureLeftOvers(
             // Otherwise, if we haven't stopped on the group's last container, there should be
             // a floating header waiting for us. We'll lay it out after the cleanup.
             // In the meantime, let's not recycle it in the cleanup, so decrement the index
-            if(m_cacheManager.IsGrouping() && current.IndexInGroup() != (current.itemCountInGroup - 1))
+            if (m_cacheManager.IsGrouping() && current.IndexInGroup() != (current.itemCountInGroup - 1))
             {
 #ifdef DBG
                 ctl::ComPtr<IUIElement> spHeader;
@@ -926,7 +949,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::RemoveMeasureLeftOvers(
 
         // +1 to convert from an index to a count.
         leftOverContainerCount = lastValidContainerIndex + 1;
-        if(m_cacheManager.IsGrouping())
+        if (m_cacheManager.IsGrouping())
         {
             leftOverHeaderCount = lastValidHeaderIndex + 1;
         }
@@ -1015,7 +1038,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::Generate(
 
     // When tracking, we should care about the future realization window
     // (when EndTrackingFirstVisbleElement gets called).
-    if(m_viewportBehavior.isTracking)
+    if (m_viewportBehavior.isTracking)
     {
         windowToFill = GetRealizationWindowAfterViewportShift();
     }
@@ -1178,8 +1201,8 @@ _Check_return_ HRESULT ModernCollectionBasePanel::Generate(
 
                     // When elements change size, we need to start tracking the first visible element if the maintain
                     // viewport behavior is enabled.
-                    if(oldBoundsAreValid &&
-                       (!DoubleUtil::AreClose(bounds.Width, oldBounds.Width) || !DoubleUtil::AreClose(bounds.Height, oldBounds.Height)))
+                    if (oldBoundsAreValid &&
+                        (!DoubleUtil::AreClose(bounds.Width, oldBounds.Width) || !DoubleUtil::AreClose(bounds.Height, oldBounds.Height)))
                     {
                         IFC_RETURN(BeginTrackingOnMeasureChange(true /* isGroupChange */, current.groupIndex));
                     }
@@ -1187,10 +1210,10 @@ _Check_return_ HRESULT ModernCollectionBasePanel::Generate(
                     // If we are tracking due to a measure change and we are about to set
                     // new bounds for the tracked element, we will need to update the local
                     // realization window.
-                    if(m_viewportBehavior.isTracking &&
-                       !wereTrackingBefore &&
-                       m_viewportBehavior.type == current.type &&
-                       m_viewportBehavior.index == current.groupIndex)
+                    if (m_viewportBehavior.isTracking &&
+                        !wereTrackingBefore &&
+                        m_viewportBehavior.type == current.type &&
+                        m_viewportBehavior.index == current.groupIndex)
                     {
                         m_viewportBehavior.elementBounds = bounds;
                         windowToFill = GetRealizationWindowAfterViewportShift();
@@ -1314,8 +1337,8 @@ _Check_return_ HRESULT ModernCollectionBasePanel::Generate(
 
                     // When elements change size, we need to start tracking the first visible element if the maintain
                     // viewport behavior is enabled.
-                    if(oldBoundsAreValid &&
-                       (!DoubleUtil::AreClose(bounds.Width, oldBounds.Width) || !DoubleUtil::AreClose(bounds.Height, oldBounds.Height)))
+                    if (oldBoundsAreValid &&
+                        (!DoubleUtil::AreClose(bounds.Width, oldBounds.Width) || !DoubleUtil::AreClose(bounds.Height, oldBounds.Height)))
                     {
                         IFC_RETURN(BeginTrackingOnMeasureChange(false /* isGroupChange */, current.itemIndex));
                     }
@@ -1323,10 +1346,10 @@ _Check_return_ HRESULT ModernCollectionBasePanel::Generate(
                     // If we are tracking due to a measure change and we are about to set
                     // new bounds for the tracked element, we will need to update the local
                     // realization window.
-                    if(m_viewportBehavior.isTracking &&
-                       !wereTrackingBefore &&
-                       m_viewportBehavior.type == current.type &&
-                       m_viewportBehavior.index == current.itemIndex)
+                    if (m_viewportBehavior.isTracking &&
+                        !wereTrackingBefore &&
+                        m_viewportBehavior.type == current.type &&
+                        m_viewportBehavior.index == current.itemIndex)
                     {
                         m_viewportBehavior.elementBounds = bounds;
                         windowToFill = GetRealizationWindowAfterViewportShift();
@@ -1604,8 +1627,8 @@ _Check_return_ HRESULT ModernCollectionBasePanel::EnsureRecycleContainerCandidat
                     spFocusedContainer = spCandidate;
                     focusedPosition = currentPosition;
                 }
-                else if(!isRecyclable &&
-                        !isPinned)
+                else if (!isRecyclable &&
+                         !isPinned)
                 {
                     // pin containers which are not pinned yet but should
                     IFC(m_containerManager.RegisterPinnedContainer(
@@ -2369,7 +2392,6 @@ _Check_return_ HRESULT DirectUI::ModernCollectionBasePanel::ArrangeElements(
                 lastCacheIndex = dataIndex;
             }
 
-
             if (!insideVisibleWindow)
             {
                 // We don't play transitions only if the container isn't in the visible window
@@ -3559,7 +3581,7 @@ float wf::Point::* ModernCollectionBasePanel::PointFromPointInVirtualizingDirect
 {
     xaml_controls::Orientation layoutOrientation = xaml_controls::Orientation_Horizontal;
 
-    if(SUCCEEDED(m_spLayoutStrategy->GetVirtualizationDirection(&layoutOrientation)))
+    if (SUCCEEDED(m_spLayoutStrategy->GetVirtualizationDirection(&layoutOrientation)))
     {
         switch(layoutOrientation)
         {
@@ -3632,7 +3654,7 @@ float wf::Rect::* ModernCollectionBasePanel::PointFromRectInVirtualizingDirectio
 {
     xaml_controls::Orientation layoutOrientation = xaml_controls::Orientation_Horizontal;
 
-    if(SUCCEEDED(m_spLayoutStrategy->GetVirtualizationDirection(&layoutOrientation)))
+    if (SUCCEEDED(m_spLayoutStrategy->GetVirtualizationDirection(&layoutOrientation)))
     {
         switch(layoutOrientation)
         {
@@ -3650,7 +3672,7 @@ float wf::Rect::* ModernCollectionBasePanel::PointFromRectInNonVirtualizingDirec
 {
     xaml_controls::Orientation layoutOrientation = xaml_controls::Orientation_Horizontal;
 
-    if(SUCCEEDED(m_spLayoutStrategy->GetVirtualizationDirection(&layoutOrientation)))
+    if (SUCCEEDED(m_spLayoutStrategy->GetVirtualizationDirection(&layoutOrientation)))
     {
         switch(layoutOrientation)
         {
@@ -3668,7 +3690,7 @@ float wf::Rect::* ModernCollectionBasePanel::SizeFromRectInVirtualizingDirection
 {
     xaml_controls::Orientation layoutOrientation = xaml_controls::Orientation_Horizontal;
 
-    if(SUCCEEDED(m_spLayoutStrategy->GetVirtualizationDirection(&layoutOrientation)))
+    if (SUCCEEDED(m_spLayoutStrategy->GetVirtualizationDirection(&layoutOrientation)))
     {
         switch(layoutOrientation)
         {
@@ -3682,6 +3704,25 @@ float wf::Rect::* ModernCollectionBasePanel::SizeFromRectInVirtualizingDirection
     return nullptr;
 }
 
+// Returns the thickess size in the virtualizing direction.
+double ModernCollectionBasePanel::SizeFromThicknessInVirtualizingDirection(xaml::Thickness thickness) const
+{
+    xaml_controls::Orientation layoutOrientation = xaml_controls::Orientation_Horizontal;
+
+    if (SUCCEEDED(m_spLayoutStrategy->GetVirtualizationDirection(&layoutOrientation)))
+    {
+        switch (layoutOrientation)
+        {
+        case xaml_controls::Orientation_Horizontal:
+            return thickness.Left + thickness.Right;
+        case xaml_controls::Orientation_Vertical:
+            return thickness.Top + thickness.Bottom;
+        }
+    }
+
+    return 0.0;
+}
+
 // Gets the cache length.
 _Check_return_ HRESULT
 ModernCollectionBasePanel::get_CacheLengthBase(
diff --git a/src/dxaml/xcp/dxaml/lib/ModernCollectionBasePanel_Partial.h b/src/dxaml/xcp/dxaml/lib/ModernCollectionBasePanel_Partial.h
index 0ae01b5955..c5a27955fc 100644
--- a/src/dxaml/xcp/dxaml/lib/ModernCollectionBasePanel_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/ModernCollectionBasePanel_Partial.h
@@ -14,6 +14,9 @@
 
 #pragma warning(disable:4267) //'var' : conversion from 'size_t' to 'type', possible loss of data
 
+// Uncomment to output ItemsUpdatingScrollMode debugging information
+//#define IUSM_DEBUG
+
 namespace DirectUI
 {
     interface IContainerRecyclingContext;
@@ -248,7 +251,13 @@ namespace DirectUI
         // GroupHeaderStrategy and update the layout strategy
         _Check_return_ HRESULT SetGroupHeaderPlacement(_In_ xaml_primitives::GroupHeaderPlacement placement);
 
-        // Only ISP supports the maintain viewport behavior.
+        // Returns the thickess size in the virtualizing direction.
+        double SizeFromThicknessInVirtualizingDirection(xaml::Thickness thickness) const;
+
+        // Returns the size of the potential GroupPadding in the virtualizing direction.
+        virtual _Check_return_ HRESULT GroupPaddingSizeInVirtualizingDirection(_Out_ double* groupPadding) { *groupPadding = 0.0; return S_OK; }
+
+        // Only ItemsStackPanel and CalendarPanel support the maintain viewport behavior.
         virtual ItemsUpdatingScrollMode GetItemsUpdatingScrollMode() const { return ItemsUpdatingScrollMode::KeepScrollOffset; }
         bool IsMaintainViewportSupportedAndEnabled() const { return GetItemsUpdatingScrollMode() != ItemsUpdatingScrollMode::KeepScrollOffset; }
 
@@ -276,8 +285,16 @@ namespace DirectUI
         // provide a default implementation that does nothing.
         virtual _Check_return_ HRESULT SetGroupHeaderStrategy(_In_ GroupHeaderStrategy strategy) { UNREFERENCED_PARAMETER(strategy); return S_OK; }
 
+        // Used to estimate tracked element reposition during items source updates. These should have been part of the 
+        // Microsoft.UI.Xaml.Controls.ILayoutStrategy interface.
+        virtual _Check_return_ HRESULT GetAverageHeaderSize(_Out_ float* averageHeaderSize) { *averageHeaderSize = -1.0f; return S_OK; };
+        virtual _Check_return_ HRESULT GetAverageContainerSize(_Out_ float* averageContainerSize) { *averageContainerSize = -1.0f; return S_OK; };
+
     // core virtualization helper methods
     private:
+        // Returns the group header strategy enum value based on virtualization direction and group header placement.
+        _Check_return_ HRESULT GetGroupHeaderStrategy(_Out_ GroupHeaderStrategy* headerStrategy);
+
         // Makes sure that whatever container we think is focused is still focused.
         // Otherwise, recycle it.
         _Check_return_ HRESULT VerifyStoredFocusedContainer();
@@ -319,7 +336,7 @@ namespace DirectUI
             // nested struct describing our grouping cache
             struct GroupCache
             {
-                GroupCache();
+                GroupCache() noexcept;
                 INT32 startItemIndex;
                 INT32 endItemIndex;
                 INT32 indexOfGroup;
@@ -476,7 +493,7 @@ namespace DirectUI
             // When grouped, the vector of groups
             ctl::ComPtr<wfc::IVector<IInspectable*>> m_strongCollectionGroupsAsV;
             // Index of the cached group
-            INT m_cachedGroupIndex;
+            INT m_cachedGroupIndex{};
             // cached group strong reference
             ctl::ComPtr<xaml_data::ICollectionViewGroup> m_strongCurrentGroup;
             // When grouped, the vector containing items of the current group, when not group, the items themselves
@@ -777,13 +794,6 @@ namespace DirectUI
             // The function takes the index and container as arguments, and should return TRUE for pinned containers to keep.
             _Check_return_ HRESULT FilterPinnedContainers(_In_ std::function<HRESULT (INT, xaml::IUIElement*, BOOLEAN*)> filterFunction);
 
-            // Our API here has a wart around the focused container. The focused container acts as if it is pinned, but when that focused element is cleared,
-            // we don't preserve its pinned state. This only really matters for special containers, so this method is here to force the container to be really pinned
-            // regardless of whether or not it's the focused element.
-            // TODO: This method will likely become superfluous if we move focus code into the GeneratorHost.
-            // See ModernCollectionBasePanel::EnsureRecycleContainerCandidate for more details.
-            _Check_return_ HRESULT EnsureContainerPinned(_In_ INT index, _In_ const ctl::ComPtr<xaml::IUIElement>& spContainer);
-
             // Is the given container pinned?
             // Is the given header pinned?
             bool GetIsHeaderPinned(_In_ const ctl::ComPtr<xaml::IUIElement>& spHeader) const
@@ -1612,7 +1622,7 @@ namespace DirectUI
             bool validWindowCalculation;
 
             // Flag indicating we are done building up our cache
-            bool cachePotentialReached;
+            bool cachePotentialReached{};
 
             // Apply a correction to our window states
             void ApplyAdjustment(_In_ const wf::Point& correction);
@@ -1682,6 +1692,9 @@ namespace DirectUI
             ViewportBehaviorInfo()
             {
                 Reset();
+#ifdef IUSM_DEBUG
+                ResetLastTracedDbg();
+#endif
             }
 
             // Cancels tracking.
@@ -1702,6 +1715,92 @@ namespace DirectUI
                 viewportOffsetDelta = 0.0f;
             }
 
+#ifdef IUSM_DEBUG
+            void ResetLastTracedDbg()
+            {
+                lastTracedIsTrackingDbg = false;
+                lastTracedIsTrackingExtentEndDbg = false;
+                lastTracedIsOffsetRelativeToSecondEdgeDbg = false;
+                lastTracedIndexDbg = -1;
+                lastTracedElementOffsetDbg = 0.0f;
+                lastTracedTrackedElementShiftDbg = 0.0f;
+                lastTracedViewportOffsetDeltaDbg = 0.0f;
+            }
+
+            void TraceChangesDbg(_In_z_ const wchar_t* context)
+            {
+                const bool isTrackingChanged = static_cast<bool>(isTracking) != lastTracedIsTrackingDbg;
+                const bool isTrackingExtentEndChanged = static_cast<bool>(isTrackingExtentEnd) != lastTracedIsTrackingExtentEndDbg;
+                const bool isOffsetRelativeToSecondEdgeChanged = static_cast<bool>(isOffsetRelativeToSecondEdge) != lastTracedIsOffsetRelativeToSecondEdgeDbg;
+                const bool indexChanged = index != lastTracedIndexDbg;
+                const bool elementOffsetChanged = elementOffset != lastTracedElementOffsetDbg;
+                const bool trackedElementShiftChanged = trackedElementShift != lastTracedTrackedElementShiftDbg;
+                const bool viewportOffsetDeltaChanged = viewportOffsetDelta != lastTracedViewportOffsetDeltaDbg;
+
+                if (isTrackingChanged ||
+                    isTrackingExtentEndChanged ||
+                    isOffsetRelativeToSecondEdgeChanged ||
+                    indexChanged ||
+                    elementOffsetChanged ||
+                    trackedElementShiftChanged ||
+                    viewportOffsetDeltaChanged)
+                {
+                    IGNOREHR(gps->DebugTrace(XCP_TRACE_OUTPUT_MSG,
+                        L"IUSM_DEBUG[0x%p]: ViewportBehaviorInfo::TraceDeltaDbg. %s", this, context));
+
+                    if (isTrackingChanged)
+                    {
+                        IGNOREHR(gps->DebugTrace(XCP_TRACE_OUTPUT_MSG, L" -isTracking: %d", isTracking));
+                        lastTracedIsTrackingDbg = isTracking;
+                    }
+
+                    if (isTrackingExtentEndChanged)
+                    {
+                        IGNOREHR(gps->DebugTrace(XCP_TRACE_OUTPUT_MSG, L" -isTrackingExtentEnd: %d", isTrackingExtentEnd));
+                        lastTracedIsTrackingExtentEndDbg = isTrackingExtentEnd;
+                    }
+
+                    if (isOffsetRelativeToSecondEdgeChanged)
+                    {
+                        IGNOREHR(gps->DebugTrace(XCP_TRACE_OUTPUT_MSG, L" -isOffsetRelativeToSecondEdge: %d", isOffsetRelativeToSecondEdge));
+                        lastTracedIsOffsetRelativeToSecondEdgeDbg = isOffsetRelativeToSecondEdge;
+                    }
+
+                    if (indexChanged)
+                    {
+                        IGNOREHR(gps->DebugTrace(XCP_TRACE_OUTPUT_MSG, L" -index: %d", index));
+                        lastTracedIndexDbg = index;
+                    }
+
+                    if (elementOffsetChanged)
+                    {
+                        IGNOREHR(gps->DebugTrace(XCP_TRACE_OUTPUT_MSG, L" -elementOffset: %f", elementOffset));
+                        lastTracedElementOffsetDbg = elementOffset;
+                    }
+
+                    if (trackedElementShiftChanged)
+                    {
+                        IGNOREHR(gps->DebugTrace(XCP_TRACE_OUTPUT_MSG, L" -trackedElementShift: %f", trackedElementShift));
+                        lastTracedTrackedElementShiftDbg = trackedElementShift;
+                    }
+
+                    if (viewportOffsetDeltaChanged)
+                    {
+                        IGNOREHR(gps->DebugTrace(XCP_TRACE_OUTPUT_MSG, L" -viewportOffsetDelta: %f", viewportOffsetDelta));
+                        lastTracedViewportOffsetDeltaDbg = viewportOffsetDelta;
+                    }
+                }
+            }
+
+            bool lastTracedIsTrackingDbg;
+            bool lastTracedIsTrackingExtentEndDbg;
+            bool lastTracedIsOffsetRelativeToSecondEdgeDbg;
+            int lastTracedIndexDbg;
+            float lastTracedElementOffsetDbg;
+            float lastTracedTrackedElementShiftDbg;
+            float lastTracedViewportOffsetDeltaDbg;
+#endif
+
             // True when we are tracking a container or a header.
             BOOLEAN isTracking;
 
@@ -1716,7 +1815,7 @@ namespace DirectUI
             float currentExtent;
 
             // Bounds of the tracked element.
-            // They get updated when there are changes before it (e.g. element inserted before).
+            // They get updated when there are changes before it, e.g. element (header or container) inserted before.
             wf::Rect elementBounds;
             // Is the tracked element a header or a container?
             xaml_controls::ElementType type;
@@ -1725,10 +1824,13 @@ namespace DirectUI
             // Offset of the viewport's top/left or bottom/right when the tracking started.
             FLOAT initialViewportEdge;
             // Offset between the viewport and the tracked element.
+            // Example:
+            // isOffsetRelativeToSecondEdge==False, ScrollViewer.VerticalOffset==1000,
+            // tracked element position in ScrollViewer.Content==900, implies elementOffset==100.
             FLOAT elementOffset;
             // Is the offset calculated based on the first or second edge?
             BOOLEAN isOffsetRelativeToSecondEdge;
-            // During the Generate phase (which take place during the measure pass),
+            // During the Generate phase (which takes place during the measure pass),
             // we shift all the elements by the amount the tracked element moved.
             // We need to store that delta in case we need to elect a new tracked
             // element during Generate. This happens only when we track a group header
@@ -1745,7 +1847,7 @@ namespace DirectUI
 
         // When called the first time, this method starts tracking the first
         // visible element. Otherwise, it does nothing.
-        _Check_return_ HRESULT BeginTrackingFirstVisibleElement();
+        _Check_return_ HRESULT BeginTrackingFirstVisibleElement(bool ignoreIsTrackingExtentEnd = false);
 
         // Starts tracking the first visible element if it's not already the case.
         // If we already tracking something, it updates the tracked element so
@@ -1835,7 +1937,7 @@ namespace DirectUI
         // Returns where should the viewport move to 'follow' the tracked element.
         // The edge is relative to whether we are tracking the first element (top/left)
         // or the last element (bottom/right).
-        FLOAT GetNewViewportEdge();
+        FLOAT GetNewViewportEdge() const;
 
         _Check_return_ HRESULT IsBottomOrRightAligned(
             _In_ xaml::IFrameworkElement* element,
diff --git a/src/dxaml/xcp/dxaml/lib/ModernCollectionBasePanel_ViewportManagement_Partial.cpp b/src/dxaml/xcp/dxaml/lib/ModernCollectionBasePanel_ViewportManagement_Partial.cpp
index b4d3e8912d..cc3b734b86 100644
--- a/src/dxaml/xcp/dxaml/lib/ModernCollectionBasePanel_ViewportManagement_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/ModernCollectionBasePanel_ViewportManagement_Partial.cpp
@@ -19,32 +19,47 @@ using xaml_controls::EstimationReference;
 // When called the first time, this method starts tracking the first
 // visible element. Otherwise, it does nothing.
 _Check_return_ HRESULT
-ModernCollectionBasePanel::BeginTrackingFirstVisibleElement()
+ModernCollectionBasePanel::BeginTrackingFirstVisibleElement(bool ignoreIsTrackingExtentEnd)
 {
     INT32 index = -1;
     xaml_controls::ElementType type = xaml_controls::ElementType_ItemContainer;
 
     ctl::ComPtr<IUIElement> spFirstVisibleElement;
-    wf::Rect window = m_windowState.GetVisibleWindow();
+    const wf::Rect window = m_windowState.GetVisibleWindow();
     auto spScrollViewer = m_wrScrollViewer.AsOrNull<IScrollViewer>();
 
     const ItemsUpdatingScrollMode itemsUpdatingScrollMode = GetItemsUpdatingScrollMode();
 
     // We only support ItemsStackPanel for this viewport behavior.
     // Also, if we are already tracking something, we can leave.
-    if(!IsMaintainViewportSupportedAndEnabled() ||
+    if (!IsMaintainViewportSupportedAndEnabled() ||
         m_viewportBehavior.isTracking ||
-        m_viewportBehavior.isTrackingExtentEnd ||
+        (!ignoreIsTrackingExtentEnd && m_viewportBehavior.isTrackingExtentEnd) ||
         !spScrollViewer)
     {
+#ifdef IUSM_DEBUG
+        IGNOREHR(gps->DebugTrace(XCP_TRACE_OUTPUT_MSG,
+            L"IUSM_DEBUG[0x%p]: ModernCollectionBasePanel::BeginTrackingFirstVisibleElement. Early exit.", m_viewportBehavior));
+#endif
         return S_OK;
     }
 
+#ifdef IUSM_DEBUG
+    if (ignoreIsTrackingExtentEnd && m_viewportBehavior.isTrackingExtentEnd)
+    {
+        IGNOREHR(gps->DebugTrace(XCP_TRACE_OUTPUT_MSG,
+            L"IUSM_DEBUG[0x%p]: ModernCollectionBasePanel::BeginTrackingFirstVisibleElement. Ignores isTrackingExtentEnd & skips early exit.", m_viewportBehavior));
+    }
+#endif
+
+    const float windowFirstEdge = window.*PointFromRectInVirtualizingDirection();
+    const float windowSecondEdge = windowFirstEdge + window.*SizeFromRectInVirtualizingDirection();
+
     // If we are at the very beginning and we are tracking the first visible element,
     // we don't have to do anything. KeepItemsInView actually means Keep*First*ItemInView
     // because we added KeepLastItemInView in RS1.
-    if(itemsUpdatingScrollMode == ItemsUpdatingScrollMode::KeepItemsInView &&
-       (window.*PointFromRectInVirtualizingDirection() <= 0.0f || DoubleUtil::IsZero(static_cast<double>(window.*PointFromRectInVirtualizingDirection()))))
+    if (itemsUpdatingScrollMode == ItemsUpdatingScrollMode::KeepItemsInView &&
+       (windowFirstEdge <= 0.0f || DoubleUtil::IsZero(static_cast<double>(windowFirstEdge))))
     {
         return S_OK;
     }
@@ -56,29 +71,35 @@ ModernCollectionBasePanel::BeginTrackingFirstVisibleElement()
     {
         // We use m_estimatedSize instead of get_DesiredSize because the latter accounts for layout rounding.
         const wf::Size extent = m_estimatedSize;
-        const double extentInVirtualizingDirection = static_cast<double>(extent.*PointFromSizeInVirtualizingDirection());
-        const double windowEdgeInVirtualizingDirection = static_cast<double>(window.*PointFromRectInVirtualizingDirection() + window.*SizeFromRectInVirtualizingDirection());
-        if (extentInVirtualizingDirection <= (windowEdgeInVirtualizingDirection + 0.5))
+        const float extentInVirtualizingDirection = extent.*PointFromSizeInVirtualizingDirection();
+        
+        if (static_cast<double>(extentInVirtualizingDirection) <= static_cast<double>(windowSecondEdge) + 0.5)
         {
             m_viewportBehavior.isTrackingExtentEnd = TRUE;
-            m_viewportBehavior.originalExtent = m_viewportBehavior.currentExtent = extent.*PointFromSizeInVirtualizingDirection();
+            m_viewportBehavior.originalExtent = m_viewportBehavior.currentExtent = extentInVirtualizingDirection;
+
+#ifdef IUSM_DEBUG
+            m_viewportBehavior.TraceChangesDbg(L"ModernCollectionBasePanel::BeginTrackingFirstVisibleElement for KeepLastItemInView.");
+#endif
         }
     }
 
     // Finds the first visible element, if any.
     IFC_RETURN(GetFirstVisibleElement(&type, &index, &spFirstVisibleElement));
 
-    if(spFirstVisibleElement)
+    if (spFirstVisibleElement)
     {
         m_viewportBehavior.isTracking = TRUE;
         m_viewportBehavior.index = index;
         m_viewportBehavior.type = type;
         m_viewportBehavior.initialViewportEdge =
-            itemsUpdatingScrollMode == ItemsUpdatingScrollMode::KeepItemsInView ?
-            window.*PointFromRectInVirtualizingDirection() :
-            window.*PointFromRectInVirtualizingDirection() + window.*SizeFromRectInVirtualizingDirection();
+            itemsUpdatingScrollMode == ItemsUpdatingScrollMode::KeepItemsInView ? windowFirstEdge : windowSecondEdge;
         m_viewportBehavior.elementBounds = GetBoundsFromElement(spFirstVisibleElement);
 
+#ifdef IUSM_DEBUG
+        m_viewportBehavior.TraceChangesDbg(L"ModernCollectionBasePanel::BeginTrackingFirstVisibleElement for FirstVisibleElement.");
+#endif
+
         SetTrackedElementOffsetRelativeToViewport();
     }
 
@@ -188,6 +209,10 @@ ModernCollectionBasePanel::BeginTrackingOnOrientationChange(_Out_ wf::Rect* pCom
             window.*PointFromRectInVirtualizingDirection();
         m_viewportBehavior.elementBounds = GetBoundsFromElement(spFirstVisibleElement);
 
+#ifdef IUSM_DEBUG
+        m_viewportBehavior.TraceChangesDbg(L"ModernCollectionBasePanel::BeginTrackingOnOrientationChange.");
+#endif
+
         SetTrackedElementOffsetRelativeToViewport();
     }
 
@@ -253,9 +278,18 @@ ModernCollectionBasePanel::BeginTrackingOnRefresh(_Out_ wf::Rect* newVisibleWind
                 newVisibleWindow));
         }
 
+#ifdef IUSM_DEBUG
+        IGNOREHR(gps->DebugTrace(XCP_TRACE_OUTPUT_MSG,
+            L"IUSM_DEBUG[0x%p]: ModernCollectionBasePanel::BeginTrackingOnRefresh. Initiated scroll to index %d.", m_viewportBehavior, scrollToTargetIndex));
+#endif
+
         m_viewportBehavior.isTrackingExtentEnd = TRUE;
         m_viewportBehavior.originalExtent = m_viewportBehavior.currentExtent = m_estimatedSize.*PointFromSizeInVirtualizingDirection();
 
+#ifdef IUSM_DEBUG
+        m_viewportBehavior.TraceChangesDbg(L"ModernCollectionBasePanel::BeginTrackingOnRefresh.");
+#endif
+
         auto itemsPresenter = m_wrItemsPresenter.AsOrNull<IItemsPresenter>();
         if (itemsPresenter)
         {
@@ -278,13 +312,13 @@ ModernCollectionBasePanel::BeginTrackingFirstVisibleElement(
     HRESULT hr = S_OK;
     BOOLEAN wasTrackingBeforeThisCall = m_viewportBehavior.isTracking;
 
-    if(isCollectionChange && action == wfc::CollectionChange_Reset)
+    if (isCollectionChange && action == wfc::CollectionChange_Reset)
         goto Cleanup;
 
     IFC(BeginTrackingFirstVisibleElement());
 
     // We should keep the tracked element's index up to date.
-    if( m_viewportBehavior.isTracking &&
+    if (m_viewportBehavior.isTracking &&
         isCollectionChange &&
         ((isGroupChange && m_viewportBehavior.type == xaml_controls::ElementType_GroupHeader) ||
         (!isGroupChange && m_viewportBehavior.type == xaml_controls::ElementType_ItemContainer)) &&
@@ -344,7 +378,7 @@ ModernCollectionBasePanel::BeginTrackingFirstVisibleElement(
     }
 
     // If an element (container or header) was inserted or removed or changed size before the tracked element.
-    // We need to redo the layout of the tracked element based on itself.
+    // We need to reevaluate the layout of the tracked element, using estimations.
     if (m_viewportBehavior.isTracking &&
         (!isCollectionChange ||
         action == wfc::CollectionChange_ItemInserted ||
@@ -357,18 +391,73 @@ ModernCollectionBasePanel::BeginTrackingFirstVisibleElement(
         IFC(IsChangeBeforeTrackedElement(isCollectionChange, isGroupChange, index, action, &isChangeBeforeTrackedElement, &isChangeGoingToHideTrackedGroupHeader));
         if (isChangeBeforeTrackedElement)
         {
-            if(isCollectionChange)
+            if (isCollectionChange)
             {
-                switch(action)
+                float estimatedElementBoundsShift = 0.0f;
+
+                switch (action)
+                {
+                    case wfc::CollectionChange_ItemInserted:
+                    case wfc::CollectionChange_ItemRemoved:
+                    {
+                        if (isGroupChange)
+                        {
+                            // First, only account for the header itself when it's inline.
+                            GroupHeaderStrategy headerStrategy = GroupHeaderStrategy::None;
+
+                            IFC(GetGroupHeaderStrategy(&headerStrategy));
+
+                            if (headerStrategy == GroupHeaderStrategy::Inline)
+                            {
+                                // A group header was inserted before the tracked element.
+                                // Attempt to access an average header size in the virtualized direction.
+                                IFC(GetAverageHeaderSize(&estimatedElementBoundsShift));
+                            }
+                            // Else headers that are placed in Parallel and have no effect on the tracked element's position.
+                        }
+                        else
+                        {
+                            // A container was inserted before the tracked element.
+                            // Attempt to access an average container size in the virtualized direction.
+                            IFC(GetAverageContainerSize(&estimatedElementBoundsShift));
+                        }
+
+                        // When estimatedElementBoundsShift >= 0.0f, use that successfully accessed average size as the estimated shift...
+                        if (estimatedElementBoundsShift < 0.0f)
+                        {
+                            // ...else fall back to using the tracked element's size.
+                            estimatedElementBoundsShift = m_viewportBehavior.elementBounds.*SizeFromRectInVirtualizingDirection();
+                        }
+
+                        if (isGroupChange)
+                        {
+                            // Second, take the GroupPadding into account irrespective of the GroupHeaderStrategy value.
+                            double groupPadding = 0.0;
+
+                            IFC(GroupPaddingSizeInVirtualizingDirection(&groupPadding));
+
+                            estimatedElementBoundsShift += static_cast<float>(groupPadding);
+                        }
+                        break;
+                    }
+                }
+
+                switch (action)
                 {
-                case wfc::CollectionChange_ItemInserted:
-                    m_viewportBehavior.elementBounds.*PointFromRectInVirtualizingDirection() += m_viewportBehavior.elementBounds.*SizeFromRectInVirtualizingDirection();
-                    break;
-
-                case wfc::CollectionChange_ItemRemoved:
-                    m_viewportBehavior.elementBounds.*PointFromRectInVirtualizingDirection() -= m_viewportBehavior.elementBounds.*SizeFromRectInVirtualizingDirection();
-                    m_viewportBehavior.elementBounds.*PointFromRectInVirtualizingDirection() = std::max(m_viewportBehavior.elementBounds.*PointFromRectInVirtualizingDirection(), 0.0f);
-                    break;
+                    case wfc::CollectionChange_ItemInserted:
+                    {
+                        // When an item was inserted before the tracked element, its estimated bounds are increased.
+                        m_viewportBehavior.elementBounds.*PointFromRectInVirtualizingDirection() += estimatedElementBoundsShift;
+                        break;
+                    }
+
+                    case wfc::CollectionChange_ItemRemoved:
+                    {
+                        // When an item was inserted before the tracked element, its estimated bounds are decreased.
+                        m_viewportBehavior.elementBounds.*PointFromRectInVirtualizingDirection() -= estimatedElementBoundsShift;
+                        m_viewportBehavior.elementBounds.*PointFromRectInVirtualizingDirection() = std::max(m_viewportBehavior.elementBounds.*PointFromRectInVirtualizingDirection(), 0.0f);
+                        break;
+                    }
                 }
             }
         }
@@ -383,6 +472,10 @@ ModernCollectionBasePanel::BeginTrackingFirstVisibleElement(
         }
     }
 
+#ifdef IUSM_DEBUG
+    m_viewportBehavior.TraceChangesDbg(L"ModernCollectionBasePanel::BeginTrackingFirstVisibleElement.");
+#endif
+
 Cleanup:
     RRETURN(hr);
 }
@@ -420,11 +513,19 @@ ModernCollectionBasePanel::BeginTrackingOnViewportSizeChange(
             static_cast<double>(previousWindow.*SizeFromRectInVirtualizingDirection()),
             static_cast<double>(currentWindow.*SizeFromRectInVirtualizingDirection())))
     {
-        IFC_RETURN(BeginTrackingFirstVisibleElement());
+        // Since m_viewportBehavior.isTrackingExtentEnd is unconditionally reset below, BeginTrackingFirstVisibleElement
+        // must not exit early when m_viewportBehavior.isTrackingExtentEnd is True. Instead, it must carry on and update
+        // the m_viewportBehavior fields originalExtent, isTracking, index, type, initialViewportEdge and elementBounds.
+        // This is particularly critical when the viewport shrinks in both dimensions.
+        IFC_RETURN(BeginTrackingFirstVisibleElement(true /*ignoreIsTrackingExtentEnd*/));
         // Don't allow tracking the extent end because it's not going to change.
         // We need to track a specific element and its offset to the bottom of the viewport
         // that just changed size.
         m_viewportBehavior.isTrackingExtentEnd = false;
+
+#ifdef IUSM_DEBUG
+        m_viewportBehavior.TraceChangesDbg(L"ModernCollectionBasePanel::BeginTrackingOnViewportSizeChange.");
+#endif
     }
     return S_OK;
 }
@@ -447,6 +548,10 @@ ModernCollectionBasePanel::ApplyTrackedElementShift()
             m_viewportBehavior.elementBounds.*PointFromRectInVirtualizingDirection() -
             GetBoundsFromElement(spTrackedElement).*PointFromRectInVirtualizingDirection();
 
+#ifdef IUSM_DEBUG
+        m_viewportBehavior.TraceChangesDbg(L"ModernCollectionBasePanel::ApplyTrackedElementShift.");
+#endif
+
         for (int typeIndex = 0; typeIndex < ElementType_Count; ++typeIndex)
         {
             const xaml_controls::ElementType type = static_cast<xaml_controls::ElementType>(typeIndex);
@@ -655,6 +760,10 @@ ModernCollectionBasePanel::TrackLastElement()
             };
             m_windowState.m_command = func;
         }
+
+#ifdef IUSM_DEBUG
+        m_viewportBehavior.TraceChangesDbg(L"ModernCollectionBasePanel::TrackLastElement.");
+#endif
     }
     return S_OK;
 }
@@ -685,12 +794,14 @@ ModernCollectionBasePanel::EndTrackingFirstVisibleElement()
         {
             m_viewportBehavior.elementBounds = GetBoundsFromElement(spTrackedElement);
 
-            viewportShift = (GetNewViewportEdge() - m_viewportBehavior.initialViewportEdge);
+            const float newViewportEdge = GetNewViewportEdge();
+
+            viewportShift = newViewportEdge - m_viewportBehavior.initialViewportEdge;
 
             // Shifts the viewport.
             const wf::Rect visibleWindow = m_windowState.GetVisibleWindow();
             const float windowShift =
-                GetNewViewportEdge() -
+                newViewportEdge -
                 (GetItemsUpdatingScrollMode() == ItemsUpdatingScrollMode::KeepItemsInView ?
                     visibleWindow.*PointFromRectInVirtualizingDirection() :
                     visibleWindow.*PointFromRectInVirtualizingDirection() + visibleWindow.*SizeFromRectInVirtualizingDirection()) +
@@ -704,10 +815,19 @@ ModernCollectionBasePanel::EndTrackingFirstVisibleElement()
 
                 // Scroll to the new window by coercing the visible window.
                 m_windowState.ApplyAdjustment(correction);
+
+#ifdef IUSM_DEBUG
+                IGNOREHR(gps->DebugTrace(XCP_TRACE_OUTPUT_MSG,
+                    L"IUSM_DEBUG[0x%p]: ModernCollectionBasePanel::EndTrackingFirstVisibleElement. Applied windowShift: %f.", m_viewportBehavior, windowShift));
+#endif
             }
         }
     }
 
+#ifdef IUSM_DEBUG
+    m_viewportBehavior.TraceChangesDbg(L"ModernCollectionBasePanel::EndTrackingFirstVisibleElement.");
+#endif
+
     IFC_RETURN(AdjustLayoutTransitions(viewportShift));
     return S_OK;
 }
@@ -864,7 +984,7 @@ ModernCollectionBasePanel::GetFirstVisibleElementForSerialization(
 {
     HRESULT hr = S_OK;
     INT elementIndex = 0;
-    wf::Rect window = m_windowState.GetVisibleWindow();
+    const wf::Rect window = m_windowState.GetVisibleWindow();
     wf::Rect actualWindow = {}; // adjusted for sticky headers, if any.
 
     *pOffset = 0.0;
@@ -947,37 +1067,37 @@ ModernCollectionBasePanel::GetFirstElementInWindow(
 
     // We will be going through the valid range.
     // For each type, retrieve the offset relative to the viewport and store it.
-    for(int typeIndex = 0; typeIndex < ElementType_Count; ++typeIndex)
+    for (int typeIndex = 0; typeIndex < ElementType_Count; ++typeIndex)
     {
         const xaml_controls::ElementType type = static_cast<xaml_controls::ElementType>(typeIndex);
         if (m_containerManager.GetValidElementCount(type) == 0) continue;
 
         const wf::Rect intersectionWindow = (typeIndex == xaml_controls::ElementType_ItemContainer) ? adjustedWindowForStickyHeaders : window;
 
-        int startIndex =
+        const int startIndex =
             itemsUpdatingScrollMode == ItemsUpdatingScrollMode::KeepLastItemInView ?
             m_containerManager.GetValidElementCount(type) - 1 :
             currentValidIndices[typeIndex];
 
-        int endIndex =
+        const int endIndex =
             itemsUpdatingScrollMode == ItemsUpdatingScrollMode::KeepLastItemInView ?
             currentValidIndices[typeIndex] - 1 :
             m_containerManager.GetValidElementCount(type);
 
-        int increment = (itemsUpdatingScrollMode == ItemsUpdatingScrollMode::KeepLastItemInView) ? -1 : 1;
+        const int increment = (itemsUpdatingScrollMode == ItemsUpdatingScrollMode::KeepLastItemInView) ? -1 : 1;
 
-        for(int validIndex = startIndex; validIndex != endIndex; validIndex += increment)
+        for (int validIndex = startIndex; validIndex != endIndex; validIndex += increment)
         {
             wf::Rect bounds = {};
             ctl::ComPtr<IUIElement> spElement;
 
-            if(validIndex == trackedElementValidIndex && m_viewportBehavior.type == type)
+            if (validIndex == trackedElementValidIndex && m_viewportBehavior.type == type)
                 continue;
 
             IFC_RETURN(m_containerManager.GetElementAtValidIndex(type, validIndex, &spElement));
 
             // Ignores any sentinel.
-            if(GetElementIsSentinel(spElement))
+            if (GetElementIsSentinel(spElement))
                 continue;
 
             bounds = GetBoundsFromElement(spElement);
@@ -1001,7 +1121,7 @@ ModernCollectionBasePanel::GetFirstElementInWindow(
     }
 
     // If we found something, return it.
-    if(found)
+    if (found)
     {
         // Preference goes to header.
         auto type = (elementsOffsets[xaml_controls::ElementType_GroupHeader] <= elementsOffsets[xaml_controls::ElementType_ItemContainer])
@@ -1021,7 +1141,6 @@ ModernCollectionBasePanel::GetFirstElementInWindow(
     return S_OK;
 }
 
-
 // Sets the offset between the tracked element and the visible window.
 void ModernCollectionBasePanel::SetTrackedElementOffsetRelativeToViewport()
 {
@@ -1030,30 +1149,14 @@ void ModernCollectionBasePanel::SetTrackedElementOffsetRelativeToViewport()
     // Note: trackedElementShift's value is always zero outside of Measure/Arrange.
     const FLOAT effectiveViewport = m_viewportBehavior.initialViewportEdge + m_viewportBehavior.trackedElementShift;
     const wf::Rect bounds = m_viewportBehavior.elementBounds;
-    FLOAT stickyHeadersAdjustement = 0.0f;
-
     const ItemsUpdatingScrollMode itemsUpdatingScrollMode = GetItemsUpdatingScrollMode();
-
-    // While we calculate the element offset relative to the (effective) viewport, we want
-    // to consider sticky headers when picking the relative edge. This is only necessary when tracking items.
-    if (itemsUpdatingScrollMode != ItemsUpdatingScrollMode::KeepLastItemInView &&
-        m_viewportBehavior.type == xaml_controls::ElementType_ItemContainer)
-    {
-        stickyHeadersAdjustement = m_lastVisibleWindowClippingHeight;
-    }
-
     const float boundsFirstEdge =
         itemsUpdatingScrollMode == ItemsUpdatingScrollMode::KeepLastItemInView ?
         bounds.*PointFromRectInVirtualizingDirection() + bounds.*SizeFromRectInVirtualizingDirection() :
         bounds.*PointFromRectInVirtualizingDirection();
 
-    const float boundsSecondEdge =
-        itemsUpdatingScrollMode == ItemsUpdatingScrollMode::KeepLastItemInView ?
-        bounds.*PointFromRectInVirtualizingDirection() :
-        bounds.*PointFromRectInVirtualizingDirection() + bounds.*SizeFromRectInVirtualizingDirection();
-
     // The calculated offset between the element and the viewport is relative to an edge (first or second from the top\left).
-    if ((itemsUpdatingScrollMode != ItemsUpdatingScrollMode::KeepLastItemInView && boundsFirstEdge >= (effectiveViewport + stickyHeadersAdjustement)) ||
+    if (itemsUpdatingScrollMode != ItemsUpdatingScrollMode::KeepLastItemInView ||
         (itemsUpdatingScrollMode == ItemsUpdatingScrollMode::KeepLastItemInView && boundsFirstEdge <= effectiveViewport))
     {
         m_viewportBehavior.isOffsetRelativeToSecondEdge = FALSE;
@@ -1061,9 +1164,18 @@ void ModernCollectionBasePanel::SetTrackedElementOffsetRelativeToViewport()
     }
     else
     {
+        const float boundsSecondEdge =
+            itemsUpdatingScrollMode == ItemsUpdatingScrollMode::KeepLastItemInView ?
+            bounds.*PointFromRectInVirtualizingDirection() :
+            bounds.*PointFromRectInVirtualizingDirection() + bounds.*SizeFromRectInVirtualizingDirection();
+
         m_viewportBehavior.isOffsetRelativeToSecondEdge = TRUE;
         m_viewportBehavior.elementOffset = effectiveViewport - boundsSecondEdge;
     }
+
+#ifdef IUSM_DEBUG
+    m_viewportBehavior.TraceChangesDbg(L"ModernCollectionBasePanel::SetTrackedElementOffsetRelativeToViewport.");
+#endif
 }
 
 // Returns the tracked UIElement or null.
@@ -1074,7 +1186,7 @@ ModernCollectionBasePanel::GetTrackedElement(_Out_ ctl::ComPtr<IUIElement>* pspT
     HRESULT hr = S_OK;
     ctl::ComPtr<IUIElement> spElement;
 
-    INT32 validIndex = m_containerManager.GetValidElementIndexFromDataIndex(m_viewportBehavior.type, m_viewportBehavior.index);
+    const INT32 validIndex = m_containerManager.GetValidElementIndexFromDataIndex(m_viewportBehavior.type, m_viewportBehavior.index);
 
     ASSERT(m_containerManager.GetValidElementCount(m_viewportBehavior.type) > 0);
     ASSERT(m_containerManager.IsValidElementIndexWithinBounds(m_viewportBehavior.type, validIndex));
@@ -1116,7 +1228,7 @@ ModernCollectionBasePanel::ElectNewTrackedElement()
 
     const wf::Rect elementBounds = spNewTrackedElement ? GetBoundsFromElement(spNewTrackedElement) : wf::Rect{};
 
-    if(spNewTrackedElement &&
+    if (spNewTrackedElement &&
        !RectUtil::AreDisjoint(elementBounds, m_windowState.GetVisibleWindow()))
     {
         m_viewportBehavior.index = elementIndex;
@@ -1136,36 +1248,38 @@ ModernCollectionBasePanel::ElectNewTrackedElement()
     }
 
 Cleanup:
+#ifdef IUSM_DEBUG
+    m_viewportBehavior.TraceChangesDbg(L"ModernCollectionBasePanel::ElectNewTrackedElement.");
+#endif
     RRETURN(hr);
 }
 
-// Returns where should the viewport move to 'follow' the tracked element.
-FLOAT ModernCollectionBasePanel::GetNewViewportEdge()
+// Returns where the viewport should move to 'follow' the tracked element.
+FLOAT ModernCollectionBasePanel::GetNewViewportEdge() const
 {
     FLOAT newViewportOffset = 0;
 
     ASSERT(m_viewportBehavior.isTracking);
 
-    wf::Rect bounds = m_viewportBehavior.elementBounds;
-
+    const wf::Rect bounds = m_viewportBehavior.elementBounds;
     const ItemsUpdatingScrollMode itemsUpdatingScrollMode = GetItemsUpdatingScrollMode();
 
-    const float boundsFirstEdge =
-        itemsUpdatingScrollMode == ItemsUpdatingScrollMode::KeepLastItemInView ?
-        bounds.*PointFromRectInVirtualizingDirection() + bounds.*SizeFromRectInVirtualizingDirection() :
-        bounds.*PointFromRectInVirtualizingDirection();
-
-    const float boundsSecondEdge =
-        itemsUpdatingScrollMode == ItemsUpdatingScrollMode::KeepLastItemInView ?
-        bounds.*PointFromRectInVirtualizingDirection() :
-        bounds.*PointFromRectInVirtualizingDirection() + bounds.*SizeFromRectInVirtualizingDirection();
-
-    if(m_viewportBehavior.isOffsetRelativeToSecondEdge)
+    if (m_viewportBehavior.isOffsetRelativeToSecondEdge)
     {
+        const float boundsSecondEdge =
+            itemsUpdatingScrollMode == ItemsUpdatingScrollMode::KeepLastItemInView ?
+            bounds.*PointFromRectInVirtualizingDirection() :
+            bounds.*PointFromRectInVirtualizingDirection() + bounds.*SizeFromRectInVirtualizingDirection();
+
         newViewportOffset = boundsSecondEdge + m_viewportBehavior.elementOffset;
     }
     else
     {
+        const float boundsFirstEdge =
+            itemsUpdatingScrollMode == ItemsUpdatingScrollMode::KeepLastItemInView ?
+            bounds.*PointFromRectInVirtualizingDirection() + bounds.*SizeFromRectInVirtualizingDirection() :
+            bounds.*PointFromRectInVirtualizingDirection();
+
         newViewportOffset = boundsFirstEdge + m_viewportBehavior.elementOffset;
     }
 
@@ -1210,5 +1324,9 @@ void ModernCollectionBasePanel::UpdateViewportOffsetDelta(
         m_viewportBehavior.viewportOffsetDelta =
             newVisibleWindow.*PointFromRectInVirtualizingDirection() -
             oldVisibleWindow.*PointFromRectInVirtualizingDirection();
+
+#ifdef IUSM_DEBUG
+        m_viewportBehavior.TraceChangesDbg(L"ModernCollectionBasePanel::UpdateViewportOffsetDelta.");
+#endif
     }
 }
diff --git a/src/dxaml/xcp/dxaml/lib/ModernCollectionBasePanel_WindowManagement_Partial.cpp b/src/dxaml/xcp/dxaml/lib/ModernCollectionBasePanel_WindowManagement_Partial.cpp
index 393e89fa3e..9692d51cd9 100644
--- a/src/dxaml/xcp/dxaml/lib/ModernCollectionBasePanel_WindowManagement_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/ModernCollectionBasePanel_WindowManagement_Partial.cpp
@@ -11,6 +11,7 @@
 #include "host.h"
 #include "BuildTreeService.g.h"
 #include "BudgetManager.g.h"
+#include "XamlTelemetry.h"
 
 using namespace DirectUI;
 using namespace DirectUISynonyms;
@@ -64,11 +65,11 @@ _Check_return_ HRESULT ModernCollectionBasePanel::CalculateVisibleWindowFromScro
 
     auto spScrollViewer = m_wrScrollViewer.AsOrNull<IScrollViewer>();
     ASSERT(spScrollViewer);
-    
+
     DOUBLE viewWidth = 0;
     DOUBLE viewHeight = 0;
     wf::Rect scrollViewport = {};
-        
+
     IFC(spScrollViewer->get_ViewportWidth(&viewWidth));
     IFC(spScrollViewer->get_ViewportHeight(&viewHeight));
 
@@ -79,9 +80,9 @@ _Check_return_ HRESULT ModernCollectionBasePanel::CalculateVisibleWindowFromScro
 
     // Build our own visible window
     IFC(CalculateVisibleWindowFromScrollData(scrollViewport, zoomFactor, pVisibleWindow));
-            
+
     m_windowState.validWindowCalculation = true;
-    
+
 Cleanup:
     RRETURN(hr);
 }
@@ -118,21 +119,21 @@ _Check_return_ HRESULT ModernCollectionBasePanel::CalculateVisibleWindowFromScro
         ourVisibleWindow.Height = static_cast<FLOAT>(scrollViewport.Height) / zoomFactor;
         break;
     }
-    
+
     // ItemsPresenter may host a header / lead padding that we need to account for,
     // so in this case we subtract our layout position relative to our visual parent.
     ourVisibleWindow.X -= m_originFromItemsPresenter.X;
     ourVisibleWindow.Y -= m_originFromItemsPresenter.Y;
-    
+
     *pVisibleWindow = ourVisibleWindow;
-        
+
 Cleanup:
     RRETURN(hr);
 }
 
 // Using the current visible window, calculate the realization window (taking into
 // account buffer space, etc).
-// 
+//
 // allowCache should be true during normal measure passes and false otherwise when initially setting the realization window.
 // The allowCache parameter allows us to incrementally build a cache by inflating the realization window during
 // measure passes.  When true, we will increase the realization window by CacheBufferPerSideInflationPixelDelta.
@@ -199,7 +200,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::SetRealizationWindowFromVisibl
 
             // The realization window might change and we might need to correct for estimation errors.
             // In this case, we should also shift the window by the correction amount.
-            m_windowState.allowWindowShiftOnEstimationErrorCorrection = TRUE;    
+            m_windowState.allowWindowShiftOnEstimationErrorCorrection = TRUE;
         }
 
         switch(panningOrientation)
@@ -213,7 +214,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::SetRealizationWindowFromVisibl
             break;
 
         default:
-            ASSERT(FALSE);  
+            ASSERT(FALSE);
             break;
         }
     }
@@ -252,6 +253,16 @@ _Check_return_ HRESULT ModernCollectionBasePanel::SetRealizationWindowFromVisibl
 
     m_windowState.SetRealizationWindow(realizationWindow);
 
+    TraceLoggingProviderWrite(
+        XamlTelemetry, "ModernCollectionBasePanel_RealizationWindow",
+        TraceLoggingUInt64(reinterpret_cast<uint64_t>(this), "ObjectPointer"),
+        TraceLoggingWideString(GetHandle()->m_strName.GetBuffer(), "Name"),
+        TraceLoggingFloat32(realizationWindow.X, "X"),
+        TraceLoggingFloat32(realizationWindow.Y, "Y"),
+        TraceLoggingFloat32(realizationWindow.Width, "Width"),
+        TraceLoggingFloat32(realizationWindow.Height, "Height"),
+        TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+
     // We are finished building the realization window because we are allowing cache
     // and the cache is at its max.
     m_windowState.cachePotentialReached = m_windowState.currentCacheBufferPerSide >= maxCacheBufferPerSide;
@@ -267,13 +278,13 @@ _Check_return_ HRESULT ModernCollectionBasePanel::SetRealizationWindowFromVisibl
         }
         ASSERT(m_isRegisteredForCallbacks);
     }
-    
+
 Cleanup:
     RRETURN(hr);
 }
 
-// infinity looses the piece of information that would allow wrapping controls (like textblock, wrapgrid, image) to properly size. 
-// it does however convey that 'feel free to take as much as you need though'. We have decided to keep the constraint, but 
+// infinity looses the piece of information that would allow wrapping controls (like textblock, wrapgrid, image) to properly size.
+// it does however convey that 'feel free to take as much as you need though'. We have decided to keep the constraint, but
 // have frameworkelement not clip in certain situations.
 BOOLEAN ModernCollectionBasePanel::WantsScrollViewerToObscureAvailableSizeBasedOnScrollBarVisibility(_In_ xaml_controls::Orientation orientation)
 {
@@ -409,12 +420,12 @@ HRESULT ModernCollectionBasePanel::WindowState::CorrectVisibleWindowForMouseLarg
 _Check_return_ HRESULT ModernCollectionBasePanel::DetachPanelComponents()
 {
     HRESULT hr = S_OK;
-    
+
     auto sv = m_wrScrollViewer.AsOrNull<IScrollViewer>();
     if (sv)
     {
         IFC(m_epScrollViewerViewChangingHandler.DetachEventHandler(sv.Get()));
-        IFC(m_epScrollViewerViewChangedHandler.DetachEventHandler(sv.Get()));        
+        IFC(m_epScrollViewerViewChangedHandler.DetachEventHandler(sv.Get()));
         IFC(m_epScrollViewerSizeChangedHandler.DetachEventHandler(sv.Get()));
     }
 
@@ -422,25 +433,25 @@ _Check_return_ HRESULT ModernCollectionBasePanel::DetachPanelComponents()
 
     m_wrScrollViewer.Reset();
     m_wrItemsPresenter.Reset();
-        
+
 Cleanup:
     RRETURN(hr);
 }
 
-// Called when our ScrollViewer's has changed. Update our current visible window.        
+// Called when our ScrollViewer's has changed. Update our current visible window.
 _Check_return_ HRESULT ModernCollectionBasePanel::OnScrollViewChanged(
     _In_ IInspectable* pSender,
     _In_ IScrollViewerViewChangedEventArgs* pArgs)
 {
     HRESULT hr = S_OK;
-    
+
     auto spScrollViewer = m_wrScrollViewer.AsOrNull<IScrollViewer>();
     if (spScrollViewer)
     {
         DOUBLE horizontalOffset = 0.0f;
         DOUBLE verticalOffset = 0.0f;
         FLOAT zoomFactor = m_windowState.m_lastZoomFactor;
-        
+
         IFC(spScrollViewer->get_HorizontalOffset(&horizontalOffset));
         IFC(spScrollViewer->get_VerticalOffset(&verticalOffset));
 
@@ -530,7 +541,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::OnScrollViewChanging(
 
             // capture the scroll direction - forward or backward
             m_windowState.m_lastScrollWasForward = m_windowState.m_lastScrollOffset.Y < verticalOffset;
-            
+
 
             IFC(spIView->get_ZoomFactor(&zoomFactor));
 
@@ -555,27 +566,27 @@ _Check_return_ HRESULT ModernCollectionBasePanel::OnScrollViewChanging(
                 IFC(InvalidateMeasure());
 
                 // What we are trying to identify is that if this view change
-                // was initiated by the user clicking on the vertical scrollbar 
+                // was initiated by the user clicking on the vertical scrollbar
                 // large increase or decrease buttons. We need to do correction to
                 // the visible window in this particular case when using sticky headers.
-                // This is because the sticky header is occluding part of the visible 
-                // window - hence when the user clicks on these buttons we end up 
-                // skipping items if we do not account for the occluded part of the 
+                // This is because the sticky header is occluding part of the visible
+                // window - hence when the user clicks on these buttons we end up
+                // skipping items if we do not account for the occluded part of the
                 // visible window.
-                // Unfortunately - there is no easy way to figure out if it was a 
-                // large increase/decrease which caused the view change without 
-                // tightly coupling with the ScrollViewer's scollbar - instead 
+                // Unfortunately - there is no easy way to figure out if it was a
+                // large increase/decrease which caused the view change without
+                // tightly coupling with the ScrollViewer's scollbar - instead
                 // we use the following check to get the same result.
 
                 // Note: PageUp/Down and ScrollItemIntoView will not come into this
-                // code path since the visible window is already set and shouldInvalidate 
+                // code path since the visible window is already set and shouldInvalidate
                 // will be false causing us to skip this code block.
 
                 // we are using sticky headers (and)
                 // we scrolled by a viewport [large increase/decrease causes that] (and)
                 // we are not in direct manipulation (and)
-                // we are not thumb dragging 
-                if (m_bUseStickyHeaders && 
+                // we are not thumb dragging
+                if (m_bUseStickyHeaders &&
                     scrolledByAViewport &&
                     !spScrollViewer.Cast<ScrollViewer>()->IsInDirectManipulation())
                 {
@@ -585,7 +596,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::OnScrollViewChanging(
                     if (!isThumbDragging)
                     {
                         // we need to adjust the visible window and account
-                        // for the part occluded by the sticky header 
+                        // for the part occluded by the sticky header
                         m_windowState.m_lastScrollWasMouseLargeClick = true;
                     }
                 }
@@ -645,9 +656,9 @@ _Check_return_ HRESULT ModernCollectionBasePanel::AttachPanelComponents()
                 IFC(m_epScrollViewerViewChangingHandler.AttachEventHandler(spNodeScrollViewer.Cast<ScrollViewer>(), std::bind(&ModernCollectionBasePanel::OnScrollViewChanging, this, _1, _2)));
                 IFC(m_epScrollViewerViewChangedHandler.AttachEventHandler(spNodeScrollViewer.Cast<ScrollViewer>(), std::bind(&ModernCollectionBasePanel::OnScrollViewChanged, this, _1, _2)));
                 IFC(m_epScrollViewerSizeChangedHandler.AttachEventHandler(spNodeScrollViewer.Cast<ScrollViewer>(), std::bind(&ModernCollectionBasePanel::OnScrollViewerSizeChanged, this, _1, _2)));
-            
+
                 IFC(spNodeScrollViewer.AsWeak(&m_wrScrollViewer));
-                
+
                 break;
             }
             else if(ctl::is<IItemsPresenter>(spParentAsDO))
@@ -657,7 +668,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::AttachPanelComponents()
         }
         spCurrentAsDO = spParentAsDO;
     }
-    
+
     // At this point we won't have gotten any ViewChanging or ViewChanged events, so we need to get a window ourselves.
     IFC(PrimeVisibleWindow());
     IFC(SetRealizationWindowFromVisibleWindow(FALSE));
@@ -705,20 +716,20 @@ _Check_return_ HRESULT ModernCollectionBasePanel::PrimeVisibleWindow(bool allowT
         DOUBLE horizontalOffset = 0.0;
         DOUBLE verticalOffset = 0.0;
         FLOAT zoomFactor = 1.0f;
-        
+
         IFC_RETURN(spScrollViewer->get_HorizontalOffset(&horizontalOffset));
         IFC_RETURN(spScrollViewer->get_VerticalOffset(&verticalOffset));
         IFC_RETURN(spScrollViewer.Cast<ScrollViewer>()->get_ZoomFactor(&zoomFactor));
-        
+
         m_windowState.m_lastScrollOffset.X = static_cast<FLOAT>(horizontalOffset);
         m_windowState.m_lastScrollOffset.Y = static_cast<FLOAT>(verticalOffset);
         m_windowState.m_lastZoomFactor = zoomFactor;
-        
+
         IFC_RETURN(CalculateVisibleWindowFromScrollPoint(m_windowState.m_lastScrollOffset, zoomFactor, &ourVisibleWindow));
     }
     else
     {
-        
+
         // Haven't yet been attached to ScrollViewers. Should just bail out and use a predetermined window.
         // We'll default to 0 pixels size in the virtualization direction, and give it the panel's available size
         // in the non-virtualizing direction
@@ -743,7 +754,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::PrimeVisibleWindow(bool allowT
             ourVisibleWindow.Height = 0;
             break;
         }
-        
+
         m_windowState.validWindowCalculation = false;
     }
 
@@ -828,7 +839,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::DetectAndHandleDisconnectedVie
             // If we detect such gap, we will call RemoveMeasureLeftOvers to clear it.
             // If we don't, we would break the contiguousness invariant and crash during
             // the Generate run.
-            
+
             const int firstValidContainerItemIndex = m_containerManager.GetItemIndexFromValidIndex(0);
             if (firstValidContainerItemIndex > startItemIndex)
             {
@@ -1038,7 +1049,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::DetectAndHandleDisconnectedVie
                 INT32 itemIndexInGroup;
                 INT32 itemCountInGroup;
                 IFC(m_cacheManager.GetGroupInformationFromItemIndex(disconnectedReferenceItemIndex, &groupIndex, &itemIndexInGroup, &itemCountInGroup));
-            
+
                 const INT validHeaderIndex = m_containerManager.GetValidHeaderIndexFromGroupIndex(groupIndex);
                 ASSERT(m_containerManager.IsValidHeaderIndexWithinBounds(validHeaderIndex));
                 IFC(m_containerManager.GetHeaderAtValidIndex(validHeaderIndex, &spHeader));
@@ -1143,7 +1154,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::DetectAndHandleDisconnectedVie
                     EstimationReference headerRef = CreateDefaultEstimationReference(xaml_controls::ElementType_GroupHeader);
                     headerRef.ElementIndex = m_containerManager.GetGroupIndexFromValidIndex(validHeaderIndex);
                     headerRef.ElementBounds = candidateHeaderBounds;
-                    
+
                     IFC(RecycleAllContainersAndHeaders());
 
                     IFC(GenerateAnchorsForWindow(windowToFill, &headerRef, nullptr));
@@ -1276,15 +1287,15 @@ _Check_return_ HRESULT ModernCollectionBasePanel::GenerateAnchorsForWindow(
             refInfo.RelativeLocation = xaml_controls::ReferenceIdentity_Myself;
             IFC(m_spLayoutStrategy->GetElementBounds(
                 xaml_controls::ElementType_ItemContainer,
-                targetItemIndex, 
-                desiredSize, 
-                refInfo, 
-                windowToFill, 
+                targetItemIndex,
+                desiredSize,
+                refInfo,
+                windowToFill,
                 &containerRect));
 
             // Store its desired position
             SetBoundsForElement(spNewContainer, containerRect);
-            
+
             pHeaderInfo->SetBounds(headerRect);
         }
         else
@@ -1326,7 +1337,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::GenerateAnchorsForWindow(
         // Generate the anchor item
         IFC(m_icg2->GenerateContainerAtIndex(targetItemIndex, &spNewContainer));
         IFC(m_containerManager.PlaceInValidContainers(targetItemIndex, spNewContainer));
-        IFC(PrepareContainerViaItemsHost(targetItemIndex, measureSize, spNewContainer)); 
+        IFC(PrepareContainerViaItemsHost(targetItemIndex, measureSize, spNewContainer));
 
         // Measure it so we can get accurate ideas for placement
         IFC(spNewContainer->Measure(measureSize));
@@ -1337,10 +1348,10 @@ _Check_return_ HRESULT ModernCollectionBasePanel::GenerateAnchorsForWindow(
         refInfo.RelativeLocation = xaml_controls::ReferenceIdentity_Myself;
         IFC(m_spLayoutStrategy->GetElementBounds(
             xaml_controls::ElementType_ItemContainer,
-            targetItemIndex, 
-            desiredSize, 
-            refInfo, 
-            windowToFill, 
+            targetItemIndex,
+            desiredSize,
+            refInfo,
+            windowToFill,
             &containerRect));
 
         // Store its desired position
@@ -1413,7 +1424,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::GenerateAnchorForGroup(
 // Given an item index and its references, estimate its position,
 // call into ICG2 to get a container, place the container
 // in the valid containers, and sets the container's bounds to the estimated
-// position.        
+// position.
 _Check_return_ HRESULT ModernCollectionBasePanel::GenerateAnchorForItem(
     _In_ const INT32 itemIndex,
     _In_opt_ const EstimationReference* headerReference,
@@ -1503,7 +1514,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::IsLastElementRealized(
             panelExtent = bounds.*PointFromRectInVirtualizingDirection() + bounds.*SizeFromRectInVirtualizingDirection();
         }
     }
-    
+
     if(checkIfLastContainerIsRealized && m_containerManager.GetValidContainerCount() > 0)
     {
         ctl::ComPtr<IUIElement> spContainer;
@@ -1562,7 +1573,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::EstimatePanelExtent(_Out_ wf::
 
             headerEstimationRef.ElementIndex = m_cacheManager.DataIndexToLayoutIndex(xaml_controls::ElementType_GroupHeader, lastGroupIndex);
             headerEstimationRef.ElementBounds = GetBoundsFromElement(spChild);
-            
+
             if (m_containerManager.GetValidContainerCount() > 0)
             {
                 EstimationReference containerEstimationRef = CreateDefaultEstimationReference(xaml_controls::ElementType_ItemContainer);
@@ -1605,7 +1616,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::EstimatePanelExtent(_Out_ wf::
 
             IFC(m_containerManager.GetContainerAtValidIndex(m_containerManager.GetValidContainerCount()-1, &spChild));
             INT lastContainerItemIndex = m_containerManager.GetItemIndexFromValidIndex(m_containerManager.GetValidContainerCount() -1);
-            
+
             EstimationReference containerEstimationRef = CreateDefaultEstimationReference(xaml_controls::ElementType_ItemContainer);
             containerEstimationRef.ElementIndex = lastContainerItemIndex;
             containerEstimationRef.ElementBounds = GetBoundsFromElement(spChild);
@@ -1665,8 +1676,8 @@ _Check_return_ HRESULT ModernCollectionBasePanel::CorrectForEstimationErrors(boo
                 EstimationReference headerReference = CreateDefaultEstimationReference(xaml_controls::ElementType_GroupHeader);
                 headerReference.ElementIndex = realizedLayoutGroupIndex;
                 headerReference.ElementBounds = firstHeaderRect;
-            
-                EstimationReference containerReference = CreateDefaultEstimationReference(xaml_controls::ElementType_ItemContainer);            
+
+                EstimationReference containerReference = CreateDefaultEstimationReference(xaml_controls::ElementType_ItemContainer);
                 if (m_containerManager.GetValidContainerCount() > 0)
                 {
                     IFC(m_containerManager.GetContainerAtValidIndex(0, &spElement));
@@ -1700,7 +1711,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::CorrectForEstimationErrors(boo
         // We only have containers, so find out where the first one is
         ctl::ComPtr<IUIElement> spContainer;
         INT32 realizedItemIndex = m_containerManager.GetItemIndexFromValidIndex(0);
-        
+
         IFC(m_containerManager.GetContainerAtItemIndex(realizedItemIndex, &spContainer));
         wf::Rect firstContainerRect = GetBoundsFromElement(spContainer);
 
@@ -1713,7 +1724,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::CorrectForEstimationErrors(boo
             wf::Point positionOfFirstElement;
             IFC(m_spLayoutStrategy->GetPositionOfFirstElement(&positionOfFirstElement));
 
-            if (firstContainerRect.*PointFromRectInVirtualizingDirection() < positionOfFirstElement.*PointFromPointInVirtualizingDirection() 
+            if (firstContainerRect.*PointFromRectInVirtualizingDirection() < positionOfFirstElement.*PointFromPointInVirtualizingDirection()
                 || m_windowState.m_estimationCorrectionPending)
             {
                 EstimationReference headerReference = CreateDefaultEstimationReference(xaml_controls::ElementType_GroupHeader);
@@ -1816,7 +1827,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::CorrectForEstimationErrors(boo
 _Check_return_ HRESULT ModernCollectionBasePanel::SetScrollViewerOffsetsTo(_In_ const wf::Rect& targetRect, _In_ bool animate, _Out_ bool* pIssued)
 {
     HRESULT hr = S_OK;
-    
+
     auto spScrollViewer = m_wrScrollViewer.AsOrNull<IScrollViewer>();
 
     *pIssued = false;
@@ -1832,9 +1843,9 @@ _Check_return_ HRESULT ModernCollectionBasePanel::SetScrollViewerOffsetsTo(_In_
         ctl::ComPtr<wf::IReference<DOUBLE>> spHorizontalOffsetReference;
         ctl::ComPtr<wf::IReference<DOUBLE>> spVerticalOffsetReference;
         xaml_controls::Orientation orientation;
-        
+
         IFC(m_spLayoutStrategy->GetVirtualizationDirection(&orientation));
-        
+
         // Account for our offset from the ItemsPresenter (i.e. listview.header)
         horizontalOffset += m_originFromItemsPresenter.X;
         verticalOffset += m_originFromItemsPresenter.Y;
@@ -1868,7 +1879,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::SetScrollViewerOffsetsTo(_In_
 
         *pIssued = true;
     }
-    
+
 Cleanup:
     RRETURN(hr);
 }
@@ -1884,7 +1895,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::ProcessOrientationChange()
     // it, since it will have no effect (measure will just automatically do the correct thing)
     if (spIHost)
     {
-        // when orientation is changed, we expect the available size to change as well, so 
+        // when orientation is changed, we expect the available size to change as well, so
         // at the beginning of measure we will invalidate the validWindowCalculation probably
         m_windowState.validWindowCalculation = FALSE;
 
@@ -1902,18 +1913,18 @@ _Check_return_ HRESULT ModernCollectionBasePanel::ProcessOrientationChange()
 
             m_windowState.m_command = func;
         }
-    } 
+    }
 
-    // there is magic happening in the layout where some components will change 
+    // there is magic happening in the layout where some components will change
     // dimensions to infinite. But since only we are dirty, in the first pass of layout
     // we will not get that code executed properly, ending up with infinity/infinity.
     // which is a terrible situation to be in for a virtualizing panel (it will de-virtualize everything).
-    // Ultimately this will fix itself because the desiredsize of this panel will change which will change 
+    // Ultimately this will fix itself because the desiredsize of this panel will change which will change
     // the desiredsize of the itemspresenter, which will invalidate the scrollcontentpresenter.
 
     // The solution is to simply be proactive and immediately invalidate the scrollcontentpresenter so that we
     // are assured of a great measure with valid values next time around.
-        
+
 
     if (spIHost)
     {
@@ -1930,7 +1941,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::ProcessOrientationChange()
                 // anything in the tree is going to be a uielement.
 
                 IFC(spParentAsDO.AsOrNull<IUIElement>()->InvalidateMeasure());
-                
+
                 // is this our itemscontrol?
                 if (spParentAsDO == spHostAsDO)
                 {
@@ -1959,7 +1970,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::FlushWindowStateCommand()
 }
 
 _Check_return_ HRESULT ModernCollectionBasePanel::ScrollRectIntoView(
-    _In_ wf::Rect targetRect, 
+    _In_ wf::Rect targetRect,
     _In_ BOOLEAN forceSynchronous)
 {
     HRESULT hr = S_OK;
@@ -1974,7 +1985,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::ScrollRectIntoView(
         {
             // Place the window around the rect
             *pNewVisibleWindow = targetRect;
-            
+
             // Cancels tracking if we were tracking.
             m_viewportBehavior.Reset();
 
@@ -2020,12 +2031,12 @@ _Check_return_ HRESULT ModernCollectionBasePanel::ScrollItemIntoView(
 
             if (IsInLiveTree() &&
                 IsItemsHostRegistered() &&
-                !m_containerManager.HasFocusedContainer() && 
+                !m_containerManager.HasFocusedContainer() &&
                 !m_layoutInProgress)
             {
                 // if nothing is focused, and index is connected, set that as focused container
                 // if not connected, create a container.
-                // we also do not want to do this during layout because we could end up preparing containers while 
+                // we also do not want to do this during layout because we could end up preparing containers while
                 // layout is in the middle of preparing containers.
                 ctl::ComPtr<IUIElement> spContainer;
                 if (m_containerManager.IsItemConnected(index))
@@ -2045,7 +2056,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::ScrollItemIntoView(
                     IFC_RETURN(EnsureRecycleContainerCandidate(index, true /*fromFront*/));
                     if (m_containerManager.HasFocusedContainer())
                     {
-                        // EnsureRecycleContainerCandidate could set the stored focused 
+                        // EnsureRecycleContainerCandidate could set the stored focused
                         // container based on who actually has focus. We don't care what
                         // currently has focus - we want to set focus on the scrolled item.
                         IFC_RETURN(ReleaseStoredFocusedContainer());
@@ -2101,8 +2112,8 @@ _Check_return_ HRESULT ModernCollectionBasePanel::ScrollItemIntoView(
     return S_OK;
 }
 
-// Provide a focus candidate. If a scroll into view happens, the panel will 
-// keep that as a focus candidate. The listview can ask for this candidate 
+// Provide a focus candidate. If a scroll into view happens, the panel will
+// keep that as a focus candidate. The listview can ask for this candidate
 // when it needs to focus.
 _Check_return_ HRESULT ModernCollectionBasePanel::GetFocusCandidate(
     _Out_ INT* index,
@@ -2135,7 +2146,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::ScrollGroupHeaderIntoView(
 {
     // If a command already exists, flush it and force a synchronous layout.
     IFC_RETURN(FlushWindowStateCommand());
-    
+
     // Animations are only supported when moving to a realized group header and all items in between are also realized.
     if (animate && m_containerManager.IsGroupHeaderConnected(index, neighboringItemIndex))
     {
@@ -2161,7 +2172,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::ScrollGroupHeaderIntoView(
                 IFC_RETURN(hr);
 
                 // if nothing is focused, and index is connected, set that as focused container
-                // if not connected, create a container 
+                // if not connected, create a container
                 ctl::ComPtr<IUIElement> spContainer;
                 index = static_cast<UINT>(m_cacheManager.DataIndexToLayoutIndex(xaml_controls::ElementType_GroupHeader, index));
                 index = static_cast<UINT>(m_cacheManager.LayoutIndexToDataIndex(xaml_controls::ElementType_GroupHeader, index));
@@ -2257,8 +2268,8 @@ _Check_return_ HRESULT ModernCollectionBasePanel::DetermineWindowAndAnchors()
             IFC_RETURN(spItemsPresenter.Cast<ItemsPresenter>()->DelayLoadFooter(&futureViewportRect, FALSE /* updateLayout */));
         }
     }
-   
-    IFC_RETURN(SetRealizationWindowFromVisibleWindow(TRUE));    
+
+    IFC_RETURN(SetRealizationWindowFromVisibleWindow(TRUE));
     IFC_RETURN(DetectAndHandleDisconnectedView());
 
     return S_OK;
@@ -2340,7 +2351,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::DoScrollItemIntoView(
             // Nothing to do here, apparently.
             goto Cleanup;
         }
-        
+
         if (!animate)
         {
             // Since the window may change, reset the cache buffers to only show what's going to be visible first.
@@ -2363,7 +2374,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::DoScrollItemIntoView(
             INT32 targetGroupIndex;
             INT32 itemCountInTargetGroup;
             IFC(m_cacheManager.GetGroupInformationFromItemIndex(itemIndex, &targetGroupIndex, &anchorItemIndexInGroup, &itemCountInTargetGroup));
-    
+
             EstimationReference headerEstimationInfo = CreateDefaultEstimationReference(xaml_controls::ElementType_GroupHeader);
             if (m_containerManager.GetValidHeaderCount() > 0)
             {
@@ -2398,7 +2409,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::DoScrollItemIntoView(
             {
                 headerEstimationInfo.ElementIndex = 0;
                 headerEstimationInfo.ElementBounds = {};
-                
+
                 // We re-estimate if there are no valid containers. Even if there is one valid
                 // container we will not re-estimate. If we decide to be more agressive we can move this
                 // outside the else clause.
@@ -2426,7 +2437,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::DoScrollItemIntoView(
                 IFC(m_spLayoutStrategy->GetElementBounds(
                     xaml_controls::ElementType_GroupHeader,
                     m_cacheManager.DataIndexToLayoutIndex(xaml_controls::ElementType_GroupHeader, targetGroupIndex),
-                    desiredSize, 
+                    desiredSize,
                     refInfo,
                     windowToFill,
                     &headerBounds));
@@ -2472,7 +2483,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::DoScrollItemIntoView(
             {
                 containerInfo.ElementIndex = 0;
                 containerInfo.ElementBounds = {};
-                
+
                 // We re-estimate if there are no valid containers. Even if there is one valid
                 // container we will not re-estimate. If we decide to be more agressive we can move this
                 // outside the else clause.
@@ -2480,7 +2491,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::DoScrollItemIntoView(
             }
 
             IFC(RecycleAllContainersAndHeaders());
-            
+
             IFC(GenerateAnchorForItem(itemIndex, nullptr, &containerInfo));
         }
 
@@ -2658,7 +2669,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::DoScrollGroupHeaderIntoView(
         // Get a reference to estimate from and generate an anchor
         ASSERT(0 <= groupIndex && groupIndex < m_cacheManager.GetTotalGroupCount() || m_cacheManager.GetTotalGroupCount() == 0);
         ASSERT(m_cacheManager.IsGrouping());
-        
+
         EstimationReference headerInfo = CreateDefaultEstimationReference(xaml_controls::ElementType_GroupHeader);
         if (m_containerManager.GetValidHeaderCount() > 0)
         {
@@ -2847,9 +2858,9 @@ ModernCollectionBasePanel::RecycleAllContainersAndHeaders()
                     {
                         if (m_containerManager.HasFocusedContainer())
                         {
-                            // this item is focused, but there is a stored focused container. There 
+                            // this item is focused, but there is a stored focused container. There
                             // was a scroll into view which stored the focused container but that was not
-                            // focused, so dump the stored focused container. 
+                            // focused, so dump the stored focused container.
                             IFC(ReleaseStoredFocusedContainer());
                         }
 
@@ -2898,7 +2909,7 @@ ModernCollectionBasePanel::RecycleAllContainersAndHeaders()
 _Check_return_ HRESULT ModernCollectionBasePanel::CanIncreaseCacheLength(_Out_ BOOLEAN *pCanIncreaseCache)
 {
     HRESULT hr = S_OK;
-    
+
     auto spScrollViewer = m_wrScrollViewer.AsOrNull<IScrollViewer>();
 
     BOOLEAN shouldProcessCache = TRUE;
@@ -2938,7 +2949,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::CanIncreaseCacheLength(_Out_ B
             shouldProcessCache = !registeredForCallbacks;
         }
     }
-        
+
     // 3. Make sure we are not bogged down
     if (shouldProcessCache)
     {
@@ -2962,7 +2973,7 @@ _Check_return_ HRESULT ModernCollectionBasePanel::CanIncreaseCacheLength(_Out_ B
             ITickableFrameScheduler *pFrameScheduler = pCore->GetBrowserHost()->GetFrameScheduler();
             if (pFrameScheduler)
             {
-                // building up cache is regarded as a task that we only do when idle. 
+                // building up cache is regarded as a task that we only do when idle.
                 // if this is a high priority frame, it was requested by an invalidation outside of the
                 // regular tick, presumably because input has occurred that has invalidated layout.
                 // In that case, we do not want to build up cache.
@@ -2992,12 +3003,12 @@ _Check_return_ HRESULT ModernCollectionBasePanel::BuildTreeImpl(_Out_ BOOLEAN *p
 
     if (static_cast<CUIElement*>(GetHandle())->GetIsMeasureDirty())
     {
-        // If we are measure dirty, we take ourselves out of the build tree service queue. 
+        // If we are measure dirty, we take ourselves out of the build tree service queue.
         // During the next measure we will re-evaluate and register work if cache needs to be expanded.
-        // Consider the case where the panel is collapsed while having work in the build tree 
+        // Consider the case where the panel is collapsed while having work in the build tree
         // service queue. We will come here repeatedly and say we have work left and invalidate measure
         // but measure will not do anything since we are collapsed, and we keep ticking.
-        // This stops that from happening. 
+        // This stops that from happening.
         *pWorkLeft = false;
     }
     else
@@ -3015,15 +3026,15 @@ _Check_return_ HRESULT ModernCollectionBasePanel::BuildTreeImpl(_Out_ BOOLEAN *p
                 // note how we only do this if we did absolutely no work
                 IFC(InvalidateMeasure());
 
-                // since after buildtree from the core we will call updatelayout, 
-                // the panel will get an opportunity to increase the cache. 
+                // since after buildtree from the core we will call updatelayout,
+                // the panel will get an opportunity to increase the cache.
                 // The panel will have logic to either do the work or not.
                 // Notice how we only did this invalidate if we did not do any other work for this
                 // panel.
             }
         }
 
-        // notice the approach here: 
+        // notice the approach here:
         // We check whether we can build up cache right now
         //   If so: invalidate
         //   If not: do nothing
diff --git a/src/dxaml/xcp/dxaml/lib/OrientedVirtualizingPanel_Partial.h b/src/dxaml/xcp/dxaml/lib/OrientedVirtualizingPanel_Partial.h
index 00360199c9..a571f123fc 100644
--- a/src/dxaml/xcp/dxaml/lib/OrientedVirtualizingPanel_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/OrientedVirtualizingPanel_Partial.h
@@ -100,7 +100,7 @@ namespace DirectUI
             FLOAT m_upperMarginSnapPointKey;                  // Bottom/right margin dimension used to compute regular and irregular snap points
             FLOAT m_irregularSnapPointKeysOffset;             // Dimension of the unrealized children ahead of the realized children ones
             FLOAT m_regularSnapPointKey;                      // Unique identifier for regular snap points (independent of snap point alignment)
-            INT32 m_cIrregularSnapPointKeys;                  // Number of irregular snap point keys
+            INT32 m_cIrregularSnapPointKeys{};                // Number of irregular snap point keys
 
             // this field will be used later as we finish discovering all scenarios where we need to propagate new zoom factor.
             // IScrollOwner.GetZoomFactor API will go away. And for now we use result from that API with ASSERT comparing with the field.
diff --git a/src/dxaml/xcp/dxaml/lib/PageStackEntryTrackerCollection.h b/src/dxaml/xcp/dxaml/lib/PageStackEntryTrackerCollection.h
index 4548194cbc..0c132530d9 100644
--- a/src/dxaml/xcp/dxaml/lib/PageStackEntryTrackerCollection.h
+++ b/src/dxaml/xcp/dxaml/lib/PageStackEntryTrackerCollection.h
@@ -19,7 +19,7 @@ namespace DirectUI
 
     private:
         // Flag indicating whether this collection corresponds to the BackStack or the ForwardStack.
-        BOOLEAN m_isBackStack;
+        BOOLEAN m_isBackStack{};
 
         // Weak reference to the NavigationHistory that owns this PageStack collection.
         ctl::WeakRefPtr m_wrNavigationHistory;
diff --git a/src/dxaml/xcp/dxaml/lib/PointerPointTransform.cpp b/src/dxaml/xcp/dxaml/lib/PointerPointTransform.cpp
index cc550e8b4c..7256f1bd33 100644
--- a/src/dxaml/xcp/dxaml/lib/PointerPointTransform.cpp
+++ b/src/dxaml/xcp/dxaml/lib/PointerPointTransform.cpp
@@ -123,7 +123,14 @@ PointerPointTransform::TryTransformBounds(
         inRect.Y += m_windowTranslation.Y;
     }
 
-    IFC(m_pTransform->TransformBounds(inRect, pOutRect));
+    if (m_pTransform)
+    {
+        IFC(m_pTransform->TransformBounds(inRect, pOutRect));
+    }
+    else
+    {
+        *pOutRect = inRect;
+    }
 
     // Apply optional inverse translation from Jupiter window to pointer's target window
     if (m_isInverse)
@@ -160,7 +167,7 @@ PointerPointTransform::QueryInterfaceImpl(
 _Check_return_ HRESULT
 PointerPointTransform::SetTransform(
     _In_ IGeneralTransform* pTransform,
-    _In_ wf::Point *pWindowTranslation,
+    _In_opt_ wf::Point *pWindowTranslation,
     _In_ bool isInverse)
 {
     HRESULT hr = S_OK;
@@ -171,7 +178,15 @@ PointerPointTransform::SetTransform(
     m_pTransform = pTransform;
     AddRefInterface(m_pTransform);
 
-    m_windowTranslation = *pWindowTranslation;
+    if (pWindowTranslation)
+    {
+        m_windowTranslation = *pWindowTranslation;
+    }
+    else
+    {
+        m_windowTranslation = {};
+    }
+
     m_isInverse = isInverse;
 
 Cleanup:
@@ -183,6 +198,20 @@ _Check_return_ HRESULT
 PointerPointTransform::CreatePointerPointTransform(
     _In_opt_ xaml::IUIElement* relativeTo,
     _Outptr_ mui::IPointerPointTransform** returnedPointerPointTransform)
+{
+    // Note: use an explicit zero here for the "windowTranslation". We already have a PointerPoint relative to the root
+    // of a Xaml tree. We can transform it down to the specified element just by accounting for offsets applied by Xaml
+    // (e.g. layout offsets, RenderTransforms). The fact that windowed popup hwnds have an offset is an implementation
+    // detail; the same offset is already counted as part of the Xaml Popup.HorizontalOffset/VerticalOffset or a layout
+    // offset.
+    return CreatePointerPointTransform(relativeTo, nullptr, returnedPointerPointTransform);
+}
+
+_Check_return_ HRESULT
+PointerPointTransform::CreatePointerPointTransform(
+    _In_opt_ xaml::IUIElement* relativeTo,
+    _In_opt_ wf::Point* windowTranslation,
+    _Outptr_ mui::IPointerPointTransform** returnedPointerPointTransform)
 {
     IFCPTR_RETURN(returnedPointerPointTransform);
     *returnedPointerPointTransform = nullptr;
@@ -209,17 +238,11 @@ PointerPointTransform::CreatePointerPointTransform(
     IFC_RETURN(ctl::make<PointerPointTransform>(&pointerPointTransform));
 
     // Set the relativeTo transform
-    // Note: use an explicit zero here for the "windowTranslation". We already have a PointerPoint relative to the root
-    // of a Xaml tree. We can transform it down to the specified element just by accounting for offsets applied by Xaml
-    // (e.g. layout offsets, RenderTransforms). The fact that windowed popup hwnds have an offset is an implementation
-    // detail; the same offset is already counted as part of the Xaml Popup.HorizontalOffset/VerticalOffset or a layout
-    // offset.
-    wf::Point zero = {};
     IFC_RETURN(pointerPointTransform->SetTransform(
         transform.Get(),
-        &zero,
+        windowTranslation,
         false /* isInverse */));
     IFC_RETURN(pointerPointTransform.CopyTo(returnedPointerPointTransform));
 
     return S_OK;
-}
\ No newline at end of file
+}
diff --git a/src/dxaml/xcp/dxaml/lib/PointerPointTransform.h b/src/dxaml/xcp/dxaml/lib/PointerPointTransform.h
index 454ad5511e..163490f342 100644
--- a/src/dxaml/xcp/dxaml/lib/PointerPointTransform.h
+++ b/src/dxaml/xcp/dxaml/lib/PointerPointTransform.h
@@ -37,13 +37,18 @@ namespace DirectUI
 
         _Check_return_ HRESULT SetTransform(
             _In_ xaml_media::IGeneralTransform* pTransform,
-            _In_ wf::Point *pWindowTranslation,
+            _In_opt_ wf::Point *pWindowTranslation,
             _In_ bool isInverse);
 
         _Check_return_ static HRESULT CreatePointerPointTransform(
             _In_opt_ xaml::IUIElement *pRelativeTo,
             _Outptr_ mui::IPointerPointTransform **ppPointerPointTransform);
 
+        _Check_return_ static HRESULT CreatePointerPointTransform(
+            _In_opt_ xaml::IUIElement* pRelativeTo,
+            _In_opt_ wf::Point* pWindowTranslation,
+            _Outptr_ mui::IPointerPointTransform** ppPointerPointTransform);
+
     private :
         // It's not necessary for this to be a TrackerPtr; it's only used to interact with core input.
         xaml_media::IGeneralTransform *m_pTransform;
diff --git a/src/dxaml/xcp/dxaml/lib/Popup_Partial.cpp b/src/dxaml/xcp/dxaml/lib/Popup_Partial.cpp
index ea7f4bdd1c..ce5ec2eb79 100644
--- a/src/dxaml/xcp/dxaml/lib/Popup_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/Popup_Partial.cpp
@@ -33,10 +33,9 @@ Popup::~Popup()
         // Clear the caches on the current window
         ClearWindowCaches();
     }
-    
+
     // These handlers don't require a DXamlCore on the thread.
     IGNOREHR(BackButtonIntegration_UnregisterListener(this));
-    IGNOREHR(WindowPositionChanged_UnregisterListener(this));
 }
 
 void Popup::ClearWindowCaches()
@@ -51,40 +50,11 @@ _Check_return_ HRESULT Popup::Initialize()
     return S_OK;
 }
 
-_Check_return_ HRESULT Popup::HookupWindowPositionChangedHandler(_In_ CDependencyObject* nativePopup)
-{
-    ASSERT(nativePopup != nullptr);
-
-    ctl::ComPtr<DependencyObject> spPopupAsDO;
-    IFC_RETURN(DXamlCore::GetCurrent()->GetPeer(nativePopup, &spPopupAsDO));
-
-    ctl::ComPtr<DirectUI::Popup> spPopup;
-    IFC_RETURN(spPopupAsDO.As(&spPopup));
-
-    IFC_RETURN(spPopup->HookupWindowPositionChangedHandlerImpl());
-
-    return S_OK;
-}
-
-// Window position changed events for light dismiss of windowed popups.
-_Check_return_ HRESULT Popup::HookupWindowPositionChangedHandlerImpl()
-{
-    if (CPopup::DoesPlatformSupportWindowedPopup(DXamlCore::GetCurrent()->GetHandle())
-        && DXamlCore::GetCurrent()->GetHandle()->UseWindowPosChanged())
-    {
-        IFC_RETURN(WindowPositionChanged_RegisterListener(this));
-    }
-
-    return S_OK;
-}
-
 _Check_return_ HRESULT Popup::CacheContentPositionInfo()
 {
     // use changes in xaml root size or screen position to detect orientation/size changed for light dismiss.
     wf::Rect currentVisibleContentBounds{};
     IFC_RETURN(DXamlCore::GetCurrent()->GetVisibleContentBoundsForElement(false, true, GetHandle(), &currentVisibleContentBounds));
-    m_previousWindowX = currentVisibleContentBounds.X;
-    m_previousWindowY = currentVisibleContentBounds.Y;
 
     auto xamlRoot = XamlRoot::GetForElementStatic(this);
     if (xamlRoot)
@@ -672,70 +642,6 @@ Popup::OnXamlRootChanged(
     return S_OK;
 }
 
-STDMETHODIMP Popup::OnCoreWindowPositionChanged()
-{
-    if (!IsAssociatedWithXamlIsland())
-    {
-        OnHostWindowPositionChangedImpl();
-    }
-
-    return S_OK;
-}
-
-/*static*/ void Popup::OnHostWindowPositionChanged(_In_ CDependencyObject* nativePopup)
-{
-    ctl::ComPtr<DependencyObject> popupAsDO;
-    IFCFAILFAST(DXamlCore::GetCurrent()->GetPeer(nativePopup, &popupAsDO));
-
-    ctl::ComPtr<DirectUI::Popup> popup;
-    IFCFAILFAST(popupAsDO.As(&popup));
-
-    popup->OnHostWindowPositionChangedImpl();
-}
-
-void Popup::OnHostWindowPositionChangedImpl()
-{
-    CPopup *pPopup = static_cast<CPopup*>(GetHandle());
-    if (pPopup && pPopup->IsWindowed())
-    {
-        auto toolTipOwner = m_wrOwner.AsOrNull<xaml_controls::IToolTip>();
-
-        if (toolTipOwner && !toolTipOwner.Cast<ToolTip>()->IsOpenAsAutomaticToolTip())
-        {
-            toolTipOwner.Cast<ToolTip>()->RepositionPopup();
-        }
-        else
-        {
-            bool shouldClose = true;
-            Window* window = nullptr;
-            IFCFAILFAST(DXamlCore::GetCurrent()->GetAssociatedWindowNoRef(this, &window));
-            if (window && window->HasBounds())
-            {
-                shouldClose = false;
-                wf::Rect currentWindowBounds = { };
-                IFCFAILFAST(DXamlCore::GetCurrent()->GetVisibleContentBoundsForElement(false, true, GetHandle(), &currentWindowBounds));
-                if (currentWindowBounds.X != m_previousWindowX ||
-                    currentWindowBounds.Y != m_previousWindowY)
-                {
-                    shouldClose = true;
-                    m_previousWindowX = currentWindowBounds.X;
-                    m_previousWindowY = currentWindowBounds.Y;
-                }
-            }
-
-            if (shouldClose)
-            {
-                // Keep CPopup alive to prevent CPopup::Close from crashing after releasing itself.
-                // This is a temporary fix to reduce risk near ship date. Ideally CPopupRoot::RemoveFromOpenPopupList
-                // should call UnpegManagedPeer before AsyncRelease, so CPopup is released on the next tick.
-                xref_ptr<CPopup> spPopup(pPopup);
-
-                IFCFAILFAST(Close());
-            }
-        }
-    }
-}
-
 /*static*/ void Popup::OnIslandLostFocus(_In_ CDependencyObject* nativePopup)
 {
     ctl::ComPtr<DependencyObject> popupAsDO;
@@ -1066,21 +972,6 @@ _Check_return_ HRESULT Popup::get_IsConstrainedToRootBoundsImpl(_Out_ BOOLEAN* p
     return S_OK;
 }
 
-_Check_return_ HRESULT Popup::QueryInterfaceImpl(_In_ REFIID iid, _Outptr_ void** ppObject)
-{
-    if (InlineIsEqualGUID(iid, __uuidof(ABI::Microsoft::Internal::FrameworkUdk::ICoreWindowPositionChangedListener)))
-    {
-        *ppObject = static_cast<ABI::Microsoft::Internal::FrameworkUdk::ICoreWindowPositionChangedListener*>(this);
-    }
-    else
-    {
-        return PopupGenerated::QueryInterfaceImpl(iid, ppObject);
-    }
-
-    AddRefOuter();
-    return S_OK;
-}
-
 _Check_return_ HRESULT Popup::SetPositionFromPlacement(float xPlacementTargetAdjustment, float yPlacementTargetAdjustment)
 {
     CPopup* corePopup = static_cast<CPopup*>(GetHandle());
diff --git a/src/dxaml/xcp/dxaml/lib/Popup_Partial.h b/src/dxaml/xcp/dxaml/lib/Popup_Partial.h
index 343cbcc61f..e56d5ff8d7 100644
--- a/src/dxaml/xcp/dxaml/lib/Popup_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/Popup_Partial.h
@@ -11,12 +11,8 @@
 namespace DirectUI
 {
     // Represents the Popup control
-    PARTIAL_CLASS(Popup), public ABI::Microsoft::Internal::FrameworkUdk::ICoreWindowPositionChangedListener
+    PARTIAL_CLASS(Popup)
     {
-        BEGIN_INTERFACE_MAP(DesktopWindowXamlSource, PopupGenerated)
-            INTERFACE_ENTRY(DesktopWindowXamlSource, ABI::Microsoft::Internal::FrameworkUdk::ICoreWindowPositionChangedListener)
-        END_INTERFACE_MAP(DesktopWindowXamlSource, PopupGenerated)
-
         public:
 
             enum class MajorPlacementMode
@@ -104,12 +100,6 @@ namespace DirectUI
 
             _Check_return_ HRESULT GetShouldUIAPeerExposeWindowPattern(_Out_ bool *shouldExposeWindowPattern);
 
-            _Check_return_ HRESULT HookupWindowPositionChangedHandlerImpl();
-
-            static _Check_return_ HRESULT HookupWindowPositionChangedHandler(_In_ CDependencyObject* nativePopup);
-
-            static void OnHostWindowPositionChanged(_In_ CDependencyObject* nativePopup);
-
             static void OnIslandLostFocus(_In_ CDependencyObject* nativePopup);
 
             _Check_return_ HRESULT SetOwner(_In_opt_ xaml::IDependencyObject* const owner);
@@ -131,8 +121,6 @@ namespace DirectUI
 
             _Check_return_ HRESULT OnPropertyChanged2(_In_ const PropertyChangedParams& args) override;
 
-            _Check_return_ HRESULT QueryInterfaceImpl(_In_ REFIID iid, _Outptr_ void** ppObject) override;
-
         private:
             bool IsAssociatedWithXamlIsland() const;
 
@@ -144,10 +132,6 @@ namespace DirectUI
                 _In_ xaml::IXamlRoot* pSender,
                 _In_ xaml::IXamlRootChangedEventArgs* pArgs);
 
-            STDMETHOD (OnCoreWindowPositionChanged)() override; //ICoreWindowPositionChangedListener
-
-            void OnHostWindowPositionChangedImpl();
-
             void OnIslandLostFocusImpl();
             _Check_return_ HRESULT OnXamlLostFocus();
 
@@ -226,10 +210,6 @@ namespace DirectUI
             FLOAT m_previousXamlRootWidth;
             FLOAT m_previousXamlRootHeight;
 
-            // Previous position of the window, used to detect when we move.
-            FLOAT m_previousWindowX;
-            FLOAT m_previousWindowY;
-
             // Store the flags that determine what triggers dismissal of this popup
             UINT32 m_dismissalTriggerFlags;
 
@@ -241,7 +221,7 @@ namespace DirectUI
             ctl::WeakRefPtr m_wrOldChild;
 
             bool m_placementAndJustificationCalculated{ false };
-            MajorPlacementMode m_calculatedMajorPlacement;
-            PreferredJustification m_calculatedJustification;
+            MajorPlacementMode m_calculatedMajorPlacement{};
+            PreferredJustification m_calculatedJustification{};
     };
 }
diff --git a/src/dxaml/xcp/dxaml/lib/RadioButton_Partial.cpp b/src/dxaml/xcp/dxaml/lib/RadioButton_Partial.cpp
index 19b1feeba7..1212c0040b 100644
--- a/src/dxaml/xcp/dxaml/lib/RadioButton_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/RadioButton_Partial.cpp
@@ -161,10 +161,26 @@ RadioButton::OnGroupNamePropertyChanged(
     IFC(Unregister(strOldValue.Get(), this));
     IFC(Register(strNewValue.Get(), this));
 
+    IFC(UpdateRadioButtonGroup());
+
 Cleanup:
     RRETURN(hr);
 }
 
+_Check_return_ HRESULT RadioButton::EnterImpl(
+    _In_ bool bLive,
+    _In_ bool bSkipNameRegistration,
+    _In_ bool bCoercedIsEnabled,
+    _In_ bool bUseLayoutRounding)
+{
+    IFC_RETURN(__super::EnterImpl(bLive, bSkipNameRegistration, bCoercedIsEnabled, bUseLayoutRounding));
+    if (bLive)
+    {
+        IFC_RETURN(UpdateRadioButtonGroup());
+    }
+    return S_OK;
+}
+
 _Check_return_ HRESULT RadioButton::OnChecked()
 {
     HRESULT hr = S_OK;
@@ -360,23 +376,54 @@ RadioButton::UnregisterFromGroup(std::list<ctl::WeakRefPtr> *groupElements, _In_
 _Check_return_ HRESULT
 RadioButton::UpdateRadioButtonGroup()
 {
-    RadioButton *pRadioButtonNoRef = nullptr;
     BOOLEAN bIsChecked = FALSE;
+    ctl::ComPtr<wf::IReference<bool>> spIsCheckedReference;
+
+    // If we are not checked then we don't have any effect on other buttons
+    IFC_RETURN(get_IsChecked(&spIsCheckedReference));
+    if (spIsCheckedReference)
+    {
+        IFC_RETURN(spIsCheckedReference->get_Value(&bIsChecked));
+        if (!bIsChecked)
+        {
+            return S_OK;
+        }
+    }
+
+    RadioButton *pRadioButtonNoRef = nullptr;
     std::list<ctl::WeakRefPtr> *groupElements = nullptr;
     bool groupNameExists = false;
     xstring_ptr groupName;
-    ctl::ComPtr<xaml::IDependencyObject> spParent;
+    xref_ptr<CDependencyObject> spParent;
+
+    IFC_RETURN(GetGroupName(&groupNameExists, &groupName));
+    IFC_RETURN(GetParentForGroup(groupNameExists, this, spParent.ReleaseAndGetAddressOf()));
 
-    // Accessing the group's parent in this first GetParentForGroup call may propagate a new
+    // If we don't get a parent then don't do anything and let it be handled on enter impl.  Without
+    // a parent we don't know what the scope of a named group item is and for unnamed items, they
+    // will all share the same group preventing different groups from having buttons selected.
+    if (!spParent)
+    {
+        return S_OK;
+    }
+    
+    // We need to make sure the DXaml peer exists for our parent because this can propagate a new
     // DataContext and cause an app FrameworkElement.DataContextChanged event handler to affect
     // the results of GetGroupName, GetParentForGroup and GetRadioButtonGroupsByName.
-    // So the GetGroupName & GetParentForGroup methods are called twice to make sure the resulting
-    // groupNameExists, groupName, spParent, groupsByName and groupElements variables are valid.
-    IFC_RETURN(GetGroupName(&groupNameExists, &groupName));
-    IFC_RETURN(GetParentForGroup(groupNameExists, this, &spParent));
+    // So the GetGroupName & GetParentForGroup methods are called a second time if we need to
+    // create a peer to make sure the resulting groupName, spParent, groupsByName
+    // and groupElements variables are valid.
+    {
+        ctl::ComPtr<DependencyObject> dxamlPeer;
 
-    IFC_RETURN(GetGroupName(&groupNameExists, &groupName));
-    IFC_RETURN(GetParentForGroup(groupNameExists, this, &spParent));
+        IFC_RETURN(DXamlCore::GetCurrent()->TryGetPeer(spParent, dxamlPeer.ReleaseAndGetAddressOf()));
+        if (!dxamlPeer)
+        {
+            IFC_RETURN(DXamlCore::GetCurrent()->GetPeer(spParent, dxamlPeer.ReleaseAndGetAddressOf()));
+            IFC_RETURN(GetGroupName(&groupNameExists, &groupName));
+            IFC_RETURN(GetParentForGroup(groupNameExists, this, spParent.ReleaseAndGetAddressOf()));
+        }
+    }
 
     xchainedmap<xstring_ptr, std::list<ctl::WeakRefPtr>*> *groupsByName;
     IFC_RETURN(DXamlCore::GetCurrent()->GetRadioButtonGroupsByName(FALSE, groupsByName));
@@ -392,8 +439,6 @@ RadioButton::UpdateRadioButtonGroup()
 
                 for (auto vector_it = groupElementsCache.begin(); vector_it != groupElementsCache.end(); ++vector_it)
                 {
-                    ctl::ComPtr<wf::IReference<bool>> spIsCheckedReference;
-
                     // Resolve the weak reference to get an actual IRadioButton
                     ctl::WeakRefPtr pRadioButtonRef = *vector_it;
                     ctl::ComPtr<IRadioButton> radioButton;
@@ -407,7 +452,7 @@ RadioButton::UpdateRadioButtonGroup()
                     // Cast to a class so we can call all the members
                     pRadioButtonNoRef = static_cast<RadioButton*>(radioButton.Get());
 
-                    IFC_RETURN(pRadioButtonNoRef->get_IsChecked(&spIsCheckedReference));
+                    IFC_RETURN(pRadioButtonNoRef->get_IsChecked(spIsCheckedReference.ReleaseAndGetAddressOf()));
                     if (spIsCheckedReference)
                     {
                         IFC_RETURN(spIsCheckedReference->get_Value(&bIsChecked));
@@ -415,8 +460,8 @@ RadioButton::UpdateRadioButtonGroup()
 
                     if (pRadioButtonNoRef != this && (!spIsCheckedReference || bIsChecked))
                     {
-                        ctl::ComPtr<xaml::IDependencyObject> spCurrentParent;
-                        IFC_RETURN(GetParentForGroup(groupNameExists, pRadioButtonNoRef, &spCurrentParent));
+                        xref_ptr<CDependencyObject> spCurrentParent;
+                        IFC_RETURN(GetParentForGroup(groupNameExists, pRadioButtonNoRef, spCurrentParent.ReleaseAndGetAddressOf()));
 
                         if (spParent == spCurrentParent)
                         {
@@ -459,28 +504,26 @@ RadioButton::GetGroupName(_Out_ bool* groupNameExists, _Out_ xstring_ptr* groupN
 }
 
 _Check_return_ HRESULT
-RadioButton::GetParentForGroup(_In_ bool groupNameExists, _In_ RadioButton* radioButton, _Outptr_ xaml::IDependencyObject** parent)
+RadioButton::GetParentForGroup(_In_ bool groupNameExists, _In_ RadioButton* radioButton, _Outptr_ CDependencyObject** parent)
 {
     *parent = nullptr;
-    ctl::ComPtr<xaml::IDependencyObject> radioButtonParent;
 
-    // If there is a groupName, then get the parent of the RadioButton.
-    if (!groupNameExists)
-    {
-        IFC_RETURN(radioButton->get_Parent(&radioButtonParent));
-    }
-    // Otherwise, the RadioButtons are in a "default group" so get the root for the RadioButton, e.g. a Panel.
-    else
-    {
-        IFC_RETURN(VisualTreeHelper::GetRootStatic(radioButton, &radioButtonParent));
-    }
-
-    if (radioButtonParent)
-    {
-        IFC_RETURN(radioButtonParent.CopyTo(parent));
-    }
-
-    return S_OK;
+    // Previously we used to return the DXaml peer but that requires us to be able to get the peer of the parent and
+    // there are scenarios when we are trying to get the parent for an item not in the tree that is the process
+    // of being destructed.  In this case we will try to resurrect the peer and will fail.  In addition, the methods
+    // used to get the DXaml peer always return null if the element is not in the active tree.  This caused us to
+    // improperly group all radio buttons not in the tree into a single group and we end up unchecking the wrong buttons.
+    // So currently we only walk the core side which ensure we always have some kind of a parent AND does not get
+    // the Dxaml peer when it isn't needed.
+    CValue result;
+    IFC_RETURN(CoreImports::DependencyObject_GetVisualRelative(
+        static_cast<CUIElement*>(radioButton->GetHandle()),
+        groupNameExists ? CoreImports::VisualRelativeKind_Root : CoreImports::VisualRelativeKind_Parent,
+        &result));
+
+    *parent = result.DetachObject().detach();
+
+     return S_OK;
 }
 
 _Check_return_ HRESULT RadioButton::AutomationRadioButtonOnToggle()
@@ -566,12 +609,12 @@ RadioButton::FocusNextElementInGroup(
     xstring_ptr currentGroupName;
     IFC_RETURN(GetGroupName(&currentGroupNameExists, &currentGroupName));
 
-    ctl::ComPtr<xaml::IDependencyObject> currentParent;
-    IFC_RETURN(GetParentForGroup(currentGroupNameExists, this, &currentParent));
-    CDependencyObject* currentParentDO = nullptr;
-    if (currentParent)
+    ctl::ComPtr<DependencyObject> currentParent;
+    xref_ptr<CDependencyObject> currentParentDO;
+    IFC_RETURN(GetParentForGroup(currentGroupNameExists, this, currentParentDO.ReleaseAndGetAddressOf()));
+    if (currentParentDO)
     {
-        currentParentDO = static_cast<CDependencyObject*>(currentParent.Cast<DependencyObject>()->GetHandle());
+        IFC_RETURN(DXamlCore::GetCurrent()->GetPeer(currentParentDO, &currentParent));
     }
 
     auto pFocusManager = VisualTree::GetFocusManagerForElement(GetHandle());
@@ -622,7 +665,8 @@ RadioButton::FocusNextElementInGroup(
 
                     if (currentGroupName.Equals(nextGroupName))
                     {
-                        pFocusManager->SetFocusedElement(FocusMovement(nextFocusCandidate, navigationDirection, DirectUI::FocusState::Keyboard));
+                        const Focus::FocusMovementResult result = pFocusManager->SetFocusedElement(FocusMovement(nextFocusCandidate, navigationDirection, DirectUI::FocusState::Keyboard));
+                        IFC_RETURN(result.GetHResult());
                         *wasFocused = true;
                         break;
                     }
diff --git a/src/dxaml/xcp/dxaml/lib/RadioButton_Partial.h b/src/dxaml/xcp/dxaml/lib/RadioButton_Partial.h
index 5a2191edbc..0cbe5659b9 100644
--- a/src/dxaml/xcp/dxaml/lib/RadioButton_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/RadioButton_Partial.h
@@ -36,6 +36,13 @@ namespace DirectUI
             // to snap directly to the new visual state.
             _In_ bool bUseTransitions) override;
 
+        // Called when the element enters the tree. Ensures multiple radio buttons in a group are not checked
+        _Check_return_ HRESULT EnterImpl(
+            _In_ bool bLive,
+            _In_ bool bSkipNameRegistration,
+            _In_ bool bCoercedIsEnabled,
+            _In_ bool bUseLayoutRounding) final;
+
     public:
         // Called by RadioButtonAutomationPeer to Toggle
         _Check_return_ HRESULT AutomationRadioButtonOnToggle();
@@ -62,7 +69,7 @@ namespace DirectUI
         _Check_return_ HRESULT FocusNextElementInGroup(_In_ bool moveForward, _Out_ bool* wasFocused);
 
         _Check_return_ HRESULT GetGroupName(_Out_ bool* groupNameExists, _Out_ xstring_ptr* groupName);
-        _Check_return_ HRESULT GetParentForGroup(_In_ bool groupNameExists, _In_ RadioButton* radioButton, _Outptr_ xaml::IDependencyObject** parent);
+        _Check_return_ HRESULT GetParentForGroup(_In_ bool groupNameExists, _In_ RadioButton* radioButton, _Outptr_ CDependencyObject** parent);
 
         _Check_return_ HRESULT UpdateRadioButtonGroup();
     };
diff --git a/src/dxaml/xcp/dxaml/lib/RaiseDragDropEventAsyncOperation.h b/src/dxaml/xcp/dxaml/lib/RaiseDragDropEventAsyncOperation.h
index d09df73ddc..18684cccc4 100644
--- a/src/dxaml/xcp/dxaml/lib/RaiseDragDropEventAsyncOperation.h
+++ b/src/dxaml/xcp/dxaml/lib/RaiseDragDropEventAsyncOperation.h
@@ -152,7 +152,7 @@ namespace DirectUI
         bool m_hasAnchorPoint = false;
         bool m_wasDeferred = false;
         wadt::DataPackageOperation m_result = wadt::DataPackageOperation::DataPackageOperation_None;
-        DragDropMessageType m_type;
+        DragDropMessageType m_type{};
         UINT32 m_deferralCount = 0;
         // Used to hold a ref to self while invoking completion handler
         Microsoft::WRL::ComPtr<RaiseDragDropEventAsyncOperation> m_spThis;
diff --git a/src/dxaml/xcp/dxaml/lib/ReversedVector.cpp b/src/dxaml/xcp/dxaml/lib/ReversedVector.cpp
index 6aaa18826a..e3a59ff2ca 100644
--- a/src/dxaml/xcp/dxaml/lib/ReversedVector.cpp
+++ b/src/dxaml/xcp/dxaml/lib/ReversedVector.cpp
@@ -32,7 +32,7 @@ class CVectorChangedEventArgs :
 
 private:
     wfc::CollectionChange _change;
-    unsigned int _index;
+    unsigned int _index{};
 };
 
 
diff --git a/src/dxaml/xcp/dxaml/lib/ReversedVector.h b/src/dxaml/xcp/dxaml/lib/ReversedVector.h
index 1c11c10bdb..1645fb912a 100644
--- a/src/dxaml/xcp/dxaml/lib/ReversedVector.h
+++ b/src/dxaml/xcp/dxaml/lib/ReversedVector.h
@@ -88,5 +88,5 @@ class ReversedVector :
     wrl::ComPtr<wfc::IObservableVector<IInspectable*>> m_observableVector;
 
     wrl::EventSource<wfc::VectorChangedEventHandler<IInspectable*>> m_eventSource;
-    EventRegistrationToken m_vectorChangedToken;
+    EventRegistrationToken m_vectorChangedToken{};
 };
diff --git a/src/dxaml/xcp/dxaml/lib/RichEditBox_Partial.h b/src/dxaml/xcp/dxaml/lib/RichEditBox_Partial.h
index 44186633ca..f33dac892a 100644
--- a/src/dxaml/xcp/dxaml/lib/RichEditBox_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/RichEditBox_Partial.h
@@ -95,7 +95,7 @@ namespace DirectUI
         // so we use this as a flag while initializing the object
         BOOLEAN m_isInitializing;
 
-        EventRegistrationToken m_storyboardCompletedToken;
+        EventRegistrationToken m_storyboardCompletedToken{};
 
         BOOLEAN m_isAnimatingHeight;
 
diff --git a/src/dxaml/xcp/dxaml/lib/RootScrollViewer_Partial.cpp b/src/dxaml/xcp/dxaml/lib/RootScrollViewer_Partial.cpp
index 8b0796b538..a5a69ed038 100644
--- a/src/dxaml/xcp/dxaml/lib/RootScrollViewer_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/RootScrollViewer_Partial.cpp
@@ -49,8 +49,7 @@ RootScrollViewer::NotifyInputPaneStateChange(
     ctl::ComPtr<FlyoutMetadata> spFlyoutMetadata;
     ctl::ComPtr<IFlyoutBase> spOpenFlyout;
     ctl::ComPtr<IFrameworkElement> spOpenFlyoutPlacementTarget;
-    ctl::ComPtr<ContentDialogMetadata> spContentDialogMetadata;
-    ctl::ComPtr<XamlRoot> xamlRoot = XamlRoot::GetImplementationForElementStatic(this);
+     ctl::ComPtr<XamlRoot> xamlRoot = XamlRoot::GetImplementationForElementStatic(this);
     BOOLEAN isInputPaneShow = inputPaneState != InputPaneState::InputPaneHidden;
     
     if (inputPaneState == InputPaneState::InputPaneShowing || inputPaneState == InputPaneState::InputPaneHidden)
@@ -107,18 +106,6 @@ RootScrollViewer::NotifyInputPaneStateChange(
         IFC(spOpenFlyout.Cast<FlyoutBase>()->NotifyInputPaneStateChange(inputPaneState, inputPaneBounds));
     }
 
-    // Update ContentDialog size/position with showing/hiding IHM.
-    // We wont fail if xamlRoot is null because if RSV is not
-    // in visual tree, it simply means that it's not attached yet.
-    if (xamlRoot)
-    {
-        IFC(xamlRoot->GetContentDialogMetadata(&spContentDialogMetadata));
-        IFC(spContentDialogMetadata->ForEachOpenDialog([inputPaneState, inputPaneBounds](xaml_controls::IContentDialog* openDialog, bool& /*stopIterating*/)
-        {
-            return static_cast<ContentDialog*>(openDialog)->NotifyInputPaneStateChange(inputPaneState, inputPaneBounds);
-        }));
-    }
-
     m_isInputPaneShow = isInputPaneShow;
 
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/RoutedEvent_Partial.h b/src/dxaml/xcp/dxaml/lib/RoutedEvent_Partial.h
index c67205a7d4..923df2b3b2 100644
--- a/src/dxaml/xcp/dxaml/lib/RoutedEvent_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/RoutedEvent_Partial.h
@@ -30,6 +30,6 @@ namespace DirectUI
 
         private:
             wrl_wrappers::HString m_strNativeRepresentation;
-            KnownEventIndex m_EventId;
+            KnownEventIndex m_EventId{};
     };
 }
diff --git a/src/dxaml/xcp/dxaml/lib/SVGImageSource_Partial.h b/src/dxaml/xcp/dxaml/lib/SVGImageSource_Partial.h
index 9634036a10..2f95c9db60 100644
--- a/src/dxaml/xcp/dxaml/lib/SVGImageSource_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/SVGImageSource_Partial.h
@@ -39,7 +39,7 @@ namespace DirectUI
             return AsyncBase::GetOnComplete(ppCompletedHandler);
         }
 
-        IFACEMETHOD(GetResults) (_Outptr_result_maybenull_ xaml_imaging::SvgImageSourceLoadStatus *results) override {*results = m_status; return S_OK;}
+        IFACEMETHOD(GetResults) (_Out_ xaml_imaging::SvgImageSourceLoadStatus *results) override {*results = m_status; return S_OK;}
 
         // SvgImageSourceSetSourceAsyncOperation overrides
         // This is the API the our code (Core and DXaml layer) talks to
diff --git a/src/dxaml/xcp/dxaml/lib/ScrollBar_Partial.h b/src/dxaml/xcp/dxaml/lib/ScrollBar_Partial.h
index eabfdb9318..255d650de8 100644
--- a/src/dxaml/xcp/dxaml/lib/ScrollBar_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/ScrollBar_Partial.h
@@ -54,20 +54,20 @@ namespace DirectUI
 
             // Event registration tokens for events attached to template parts
             // so the handlers can be removed if we apply a new template.
-            EventRegistrationToken m_ElementHorizontalThumbDragStartedToken;
-            EventRegistrationToken m_ElementHorizontalThumbDragDeltaToken;
-            EventRegistrationToken m_ElementHorizontalThumbDragCompletedToken;
-            EventRegistrationToken m_ElementHorizontalLargeDecreaseClickToken;
-            EventRegistrationToken m_ElementHorizontalLargeIncreaseClickToken;
-            EventRegistrationToken m_ElementHorizontalSmallDecreaseClickToken;
-            EventRegistrationToken m_ElementHorizontalSmallIncreaseClickToken;
-            EventRegistrationToken m_ElementVerticalThumbDragStartedToken;
-            EventRegistrationToken m_ElementVerticalThumbDragDeltaToken;
-            EventRegistrationToken m_ElementVerticalThumbDragCompletedToken;
-            EventRegistrationToken m_ElementVerticalLargeDecreaseClickToken;
-            EventRegistrationToken m_ElementVerticalLargeIncreaseClickToken;
-            EventRegistrationToken m_ElementVerticalSmallDecreaseClickToken;
-            EventRegistrationToken m_ElementVerticalSmallIncreaseClickToken;
+            EventRegistrationToken m_ElementHorizontalThumbDragStartedToken{};
+            EventRegistrationToken m_ElementHorizontalThumbDragDeltaToken{};
+            EventRegistrationToken m_ElementHorizontalThumbDragCompletedToken{};
+            EventRegistrationToken m_ElementHorizontalLargeDecreaseClickToken{};
+            EventRegistrationToken m_ElementHorizontalLargeIncreaseClickToken{};
+            EventRegistrationToken m_ElementHorizontalSmallDecreaseClickToken{};
+            EventRegistrationToken m_ElementHorizontalSmallIncreaseClickToken{};
+            EventRegistrationToken m_ElementVerticalThumbDragStartedToken{};
+            EventRegistrationToken m_ElementVerticalThumbDragDeltaToken{};
+            EventRegistrationToken m_ElementVerticalThumbDragCompletedToken{};
+            EventRegistrationToken m_ElementVerticalLargeDecreaseClickToken{};
+            EventRegistrationToken m_ElementVerticalLargeIncreaseClickToken{};
+            EventRegistrationToken m_ElementVerticalSmallDecreaseClickToken{};
+            EventRegistrationToken m_ElementVerticalSmallIncreaseClickToken{};
             
             // value that indicates that we are currently blocking indicators from showing
             BOOLEAN m_blockIndicators;
diff --git a/src/dxaml/xcp/dxaml/lib/ScrollContentPresenter_Partial.cpp b/src/dxaml/xcp/dxaml/lib/ScrollContentPresenter_Partial.cpp
index 8f9eaea226..f1a5d0eaf5 100644
--- a/src/dxaml/xcp/dxaml/lib/ScrollContentPresenter_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/ScrollContentPresenter_Partial.cpp
@@ -26,11 +26,36 @@ using namespace DirectUISynonyms;
 
 // Define as 1 (i.e. XCP_TRACE_OUTPUT_MSG) to get DirectManipulation debug outputs, and 0 otherwise
 #define DMSCP_DBG 0
-//#define DM_DEBUG
 
 // Define as 1 (i.e. XCP_TRACE_OUTPUT_MSG) to get DirectManipulation verbose debug outputs, and 0 otherwise
 #define DMSCPv_DBG 0
 
+#ifdef DM_DEBUG
+bool ScrollContentPresenter::DMSCP_TraceDbg() const
+{
+    bool result = gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK;
+
+    if constexpr (DMSCP_DBG)
+    {
+        result = true;
+    }
+
+    return result;
+}
+
+bool ScrollContentPresenter::DMSCPv_TraceDbg() const
+{
+    bool result = gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE)) == S_OK;
+
+    if constexpr (DMSCPv_DBG)
+    {
+        result = true;
+    }
+
+    return result;
+}
+#endif // DM_DEBUG
+
 // Initializes a new instance of the ScrollContentPresenter class.
 ScrollContentPresenter::ScrollContentPresenter()
     : m_isClipPropertySet(FALSE)
@@ -403,7 +428,7 @@ _Check_return_ HRESULT ScrollContentPresenter::LineUpImpl()
     BOOLEAN isScrollClient = FALSE;
 
 #ifdef DM_DEBUG
-    if (DMSCPv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSCPv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE | DMSCPv_DBG) /*traceType*/, L"DMSCPv[0x%p]:LineUpImpl.", this));
     }
@@ -428,7 +453,7 @@ _Check_return_ HRESULT ScrollContentPresenter::LineDownImpl()
     BOOLEAN isScrollClient = FALSE;
 
 #ifdef DM_DEBUG
-    if (DMSCPv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSCPv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE | DMSCPv_DBG) /*traceType*/, L"DMSCPv[0x%p]:LineDownImpl.", this));
     }
@@ -453,7 +478,7 @@ _Check_return_ HRESULT ScrollContentPresenter::LineLeftImpl()
     BOOLEAN isScrollClient = FALSE;
 
 #ifdef DM_DEBUG
-    if (DMSCPv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSCPv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE | DMSCPv_DBG) /*traceType*/, L"DMSCPv[0x%p]:LineLeftImpl.", this));
     }
@@ -478,7 +503,7 @@ _Check_return_ HRESULT ScrollContentPresenter::LineRightImpl()
     BOOLEAN isScrollClient = FALSE;
 
 #ifdef DM_DEBUG
-    if (DMSCPv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSCPv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE | DMSCPv_DBG) /*traceType*/, L"DMSCPv[0x%p]:LineRightImpl.", this));
     }
@@ -503,7 +528,7 @@ _Check_return_ HRESULT ScrollContentPresenter::PageUpImpl()
     BOOLEAN isScrollClient = FALSE;
 
 #ifdef DM_DEBUG
-    if (DMSCPv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSCPv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE | DMSCPv_DBG) /*traceType*/, L"DMSCPv[0x%p]:PageUpImpl.", this));
     }
@@ -533,7 +558,7 @@ _Check_return_ HRESULT ScrollContentPresenter::PageDownImpl()
     BOOLEAN isScrollClient = FALSE;
 
 #ifdef DM_DEBUG
-    if (DMSCPv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSCPv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE | DMSCPv_DBG) /*traceType*/, L"DMSCPv[0x%p]:PageDownImpl.", this));
     }
@@ -563,7 +588,7 @@ _Check_return_ HRESULT ScrollContentPresenter::PageLeftImpl()
     BOOLEAN isScrollClient = FALSE;
 
 #ifdef DM_DEBUG
-    if (DMSCPv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSCPv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE | DMSCPv_DBG) /*traceType*/, L"DMSCPv[0x%p]:PageLeftImpl.", this));
     }
@@ -593,7 +618,7 @@ _Check_return_ HRESULT ScrollContentPresenter::PageRightImpl()
     BOOLEAN isScrollClient = FALSE;
 
 #ifdef DM_DEBUG
-    if (DMSCPv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSCPv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE | DMSCPv_DBG) /*traceType*/, L"DMSCPv[0x%p]:PageRightImpl.", this));
     }
@@ -630,7 +655,7 @@ ScrollContentPresenter::MouseWheelUp(_In_ UINT mouseWheelDelta)
     BOOLEAN isScrollClient = FALSE;
 
 #ifdef DM_DEBUG
-    if (DMSCPv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSCPv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE | DMSCPv_DBG) /*traceType*/, L"DMSCPv[0x%p]:MouseWheelUp - mouseWheelDelta=%d.",
             this, mouseWheelDelta));
@@ -676,7 +701,7 @@ ScrollContentPresenter::MouseWheelDown(_In_ UINT mouseWheelDelta)
     BOOLEAN isScrollClient = FALSE;
 
 #ifdef DM_DEBUG
-    if (DMSCPv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSCPv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE | DMSCPv_DBG) /*traceType*/, L"DMSCPv[0x%p]:MouseWheelDown - mouseWheelDelta=%d.",
             this, mouseWheelDelta));
@@ -722,7 +747,7 @@ ScrollContentPresenter::MouseWheelLeft(_In_ UINT mouseWheelDelta)
     BOOLEAN isScrollClient = FALSE;
 
 #ifdef DM_DEBUG
-    if (DMSCPv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSCPv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE | DMSCPv_DBG) /*traceType*/, L"DMSCPv[0x%p]:MouseWheelLeft - mouseWheelDelta=%d.",
             this, mouseWheelDelta));
@@ -758,7 +783,7 @@ ScrollContentPresenter::MouseWheelRight(_In_ UINT mouseWheelDelta)
     BOOLEAN isScrollClient = FALSE;
 
 #ifdef DM_DEBUG
-    if (DMSCPv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSCPv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE | DMSCPv_DBG) /*traceType*/, L"DMSCPv[0x%p]:MouseWheelRight - mouseWheelDelta=%d.",
             this, mouseWheelDelta));
@@ -785,7 +810,7 @@ _Check_return_ HRESULT ScrollContentPresenter::SetHorizontalOffsetImpl(
     _In_ DOUBLE offset)
 {
 #ifdef DM_DEBUG
-    if (DMSCPv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSCPv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE | DMSCPv_DBG) /*traceType*/, L"DMSCPv[0x%p]:SetHorizontalOffsetImpl - offset=%f.",
             this, offset));
@@ -802,7 +827,7 @@ _Check_return_ HRESULT ScrollContentPresenter::SetHorizontalOffsetPrivate(
     BOOLEAN canHorizontallyScroll = FALSE;
 
 #ifdef DM_DEBUG
-    if (DMSCPv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSCPv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE | DMSCPv_DBG) /*traceType*/, L"DMSCPv[0x%p]:SetHorizontalOffsetPrivate - offset=%f.",
             this, offset));
@@ -863,7 +888,7 @@ _Check_return_ HRESULT ScrollContentPresenter::SetVerticalOffsetImpl(
     _In_ DOUBLE offset)
 {
 #ifdef DM_DEBUG
-    if (DMSCPv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSCPv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE | DMSCPv_DBG) /*traceType*/, L"DMSCPv[0x%p]:SetVerticalOffsetImpl - offset=%f.",
             this, offset));
@@ -880,7 +905,7 @@ _Check_return_ HRESULT ScrollContentPresenter::SetVerticalOffsetPrivate(
     BOOLEAN canVerticallyScroll = FALSE;
 
 #ifdef DM_DEBUG
-    if (DMSCPv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSCPv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE | DMSCPv_DBG) /*traceType*/, L"DMSCPv[0x%p]:SetVerticalOffsetPrivate - offset=%f.",
             this, offset));
@@ -950,7 +975,7 @@ _Check_return_ HRESULT ScrollContentPresenter::SetOffsetsWithExtents(
     ScrollData* pScrollData = NULL;
 
 #ifdef DM_DEBUG
-    if (DMSCPv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSCPv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE | DMSCPv_DBG) /*traceType*/, L"DMSCPv[0x%p]:SetOffsetsWithExtents offsetX=%f, offsetY=%f, extentWidth=%f, extentHeight=%f.",
             this, offsetX, offsetY, extentWidth, extentHeight));
@@ -1108,7 +1133,7 @@ _Check_return_ HRESULT ScrollContentPresenter::MakeVisibleImpl(
     ctl::ComPtr<Page> spPageBetween;
 
 #ifdef DM_DEBUG
-    if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+    if (DMSCP_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | DMSCP_DBG) /*traceType*/,
             L"DMSCP[0x%p]: MakeVisibleImpl - rectangle=(%f, %f, %f, %f), useAnimation=%d.",
@@ -1348,7 +1373,7 @@ _Check_return_ HRESULT ScrollContentPresenter::MakeVisibleImpl(
                         IFC_RETURN(spVerticalOffset.As(&spVerticalOffsetReference));
                         // disableAnimation is FALSE by default, which is what we want here.
 #ifdef DM_DEBUG
-                        if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+                        if (DMSCP_TraceDbg())
                         {
                             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | DMSCP_DBG) /*traceType*/,
                                 L"                   Calling ChangeView(ho=%f, vo=%f, null).", targetHorizontalOffset, targetVerticalOffset));
@@ -1382,7 +1407,7 @@ _Check_return_ HRESULT ScrollContentPresenter::MakeVisibleImpl(
                         }
                     }
 #ifdef DM_DEBUG
-                    else if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+                    else if (DMSCP_TraceDbg())
                     {
                         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | DMSCP_DBG) /*traceType*/,
                             L"                   Skipping request during ongoing manipulation to (ho=%f, vo=%f, zf=%f).",
@@ -1401,7 +1426,7 @@ _Check_return_ HRESULT ScrollContentPresenter::MakeVisibleImpl(
                     if (horizontalOffset != minX)
                     {
 #ifdef DM_DEBUG
-                        if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+                        if (DMSCP_TraceDbg())
                         {
                             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | DMSCP_DBG) /*traceType*/,
                                 L"                   Calling SetHorizontalOffsetPrivate(%f).", minX));
@@ -1424,7 +1449,7 @@ _Check_return_ HRESULT ScrollContentPresenter::MakeVisibleImpl(
                     if (verticalOffset != minY)
                     {
 #ifdef DM_DEBUG
-                        if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+                        if (DMSCP_TraceDbg())
                         {
                             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | DMSCP_DBG) /*traceType*/,
                                 L"                   Calling SetVerticalOffsetPrivate(%f).", minY));
@@ -1486,7 +1511,7 @@ _Check_return_ HRESULT ScrollContentPresenter::MakeVisibleImpl(
     *resultRectangle = rectangle;
 
 #ifdef DM_DEBUG
-    if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+    if (DMSCP_TraceDbg())
     {
         if (resultRectangle)
         {
@@ -1618,7 +1643,7 @@ IFACEMETHODIMP ScrollContentPresenter::MeasureOverride(
     xaml::VerticalAlignment verticalContentAlignment = xaml::VerticalAlignment_Center;
 
 #ifdef DM_DEBUG
-    if (DMSCPv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSCPv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE | DMSCPv_DBG) /*traceType*/, L"DMSCPv[0x%p]:MeasureOverride availableSize=%f,%f.",
             this, availableSize.Width, availableSize.Height));
@@ -1906,7 +1931,7 @@ IFACEMETHODIMP ScrollContentPresenter::MeasureOverride(
                         if (!canUseActualSizeAsExtent)
                         {
 #ifdef DM_DEBUG
-                            if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+                            if (DMSCP_TraceDbg())
                             {
                                 IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | DMSCP_DBG) /*traceType*/,
                                     L"DMSCP[0x%p]: MeasureOverride - Stopping use of actual width as extent.", this));
@@ -1938,7 +1963,7 @@ IFACEMETHODIMP ScrollContentPresenter::MeasureOverride(
                         if (!canUseActualSizeAsExtent)
                         {
 #ifdef DM_DEBUG
-                            if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+                            if (DMSCP_TraceDbg())
                             {
                                 IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | DMSCP_DBG) /*traceType*/,
                                     L"DMSCP[0x%p]: MeasureOverride - Stopping use of actual height as extent.", this));
@@ -2036,7 +2061,7 @@ IFACEMETHODIMP ScrollContentPresenter::MeasureOverride(
 
 Cleanup:
 #ifdef DM_DEBUG
-    if (DMSCPv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSCPv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE | DMSCPv_DBG) /*traceType*/,
             L"DMSCPv[0x%p]:MeasureOverride desiredSizeZoomed=%f,%f, desiredSize=%f,%f.", this, desiredSizeZoomed.Width, desiredSizeZoomed.Height, pReturnValue->Width, pReturnValue->Height));
@@ -2075,7 +2100,7 @@ IFACEMETHODIMP ScrollContentPresenter::ArrangeOverride(
     HRESULT hr = S_OK;
 
 #ifdef DM_DEBUG
-    if (DMSCPv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSCPv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE | DMSCPv_DBG) /*traceType*/, L"DMSCPv[0x%p]:ArrangeOverride finalSize=%f,%f.",
             this, finalSize.Width, finalSize.Height));
@@ -2139,7 +2164,7 @@ IFACEMETHODIMP ScrollContentPresenter::ArrangeOverride(
         IFC(IsScrollClient(&isScrollClient));
 
 #ifdef DM_DEBUG
-        if ((DMSCPv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE)) == S_OK) && spScrollViewer != nullptr)
+        if (DMSCPv_TraceDbg() && spScrollViewer != nullptr)
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE | DMSCPv_DBG) /*traceType*/,
                 L"                   IsRootSV=%d.", spScrollViewer.Cast<ScrollViewer>()->IsRootScrollViewerDbg()));
@@ -2159,7 +2184,7 @@ IFACEMETHODIMP ScrollContentPresenter::ArrangeOverride(
                     // Use the unpublished desired width which ends up being the final arrangement width.
                     extentSize.Width = m_unpublishedExtentSize.Width;
 #ifdef DM_DEBUG
-                    if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+                    if (DMSCP_TraceDbg())
                     {
                         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | DMSCP_DBG) /*traceType*/,
                             L"DMSCP[0x%p]: ArrangeOverride - Stopping use of actual width as extent.", this));
@@ -2178,7 +2203,7 @@ IFACEMETHODIMP ScrollContentPresenter::ArrangeOverride(
                     // Use the unpublished desired height which ends up being the final arrangement height.
                     extentSize.Height = m_unpublishedExtentSize.Height;
 #ifdef DM_DEBUG
-                    if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+                    if (DMSCP_TraceDbg())
                     {
                         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | DMSCP_DBG) /*traceType*/,
                             L"DMSCP[0x%p]: ArrangeOverride - Stopping use of actual height as extent.", this));
@@ -2369,7 +2394,7 @@ IFACEMETHODIMP ScrollContentPresenter::ArrangeOverride(
                                 if (!m_isChildActualWidthUsedAsExtent)
                                 {
 #ifdef DM_DEBUG
-                                    if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+                                    if (DMSCP_TraceDbg())
                                     {
                                         IGNOREHR(spChildAsFE->get_ActualHeight(&actualHeight));
                                         actualHeight = DoubleUtil::Max(0.0, actualHeight + margins.Top + margins.Bottom);
@@ -2454,7 +2479,7 @@ IFACEMETHODIMP ScrollContentPresenter::ArrangeOverride(
                                 if (!m_isChildActualHeightUsedAsExtent)
                                 {
 #ifdef DM_DEBUG
-                                    if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+                                    if (DMSCP_TraceDbg())
                                     {
                                         IGNOREHR(spChildAsFE->get_ActualWidth(&actualWidth));
                                         actualWidth = DoubleUtil::Max(0.0, actualWidth + margins.Left + margins.Right);
@@ -2567,7 +2592,7 @@ IFACEMETHODIMP ScrollContentPresenter::OnApplyTemplate()
     if (m_isChildActualWidthUsedAsExtent)
     {
 #ifdef DM_DEBUG
-        if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+        if (DMSCP_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | DMSCP_DBG) /*traceType*/,
                 L"DMSCP[0x%p]: OnApplyTemplate - Stopping use of actual width as extent.", this));
@@ -2580,7 +2605,7 @@ IFACEMETHODIMP ScrollContentPresenter::OnApplyTemplate()
     if (m_isChildActualHeightUsedAsExtent)
     {
 #ifdef DM_DEBUG
-        if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+        if (DMSCP_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | DMSCP_DBG) /*traceType*/,
                 L"DMSCP[0x%p]: OnApplyTemplate - Stopping use of actual height as extent.", this));
@@ -2972,7 +2997,7 @@ _Check_return_ HRESULT ScrollContentPresenter::RefreshUseOfActualSizeAsExtent(
         if (m_isChildActualWidthUsedAsExtent != canUseActualWidthAsExtent || m_isChildActualHeightUsedAsExtent != canUseActualHeightAsExtent)
         {
 #ifdef DM_DEBUG
-            if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+            if (DMSCP_TraceDbg())
             {
                 IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | DMSCP_DBG) /*traceType*/,
                     L"DMSCP[0x%p]: RefreshUseOfActualSizeAsExtent - Calling InvalidateMeasure.", this));
@@ -3317,7 +3342,7 @@ _Check_return_ HRESULT ScrollContentPresenter::SetZoomFactor(
     BOOLEAN isScrollClient = FALSE;
 
 #ifdef DM_DEBUG
-    if (DMSCPv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSCPv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE | DMSCPv_DBG) /*traceType*/, L"DMSCPv[0x%p]:SetZoomFactor oldZF=%f, newZF=%f.",
             this, m_fZoomFactor, newZoomFactor));
@@ -3367,9 +3392,9 @@ _Check_return_ HRESULT ScrollContentPresenter::put_TopLeftHeader(
     _In_ ScrollViewer* pOwningScrollViewer)
 {
 #ifdef DM_DEBUG
-    if (DMSCPv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSCPv_TraceDbg())
     {
-        IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE | DMSCPv_DBG) /*traceType*/, L"DMSCPv[0x%p]:put_TopLeftHeader spTopLeftHeader=0x%p.", this, spTopLeftHeader));
+        IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE | DMSCPv_DBG) /*traceType*/, L"DMSCPv[0x%p]:put_TopLeftHeader spTopLeftHeader=0x%p.", this, spTopLeftHeader.Get()));
     }
 #endif // DM_DEBUG
 
@@ -3400,9 +3425,9 @@ _Check_return_ HRESULT ScrollContentPresenter::put_TopHeader(
     _In_ ScrollViewer* pOwningScrollViewer)
 {
 #ifdef DM_DEBUG
-    if (DMSCPv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSCPv_TraceDbg())
     {
-        IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE | DMSCPv_DBG) /*traceType*/, L"DMSCPv[0x%p]:put_TopHeader spTopHeader=0x%p.", this, spTopHeader));
+        IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE | DMSCPv_DBG) /*traceType*/, L"DMSCPv[0x%p]:put_TopHeader spTopHeader=0x%p.", this, spTopHeader.Get()));
     }
 #endif // DM_DEBUG
 
@@ -3433,9 +3458,9 @@ _Check_return_ HRESULT ScrollContentPresenter::put_LeftHeader(
     _In_ ScrollViewer* pOwningScrollViewer)
 {
 #ifdef DM_DEBUG
-    if (DMSCPv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSCPv_TraceDbg())
     {
-        IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE | DMSCPv_DBG) /*traceType*/, L"DMSCPv[0x%p]:put_LeftHeader spLeftHeader=0x%p.", this, spLeftHeader));
+        IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | XCP_TRACE_VERBOSE | DMSCPv_DBG) /*traceType*/, L"DMSCPv[0x%p]:put_LeftHeader spLeftHeader=0x%p.", this, spLeftHeader.Get()));
     }
 #endif // DM_DEBUG
 
@@ -3454,7 +3479,7 @@ _Check_return_ HRESULT ScrollContentPresenter::OnUnloaded(
     _In_ xaml::IRoutedEventArgs* pArgs)
 {
 #ifdef DM_DEBUG
-    if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+    if (DMSCP_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | DMSCP_DBG) /*traceType*/,
             L"DMSCP[0x%p]: OnUnloaded.", this));
@@ -3485,7 +3510,7 @@ _Check_return_ HRESULT ScrollContentPresenter::OnTreeParentUpdated(
     HRESULT hr = S_OK;
 
 #ifdef DM_DEBUG
-    if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+    if (DMSCP_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | DMSCP_DBG) /*traceType*/,
             L"DMSCP[0x%p]: OnTreeParentUpdated pNewParent=0x%p, isParentAlive=%d.",
@@ -3533,7 +3558,7 @@ _Check_return_ HRESULT ScrollContentPresenter::OnChildrenCleared()
     ctl::ComPtr<IScrollViewer> spScrollViewer;
 
 #ifdef DM_DEBUG
-    if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+    if (DMSCP_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | DMSCP_DBG) /*traceType*/, L"DMSCP[0x%p]: OnChildrenCleared.", this));
     }
@@ -3570,7 +3595,7 @@ _Check_return_ HRESULT ScrollContentPresenter::UnparentHeaders()
     ctl::ComPtr<IScrollViewer> spScrollViewer;
 
 #ifdef DM_DEBUG
-    if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+    if (DMSCP_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | DMSCP_DBG) /*traceType*/, L"DMSCP[0x%p]: UnparentHeaders.", this));
     }
@@ -3673,7 +3698,7 @@ _Check_return_ HRESULT ScrollContentPresenter::AddHeader(
     INT childCount = 0;
 
 #ifdef DM_DEBUG
-    if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+    if (DMSCP_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | DMSCP_DBG) /*traceType*/,
             L"DMSCP[0x%p]: AddHeader isTopHeader=%d, isLeftHeader=%d.", this, isTopHeader, isLeftHeader));
@@ -3752,7 +3777,7 @@ _Check_return_ HRESULT ScrollContentPresenter::RemoveTopLeftHeader(
     ctl::ComPtr<IUIElement> spTopLeftHeader;
 
 #ifdef DM_DEBUG
-    if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+    if (DMSCP_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | DMSCP_DBG) /*traceType*/, L"DMSCP[0x%p]: RemoveTopLeftHeader. removeFromChildrenCollection=%d", this, removeFromChildrenCollection));
     }
@@ -3802,7 +3827,7 @@ _Check_return_ HRESULT ScrollContentPresenter::RemoveTopHeader(
     ctl::ComPtr<IUIElement> spTopHeader;
 
 #ifdef DM_DEBUG
-    if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+    if (DMSCP_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | DMSCP_DBG) /*traceType*/, L"DMSCP[0x%p]: RemoveTopHeader. removeFromChildrenCollection=%d", this, removeFromChildrenCollection));
     }
@@ -3852,7 +3877,7 @@ _Check_return_ HRESULT ScrollContentPresenter::RemoveLeftHeader(
     ctl::ComPtr<IUIElement> spLeftHeader;
 
 #ifdef DM_DEBUG
-    if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+    if (DMSCP_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | DMSCP_DBG) /*traceType*/, L"DMSCP[0x%p]: RemoveLeftHeader. removeFromChildrenCollection=%d", this, removeFromChildrenCollection));
     }
@@ -3984,7 +4009,7 @@ _Check_return_ HRESULT ScrollContentPresenter::ProcessTabStopOverride(
     CDependencyObject* pLastFocusableDO = NULL;
 
 #ifdef DM_DEBUG
-    if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+    if (DMSCP_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | DMSCP_DBG) /*traceType*/,
             L"DMSCP[0x%p]: ProcessTabStopOverride pFocusedElement=0x%p, pCandidateTabStopElement=0x%p, isBackward=%d.",
@@ -4438,7 +4463,7 @@ _Check_return_ HRESULT ScrollContentPresenter::ProcessCandidateTabStopOverride(
     CDependencyObject* pLastFocusableDO = NULL;
 
 #ifdef DM_DEBUG
-    if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+    if (DMSCP_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | DMSCP_DBG) /*traceType*/,
             L"DMSCP[0x%p]: ProcessCandidateTabStopOverride pFocusedElement=0x%p, pCandidateTabStopElement=0x%p, isBackward=%d.",
@@ -4641,7 +4666,7 @@ _Check_return_ HRESULT ScrollContentPresenter::GetFirstFocusableElementOverride(
     ctl::ComPtr<IDependencyObject> spFirstFocusable;
 
 #ifdef DM_DEBUG
-    if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+    if (DMSCP_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | DMSCP_DBG) /*traceType*/,
             L"DMSCP[0x%p]: GetFirstFocusableElementOverride - entry.", this));
@@ -4795,7 +4820,7 @@ _Check_return_ HRESULT ScrollContentPresenter::GetLastFocusableElementOverride(
     ctl::ComPtr<IDependencyObject> spLastFocusable;
 
 #ifdef DM_DEBUG
-    if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+    if (DMSCP_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | DMSCP_DBG) /*traceType*/,
             L"DMSCP[0x%p]: GetLastFocusableElementOverride - entry.", this));
@@ -4950,7 +4975,7 @@ _Check_return_ HRESULT ScrollContentPresenter::HasDirectChildWithTabIndexSet(
     ctl::ComPtr<IDependencyObject> spDependencyObject;
 
 #ifdef DM_DEBUG
-    if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+    if (DMSCP_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | DMSCP_DBG) /*traceType*/,
             L"DMSCP[0x%p]: HasDirectChildWithTabIndexSet - entry.", this));
@@ -5047,7 +5072,7 @@ _Check_return_ HRESULT ScrollContentPresenter::ProcessTabStopPrivate(
     ctl::ComPtr<DependencyObject> spLastFocusableDO;
 
 #ifdef DM_DEBUG
-    if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+    if (DMSCP_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | DMSCP_DBG) /*traceType*/,
             L"DMSCP[0x%p]: ProcessTabStopPrivate - entry. pFocusedElement=0x%p, isBackward=%d", this, pFocusedElement, isBackward));
@@ -5196,7 +5221,7 @@ _Check_return_ HRESULT ScrollContentPresenter::GetFirstFocusableElementPrivate(
     ctl::ComPtr<IDependencyObject> spFirstFocusable;
 
 #ifdef DM_DEBUG
-    if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+    if (DMSCP_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | DMSCP_DBG) /*traceType*/,
             L"DMSCP[0x%p]: GetFirstFocusableElementPrivate - entry.", this));
@@ -5311,7 +5336,7 @@ _Check_return_ HRESULT ScrollContentPresenter::GetLastFocusableElementPrivate(
     ctl::ComPtr<IDependencyObject> spLastFocusable;
 
 #ifdef DM_DEBUG
-    if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+    if (DMSCP_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | DMSCP_DBG) /*traceType*/,
             L"DMSCP[0x%p]: GetLastFocusableElementPrivate - entry.", this));
@@ -5433,7 +5458,7 @@ _Check_return_ HRESULT ScrollContentPresenter::GetNextFocusableElementPrivate(
     ctl::ComPtr<IDependencyObject> spFocusedDirectChild;
 
 #ifdef DM_DEBUG
-    if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+    if (DMSCP_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | DMSCP_DBG) /*traceType*/,
             L"DMSCP[0x%p]: GetNextFocusableElementPrivate isFocusedElementInTopLeftHeader=%d, isFocusedElementInTopHeader=%d, isFocusedElementInLeftHeader=%d, isFocusedElementInContent=%d.",
@@ -5585,7 +5610,7 @@ _Check_return_ HRESULT ScrollContentPresenter::GetPreviousFocusableElementPrivat
     ctl::ComPtr<IDependencyObject> spFocusedDirectChild;
 
 #ifdef DM_DEBUG
-    if (DMSCP_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLCONTENTPRESENTER) == S_OK)
+    if (DMSCP_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLCONTENTPRESENTER | DMSCP_DBG) /*traceType*/,
             L"DMSCP[0x%p]: GetPreviousFocusableElementPrivate isFocusedElementInTopLeftHeader=%d, isFocusedElementInTopHeader=%d, isFocusedElementInLeftHeader=%d, isFocusedElementInContent=%d.",
diff --git a/src/dxaml/xcp/dxaml/lib/ScrollContentPresenter_Partial.h b/src/dxaml/xcp/dxaml/lib/ScrollContentPresenter_Partial.h
index ad667c705c..defa682735 100644
--- a/src/dxaml/xcp/dxaml/lib/ScrollContentPresenter_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/ScrollContentPresenter_Partial.h
@@ -3,6 +3,9 @@
 
 #pragma once
 
+// Uncomment for DManip debug outputs.
+//#define DM_DEBUG
+
 #include "ScrollContentPresenter.g.h"
 
 namespace DirectUI
@@ -441,6 +444,11 @@ namespace DirectUI
             }
 
         private:
+#ifdef DM_DEBUG
+            bool DMSCP_TraceDbg() const;
+            bool DMSCPv_TraceDbg() const;
+#endif // DM_DEBUG
+
             // Unloaded event handler.
             _Check_return_ HRESULT OnUnloaded(
                 _In_ IInspectable* pSender,
diff --git a/src/dxaml/xcp/dxaml/lib/ScrollViewer_Partial.cpp b/src/dxaml/xcp/dxaml/lib/ScrollViewer_Partial.cpp
index 0c4097baaf..0886ef3795 100644
--- a/src/dxaml/xcp/dxaml/lib/ScrollViewer_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/ScrollViewer_Partial.cpp
@@ -44,7 +44,6 @@ using namespace DirectUISynonyms;
 
 // Define as 1 (i.e. XCP_TRACE_OUTPUT_MSG) to get DirectManipulation debug outputs, and 0 otherwise
 #define DMSV_DBG 0
-//#define DM_DEBUG
 
 // Define as 1 (i.e. XCP_TRACE_OUTPUT_MSG) to get DirectManipulation verbose debug outputs, and 0 otherwise
 #define DMSVv_DBG 0
@@ -76,6 +75,32 @@ static bool IsAnimationEnabled()
     return isAnimationEnabled;
 }
 
+#ifdef DM_DEBUG
+bool ScrollViewer::DMSV_TraceDbg() const
+{
+    bool result = gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK;
+ 
+    if constexpr (DMSV_DBG)
+    {
+        result = true;
+    }
+
+    return result;
+}
+
+bool ScrollViewer::DMSVv_TraceDbg() const
+{
+    bool result = gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK;
+
+    if constexpr (DMSVv_DBG)
+    {
+        result = true;
+    }
+
+    return result;
+}
+#endif // DM_DEBUG
+
 // Initializes a new instance of the ScrollViewer class.
 ScrollViewer::ScrollViewer()
     : m_templatedParentHandlesMouseButton(FALSE)
@@ -485,7 +510,7 @@ _Check_return_ HRESULT ScrollViewer::OnIsEnabledChanged(
     _In_ IsEnabledChangedEventArgs* pArgs)
 {
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         BOOLEAN isEnabledDbg = FALSE;
         IGNOREHR(get_IsEnabled(&isEnabledDbg));
@@ -526,7 +551,7 @@ _Check_return_ HRESULT ScrollViewer::OnTreeParentUpdated(
     _In_ BOOLEAN isParentAlive)
 {
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
             L"DMSV[0x%p]:  OnTreeParentUpdated pNewParent=0x%p, isParentAlive=%d.", this, pNewParent, isParentAlive));
@@ -838,7 +863,7 @@ _Check_return_ HRESULT ScrollViewer::put_HorizontalOffset(
     }
 
 #ifdef DM_DEBUG
-    if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSVv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/, L"DMSVv[0x%p]: put_HorizontalOffset m_xOffset=%f.", this, m_xOffset));
     }
@@ -891,7 +916,7 @@ _Check_return_ HRESULT ScrollViewer::put_ViewportWidth(
     IFC(ScrollViewerGenerated::put_ViewportWidth(value));
 
 #ifdef DM_DEBUG
-    if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSVv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/, L"DMSVv[0x%p]: put_ViewportWidth new viewport width: m_xViewport=%f.", this, m_xViewport));
     }
@@ -967,7 +992,7 @@ _Check_return_ HRESULT ScrollViewer::put_VerticalOffset(
     }
 
 #ifdef DM_DEBUG
-    if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSVv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/, L"DMSVv[0x%p]: put_VerticalOffset m_yOffset=%f.", this, m_yOffset));
     }
@@ -1020,7 +1045,7 @@ _Check_return_ HRESULT ScrollViewer::put_ViewportHeight(
     IFC(ScrollViewerGenerated::put_ViewportHeight(value));
 
 #ifdef DM_DEBUG
-    if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSVv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/, L"DMSVv[0x%p]: put_ViewportHeight new viewport height: m_yViewport=%f.", this, m_yViewport));
     }
@@ -1256,7 +1281,7 @@ IFACEMETHODIMP ScrollViewer::OnApplyTemplate() noexcept
     EventRegistrationToken MouseIndicatorFullStateStoryboardCompletedToken;
 
 #ifdef DM_DEBUG
-    if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSVv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/, L"DMSVv[0x%p]: OnApplyTemplate.", this));
     }
@@ -1765,7 +1790,7 @@ _Check_return_ HRESULT ScrollViewer::ScrollToHorizontalOffsetImpl(
     _In_ DOUBLE offset)
 {
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"DMSV[0x%p]:  ScrollToHorizontalOffsetImpl offset=%f.", this, offset));
     }
@@ -1780,7 +1805,7 @@ _Check_return_ HRESULT ScrollViewer::ScrollToHorizontalOffsetInternal(
     _In_ DOUBLE offset)
 {
 #ifdef DM_DEBUG
-    if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSVv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/,
             L"DMSVv[0x%p]: ScrollToHorizontalOffsetInternal offset=%f.", this, offset));
@@ -1795,7 +1820,7 @@ _Check_return_ HRESULT ScrollViewer::ScrollToVerticalOffsetImpl(
     _In_ DOUBLE offset)
 {
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"DMSV[0x%p]:  ScrollToVerticalOffsetImpl offset=%f.", this, offset));
     }
@@ -1810,7 +1835,7 @@ _Check_return_ HRESULT ScrollViewer::ScrollToVerticalOffsetInternal(
     _In_ DOUBLE offset)
 {
 #ifdef DM_DEBUG
-    if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSVv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/,
             L"DMSVv[0x%p]: ScrollToVerticalOffsetInternal offset=%f.", this, offset));
@@ -2070,7 +2095,7 @@ IFACEMETHODIMP ScrollViewer::MeasureOverride(
     m_inMeasure = FALSE;
 
 #ifdef DM_DEBUG
-    if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSVv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/,
             L"DMSVv[0x%p]: MeasureOverride availableSize=%f,%f, IsRootSV=%d.", this, availableSize.Width, availableSize.Height, IsRootScrollViewer()));
@@ -2356,7 +2381,7 @@ IFACEMETHODIMP ScrollViewer::OnKeyDown(
     m_preferMouseIndicators = FALSE;
 
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(pArgs->get_Key(&key));
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"DMSV[0x%p]:  OnKeyDown - entry. key=%d.", this, key));
@@ -2369,7 +2394,7 @@ IFACEMETHODIMP ScrollViewer::OnKeyDown(
     if (handled)
     {
 #ifdef DM_DEBUG
-        if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+        if (DMSV_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"Exits because handled after ScrollViewerGenerated::OnKeyDown."));
         }
@@ -2382,7 +2407,7 @@ IFACEMETHODIMP ScrollViewer::OnKeyDown(
     if (templatedParentHandlesScrolling)
     {
 #ifdef DM_DEBUG
-        if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+        if (DMSV_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"Exits because get_TemplatedParentHandlesScrolling returns true."));
         }
@@ -2425,7 +2450,7 @@ IFACEMETHODIMP ScrollViewer::OnKeyDown(
             IFC(ProcessPureInertiaInputMessage(messageZoomDirection, &handled));
             IFC(pArgs->put_Handled(handled));
 #ifdef DM_DEBUG
-            if (handled && (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK))
+            if (handled && DMSV_TraceDbg())
             {
                 IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"ProcessInputMessage returns true. Setting handled."));
             }
@@ -2516,10 +2541,41 @@ IFACEMETHODIMP ScrollViewer::OnPointerReleased(
             }
             else
             {
-                // Focus now.
-                // Set focus to the ScrollViewer to capture key input for scrolling
-                IFC(Focus(xaml::FocusState_Pointer, &focused));
-                IFC(pArgs->put_Handled(focused));
+                BOOLEAN scrollViewerIsFocusAncestor = FALSE;
+                BOOLEAN scrollViewerIsTabStop = FALSE;
+
+                IFC(get_IsTabStop(&scrollViewerIsTabStop));
+
+                if (CFocusManager* focusManagerNoRef = VisualTree::GetFocusManagerForElement(GetHandle()))
+                {
+                    if (CDependencyObject* coreCurrentFocusedElementNoRef = focusManagerNoRef->GetFocusedElementNoRef())
+                    {
+                        ctl::ComPtr<DependencyObject> currentFocusedElement;
+
+                        IFC(DXamlCore::GetCurrent()->GetPeer(coreCurrentFocusedElementNoRef, &currentFocusedElement));
+
+                        if (currentFocusedElement)
+                        {
+                            IFC(IsAncestorOf(currentFocusedElement.Get(), &scrollViewerIsFocusAncestor));
+                        }
+                    }
+                }
+
+                if (!scrollViewerIsTabStop && scrollViewerIsFocusAncestor)
+                {
+                    // Do not take focus when:
+                    // - ScrollViewer.IsTabStop is False and
+                    // - Currently focused element is within this ScrollViewer.
+                    // In that case, leave the focus as is by marking this event handled.
+                    IFC(pArgs->put_Handled(TRUE));
+                }
+                else
+                {
+                    // Focus now.
+                    // Set focus to the ScrollViewer to capture key input for scrolling
+                    IFC(Focus(xaml::FocusState_Pointer, &focused));
+                    IFC(pArgs->put_Handled(focused));
+                }
             }
         }
     }
@@ -2822,7 +2878,7 @@ _Check_return_ HRESULT ScrollViewer::MakeVisible(
     wf::Point transformedPoint = {};
 
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
             L"DMSV[0x%p]:  MakeVisible - targetRect=(%f, %f, %f, %f), forceIntoView=%d, useAnimation=%d, skipDuringManipulation=%d.",
@@ -2956,7 +3012,7 @@ _Check_return_ HRESULT ScrollViewer::OnBringIntoViewRequested(
     UIElement* elementNoRef = spTargetObject.Cast<UIElement>();
 
 #ifdef DM_DEBUG
-    if (args && (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK))
+    if (args && DMSV_TraceDbg())
     {
         BOOLEAN forceIntoViewDbg = FALSE;
         BOOLEAN useAnimationDbg = FALSE;
@@ -3057,7 +3113,7 @@ _Check_return_ HRESULT ScrollViewer::HandleVerticalScroll(
     DOUBLE scrollable = 0.0;
 
 #ifdef DM_DEBUG
-    if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSVv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/,
             L"DMSVv[0x%p]: HandleVerticalScroll - entry. offset=%f.", this, offset));
@@ -3134,7 +3190,7 @@ _Check_return_ HRESULT ScrollViewer::HandleVerticalScroll(
         if (!isDeferring)
         {
 #ifdef DM_DEBUG
-            if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+            if (DMSVv_TraceDbg())
             {
                 IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/, L"DMSVv[0x%p]: HandleVerticalScroll calls SetVerticalOffset with newOffset=%f.", this, newOffset));
             }
@@ -3160,7 +3216,7 @@ _Check_return_ HRESULT ScrollViewer::HandleHorizontalScroll(
     DOUBLE scrollable = 0.0;
 
 #ifdef DM_DEBUG
-    if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSVv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/,
             L"DMSVv[0x%p]: HandleHorizontalScroll - entry. offset=%f.", this, offset));
@@ -3233,7 +3289,7 @@ _Check_return_ HRESULT ScrollViewer::HandleHorizontalScroll(
         if (!isDeferring)
         {
 #ifdef DM_DEBUG
-            if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+            if (DMSVv_TraceDbg())
             {
                 IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/, L"DMSVv[0x%p]: HandleHorizontalScroll calls SetHorizontalOffset with newOffset=%f.", this, newOffset));
             }
@@ -3264,7 +3320,7 @@ _Check_return_ HRESULT ScrollViewer::ChangeViewImpl(
     _Out_ BOOLEAN* pReturnValue)
 {
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"DMSV[0x%p]:  ChangeViewImpl - entry.", this));
     }
@@ -3304,7 +3360,7 @@ _Check_return_ HRESULT ScrollViewer::ChangeViewWithOptionalAnimationImpl(
     _Out_ BOOLEAN* pReturnValue)
 {
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"DMSV[0x%p]:  ChangeViewWithOptionalAnimationImpl - entry.", this));
     }
@@ -3407,7 +3463,7 @@ _Check_return_ HRESULT ScrollViewer::ChangeViewInternal(
     *pReturnValue = FALSE;
 
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         DOUBLE targetHorizontalOffsetDbg = 0.0;
         DOUBLE targetVerticalOffsetDbg = 0.0;
@@ -3477,7 +3533,7 @@ _Check_return_ HRESULT ScrollViewer::ChangeViewInternal(
     IFC(get_ZoomFactor(&currentZoomFactor));
 
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
             L"                   Current HorizontalOffset=%f, VerticalOffset=%f, ZoomFactor=%4.8lf, m_xPixelOffsetRequested=%f, m_yPixelOffsetRequested=%f, m_targetChangeViewHorizontalOffset=%f, m_targetChangeViewVerticalOffset=%f, m_targetChangeViewZoomFactor=%4.8lf.",
@@ -3567,7 +3623,7 @@ _Check_return_ HRESULT ScrollViewer::ChangeViewInternal(
 
         // When operating with a IManipulationDataProvider implementation, we do not support animations. Pretend the flag was set to False.
 #ifdef DM_DEBUG
-        if (!disableAnimation && (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK))
+        if (!disableAnimation && DMSVv_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/, L"                   Ignoring animation request for IManipulationDataProvider implementation."));
         }
@@ -4142,7 +4198,7 @@ _Check_return_ HRESULT ScrollViewer::ChangeViewInternal(
                         {
                             m_xPixelOffsetRequested = currentTargetHorizontalOffset;
 #ifdef DM_DEBUG
-                            if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+                            if (DMSV_TraceDbg())
                             {
                                 IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
                                     L"                   Set m_xPixelOffsetRequested=%f.", m_xPixelOffsetRequested));
@@ -4153,7 +4209,7 @@ _Check_return_ HRESULT ScrollViewer::ChangeViewInternal(
                         {
                             m_yPixelOffsetRequested = currentTargetVerticalOffset;
 #ifdef DM_DEBUG
-                            if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+                            if (DMSV_TraceDbg())
                             {
                                 IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
                                     L"                   Set m_yPixelOffsetRequested=%f.", m_yPixelOffsetRequested));
@@ -4320,7 +4376,7 @@ _Check_return_ HRESULT ScrollViewer::ChangeViewInternal(
     }
 
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"DMSV[0x%p]:  ChangeViewInternal - exit with returnValue=%d.", this, *pReturnValue));
     }
@@ -4350,7 +4406,7 @@ _Check_return_ HRESULT ScrollViewer::InvalidateScrollInfoImpl() noexcept
     HRESULT tryUpdateResult = S_OK;
 
 #ifdef DM_DEBUG
-    if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSVv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/, L"DMSVv[0x%p]: InvalidateScrollInfoImpl entry.", this));
     }
@@ -4489,7 +4545,7 @@ _Check_return_ HRESULT ScrollViewer::InvalidateScrollInfoImpl() noexcept
                         if (!spProvider || pixelDelta >= ScrollViewerScrollRoundingToleranceForProvider)
                         {
 #ifdef DM_DEBUG
-                            if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+                            if (DMSV_TraceDbg())
                             {
                                 IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
                                     L"DMSV[0x%p]:  InvalidateScrollInfoImpl Unexpected horizontal pixel offset change xOldPixelOffset=%f m_xPixelOffsetRequested=%f m_xPixelOffset=%f.",
@@ -4512,7 +4568,7 @@ _Check_return_ HRESULT ScrollViewer::InvalidateScrollInfoImpl() noexcept
                         if (!spProvider || pixelDelta >= ScrollViewerScrollRoundingToleranceForProvider)
                         {
 #ifdef DM_DEBUG
-                            if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+                            if (DMSV_TraceDbg())
                             {
                                 IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
                                     L"DMSV[0x%p]:  InvalidateScrollInfoImpl Out-of-manip horizontal pixel offset change xOldPixelOffset=%f m_xPixelOffsetRequested=%f m_xPixelOffset=%f.",
@@ -4529,7 +4585,7 @@ _Check_return_ HRESULT ScrollViewer::InvalidateScrollInfoImpl() noexcept
 
             // No more pending request for a horizontal scroll.
 #ifdef DM_DEBUG
-            if ((DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK) && m_xPixelOffsetRequested != -1)
+            if (DMSVv_TraceDbg() && m_xPixelOffsetRequested != -1)
             {
                 IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/,
                     L"DMSVv[0x%p]: InvalidateScrollInfoImpl resetting m_xPixelOffsetRequested=%f to -1.", this, m_xPixelOffsetRequested));
@@ -4578,7 +4634,7 @@ _Check_return_ HRESULT ScrollViewer::InvalidateScrollInfoImpl() noexcept
                         if (!spProvider || pixelDelta >= ScrollViewerScrollRoundingToleranceForProvider)
                         {
 #ifdef DM_DEBUG
-                            if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+                            if (DMSV_TraceDbg())
                             {
                                 IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
                                     L"DMSV[0x%p]:  InvalidateScrollInfoImpl Unexpected vertical pixel offset change yOldPixelOffset=%f m_yPixelOffsetRequested=%f m_yPixelOffset=%f.",
@@ -4601,7 +4657,7 @@ _Check_return_ HRESULT ScrollViewer::InvalidateScrollInfoImpl() noexcept
                         if (!spProvider || pixelDelta >= ScrollViewerScrollRoundingToleranceForProvider)
                         {
 #ifdef DM_DEBUG
-                            if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+                            if (DMSV_TraceDbg())
                             {
                                 IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
                                     L"DMSV[0x%p]:  InvalidateScrollInfoImpl Out-of-manip vertical pixel offset change yOldPixelOffset=%f m_yPixelOffsetRequested=%f m_yPixelOffset=%f.",
@@ -4617,7 +4673,7 @@ _Check_return_ HRESULT ScrollViewer::InvalidateScrollInfoImpl() noexcept
 
             // No more pending request for a vertical scroll.
 #ifdef DM_DEBUG
-            if ((DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK) && m_yPixelOffsetRequested != -1)
+            if (DMSVv_TraceDbg() && m_yPixelOffsetRequested != -1)
             {
                 IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/,
                     L"DMSVv[0x%p]: InvalidateScrollInfoImpl resetting m_yPixelOffsetRequested=%f to -1.", this, m_yPixelOffsetRequested));
@@ -4733,7 +4789,7 @@ _Check_return_ HRESULT ScrollViewer::InvalidateScrollInfoImpl() noexcept
             if (!areExtentChangesExpected)
             {
 #ifdef DM_DEBUG
-                if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+                if (DMSV_TraceDbg())
                 {
                     IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"DMSV[0x%p]:  InvalidateScrollInfoImpl Unexpected extent change.", this));
                 }
@@ -4756,7 +4812,7 @@ _Check_return_ HRESULT ScrollViewer::InvalidateScrollInfoImpl() noexcept
                         if (!areScrollOffsetsInSync)
                         {
 #ifdef DM_DEBUG
-                            if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+                            if (DMSV_TraceDbg())
                             {
                                 IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"DMSV[0x%p]:  InvalidateScrollInfoImpl ScrollContentPresenter's AreScrollOffsetsInSync==FALSE.", this));
                             }
@@ -4796,7 +4852,7 @@ _Check_return_ HRESULT ScrollViewer::InvalidateScrollInfoImpl() noexcept
                     m_trElementScrollContentPresenter.Cast<ScrollContentPresenter>()->IsChildActualWidthUpdated())
                 {
 #ifdef DM_DEBUG
-                    if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+                    if (DMSVv_TraceDbg())
                     {
                         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/,
                             L"DMSVv[0x%p]: InvalidateScrollInfoImpl resetting m_contentWidthRequested=%f to -1.", this, m_contentWidthRequested));
@@ -4810,7 +4866,7 @@ _Check_return_ HRESULT ScrollViewer::InvalidateScrollInfoImpl() noexcept
                     m_trElementScrollContentPresenter.Cast<ScrollContentPresenter>()->IsChildActualHeightUpdated())
                 {
 #ifdef DM_DEBUG
-                    if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+                    if (DMSVv_TraceDbg())
                     {
                         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/,
                             L"DMSVv[0x%p]: InvalidateScrollInfoImpl resetting m_contentHeightRequested=%f to -1.", this, m_contentHeightRequested));
@@ -4859,7 +4915,7 @@ _Check_return_ HRESULT ScrollViewer::InvalidateScrollInfoImpl() noexcept
 
     // Raise any potentially delayed ViewChanged notification
 #ifdef DM_DEBUG
-    if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSVv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/,
             L"DMSVv[0x%p]: InvalidateScrollInfoImpl calling FlushViewChanged.", this));
@@ -4877,7 +4933,7 @@ _Check_return_ HRESULT ScrollViewer::NotifyHorizontalOffsetChanging(
     _In_ DOUBLE targetVerticalOffset)
 {
 #ifdef DM_DEBUG
-    if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSVv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/,
             L"DMSVv[0x%p]: NotifyHorizontalOffsetChanging - TargetHorizontalOffset=%f, TargetVerticalOffset=%f.", this, targetHorizontalOffset, targetVerticalOffset));
@@ -4895,7 +4951,7 @@ _Check_return_ HRESULT ScrollViewer::NotifyVerticalOffsetChanging(
     _In_ DOUBLE targetVerticalOffset)
 {
 #ifdef DM_DEBUG
-    if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSVv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/,
             L"DMSVv[0x%p]: NotifyVerticalOffsetChanging - TargetHorizontalOffset=%f, TargetVerticalOffset=%f.", this, targetHorizontalOffset, targetVerticalOffset));
@@ -4940,7 +4996,7 @@ _Check_return_ HRESULT ScrollViewer::NotifyZoomFactorChanging(
     DOUBLE targetVerticalOffset = 0.0;
 
 #ifdef DM_DEBUG
-    if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSVv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/,
             L"DMSVv[0x%p]: NotifyZoomFactorChanging - TargetZoomFactor=%f.", this, targetZoomFactor));
@@ -5145,7 +5201,7 @@ _Check_return_ HRESULT ScrollViewer::InvalidateScrollInfo_TryUpdateValues(
             !DoubleUtil::AreClose(m_xPixelOffset, xPixelOffset))
         {
 #ifdef DM_DEBUG
-            if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+            if (DMSVv_TraceDbg())
             {
                 IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/,
                     L"DMSVv[0x%p]: InvalidateScrollInfo_TryUpdateValues horizontal offset changed: m_xPixelOffset=%f xPixelOffset=%f.",
@@ -5163,7 +5219,7 @@ _Check_return_ HRESULT ScrollViewer::InvalidateScrollInfo_TryUpdateValues(
             !DoubleUtil::AreClose(m_yPixelOffset, yPixelOffset))
         {
 #ifdef DM_DEBUG
-            if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+            if (DMSVv_TraceDbg())
             {
                 IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/,
                     L"DMSVv[0x%p]: InvalidateScrollInfo_TryUpdateValues vertical offset changed: m_yPixelOffset=%f yPixelOffset=%f.",
@@ -5218,7 +5274,7 @@ _Check_return_ HRESULT ScrollViewer::InvalidateScrollInfo_TryUpdateValues(
         if (!DoubleUtil::AreClose(m_xPixelExtent, xPixelExtent))
         {
 #ifdef DM_DEBUG
-            if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+            if (DMSV_TraceDbg())
             {
                 IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
                     L"DMSV[0x%p]:  InvalidateScrollInfo_TryUpdateValues horizontal extent changed: m_xPixelExtent=%f xPixelExtent=%f.",
@@ -5240,7 +5296,7 @@ _Check_return_ HRESULT ScrollViewer::InvalidateScrollInfo_TryUpdateValues(
         if (!DoubleUtil::AreClose(m_yPixelExtent, yPixelExtent))
         {
 #ifdef DM_DEBUG
-            if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+            if (DMSV_TraceDbg())
             {
                 IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
                     L"DMSV[0x%p]:  InvalidateScrollInfo_TryUpdateValues vertical extent changed: m_yPixelExtent=%f yPixelExtent=%f.",
@@ -5367,7 +5423,7 @@ _Check_return_ HRESULT ScrollViewer::OnHorizontalScrollBarScroll(
     IFC(pArgs->get_NewValue(&newOffset));
 
 #ifdef DM_DEBUG
-    if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSVv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/,
             L"DMSVv[0x%p]: OnHorizontalScrollBarScroll - entry. scrollEventType=%d, newOffset=%f.", this, scrollEventType, newOffset));
@@ -5401,7 +5457,7 @@ _Check_return_ HRESULT ScrollViewer::OnVerticalScrollBarScroll(
     IFC(pArgs->get_NewValue(&newOffset));
 
 #ifdef DM_DEBUG
-    if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSVv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/,
             L"DMSVv[0x%p]: OnVerticalScrollBarScroll - entry. scrollEventType=%d, newOffset=%f.", this, scrollEventType, newOffset));
@@ -6085,7 +6141,7 @@ _Check_return_ HRESULT ScrollViewer::ScrollByPixelDelta(
     DOUBLE newPixelDelta = pixelDelta;
 
 #ifdef DM_DEBUG
-    if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSVv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/,
             L"DMSVv[0x%p]: ScrollByPixelDelta isForHorizontalOrientation=%d newPixelOffset=%f pixelDelta=%f, isDManipInput=%d",
@@ -6105,7 +6161,7 @@ _Check_return_ HRESULT ScrollViewer::ScrollByPixelDelta(
     {
         IFC(spProvider->ComputeLogicalOffset(isForHorizontalOrientation, newPixelDelta, newOffset));
 #ifdef DM_DEBUG
-        if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+        if (DMSVv_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/,
                 L"DMSVv[0x%p]: ScrollByPixelDelta ComputeLogicalOffset returns newOffset=%f, newPixelDelta=%f for pixelDelta=%f.",
@@ -6154,7 +6210,7 @@ _Check_return_ HRESULT ScrollViewer::ScrollByPixelDelta(
                 m_xPixelOffsetRequested = DoubleUtil::Min(DoubleUtil::Max(newPixelOffset, 0), pixelScrollable);
             }
 #ifdef DM_DEBUG
-            if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+            if (DMSV_TraceDbg())
             {
                 IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
                     L"DMSV[0x%p]:  ScrollByPixelDelta oldOffset=%f newOffset=%f, new m_xPixelOffsetRequested=%f.",
@@ -6168,7 +6224,7 @@ _Check_return_ HRESULT ScrollViewer::ScrollByPixelDelta(
         {
             // Since the current offset is now close to the target, no offset change is expected
 #ifdef DM_DEBUG
-            if ((DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK) && m_xPixelOffsetRequested != -1)
+            if (DMSVv_TraceDbg() && m_xPixelOffsetRequested != -1)
             {
                 IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/,
                     L"DMSVv[0x%p]: ScrollByPixelDelta resetting m_xPixelOffsetRequested=%f to -1.", this, m_xPixelOffsetRequested));
@@ -6225,7 +6281,7 @@ _Check_return_ HRESULT ScrollViewer::ScrollByPixelDelta(
                 }
             }
 #ifdef DM_DEBUG
-            if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+            if (DMSV_TraceDbg())
             {
                 IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"DMSV[0x%p]:  ScrollByPixelDelta oldOffset=%f newOffset=%f, new m_yPixelOffsetRequested=%f.",
                     this, oldOffset, newOffset, m_yPixelOffsetRequested));
@@ -6238,7 +6294,7 @@ _Check_return_ HRESULT ScrollViewer::ScrollByPixelDelta(
         {
             // Since the current offset is now close to the target, no offset change is expected
 #ifdef DM_DEBUG
-            if ((DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK) && m_yPixelOffsetRequested != -1)
+            if (DMSVv_TraceDbg() && m_yPixelOffsetRequested != -1)
             {
                 IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/,
                     L"DMSVv[0x%p]: ScrollByPixelDelta resetting m_yPixelOffsetRequested=%f to -1.", this, m_yPixelOffsetRequested));
@@ -6452,7 +6508,7 @@ _Check_return_ HRESULT ScrollViewer::ZoomToFactorImpl(
     _In_ FLOAT value)
 {
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"DMSV[0x%p]:  ZoomToFactorImpl value=%4.8lf.", this, value));
     }
@@ -6477,7 +6533,7 @@ _Check_return_ HRESULT ScrollViewer::ZoomToFactorInternal(
     bool zoomChanged = false;
 
 #ifdef DM_DEBUG
-    if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSVv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/, L"DMSVv[0x%p]: ZoomToFactorInternal value=%4.8lf, delayAndFlushViewChanged=%d.", this, value, delayAndFlushViewChanged));
     }
@@ -8643,7 +8699,7 @@ _Check_return_ HRESULT ScrollViewer::BringIntoViewport(
     _Out_ BOOLEAN* pHandled)
 {
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"DMSV[0x%p]:  BringIntoViewport - bounds=(%f, %f, %f, %f), skipDuringTouchContact=%d, skipAnimationWhileRunning=%d.",
             this, bounds.X, bounds.Y, bounds.Width, bounds.Height, skipDuringTouchContact, skipAnimationWhileRunning));
@@ -8703,7 +8759,7 @@ _Check_return_ HRESULT ScrollViewer::BringIntoViewportInternal(
     bool fHandled = false;
 
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"DMSV[0x%p]:  BringIntoViewportInternal - bounds=(%f, %f, %f, %f), translateX=%f, translateY=%f, zoomFactor=%f,",
             this, bounds.X, bounds.Y, bounds.Width, bounds.Height, translateX, translateY, zoomFactor));
@@ -8794,7 +8850,7 @@ _Check_return_ HRESULT ScrollViewer::SetDirectManipulationOverridingZoomBoundari
             }
 
 #ifdef DM_DEBUG
-            if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+            if (DMSV_TraceDbg())
             {
                 IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
                     L"DMSV[0x%p]:  SetDirectManipulationOverridingZoomBoundaries - Notifying zoom factor boundary change. m_overridingMinZoomFactor=%f m_overridingMaxZoomFactor=%f.",
@@ -8819,7 +8875,7 @@ _Check_return_ HRESULT ScrollViewer::SetDirectManipulationOverridingZoomBoundari
 _Check_return_ HRESULT ScrollViewer::ResetDirectManipulationOverridingZoomBoundaries()
 {
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"DMSV[0x%p]:  ResetDirectManipulationOverridingZoomBoundaries - Resetting zoom boundary overrides.", this));
     }
@@ -8844,7 +8900,7 @@ _Check_return_ HRESULT ScrollViewer::SetLayoutSize(
         wf::Size availableSize = { 0.0f, 0.0f };
 
 #ifdef DM_DEBUG
-        if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+        if (DMSV_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"DMSV[0x%p]:  SetLayoutSize - layoutSize=%f, %f.", this, layoutSize.Width, layoutSize.Height));
         }
@@ -8882,7 +8938,7 @@ _Check_return_ HRESULT ScrollViewer::PostDirectManipulationLayoutRefreshed()
 _Check_return_ HRESULT ScrollViewer::NotifyLayoutRefreshed()
 {
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"DMSV[0x%p]:  NotifyLayoutRefreshed.", this));
     }
@@ -9918,7 +9974,7 @@ IFACEMETHODIMP ScrollViewer::OnContentChanged(
 _Check_return_ HRESULT ScrollViewer::OnContentPropertyChanged()
 {
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
             L"DMSV[0x%p]:  OnContentPropertyChanged.", this));
@@ -9972,7 +10028,7 @@ _Check_return_ HRESULT ScrollViewer::OnManipulatabilityAffectingPropertyChanged(
     DMConfigurations bringIntoViewportConfiguration = DMConfigurationNone;
 
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
             L"DMSV[0x%p]:  OnManipulatabilityAffectingPropertyChanged pIsInLiveTree=%d, isCachedPropertyChanged=%d, isContentChanged=%d, isAffectingConfigurations=%d, isAffectingTouchConfiguration=%d.",
@@ -10186,7 +10242,7 @@ _Check_return_ HRESULT ScrollViewer::OnViewportConfigurationsAffectingPropertyCh
     DMConfigurations bringIntoViewportConfiguration = DMConfigurationNone;
 
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
             L"DMSV[0x%p]:  OnViewportConfigurationsAffectingPropertyChanged - entry.", this));
@@ -10227,7 +10283,7 @@ _Check_return_ HRESULT ScrollViewer::OnViewportConfigurationsAffectingPropertyCh
                 if (!areConfigurationsUpdated)
                 {
 #ifdef DM_DEBUG
-                    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+                    if (DMSV_TraceDbg())
                     {
                         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
                             L"DMSV[0x%p]:  OnViewportConfigurationsAffectingPropertyChanged sets m_areViewportConfigurationsInvalid=True.", this));
@@ -10704,7 +10760,7 @@ _Check_return_ HRESULT ScrollViewer::IsExtentXChangeExpected(
     if (!IsInDirectManipulation() || m_contentWidthRequested == -1)
     {
 #ifdef DM_DEBUG
-        if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+        if (DMSV_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
                 L"DMSV[0x%p]:  IsExtentXChangeExpected IsInDirectManipulation=%d m_contentWidthRequested=%f.",
@@ -10721,7 +10777,7 @@ _Check_return_ HRESULT ScrollViewer::IsExtentXChangeExpected(
     if (DoubleUtil::Abs(m_contentWidthRequested - extent) / extent > ScrollViewerZoomExtentRoundingTolerance)
     {
 #ifdef DM_DEBUG
-        if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+        if (DMSV_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
                 L"DMSV[0x%p]:  IsExtentXChangeExpected extent=%f m_contentWidthRequested=%f.",
@@ -10759,7 +10815,7 @@ _Check_return_ HRESULT ScrollViewer::IsExtentYChangeExpected(
     if (!IsInDirectManipulation() || m_contentHeightRequested == -1)
     {
 #ifdef DM_DEBUG
-        if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+        if (DMSV_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
                 L"DMSV[0x%p]:  IsExtentYChangeExpected IsInDirectManipulation=%d m_contentHeightRequested=%f.",
@@ -10776,7 +10832,7 @@ _Check_return_ HRESULT ScrollViewer::IsExtentYChangeExpected(
     if (DoubleUtil::Abs(m_contentHeightRequested - extent) / extent > ScrollViewerZoomExtentRoundingTolerance)
     {
 #ifdef DM_DEBUG
-        if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+        if (DMSV_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
                 L"DMSV[0x%p]:  IsExtentYChangeExpected extent=%f m_contentHeightRequested=%f.",
@@ -10869,7 +10925,7 @@ _Check_return_ HRESULT ScrollViewer::put_ManipulationHandler(
     HRESULT hr = S_OK;
 
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
             L"DMSV[0x%p]:  put_ManipulationHandler - setting hManipulationHandler=0x%p.", this, hManipulationHandler));
@@ -11406,7 +11462,7 @@ _Check_return_ HRESULT ScrollViewer::GetManipulationSecondaryContent(
     pOffsets->width = pOffsets->height = 0.0f;
 
 #ifdef DM_DEBUG
-    if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSVv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/, L"DMSV[0x%p]:  GetManipulationSecondaryContent - entry. pContentElement=0x%p.",
             this, pContentElement));
@@ -11473,7 +11529,7 @@ _Check_return_ HRESULT ScrollViewer::GetManipulationPrimaryContentTransform(
     xaml_controls::ZoomMode zoomMode;
 
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
             L"DMSV[0x%p]:  GetManipulationPrimaryContentTransform - entry. inManipulation=%d, forInitialTransformationAdjustment=%d, forMargins=%d.",
@@ -11622,7 +11678,7 @@ _Check_return_ HRESULT ScrollViewer::GetManipulationSecondaryContentTransform(
     FLOAT zoomFactor = 0.0f;
 
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
             L"DMSV[0x%p]:  GetManipulationSecondaryContentTransform - entry. pContentElement=0x%p.", this, pContentElement));
@@ -12669,7 +12725,7 @@ _Check_return_ HRESULT ScrollViewer::NotifyManipulatabilityAffectingPropertyChan
     _In_ BOOLEAN isInLiveTree)
 {
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
             L"DMSV[0x%p]:  NotifyManipulatabilityAffectingPropertyChanged isInLiveTree=%d.", this, isInLiveTree));
@@ -12726,7 +12782,7 @@ _Check_return_ HRESULT ScrollViewer::NotifyContentAlignmentAffectingPropertyChan
     ctl::ComPtr<xaml::IUIElement> spHeader;
 
 #ifdef DM_DEBUG
-    if ((DMSV_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG)) == S_OK))
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
             L"DMSV[0x%p]:  NotifyContentAlignmentAffectingPropertyChanged - pManipulatedElement=0x%p, isForHorizontalAlignment=%d, isForStretchAlignment=%d, isStretchAlignmentTreatedAsNear=%d.",
@@ -12849,7 +12905,7 @@ _Check_return_ HRESULT ScrollViewer::NotifyManipulationProgress(
     BOOLEAN wasInDirectManipulationZoom = FALSE;
 
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
             L"DMSV[0x%p]:  NotifyManipulationProgress pManipulatedElement=0x%p, state=%d, xCumulativeTranslation=%f, yCumulativeTranslation=%f, zCumulativeFactor=%4.8lf.",
@@ -13000,7 +13056,7 @@ _Check_return_ HRESULT ScrollViewer::NotifyManipulationStateChanged(
     HRESULT hr = S_OK;
 
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
             L"DMSV[0x%p]:  NotifyManipulationStateChanged state=%d.", this, state));
@@ -13122,7 +13178,7 @@ _Check_return_ HRESULT ScrollViewer::NotifyBringIntoViewportNeeded(
     HRESULT hr = S_OK;
 
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
             L"DMSV[0x%p]:  NotifyBringIntoViewportNeeded pManipulatedElement=0x%p, translationX=%f, translationY=%f, zoomFactor=%4.8lf, transformIsValid=%d, transformIsInertiaEnd=%d.",
@@ -13192,7 +13248,7 @@ _Check_return_ HRESULT ScrollViewer::NotifyBringIntoViewportNeeded(
         }
 
 #ifdef DM_DEBUG
-        if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+        if (DMSV_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
                 L"                   translationX=%f, translationY=%f, zoomFactor=%4.8lf.",
@@ -13261,7 +13317,7 @@ _Check_return_ HRESULT ScrollViewer::HandleManipulationStarting(
     if (spProvider)
     {
 #ifdef DM_DEBUG
-        if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+        if (DMSV_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
                 L"DMSV[0x%p]:  HandleManipulationStarting - calling UpdateInManipulation with isInManipulation=1, isInLiveTree=1, nonVirtualizingOffset=-1.", this));
@@ -13302,7 +13358,7 @@ _Check_return_ HRESULT ScrollViewer::HandleManipulationStarting(
     if (spProvider)
     {
 #ifdef DM_DEBUG
-        if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+        if (DMSV_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
                 L"DMSV[0x%p]:  HandleManipulationStarting - calling UpdateInManipulation with isInManipulation=1, isInLiveTree=1, nonVirtualizingOffset=-1.", this));
@@ -13337,7 +13393,7 @@ _Check_return_ HRESULT ScrollViewer::HandleManipulationStarting(
     }
 
 #ifdef DM_DEBUG
-    if (m_areViewportConfigurationsInvalid && (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK))
+    if (m_areViewportConfigurationsInvalid && DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
             L"DMSV[0x%p]:  HandleManipulationStarting m_areViewportConfigurationsInvalid=True, pManipulatedElement=0x%p.",
@@ -13411,7 +13467,7 @@ _Check_return_ HRESULT ScrollViewer::HandleManipulationDelta(
     FLOAT newUncompressedZoomFactorClamped = 1.0f;
 
 #ifdef DM_DEBUG
-    if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSVv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/,
             L"DMSVv[0x%p]: HandleManipulationDelta xInertiaEndTranslation=%f, yInertiaEndTranslation=%f, zInertiaEndFactor=%4.8lf, isInertiaEndTransformValid=%d, isBringIntoViewportConfigurationActivated=%d, isLastDelta=%d.",
@@ -13449,7 +13505,7 @@ _Check_return_ HRESULT ScrollViewer::HandleManipulationDelta(
     }
 
 #ifdef DM_DEBUG
-    if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSVv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/,
             L"DMSVv[0x%p]: HandleManipulationDelta hasZoomFactorChanged=%d, m_isDirectManipulationZoomFactorChangeIgnored=%d.",
@@ -13467,7 +13523,7 @@ _Check_return_ HRESULT ScrollViewer::HandleManipulationDelta(
         IFC(get_ZoomFactor(&newUncompressedZoomFactorClamped)); // We restrict value to [MinZoomFactor, MaxZoomFactor].
 
 #ifdef DM_DEBUG
-        if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+        if (DMSVv_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/,
                 L"DMSVv[0x%p]: HandleManipulationDelta updating old m_contentWidthRequested=%f, m_contentHeightRequested=%f.",
@@ -13501,7 +13557,7 @@ _Check_return_ HRESULT ScrollViewer::HandleManipulationDelta(
             m_contentWidthRequested *= newUncompressedZoomFactorClamped / oldZoomFactor;
         }
 #ifdef DM_DEBUG
-        if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+        if (DMSVv_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/,
                 L"DMSVv[0x%p]: HandleManipulationDelta new m_contentWidthRequested=%f.", this, m_contentWidthRequested));
@@ -13559,7 +13615,7 @@ _Check_return_ HRESULT ScrollViewer::HandleManipulationDelta(
             m_contentHeightRequested *= newUncompressedZoomFactorClamped / oldZoomFactor;
         }
 #ifdef DM_DEBUG
-        if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+        if (DMSVv_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/,
                 L"DMSVv[0x%p]: HandleManipulationDelta new m_contentHeightRequested=%f.", this, m_contentHeightRequested));
@@ -13616,7 +13672,7 @@ _Check_return_ HRESULT ScrollViewer::HandleManipulationDelta(
             m_isOffsetChangeIgnored = TRUE;
 
 #ifdef DM_DEBUG
-            if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+            if (DMSV_TraceDbg())
             {
                 IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
                     L"DMSV[0x%p]:  HandleManipulationDelta before UpdateLayout m_xPixelOffsetRequested=%f m_xPixelOffset=%f translationX=%f.",
@@ -13630,7 +13686,7 @@ _Check_return_ HRESULT ScrollViewer::HandleManipulationDelta(
             m_isOffsetChangeIgnored = FALSE;
 
 #ifdef DM_DEBUG
-            if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+            if (DMSV_TraceDbg())
             {
                 IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
                     L"DMSV[0x%p]:  HandleManipulationDelta after UpdateLayout m_xPixelOffsetRequested=%f m_xPixelOffset=%f.",
@@ -13829,7 +13885,7 @@ _Check_return_ HRESULT ScrollViewer::HandleManipulationLastDelta(
     IFC(get_ZoomFactor(&zoomFactor));
 
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
             L"DMSV[0x%p]:  HandleManipulationLastDelta - entry. xNewOffset=%f, yNewOffset=%f, zoomFactor=%4.8lf.",
@@ -13888,7 +13944,7 @@ _Check_return_ HRESULT ScrollViewer::HandleManipulationLastDelta(
         }
 
 #ifdef DM_DEBUG
-        if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+        if (DMSV_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
                 L"DMSV[0x%p]:  HandleManipulationLastDelta - calling BringIntoViewportInternal(X=%f, Y=%f, W=%f, H=%f, transformIsValid=TRUE, skipDuringTouchContact=FALSE, skipAnimationWhileRunning=FALSE, animate=%d, applyAsManip=TRUE, isForMakeVisible=FALSE).",
@@ -13941,7 +13997,7 @@ _Check_return_ HRESULT ScrollViewer::HandleManipulationCompleted(
     DOUBLE virtualizingLogicalOffset = -1.0;
 
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
             L"DMSV[0x%p]:  HandleManipulationCompleted - entry. wasInDirectManipulationZoom=%d, xCumulativeTranslation=%f, yCumulativeTranslation=%f.",
@@ -13988,7 +14044,7 @@ _Check_return_ HRESULT ScrollViewer::HandleManipulationCompleted(
     if (spProvider)
     {
 #ifdef DM_DEBUG
-        if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+        if (DMSV_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
                 L"DMSV[0x%p]:  HandleManipulationCompleted - calling UpdateInManipulation with isInManipulation=%d, isInLiveTree=%d, nonVirtualizingOffset=%f.",
@@ -14087,7 +14143,7 @@ _Check_return_ HRESULT ScrollViewer::HandleManipulationCompleted(
     // The latest ManipulationDelta might trigger a view change later. Only raise the final ViewChanged
     // if there are no pending changes in the offsets.
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
             L"DMSV[0x%p]:  HandleManipulationCompleted - calling LeaveIntermediateViewChangedMode(raiseFinalViewChanged=%d), m_xPixelOffsetRequested=%f, m_yPixelOffsetRequested=%f.",
@@ -14255,7 +14311,7 @@ _Check_return_ HRESULT ScrollViewer::GetDManipView(
     }
 
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"DMSV[0x%p]:  GetDManipView - horizontalOffset=%f, verticalOffset=%f, zoomFactor=%f.",
             this, *pHorizontalOffset, *pVerticalOffset, *pZoomFactor));
@@ -14299,7 +14355,7 @@ _Check_return_ HRESULT ScrollViewer::GetTargetView(
     }
 
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"DMSV[0x%p]:  GetTargetView - targetHorizontalOffset=%f, targetVerticalOffset=%f, targetZoomFactor=%f.",
             this, *pTargetHorizontalOffset, *pTargetVerticalOffset, *pTargetZoomFactor));
@@ -14313,7 +14369,7 @@ _Check_return_ HRESULT ScrollViewer::GetTargetView(
 _Check_return_ HRESULT ScrollViewer::StopInertialManipulation()
 {
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"DMSV[0x%p]:  StopInertialManipulation - m_isInertial=%d.", this, m_isInertial));
     }
@@ -14650,7 +14706,7 @@ _In_ FLOAT targetZoomFactor)
     if (m_iViewChangingDelay > 0)
     {
 #ifdef DM_DEBUG
-        if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+        if (DMSV_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
                 L"DMSV[0x%p]:  RaiseViewChanging - Delaying ViewChanging(TargetHorizontalOffset=%f, TargetVerticalOffset=%f, TargetZoomFactor=%4.8lf, IsInertial=%d) event.",
@@ -14663,7 +14719,7 @@ _In_ FLOAT targetZoomFactor)
     else
     {
 #ifdef DM_DEBUG
-        if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+        if (DMSV_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/,
                 L"DMSV[0x%p]:  RaiseViewChanging - Raising ViewChanging(TargetHorizontalOffset=%f, TargetVerticalOffset=%f, TargetZoomFactor=%4.8lf",
@@ -14726,7 +14782,7 @@ _In_ BOOLEAN isIntermediate)
     if (m_iViewChangedDelay > 0)
     {
 #ifdef DM_DEBUG
-        if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+        if (DMSV_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"DMSV[0x%p]:  RaiseViewChanged - Delaying ViewChanged(IsIntermediate=%s) event.", this, isIntermediate ? L"True" : L"False"));
         }
@@ -14742,7 +14798,7 @@ _In_ BOOLEAN isIntermediate)
         if (m_isInIntermediateViewChangedMode)
         {
 #ifdef DM_DEBUG
-            if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+            if (DMSV_TraceDbg())
             {
                 IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"DMSV[0x%p]:  RaiseViewChanged - Raising ViewChanged event while in intermediate mode.", this));
             }
@@ -14755,7 +14811,7 @@ _In_ BOOLEAN isIntermediate)
         }
 
 #ifdef DM_DEBUG
-        if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+        if (DMSV_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"DMSV[0x%p]:  RaiseViewChanged - Raising ViewChanged(IsIntermediate=%s) event.", this, isIntermediate ? L"True" : L"False"));
         }
@@ -14809,7 +14865,7 @@ ScrollViewer::FlushViewChanging(
 _In_ HRESULT hr)
 {
 #ifdef DM_DEBUG
-    if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSVv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/, L"DMSVv[0x%p]: FlushViewChanging isInertial=%s, can raise=%s, must raise=%s.",
             this, m_isInertial ? L"True" : L"False", m_iViewChangingDelay == 1 ? L"True" : L"False", m_isViewChangingDelayed ? L"True" : L"False"));
@@ -14825,7 +14881,7 @@ _In_ HRESULT hr)
         if (m_iViewChangingDelay == 0 && m_isViewChangingDelayed)
         {
 #ifdef DM_DEBUG
-            if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+            if (DMSV_TraceDbg())
             {
                 IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"DMSV[0x%p]:  FlushViewChanging - Raising delayed ViewChanging.", this));
             }
@@ -14848,7 +14904,7 @@ ScrollViewer::FlushViewChanged(
 _In_ HRESULT hr)
 {
 #ifdef DM_DEBUG
-    if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSVv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/, L"DMSVv[0x%p]: FlushViewChanged can raise=%s, must raise=%s.",
             this, m_iViewChangedDelay == 1 ? L"True" : L"False", m_isViewChangedDelayed ? L"True" : L"False"));
@@ -14864,7 +14920,7 @@ _In_ HRESULT hr)
         SUCCEEDED(hr))
     {
 #ifdef DM_DEBUG
-        if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+        if (DMSV_TraceDbg())
         {
             IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"DMSV[0x%p]:  FlushViewChanged - Raising delayed ViewChanged.", this));
         }
@@ -14882,7 +14938,7 @@ _Check_return_ HRESULT
 ScrollViewer::EnterIntermediateViewChangedMode()
 {
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"DMSV[0x%p]:  EnterIntermediateViewChangedMode.", this));
     }
@@ -14906,7 +14962,7 @@ _In_ BOOLEAN raiseFinalViewChanged)
     HRESULT hr = S_OK;
 
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"DMSV[0x%p]:  LeaveIntermediateViewChangedMode.", this));
     }
@@ -14923,7 +14979,7 @@ _In_ BOOLEAN raiseFinalViewChanged)
             if (raiseFinalViewChanged)
             {
 #ifdef DM_DEBUG
-                if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+                if (DMSV_TraceDbg())
                 {
                     IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"DMSV[0x%p]:  LeaveIntermediateViewChangedMode - Raising final ViewChanged.", this));
                 }
@@ -15176,7 +15232,7 @@ _Check_return_ HRESULT ScrollViewer::OnHeaderPropertyChanged(
     ScrollContentPresenter* pScrollContentPresenter = NULL;
 
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"DMSV[0x%p]:  OnHeaderPropertyChanged isTopHeader=%d, isLeftHeader=%d.",
             this, isTopHeader, isLeftHeader, isAssociated));
@@ -15351,7 +15407,7 @@ _Check_return_ HRESULT ScrollViewer::NotifyHeadersParented()
     ctl::ComPtr<IUIElement> spHeader;
 
 #ifdef DM_DEBUG
-    if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSVv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/, L"DMSV[0x%p]:  NotifyHeadersParented.", this));
     }
@@ -15509,7 +15565,7 @@ _Check_return_ HRESULT ScrollViewer::SetScrollContentPresenterHeaders()
     ctl::ComPtr<IUIElement> spHeader;
 
 #ifdef DM_DEBUG
-    if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSVv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/, L"DMSVv[0x%p]: SetScrollContentPresenterHeaders.", this));
     }
@@ -15579,7 +15635,7 @@ _Check_return_ HRESULT ScrollViewer::UpdateHeaderAssociatedStatus(
     bool allowsMultipleAssociations = false;
 
 #ifdef DM_DEBUG
-    if (DMSVv_DBG || gps->IsDebugTraceTypeActive(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE)) == S_OK)
+    if (DMSVv_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | XCP_TRACE_VERBOSE | DMSVv_DBG) /*traceType*/, L"DMSVv[0x%p]: UpdateHeaderAssociatedStatus pObject=0x%p, isTopHeader=%d, isLeftHeader=%d, associate=%d.",
             this, pObject, isTopHeader, isLeftHeader, associate));
@@ -15934,7 +15990,7 @@ ScrollViewer::SetOverpanModes(
     const bool verticalOverpanModeChanged = verticalOverpanMode != m_verticalOverpanMode;
 
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"DMSV[0x%p]:  SetOverpanModes - horizontalOverpanMode=%d, verticalOverpanMode=%d, horizontalOverpanModeChanged=%d, verticalOverpanModeChanged=%d.",
             this, horizontalOverpanMode, verticalOverpanMode, horizontalOverpanModeChanged, verticalOverpanModeChanged));
@@ -15965,7 +16021,7 @@ _Check_return_ HRESULT
 ScrollViewer::DisableOverpanImpl()
 {
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"DMSV[0x%p]:  DisableOverpanImpl - entry.", this));
     }
@@ -15979,7 +16035,7 @@ _Check_return_ HRESULT
 ScrollViewer::EnableOverpanImpl()
 {
 #ifdef DM_DEBUG
-    if (DMSV_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_SCROLLVIEWER) == S_OK)
+    if (DMSV_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_SCROLLVIEWER | DMSV_DBG) /*traceType*/, L"DMSV[0x%p]:  EnableOverpanImpl - entry.", this));
     }
diff --git a/src/dxaml/xcp/dxaml/lib/ScrollViewer_Partial.h b/src/dxaml/xcp/dxaml/lib/ScrollViewer_Partial.h
index 68f6a9278b..c28e243bfc 100644
--- a/src/dxaml/xcp/dxaml/lib/ScrollViewer_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/ScrollViewer_Partial.h
@@ -6,7 +6,10 @@
 
 #pragma once
 
+// Uncomment for DManip debug outputs.
 //#define DM_DEBUG
+
+// Uncomment for anchoring debug outputs.
 //#define ANCHORING_DEBUG
 
 #ifdef ANCHORING_DEBUG
@@ -1353,6 +1356,9 @@ namespace DirectUI
 
 #ifdef DM_DEBUG
         BOOLEAN IsRootScrollViewerDbg() { return IsRootScrollViewer(); }
+
+        bool DMSV_TraceDbg() const;
+        bool DMSVv_TraceDbg() const;
 #endif // DM_DEBUG
 
         // Enters the mode where the child's actual size is used for
diff --git a/src/dxaml/xcp/dxaml/lib/Selector_Partial.h b/src/dxaml/xcp/dxaml/lib/Selector_Partial.h
index 731f0f17e3..e0252cb529 100644
--- a/src/dxaml/xcp/dxaml/lib/Selector_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/Selector_Partial.h
@@ -618,8 +618,8 @@ namespace DirectUI
         };
 
         TrackerPtr<wfc::IObservableVector<IInspectable*>> m_tpSelectedItemsImpl;
-        EventRegistrationToken m_SelectedItemsVectorChangedToken;
-        EventRegistrationToken m_focusEnagedToken;
+        EventRegistrationToken m_SelectedItemsVectorChangedToken{};
+        EventRegistrationToken m_focusEnagedToken{};
 
         TrackerPtr<wfc::IVector<xaml_data::ItemIndexRange*>> m_tpSelectedRangesImpl;
 
diff --git a/src/dxaml/xcp/dxaml/lib/SemanticZoomLocation_Partial.h b/src/dxaml/xcp/dxaml/lib/SemanticZoomLocation_Partial.h
index 4b376cf83f..462767c70e 100644
--- a/src/dxaml/xcp/dxaml/lib/SemanticZoomLocation_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/SemanticZoomLocation_Partial.h
@@ -50,6 +50,6 @@ namespace DirectUI
         }
 
     private:
-        BOOLEAN m_bIsBottomAlignment;
+        BOOLEAN m_bIsBottomAlignment{};
     };
 }
diff --git a/src/dxaml/xcp/dxaml/lib/StackingLayoutStrategy_Partial.h b/src/dxaml/xcp/dxaml/lib/StackingLayoutStrategy_Partial.h
index 9df2fba976..093f8cfe75 100644
--- a/src/dxaml/xcp/dxaml/lib/StackingLayoutStrategy_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/StackingLayoutStrategy_Partial.h
@@ -170,6 +170,9 @@ namespace DirectUI
         // Notify the layout strategy of the new header placement.
         void SetGroupHeaderStrategy(_In_ GroupHeaderStrategy strategy);
         
+        // Used to estimate tracked element reposition during items source updates.
+        float GetAverageHeaderSize() const { return _layoutStrategyImpl.GetAverageHeaderSize(); }
+        float GetAverageContainerSize() const { return _layoutStrategyImpl.GetAverageContainerSize(); }
 
     private:
         // This is where the actual implementation of the layout strategy exists,
diff --git a/src/dxaml/xcp/dxaml/lib/StaggerFunctionBase_Partial.cpp b/src/dxaml/xcp/dxaml/lib/StaggerFunctionBase_Partial.cpp
index f6b7cb05d7..7f83350610 100644
--- a/src/dxaml/xcp/dxaml/lib/StaggerFunctionBase_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/StaggerFunctionBase_Partial.cpp
@@ -106,7 +106,7 @@ _Check_return_ HRESULT PVLStaggerFunction::GetTransitionDelays(
 
         LayoutTransitionStaggerItem* pStaggerItem = static_cast<LayoutTransitionStaggerItem*>(pStaggerItemAsI);
 
-        pStaggerItem->put_StaggerTime(runningTime);
+        IFC(pStaggerItem->put_StaggerTime(runningTime));
         ReleaseInterface(pStaggerItemAsI);
 
         Delay *= DelayReduce;
diff --git a/src/dxaml/xcp/dxaml/lib/StartDragAsyncOperation.h b/src/dxaml/xcp/dxaml/lib/StartDragAsyncOperation.h
index 12fe6e04f9..912582028c 100644
--- a/src/dxaml/xcp/dxaml/lib/StartDragAsyncOperation.h
+++ b/src/dxaml/xcp/dxaml/lib/StartDragAsyncOperation.h
@@ -72,7 +72,7 @@ namespace DirectUI
         bool m_hasAnchorPoint = false;
         bool m_started = false;
         bool m_deferVisual = true;
-        wf::Point m_anchorPoint;
+        wf::Point m_anchorPoint{};
         ctl::ComPtr<DragVisual> m_spDragVisual;
         ctl::ComPtr<mui::DragDrop::IDragOperation> m_spDragOperation;
         ctl::ComPtr<IAsyncInfo> m_spCoreDragOperationAsyncInfo;
diff --git a/src/dxaml/xcp/dxaml/lib/TextAlternativesAsyncOperation.cpp b/src/dxaml/xcp/dxaml/lib/TextAlternativesAsyncOperation.cpp
index 8d3b9e5191..81aa693d71 100644
--- a/src/dxaml/xcp/dxaml/lib/TextAlternativesAsyncOperation.cpp
+++ b/src/dxaml/xcp/dxaml/lib/TextAlternativesAsyncOperation.cpp
@@ -268,7 +268,7 @@ IFACEMETHODIMP TextAlternativesAsyncCompleteHandler::Invoke(
     }
     else
     {
-        m_spTextAlternativesOperation->SetEmptyResults();
+        IFC_RETURN(m_spTextAlternativesOperation->SetEmptyResults());
     }
 
     return S_OK;
diff --git a/src/dxaml/xcp/dxaml/lib/TextAlternativesAsyncOperation.h b/src/dxaml/xcp/dxaml/lib/TextAlternativesAsyncOperation.h
index a8ff101b28..eb66aa2a17 100644
--- a/src/dxaml/xcp/dxaml/lib/TextAlternativesAsyncOperation.h
+++ b/src/dxaml/xcp/dxaml/lib/TextAlternativesAsyncOperation.h
@@ -21,7 +21,7 @@ namespace DirectUI
             // Used to assign unique ids to AsyncActions
             static ULONG z_ulUniqueAsyncActionId;
 
-            wfc::IVectorView<HSTRING>* m_pAlternatives;
+            wfc::IVectorView<HSTRING>* m_pAlternatives{};
 
             wrl_wrappers::HString m_compositionString;
             wrl_wrappers::HString m_prefixString;
diff --git a/src/dxaml/xcp/dxaml/lib/TextBox_Partial.h b/src/dxaml/xcp/dxaml/lib/TextBox_Partial.h
index 6b0d757e71..db3a24aad1 100644
--- a/src/dxaml/xcp/dxaml/lib/TextBox_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/TextBox_Partial.h
@@ -121,7 +121,7 @@ namespace DirectUI
         // so we use this as a flag while initializing the object
         BOOLEAN m_isInitializing;
 
-        EventRegistrationToken m_storyboardCompletedToken;
+        EventRegistrationToken m_storyboardCompletedToken{};
 
         BOOLEAN m_isAnimatingHeight;
 
diff --git a/src/dxaml/xcp/dxaml/lib/ThemeGenerator.h b/src/dxaml/xcp/dxaml/lib/ThemeGenerator.h
index 02b6e15cca..a14898a5b3 100644
--- a/src/dxaml/xcp/dxaml/lib/ThemeGenerator.h
+++ b/src/dxaml/xcp/dxaml/lib/ThemeGenerator.h
@@ -96,7 +96,7 @@ namespace DirectUI
         wf::Point m_startOffset;
         wf::Point m_destinationOffset;
 
-        IActivationFactory* m_pActivationFactory;
+        IActivationFactory* m_pActivationFactory{};
         xaml_animation::IStoryboardStatics* m_pStoryboardStatics;
 
         wrl_wrappers::HString m_strTranslateXPropertyName;
diff --git a/src/dxaml/xcp/dxaml/lib/TimedTextSource.h b/src/dxaml/xcp/dxaml/lib/TimedTextSource.h
index d71505ba6d..6738471ca9 100644
--- a/src/dxaml/xcp/dxaml/lib/TimedTextSource.h
+++ b/src/dxaml/xcp/dxaml/lib/TimedTextSource.h
@@ -91,7 +91,7 @@ namespace DirectUI
             unsigned int Track;
             ctl::ComPtr<wmc::ITimedMetadataTrack> spTrack;
             EventRegistrationToken EnteredToken;
-            EventRegistrationToken ExitedToken;
+            EventRegistrationToken ExitedToken{};
         };
 
         std::list<std::shared_ptr<CTrackTokens>> m_tokensList;
diff --git a/src/dxaml/xcp/dxaml/lib/ToggleSwitch_Partial.h b/src/dxaml/xcp/dxaml/lib/ToggleSwitch_Partial.h
index 9a8fe17f68..9c94df84b0 100644
--- a/src/dxaml/xcp/dxaml/lib/ToggleSwitch_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/ToggleSwitch_Partial.h
@@ -184,17 +184,17 @@ namespace DirectUI
 
         ctl::ComPtr<xaml_media::ITranslateTransform> m_spCurtainTransform;
 
-        EventRegistrationToken m_dragStarted;
+        EventRegistrationToken m_dragStarted{};
         
-        EventRegistrationToken m_dragDelta;
+        EventRegistrationToken m_dragDelta{};
         
-        EventRegistrationToken m_dragCompleted;
+        EventRegistrationToken m_dragCompleted{};
         
-        EventRegistrationToken m_tap;
+        EventRegistrationToken m_tap{};
         
-        EventRegistrationToken m_knobSizeChanged;
+        EventRegistrationToken m_knobSizeChanged{};
         
-        EventRegistrationToken m_knobBoundsSizeChanged;
+        EventRegistrationToken m_knobBoundsSizeChanged{};
 
     };
 }
diff --git a/src/dxaml/xcp/dxaml/lib/ToolTip_Partial.cpp b/src/dxaml/xcp/dxaml/lib/ToolTip_Partial.cpp
index 0259e92487..db19ec727c 100644
--- a/src/dxaml/xcp/dxaml/lib/ToolTip_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/ToolTip_Partial.cpp
@@ -1402,7 +1402,7 @@ _Check_return_ HRESULT ToolTip::PerformPlacementWithWindowedPopup(
         spCurrentPointerPoint = GetCurrentPointFromRootOrCoreWindow(spTarget);
         if (!spCurrentPointerPoint)
         {
-            // We can hit a case where the most recent mouse event went to a hWnd which is now closed
+            // We can hit a case where the most recent mouse event went to a window which is now closed
             // (e.g. a different ToolTip that is now closed). See bug MSFT:2303578 for details.
             // We fall back to a point cached by ToolTipService whenever the CoreWindow/Island doesn't have a cached point.
             lastPointerEnteredPoint = ToolTipService::s_lastPointerEnteredPoint;
@@ -1411,10 +1411,6 @@ _Check_return_ HRESULT ToolTip::PerformPlacementWithWindowedPopup(
         {
             IFC(hr);
             IFC(spCurrentPointerPoint->get_Position(&lastPointerEnteredPoint));
-
-            // Deliverable 21236263: Support windowed popups
-            // When Xaml had windowed popups, we would adjust for the difference between the popup hwnd and the main tree's
-            // hwnd here. That adjustment will be needed again once windowed popups are brought back.
         }
 
         currentPoint = lastPointerEnteredPoint;
diff --git a/src/dxaml/xcp/dxaml/lib/ToolTip_Partial.h b/src/dxaml/xcp/dxaml/lib/ToolTip_Partial.h
index 7861ae6bb5..eaba3e4ce9 100644
--- a/src/dxaml/xcp/dxaml/lib/ToolTip_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/ToolTip_Partial.h
@@ -56,15 +56,15 @@ namespace DirectUI
             static constexpr UINT m_mousePlacementVerticalOffset = 11;  // Mouse placement vertical offset
 
         public:
-            EventRegistrationToken m_ownerPointerEnteredToken;
-            EventRegistrationToken m_ownerPointerExitedToken;
-            EventRegistrationToken m_ownerPointerCaptureLostToken;
-            EventRegistrationToken m_ownerPointerCanceledToken;
-            EventRegistrationToken m_ownerGotFocusToken;
-            EventRegistrationToken m_ownerLostFocusToken;
-            BOOLEAN m_bInputEventsHookedUp;
-            AutomaticToolTipInputMode m_inputMode;
-            BOOLEAN m_isSliderThumbToolTip;
+            EventRegistrationToken m_ownerPointerEnteredToken{};
+            EventRegistrationToken m_ownerPointerExitedToken{};
+            EventRegistrationToken m_ownerPointerCaptureLostToken{};
+            EventRegistrationToken m_ownerPointerCanceledToken{};
+            EventRegistrationToken m_ownerGotFocusToken{};
+            EventRegistrationToken m_ownerLostFocusToken{};
+            BOOLEAN m_bInputEventsHookedUp{};
+            AutomaticToolTipInputMode m_inputMode{};
+            BOOLEAN m_isSliderThumbToolTip{};
 
             // Top - Default PlacementMode for ToolTips in Jupiter.
             static const xaml_primitives::PlacementMode DefaultPlacementMode =
diff --git a/src/dxaml/xcp/dxaml/lib/TouchHitTestingHandler.cpp b/src/dxaml/xcp/dxaml/lib/TouchHitTestingHandler.cpp
index 4e97c20c94..bf2a206d1f 100644
--- a/src/dxaml/xcp/dxaml/lib/TouchHitTestingHandler.cpp
+++ b/src/dxaml/xcp/dxaml/lib/TouchHitTestingHandler.cpp
@@ -71,29 +71,6 @@ _Check_return_ HRESULT TouchHitTestingHandler::Unregister(_In_ wuc::ICoreWindow*
     RRETURN(hr);
 }
 
-//------------------------------------------------------------------------
-//
-// Registers for touch hit testing messages directly using the low-level
-// Win32 API.
-//
-// This is used in hosting scenarios when we don't have a CoreWindow. We
-// don't unregister in this case. It's fine to let the window be destroyed
-// without unregistering via the low-level API.
-//
-//------------------------------------------------------------------------
-_Check_return_ HRESULT TouchHitTestingHandler::Register(_In_ HWND hwnd)
-{
-    HRESULT hr = S_OK;
-
-    if (IsRegisterTouchHitTestingWindowPresent())
-    {
-        IFCW32(RegisterTouchHitTestingWindow(hwnd, TOUCH_HIT_TESTING_CLIENT));
-    }
-
-Cleanup:
-    RRETURN(hr);
-}
-
 _Check_return_ HRESULT TouchHitTestingHandler::GetPointList(_In_ wfc::IIterable<wf::Point>* pIterable, _Inout_ std::vector<wf::Point>& list)
 {
     HRESULT hr = S_OK;
diff --git a/src/dxaml/xcp/dxaml/lib/TouchHitTestingHandler.h b/src/dxaml/xcp/dxaml/lib/TouchHitTestingHandler.h
index 24914e45b5..39b81d788c 100644
--- a/src/dxaml/xcp/dxaml/lib/TouchHitTestingHandler.h
+++ b/src/dxaml/xcp/dxaml/lib/TouchHitTestingHandler.h
@@ -15,8 +15,6 @@ namespace DirectUI
         _Check_return_ HRESULT Register(_In_ wuc::ICoreWindow* pCoreWindow);
         _Check_return_ HRESULT Unregister(_In_ wuc::ICoreWindow* pCoreWindow);
 
-        _Check_return_ HRESULT Register(_In_ HWND hwnd);
-
         static _Check_return_ HRESULT TouchHitTesting(
             _In_opt_ CUIElement* subtreeRootElement,
             _In_ mui::ITouchHitTestingEventArgs* pArgs);
diff --git a/src/dxaml/xcp/dxaml/lib/TryStartConnectedAnimationOperation.h b/src/dxaml/xcp/dxaml/lib/TryStartConnectedAnimationOperation.h
index 2901385494..cbdbf67835 100644
--- a/src/dxaml/xcp/dxaml/lib/TryStartConnectedAnimationOperation.h
+++ b/src/dxaml/xcp/dxaml/lib/TryStartConnectedAnimationOperation.h
@@ -23,7 +23,7 @@ namespace DirectUI
             ctl::ComPtr<xaml_animation::IConnectedAnimation> m_animation;
             ctl::ComPtr<IInspectable> m_item;
             ctl::ComPtr<ListViewBase> m_listview;
-            HSTRING m_elementName;
+            HSTRING m_elementName{};
             boolean m_result = false;
 
         public:
diff --git a/src/dxaml/xcp/dxaml/lib/UIElement_Partial.cpp b/src/dxaml/xcp/dxaml/lib/UIElement_Partial.cpp
index 1616ad3d58..99aa7d79f5 100644
--- a/src/dxaml/xcp/dxaml/lib/UIElement_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/UIElement_Partial.cpp
@@ -2148,7 +2148,7 @@ UIElementFactory::InternalPutIsEnabledImpl(
     UIElement* pUIElement = static_cast<UIElement*>(pElement);
 
     CUIElement* pCUIElement = static_cast<CUIElement*>(pUIElement->GetHandle());
-    pCUIElement->CoerceIsEnabled(value, TRUE/*bCoerceChildren*/);
+    IFC_RETURN(pCUIElement->CoerceIsEnabled(value, TRUE/*bCoerceChildren*/));
 
     return S_OK;
 }
@@ -2568,7 +2568,7 @@ void UIElement::VirtualizationInformation::SetBounds(_In_ const wf::Rect& bounds
     m_bounds = bounds;
 }
 
-_Check_return_ HRESULT UIElement::VirtualizationInformation::SetItem(_In_ IInspectable* pDataItem)
+_Check_return_ HRESULT UIElement::VirtualizationInformation::SetItem(_In_opt_ IInspectable* pDataItem)
 {
     HRESULT hr = S_OK;
     bool areEqual = false;
diff --git a/src/dxaml/xcp/dxaml/lib/UIElement_Partial.h b/src/dxaml/xcp/dxaml/lib/UIElement_Partial.h
index 961b27fc12..c7f8f34f96 100644
--- a/src/dxaml/xcp/dxaml/lib/UIElement_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/UIElement_Partial.h
@@ -41,10 +41,6 @@ namespace DirectUI
         friend class VirtualizationInformation;
         friend class AutomaticDragHelper;
 
-        // Grant XamlDirect class friend access so it can call
-        // EventAddHandlerByIndex and EventRemoveHandlerByIndex
-        friend class XamlDirect;
-
         public:
             // Initializes a new instance of the UIElement class.
             UIElement();
@@ -830,7 +826,7 @@ namespace DirectUI
                 void SetBounds(_In_ const wf::Rect& bounds);
 
                 ctl::ComPtr<IInspectable> GetItem() const;
-                _Check_return_ HRESULT SetItem(_In_ IInspectable* pDataitem);
+                _Check_return_ HRESULT SetItem(_In_opt_ IInspectable* pDataitem);
 
                 void SetIsRealized(bool isRealized);
                 bool GetIsRealized() const { return m_isRealized; }
diff --git a/src/dxaml/xcp/dxaml/lib/UWPWindowImpl.cpp b/src/dxaml/xcp/dxaml/lib/UWPWindowImpl.cpp
index 7248b75425..2c0d40765b 100644
--- a/src/dxaml/xcp/dxaml/lib/UWPWindowImpl.cpp
+++ b/src/dxaml/xcp/dxaml/lib/UWPWindowImpl.cpp
@@ -681,7 +681,7 @@ _Check_return_ HRESULT UWPWindowImpl::OnWindowSizeChanged()
     IFC_RETURN(m_contentManager.OnWindowSizeChanged());
 
     wf::Rect layoutBounds;
-    GetLayoutBounds(&layoutBounds);
+    IFC_RETURN(GetLayoutBounds(&layoutBounds));
 
     // Save the current layout bounds.
     m_layoutBounds = layoutBounds;
diff --git a/src/dxaml/xcp/dxaml/lib/UWPWindowImpl.h b/src/dxaml/xcp/dxaml/lib/UWPWindowImpl.h
index fa4900c55f..6f723d236f 100644
--- a/src/dxaml/xcp/dxaml/lib/UWPWindowImpl.h
+++ b/src/dxaml/xcp/dxaml/lib/UWPWindowImpl.h
@@ -123,7 +123,7 @@ namespace DirectUI
         EventRegistrationToken m_tokCoreWindowClosed;
         bool m_coreWindowClosed;
         CFTMEventSource<wf::ITypedEventHandler<IInspectable*, xaml::WindowSizeChangedEventArgs*>, xaml::IWindow, xaml::IWindowSizeChangedEventArgs> m_SizeChangedEventSource;
-        wf::Rect m_layoutBounds;
+        wf::Rect m_layoutBounds{};
 
         ctl::ComPtr<wuv::IApplicationView2> m_spApplicationView2;
         BOOLEAN m_useApplicationView = TRUE;
diff --git a/src/dxaml/xcp/dxaml/lib/VariableSizedWrapGrid_Partial.h b/src/dxaml/xcp/dxaml/lib/VariableSizedWrapGrid_Partial.h
index 02c9415c62..546c1c7a75 100644
--- a/src/dxaml/xcp/dxaml/lib/VariableSizedWrapGrid_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/VariableSizedWrapGrid_Partial.h
@@ -127,7 +127,7 @@ namespace DirectUI
         bool m_isHorizontalOrientation;
         XUINT32 m_currentRowIndex;
         XUINT32 m_currentColumnIndex;
-        wf::Size m_itemSize;
+        wf::Size m_itemSize{};
         OccupancyBlock* m_pOccupancyBlock;
 
         // contains the list of locations (rowIndex,colIndex) for each Element
diff --git a/src/dxaml/xcp/dxaml/lib/VirtualizingPanel_Partial.h b/src/dxaml/xcp/dxaml/lib/VirtualizingPanel_Partial.h
index c402de24e4..77b5f57283 100644
--- a/src/dxaml/xcp/dxaml/lib/VirtualizingPanel_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/VirtualizingPanel_Partial.h
@@ -93,7 +93,7 @@ namespace DirectUI
             _In_opt_ IInspectable* pUnused2);
         
         TrackerPtr<xaml::IDispatcherTimer> m_tpFillBuffersTimer;
-        EventRegistrationToken m_ItemsChangedToken;
+        EventRegistrationToken m_ItemsChangedToken{};
         BOOL m_bGeneratorHooked;
         
         INT32 m_itemsHostValidatedTick;
diff --git a/src/dxaml/xcp/dxaml/lib/VisualStateManager_Partial.cpp b/src/dxaml/xcp/dxaml/lib/VisualStateManager_Partial.cpp
index aa5805d53e..d74612fdd1 100644
--- a/src/dxaml/xcp/dxaml/lib/VisualStateManager_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/VisualStateManager_Partial.cpp
@@ -335,7 +335,7 @@ _Check_return_ HRESULT VisualStateManager::CustomVSMGoToState(
     pIControlNoRef = spPeer.Cast<Control>();
 
     BOOLEAN succeeded;
-    GoToStateImpl(pIControlNoRef, token, nullptr, groupIndex, bUseTransitions, &succeeded);
+    IFC_RETURN(GoToStateImpl(pIControlNoRef, token, nullptr, groupIndex, bUseTransitions, &succeeded));
     *bSucceeded = !!succeeded;
 
     return S_OK;
diff --git a/src/dxaml/xcp/dxaml/lib/WindowChrome_Partial.cpp b/src/dxaml/xcp/dxaml/lib/WindowChrome_Partial.cpp
index 879251761b..eadba88719 100644
--- a/src/dxaml/xcp/dxaml/lib/WindowChrome_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/WindowChrome_Partial.cpp
@@ -25,7 +25,7 @@ _Check_return_ HRESULT WindowChromeFactory::CreateInstanceImpl(
 {
     ctl::ComPtr<xaml::IWindow> parentIWindow(parent);
     ctl::ComPtr<Window> parentWindow;
-    parentIWindow.As(&parentWindow);
+    IFC_RETURN(parentIWindow.As(&parentWindow));
     HWND parentHwnd = nullptr;
     IFC_RETURN(parentWindow->get_WindowHandle(&parentHwnd));
 
@@ -39,6 +39,14 @@ _Check_return_ HRESULT WindowChrome::Initialize(_In_ HWND parentWindow)
 {
     const auto chrome = static_cast<CWindowChrome*>(GetHandle());
     IFC_RETURN(chrome->Initialize(parentWindow));
+    auto hr = m_LoadedEventHandler.AttachEventHandler(this,
+        [this](auto&&... /*unused*/)
+        {
+            auto chrome = static_cast<CWindowChrome*>(GetHandle());
+            IFC_RETURN(chrome->SetFocusIfNeeded());
+            return S_OK;
+        });
+    IFC_RETURN(hr);
     return S_OK;
 }
 
@@ -71,6 +79,7 @@ void WindowChrome::MoveContainer(WPARAM wParam, LPARAM lParam)
 }
 _Check_return_ HRESULT WindowChrome::SetTitleBar(_In_opt_ xaml::IUIElement* titleBar)
 {
+
     auto pCoreWindowChrome = static_cast<CWindowChrome*>(GetHandle());
     ASSERT(pCoreWindowChrome != nullptr);
     
@@ -84,6 +93,14 @@ _Check_return_ HRESULT WindowChrome::SetTitleBar(_In_opt_ xaml::IUIElement* titl
         mu::WindowId windowId;
         ctl::ComPtr<ixp::IAppWindow> appWindow;
         IFC_RETURN(GetDesktopWindowNoRef()->get_AppWindowImpl(&appWindow));
+        
+        if (!appWindow)
+        {
+             // custom titlebar code is being run in a scenario where appwindow is null and thus
+             // it cannot continue to run. it is running in an unsupported scenario.
+             // one such scenario is where a top level window is reparented to become a child window of another window
+            IFCFAILFAST(E_NOTSUPPORTED);
+        }
         IFC_RETURN(appWindow->get_Id(&windowId));
         
         IFC_RETURN(inputNonClientPtrSrcStatics->GetForWindowId(windowId, &m_inputNonClientPtrSrc));
@@ -154,6 +171,10 @@ ctl::ComPtr<ixp::IAppWindow> WindowChrome::GetAppWindow() const
 {
     ctl::ComPtr<ixp::IAppWindow> appWindow;
     IFCFAILFAST(m_desktopWindow->get_AppWindowImpl(&appWindow));
+    if(!appWindow)
+    {
+        IFCFAILFAST(E_NOTSUPPORTED);
+    }
     return appWindow;
 }
 
diff --git a/src/dxaml/xcp/dxaml/lib/WindowChrome_Partial.h b/src/dxaml/xcp/dxaml/lib/WindowChrome_Partial.h
index 324446fa9b..cab38985f9 100644
--- a/src/dxaml/xcp/dxaml/lib/WindowChrome_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/WindowChrome_Partial.h
@@ -82,7 +82,7 @@ namespace DirectUI
         
         TrackerPtr<xaml::IUIElement> m_userTitleBar;
         ctl::EventPtr<FrameworkElementSizeChangedEventCallback> m_titlebarSizeChangedEventHandler;
-
+        ctl::EventPtr<FrameworkElementLoadedEventCallback> m_LoadedEventHandler;
         
         // ref to desktop window for calling its helper functions
         // instantiated when windowchrome object is created, set to null when DesktopWindow is closing
diff --git a/src/dxaml/xcp/dxaml/lib/Window_Partial.cpp b/src/dxaml/xcp/dxaml/lib/Window_Partial.cpp
index 55d1b7751b..4092dedc55 100644
--- a/src/dxaml/xcp/dxaml/lib/Window_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/Window_Partial.cpp
@@ -109,25 +109,7 @@ Window::Window()
     }
     else
     {
-        // The XAML Application instance is required by UWP and always created in Desktop
-        // by WindowsXamlManager.  There should be no case where Application::Current is NULL.
-        AppPolicyWindowingModel policy = FrameworkApplication::GetCurrentNoRef()->GetAppPolicyWindowingModel();
-
-        // WinUI UWP
-        if (policy != AppPolicyWindowingModel_ClassicDesktop)
-        {
-           ::RoOriginateError(
-                E_FAIL,
-                wrl_wrappers::HStringReference(
-                L"WinUI: Error creating second UWP Window on the current thread. No more than one UWP Window is allowed on a thread."
-                ).Get());
-            XAML_FAIL_FAST();
-        }
-        // WinUI Desktop
-        else
-        {
-            m_spWindowImpl = std::make_shared<DesktopWindowImpl>(this);
-        }
+        m_spWindowImpl = std::make_shared<DesktopWindowImpl>(this);
     }
 }
 
@@ -806,19 +788,6 @@ _Check_return_ HRESULT Window::QueryInterfaceImpl(_In_ REFIID iid, _Outptr_ void
 {
     if (InlineIsEqualGUID(iid, __uuidof(IWindowNative)))
     {
-        // The XAML Application instance is required by UWP and always created in Desktop
-        // by WindowsXamlManager.  There should be no case where Application::Current is NULL.
-        if (AppPolicyWindowingModel_ClassicDesktop != FrameworkApplication::GetCurrentNoRef()->GetAppPolicyWindowingModel())
-        {
-           ::RoOriginateError(
-                E_NOINTERFACE,
-                wrl_wrappers::HStringReference(
-                L"The IWindowNative interface and support for obtaining the window handle (HWND) is only available on WinUI Desktop, not WinUI UWP."
-                ).Get());
-
-            return E_NOINTERFACE;
-        }
-
         *ppObject = static_cast<IWindowNative*>(this);
 
         return AddRefOuter();
diff --git a/src/dxaml/xcp/dxaml/lib/WindowedPopupInputSiteAdapter.h b/src/dxaml/xcp/dxaml/lib/WindowedPopupInputSiteAdapter.h
index bfeb5103c5..56dc7c0388 100644
--- a/src/dxaml/xcp/dxaml/lib/WindowedPopupInputSiteAdapter.h
+++ b/src/dxaml/xcp/dxaml/lib/WindowedPopupInputSiteAdapter.h
@@ -35,5 +35,5 @@ class WindowedPopupInputSiteAdapter : public InputSiteAdapter
     ctl::ComPtr<DirectUI::PointerPointTransform> m_pointerPointTransformFromContentRoot;
 
     // This popup controls the lifetime of this WindowedPopupInputSiteAdapter, and we'll never outlive the popup.
-    CPopup* m_windowedPopupNoRef;
+    CPopup* m_windowedPopupNoRef{};
 };
\ No newline at end of file
diff --git a/src/dxaml/xcp/dxaml/lib/WindowsXamlManager_Partial.cpp b/src/dxaml/xcp/dxaml/lib/WindowsXamlManager_Partial.cpp
index 588b10a42b..b7b9cbd65a 100644
--- a/src/dxaml/xcp/dxaml/lib/WindowsXamlManager_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/WindowsXamlManager_Partial.cpp
@@ -41,7 +41,7 @@ class XamlCoreLegacyShutdown
         ASSERT(m_managers.empty());
     }
 
-    void OnManagerCreated(_In_ WindowsXamlManager* manager) override
+    void RegisterManager(_In_ WindowsXamlManager* manager) override
     {
         auto it = std::find(m_managers.begin(), m_managers.end(), manager);
         if (it == m_managers.end())
@@ -107,7 +107,7 @@ class XamlCoreNewShutdown
     ~XamlCoreNewShutdown() {}
 
     // In this model, only one manager is allowed per thread.  Closing a manager is a no-op.
-    void OnManagerCreated(_In_ WindowsXamlManager* manager) override
+    void RegisterManager(_In_ WindowsXamlManager* manager) override
     {
         if (m_manager.Get() != manager)
         {
@@ -205,7 +205,7 @@ _Check_return_ HRESULT WindowsXamlManagerFactory::InitializeForCurrentThreadImpl
     return S_OK;
 }
 
-_Check_return_ HRESULT WindowsXamlManagerFactory::GetForCurrentThreadImpl(_Outptr_ xaml_hosting::IWindowsXamlManager** ppReturnValue)
+_Check_return_ HRESULT WindowsXamlManagerFactory::GetForCurrentThreadImpl(_Outptr_result_maybenull_ xaml_hosting::IWindowsXamlManager** ppReturnValue)
 {
     if (ComPtr<WindowsXamlManager> manager = WindowsXamlManager::GetForCurrentThread())
     {
@@ -335,7 +335,10 @@ _Check_return_ HRESULT WindowsXamlManager::Initialize()
             tls_xamlCore = std::make_shared<XamlCoreNewShutdown>();
         }
 
-        tls_xamlCore->OnManagerCreated(this);
+        // We need to call RegisterManager here to make sure we're tracking it for the current thread before the 
+        // below call to Initialize().  This is because Initialize() will call Application.OnLaunched(), which calls
+        // out to app code, which may call WindowsXamlManager.InitializeForCurrentThread().
+        tls_xamlCore->RegisterManager(this);
 
         IFC_RETURN(tls_xamlCore->Initialize(m_dispatcherQueue.Get()));
     }
@@ -350,7 +353,7 @@ _Check_return_ HRESULT WindowsXamlManager::Initialize()
         tls_xamlCore->SetState(XamlCore::State::Normal);
     }
 
-    tls_xamlCore->OnManagerCreated(this);
+    tls_xamlCore->RegisterManager(this);
 
     // This will make sure that it doesn't get cleared off thread in WeakReferenceSourceNoThreadId::OnFinalReleaseOffThread()
     // as it has thread-local variables and needs to be disposed off by the same thread
@@ -395,7 +398,7 @@ void WindowsXamlManager::RaiseXamlShutdownCompletedOnThreadEvent(_In_ msy::IDisp
         IFCFAILFAST(this->QueryInterfaceImpl(IID_PPV_ARGS(&sender)));
 
         ctl::ComPtr<XamlShutdownCompletedOnThreadEventArgs> args;
-        ctl::make<XamlShutdownCompletedOnThreadEventArgs>(&args);
+        IFCFAILFAST(ctl::make<XamlShutdownCompletedOnThreadEventArgs>(&args));
 
         args->SetDispatcherQueueShutdownStartingEventArgs(shutdownStartingArgs);
         
diff --git a/src/dxaml/xcp/dxaml/lib/WindowsXamlManager_Partial.h b/src/dxaml/xcp/dxaml/lib/WindowsXamlManager_Partial.h
index 8379ffe9cb..37b1dc86f7 100644
--- a/src/dxaml/xcp/dxaml/lib/WindowsXamlManager_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/WindowsXamlManager_Partial.h
@@ -19,7 +19,7 @@ namespace DirectUI
     public:
         _Check_return_ HRESULT Initialize() override;
         IFACEMETHOD(Close)() override;
-        HRESULT CloseImpl(bool synchronous);
+        _Check_return_ HRESULT CloseImpl(bool synchronous);
 
         _Check_return_ HRESULT GetXamlShutdownCompletedOnThreadEventSourceNoRef(
             _Outptr_ XamlShutdownCompletedOnThreadEventSourceType** ppEventSource) override
@@ -65,7 +65,7 @@ namespace DirectUI
             State GetState() const { return m_state; }
             void SetState(State state) { m_state = state; }
            
-            virtual void OnManagerCreated(_In_ WindowsXamlManager* manager) = 0;
+            virtual void RegisterManager(_In_ WindowsXamlManager* manager) = 0;
             virtual void OnManagerClosed(_In_ WindowsXamlManager* manager) = 0;
             virtual ctl::ComPtr<DirectUI::WindowsXamlManager> GetForCurrentThread() = 0;
             virtual bool ReadyForEarlyShutdown() const = 0;
diff --git a/src/dxaml/xcp/dxaml/lib/XBFXamlTypeWrapper.h b/src/dxaml/xcp/dxaml/lib/XBFXamlTypeWrapper.h
index bbfb669232..3350d712df 100644
--- a/src/dxaml/xcp/dxaml/lib/XBFXamlTypeWrapper.h
+++ b/src/dxaml/xcp/dxaml/lib/XBFXamlTypeWrapper.h
@@ -81,7 +81,7 @@ namespace DirectUI
         IFACEMETHOD(AddToMap)(_In_ IInspectable *instance, _In_ IInspectable *key, _In_ IInspectable *value);
 
     private:
-        xaml_markup::IXamlType* m_pXamlType;
+        xaml_markup::IXamlType* m_pXamlType{};
     };
 
     class XBFXamlMemberWrapper: public xaml_markup::IXamlMember, public ctl::ComBase
diff --git a/src/dxaml/xcp/dxaml/lib/XamlCompositionBrushBase_Partial.h b/src/dxaml/xcp/dxaml/lib/XamlCompositionBrushBase_Partial.h
index daa9025ed8..d161e27b9b 100644
--- a/src/dxaml/xcp/dxaml/lib/XamlCompositionBrushBase_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/XamlCompositionBrushBase_Partial.h
@@ -35,7 +35,7 @@ namespace DirectUI
         xaml_media::IXamlCompositionBrushBaseOverridesPrivate* GetPrivateOverridesNoRef();
 
         bool m_didQueryForPrivateOverrides = false;
-        xaml_media::IXamlCompositionBrushBaseOverridesPrivate* m_privateOverridesNoRef;
+        xaml_media::IXamlCompositionBrushBaseOverridesPrivate* m_privateOverridesNoRef{};
     };
 }
 
diff --git a/src/dxaml/xcp/dxaml/lib/XamlDirect_Partial.cpp b/src/dxaml/xcp/dxaml/lib/XamlDirect_Partial.cpp
deleted file mode 100644
index 7f71b0a858..0000000000
--- a/src/dxaml/xcp/dxaml/lib/XamlDirect_Partial.cpp
+++ /dev/null
@@ -1,712 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-#include "precomp.h"
-#include "XamlDirect.g.h"
-#include "XbfMetadataApi.h"
-#include "XamlDirect_Partial.h"
-#include <MetadataAPI.h>
-#include <ValueType.h>
-#include "UIElement.g.h"
-
-using namespace DirectUI;
-
-XamlDirect::XamlDirect()
-{
-}
-
-XamlDirect::~XamlDirect()
-{
-}
-
-_Check_return_ HRESULT XamlDirectFactory::GetDefaultImpl(
-    _Outptr_ xaml::Core::Direct::IXamlDirect** ppResult)
-{
-    *ppResult = nullptr;
-    XamlDirect* pDefaultInstance = DXamlCore::GetCurrent()->GetXamlDirectDefaultInstanceNoRef();
-    IFC_RETURN(ctl::do_query_interface(*ppResult, pDefaultInstance));
-
-    return S_OK;
-}
-
-#pragma region CreateInstance
-
-_Check_return_ HRESULT XamlDirect::CreateInstanceImpl(
-    _In_ xaml::Core::Direct::XamlTypeIndex typeIndex,
-    _Outptr_ xaml::Core::Direct::IXamlDirectObject** ppResult)
-{
-    *ppResult = nullptr;
-    auto localIndex = static_cast<std::underlying_type<Parser::StableXbfTypeIndex>::type>(typeIndex);
-    if (localIndex <= 0 || localIndex >= Parser::StableXbfTypeCount)
-    {
-        IFCFAILFAST(E_INVALIDARG);
-    }
-
-    const CClassInfo* ppType = MetadataAPI::GetClassInfoByIndex(GetKnownTypeIndex(static_cast<Parser::StableXbfTypeIndex>(typeIndex)));
-
-    CDependencyObject* pCDO = nullptr;
-    IFC_RETURN(ActivationAPI::ActivateCoreInstance(ppType, &pCDO));
-
-    *ppResult = ctl::interface_cast<xaml::Core::Direct::IXamlDirectObject>(pCDO);
-
-    return S_OK;
-}
-
-#pragma endregion
-
-#pragma region GetObject
-
-_Check_return_ HRESULT XamlDirect::GetObjectImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _Outptr_ IInspectable** ppResult)
-{
-    *ppResult = nullptr;
-    HRESULT hr = S_OK;
-    DependencyObject* pPeer = nullptr;
-
-    IFC(DXamlCore::GetCurrent()->GetPeer(ctl::impl_cast<CDependencyObject>(pXamlDirectObject), &pPeer));
-    IFC(ctl::do_query_interface(*ppResult, pPeer));
-
-Cleanup:
-    ctl::release_interface(pPeer);
-
-    return hr;
-}
-
-#pragma endregion
-
-#pragma region GetXamlDirectObject
-
-_Check_return_ HRESULT XamlDirect::GetXamlDirectObjectImpl(
-    _In_ IInspectable* pObject,
-    _Outptr_ xaml::Core::Direct::IXamlDirectObject** ppResult)
-{
-    *ppResult = nullptr;
-    DependencyObject* pDO = ctl::query_interface_cast<DependencyObject>(pObject).Get();
-
-    CDependencyObject* pCDO = pDO->GetHandleAddRef();
-
-    *ppResult = ctl::interface_cast<xaml::Core::Direct::IXamlDirectObject>(pCDO);
-
-    return S_OK;
-}
-
-#pragma endregion
-
-#pragma region SetValue
-
-template<typename T>
-_Check_return_ HRESULT XamlDirect::SetValueByIndex(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _In_ T inputValue)
-{
-    CheckPropertyIndex(propertyIndex);
-
-    CValue value;
-    BoxerBuffer buffer;
-    IFC_RETURN(CValueBoxer::BoxValue(&value, inputValue, &buffer));
-
-    CDependencyObject* pCDO = ctl::impl_cast<CDependencyObject>(pXamlDirectObject);
-    IFC_RETURN(pCDO->SetValueByIndex(GetKnownPropertyIndex(static_cast<Parser::StableXbfPropertyIndex>(propertyIndex)), value));
-
-    return S_OK;
-}
-
-_Check_return_ HRESULT XamlDirect::SetObjectPropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _In_opt_ IInspectable* pValue)
-{
-    CheckPropertyIndex(propertyIndex);
-
-    const CDependencyProperty* pDP = MetadataAPI::GetDependencyPropertyByIndex(GetKnownPropertyIndex(static_cast<Parser::StableXbfPropertyIndex>(propertyIndex)));
-
-    CValue value;
-    BoxerBuffer buffer;
-    DependencyObject* pMOR;
-    IFC_RETURN(CValueBoxer::BoxObjectValue(&value, pDP->GetPropertyType(), pValue, &buffer, &pMOR));
-
-    CDependencyObject* pCDO = ctl::impl_cast<CDependencyObject>(pXamlDirectObject);
-    IFC_RETURN(CheckNeedsPeer(pCDO, pDP));
-    IFC_RETURN(pCDO->SetValue(pDP, value));
-
-    return S_OK;
-}
-
-_Check_return_ HRESULT XamlDirect::SetXamlDirectObjectPropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _In_opt_ xaml::Core::Direct::IXamlDirectObject* pValue)
-{
-    CheckPropertyIndex(propertyIndex);
-
-    CValue value;
-    if (pValue != nullptr)
-    {
-        value.SetObjectAddRef(ctl::impl_cast<CDependencyObject>(pValue));
-    }
-    else
-    {
-        value.SetNull();
-    }
-
-    CDependencyObject* pCDO = ctl::impl_cast<CDependencyObject>(pXamlDirectObject);
-    const CDependencyProperty* pDP = MetadataAPI::GetDependencyPropertyByIndex(GetKnownPropertyIndex(static_cast<Parser::StableXbfPropertyIndex>(propertyIndex)));
-    IFC_RETURN(CheckNeedsPeer(pCDO, pDP));
-    IFC_RETURN(pCDO->SetValue(pDP, value));
-
-    return S_OK;
-}
-
-_Check_return_ HRESULT XamlDirect::SetBooleanPropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _In_ BOOLEAN boolValue)
-{
-    return SetValueByIndex(pXamlDirectObject, propertyIndex, boolValue);
-}
-
-_Check_return_ HRESULT XamlDirect::SetDoublePropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _In_ DOUBLE doubleValue)
-{
-    return SetValueByIndex(pXamlDirectObject, propertyIndex, doubleValue);
-}
-
-_Check_return_ HRESULT XamlDirect::SetInt32PropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _In_ INT intValue)
-{
-    return SetValueByIndex(pXamlDirectObject, propertyIndex, intValue);
-}
-
-_Check_return_ HRESULT XamlDirect::SetStringPropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _In_opt_ HSTRING stringValue)
-{
-    return SetValueByIndex(pXamlDirectObject, propertyIndex, stringValue);
-}
-
-_Check_return_ HRESULT XamlDirect::SetDateTimePropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _In_ wf::DateTime dateTimeValue)
-{
-    return SetValueByIndex(pXamlDirectObject, propertyIndex, dateTimeValue);
-}
-
-_Check_return_ HRESULT XamlDirect::SetPointPropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _In_ wf::Point pointValue)
-{
-    return SetValueByIndex(pXamlDirectObject, propertyIndex, pointValue);
-}
-
-_Check_return_ HRESULT XamlDirect::SetRectPropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _In_ wf::Rect rectValue)
-{
-    return SetValueByIndex(pXamlDirectObject, propertyIndex, rectValue);
-}
-
-_Check_return_ HRESULT XamlDirect::SetSizePropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _In_ wf::Size sizeValue)
-{
-    return SetValueByIndex(pXamlDirectObject, propertyIndex, sizeValue);
-}
-
-_Check_return_ HRESULT XamlDirect::SetTimeSpanPropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _In_ wf::TimeSpan timeSpanValue)
-{
-    return SetValueByIndex(pXamlDirectObject, propertyIndex, timeSpanValue);
-}
-
-_Check_return_ HRESULT XamlDirect::SetColorPropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _In_ wu::Color colorValue)
-{
-    return SetValueByIndex(pXamlDirectObject, propertyIndex, colorValue);
-}
-
-_Check_return_ HRESULT XamlDirect::SetCornerRadiusPropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _In_ xaml::CornerRadius cornerRadiusValue)
-{
-    return SetValueByIndex(pXamlDirectObject, propertyIndex, cornerRadiusValue);
-}
-
-_Check_return_ HRESULT XamlDirect::SetDurationPropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _In_ xaml::Duration durationValue)
-{
-    return SetValueByIndex(pXamlDirectObject, propertyIndex, durationValue);
-}
-
-_Check_return_ HRESULT XamlDirect::SetGridLengthPropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _In_ xaml::GridLength gridLengthValue)
-{
-    return SetValueByIndex(pXamlDirectObject, propertyIndex, gridLengthValue);
-}
-
-_Check_return_ HRESULT XamlDirect::SetThicknessPropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _In_ xaml::Thickness thicknessValue)
-{
-    return SetValueByIndex(pXamlDirectObject, propertyIndex, thicknessValue);
-}
-
-_Check_return_ HRESULT XamlDirect::SetMatrixPropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _In_ xaml_media::Matrix matrixValue)
-{
-    return SetValueByIndex(pXamlDirectObject, propertyIndex, matrixValue);
-}
-
-_Check_return_ HRESULT XamlDirect::SetMatrix3DPropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _In_ xaml_media::Media3D::Matrix3D matrix3dValue)
-{
-    return SetValueByIndex(pXamlDirectObject, propertyIndex, matrix3dValue);
-}
-
-_Check_return_ HRESULT XamlDirect::SetEnumPropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _In_ UINT uintValue)
-{
-    CheckPropertyIndex(propertyIndex);
-
-    CValue value;
-    IFC_RETURN(CValueBoxer::BoxEnumValue(&value, uintValue));
-
-    CDependencyObject* pCDO = ctl::impl_cast<CDependencyObject>(pXamlDirectObject);
-    IFC_RETURN(pCDO->SetValueByIndex(GetKnownPropertyIndex(static_cast<Parser::StableXbfPropertyIndex>(propertyIndex)), value));
-
-    return S_OK;
-}
-
-#pragma endregion
-
-#pragma region GetValue
-
-template<typename T>
-_Check_return_ HRESULT XamlDirect::GetValueByIndex(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _Out_ T* pResult)
-{
-    CheckPropertyIndex(propertyIndex);
-
-    CDependencyObject* pCDO = ctl::impl_cast<CDependencyObject>(pXamlDirectObject);
-
-    CValue value;
-    IFC_RETURN(pCDO->GetValueByIndex(GetKnownPropertyIndex(static_cast<Parser::StableXbfPropertyIndex>(propertyIndex)), &value));
-    IFC_RETURN(CValueBoxer::UnboxValue(&value, pResult));
-
-    return S_OK;
-}
-
-_Check_return_ HRESULT XamlDirect::GetObjectPropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _Out_ IInspectable** pResult)
-{
-    *pResult = nullptr;
-    CheckPropertyIndex(propertyIndex);
-
-    const CDependencyProperty* pDP = MetadataAPI::GetDependencyPropertyByIndex(GetKnownPropertyIndex(static_cast<Parser::StableXbfPropertyIndex>(propertyIndex)));
-    CDependencyObject* pCDO = ctl::impl_cast<CDependencyObject>(pXamlDirectObject);
-
-    CValue value;
-    IFC_RETURN(CheckNeedsPeer(pCDO, pDP));
-    IFC_RETURN(pCDO->GetValue(pDP, &value));
-    IFC_RETURN(CValueBoxer::UnboxObjectValue(&value, pDP->GetPropertyType(), pResult));
-
-    return S_OK;
-}
-
-_Check_return_ HRESULT XamlDirect::GetXamlDirectObjectPropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _Out_ xaml::Core::Direct::IXamlDirectObject** pResult)
-{
-    *pResult = nullptr;
-    CheckPropertyIndex(propertyIndex);
-
-    const CDependencyProperty* pDP = MetadataAPI::GetDependencyPropertyByIndex(GetKnownPropertyIndex(static_cast<Parser::StableXbfPropertyIndex>(propertyIndex)));
-    CDependencyObject* pCDO = ctl::impl_cast<CDependencyObject>(pXamlDirectObject);
-
-    CValue value;
-    IFC_RETURN(pCDO->GetValue(pDP, &value));
-
-    if (!value.IsNull())
-    {
-        CDependencyObject* pValueCDO = value.AsObject();
-        pValueCDO->AddRef();
-        *pResult = ctl::interface_cast<xaml::Core::Direct::IXamlDirectObject>(pValueCDO);
-    }
-
-    return S_OK;
-}
-
-_Check_return_ HRESULT XamlDirect::GetBooleanPropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _Out_ BOOLEAN* pResult)
-{
-    return GetValueByIndex(pXamlDirectObject, propertyIndex, pResult);
-}
-
-_Check_return_ HRESULT XamlDirect::GetDoublePropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _Out_ DOUBLE* pResult)
-{
-    return GetValueByIndex(pXamlDirectObject, propertyIndex, pResult);
-}
-
-_Check_return_ HRESULT XamlDirect::GetInt32PropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _Out_ INT* pResult)
-{
-    return GetValueByIndex(pXamlDirectObject, propertyIndex, pResult);
-}
-
-_Check_return_ HRESULT XamlDirect::GetStringPropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _Out_ HSTRING* pResult)
-{
-    return GetValueByIndex(pXamlDirectObject, propertyIndex, pResult);
-}
-
-_Check_return_ HRESULT XamlDirect::GetDateTimePropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _Out_ wf::DateTime* pResult)
-{
-    return GetValueByIndex(pXamlDirectObject, propertyIndex, pResult);
-}
-
-_Check_return_ HRESULT XamlDirect::GetPointPropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _Out_ wf::Point* pResult)
-{
-    return GetValueByIndex(pXamlDirectObject, propertyIndex, pResult);
-}
-
-_Check_return_ HRESULT XamlDirect::GetRectPropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _Out_ wf::Rect* pResult)
-{
-    return GetValueByIndex(pXamlDirectObject, propertyIndex, pResult);
-}
-
-_Check_return_ HRESULT XamlDirect::GetSizePropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _Out_ wf::Size* pResult)
-{
-    return GetValueByIndex(pXamlDirectObject, propertyIndex, pResult);
-}
-
-_Check_return_ HRESULT XamlDirect::GetTimeSpanPropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _Out_ wf::TimeSpan* pResult)
-{
-    return GetValueByIndex(pXamlDirectObject, propertyIndex, pResult);
-}
-
-_Check_return_ HRESULT XamlDirect::GetColorPropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _Out_ wu::Color* pResult)
-{
-    return GetValueByIndex(pXamlDirectObject, propertyIndex, pResult);
-}
-
-_Check_return_ HRESULT XamlDirect::GetCornerRadiusPropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _Out_ xaml::CornerRadius* pResult)
-{
-    return GetValueByIndex(pXamlDirectObject, propertyIndex, pResult);
-}
-
-_Check_return_ HRESULT XamlDirect::GetDurationPropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _Out_ xaml::Duration* pResult)
-{
-    return GetValueByIndex(pXamlDirectObject, propertyIndex, pResult);
-}
-
-_Check_return_ HRESULT XamlDirect::GetGridLengthPropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _Out_ xaml::GridLength* pResult)
-{
-    return GetValueByIndex(pXamlDirectObject, propertyIndex, pResult);
-}
-
-_Check_return_ HRESULT XamlDirect::GetThicknessPropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _Out_ xaml::Thickness* pResult)
-{
-    return GetValueByIndex(pXamlDirectObject, propertyIndex, pResult);
-}
-
-_Check_return_ HRESULT XamlDirect::GetMatrixPropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _Out_ xaml_media::Matrix* pResult)
-{
-    return GetValueByIndex(pXamlDirectObject, propertyIndex, pResult);
-}
-
-_Check_return_ HRESULT XamlDirect::GetMatrix3DPropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _Out_ xaml_media::Media3D::Matrix3D* pResult)
-{
-    return GetValueByIndex(pXamlDirectObject, propertyIndex, pResult);
-}
-
-_Check_return_ HRESULT XamlDirect::GetEnumPropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex,
-    _Out_ UINT* pResult)
-{
-    CheckPropertyIndex(propertyIndex);
-
-    CDependencyObject* pCDO = ctl::impl_cast<CDependencyObject>(pXamlDirectObject);
-
-    CValue value;
-    IFC_RETURN(pCDO->GetValueByIndex(GetKnownPropertyIndex(static_cast<Parser::StableXbfPropertyIndex>(propertyIndex)), &value));
-    IFC_RETURN(CValueBoxer::UnboxEnumValue(&value, NULL, pResult));
-
-    return S_OK;
-}
-
-#pragma endregion
-
-#pragma region ClearValue
-
-_Check_return_ HRESULT XamlDirect::ClearPropertyImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex)
-{
-    CheckPropertyIndex(propertyIndex);
-
-    CDependencyObject* pCDO = ctl::impl_cast<CDependencyObject>(pXamlDirectObject);
-    const CDependencyProperty* pDP = MetadataAPI::GetDependencyPropertyByIndex(GetKnownPropertyIndex(static_cast<Parser::StableXbfPropertyIndex>(propertyIndex)));
-    IFC_RETURN(CheckNeedsPeer(pCDO, pDP));
-    IFC_RETURN(pCDO->ClearValue(pDP));
-
-    return S_OK;
-}
-
-#pragma endregion
-
-#pragma region Collections
-
-_Check_return_ HRESULT XamlDirect::GetCollectionCountImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _Out_ UINT* pResult)
-{
-    CDependencyObject* pCDO = ctl::impl_cast<CDependencyObject>(pXamlDirectObject);
-
-    CCollection* pCollection = static_cast<CCollection*>(pCDO);
-
-    *pResult = static_cast<UINT>(pCollection->GetCount());
-
-    return S_OK;
-}
-
-_Check_return_ HRESULT XamlDirect::GetXamlDirectObjectFromCollectionAtImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ UINT index,
-    _Outptr_ xaml::Core::Direct::IXamlDirectObject** ppResult)
-{
-    *ppResult = nullptr;
-    CDependencyObject* pCDO = ctl::impl_cast<CDependencyObject>(pXamlDirectObject);
-
-    CCollection* pCollection = static_cast<CCollection*>(pCDO);
-
-    CDependencyObject* pValueCDO = static_cast<CDependencyObject*>(pCollection->GetItemWithAddRef(index));
-    *ppResult = ctl::interface_cast<xaml::Core::Direct::IXamlDirectObject>(pValueCDO);
-
-    return S_OK;
-}
-
-_Check_return_ HRESULT XamlDirect::AddToCollectionImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::IXamlDirectObject* pValue)
-{
-    CDependencyObject* pCDO = ctl::impl_cast<CDependencyObject>(pXamlDirectObject);
-
-    CCollection* pCollection = static_cast<CCollection*>(pCDO);
-
-    CValue value;
-    value.Wrap<valueObject>(ctl::impl_cast<CDependencyObject>(pValue));
-
-    IFC_RETURN(pCollection->Append(value));
-
-    return S_OK;
-}
-
-_Check_return_ HRESULT XamlDirect::InsertIntoCollectionAtImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ UINT index,
-    _In_ xaml::Core::Direct::IXamlDirectObject* pValue)
-{
-    CDependencyObject* pCDO = ctl::impl_cast<CDependencyObject>(pXamlDirectObject);
-
-    CCollection* pCollection = static_cast<CCollection*>(pCDO);
-
-    CValue value;
-    value.Wrap<valueObject>(ctl::impl_cast<CDependencyObject>(pValue));
-
-    IFC_RETURN(pCollection->Insert(static_cast<XUINT32>(index), value));
-
-    return S_OK;
-}
-
-_Check_return_ HRESULT XamlDirect::RemoveFromCollectionImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::IXamlDirectObject* pValue,
-    _Out_ BOOLEAN* pResult)
-{
-    CDependencyObject* pCDO = ctl::impl_cast<CDependencyObject>(pXamlDirectObject);
-
-    CCollection* pCollection = static_cast<CCollection*>(pCDO);
-
-    CValue value;
-    value.SetObjectAddRef(ctl::impl_cast<CDependencyObject>(pValue));
-
-    XINT32 index = -1;
-    IFC_RETURN(pCollection->IndexOf(value, &index));
-    if (*pResult = (index >= 0))
-    {
-        xref_ptr<CDependencyObject> pRemovedCDO;
-        pRemovedCDO.attach(static_cast<CDependencyObject*>(pCollection->RemoveAt(static_cast<XUINT32>(index))));
-    }
-
-    return S_OK;
-}
-
-_Check_return_ HRESULT XamlDirect::RemoveFromCollectionAtImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ UINT index)
-{
-    CDependencyObject* pCDO = ctl::impl_cast<CDependencyObject>(pXamlDirectObject);
-
-    CCollection* pCollection = static_cast<CCollection*>(pCDO);
-
-    xref_ptr<CDependencyObject> pRemovedCDO;
-    pRemovedCDO.attach(static_cast<CDependencyObject*>(pCollection->RemoveAt(static_cast<XUINT32>(index))));
-
-    return S_OK;
-}
-
-_Check_return_ HRESULT XamlDirect::ClearCollectionImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject)
-{
-    CDependencyObject* pCDO = ctl::impl_cast<CDependencyObject>(pXamlDirectObject);
-
-    CCollection* pCollection = static_cast<CCollection*>(pCDO);
-    IFC_RETURN(pCollection->Clear());
-
-    return S_OK;
-}
-
-#pragma endregion
-
-#pragma region Events
-
-_Check_return_ HRESULT XamlDirect::AddEventHandlerImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlEventIndex eventIndex,
-    _In_ IInspectable* pHandler)
-{
-    return AddEventHandler_HandledEventsTooImpl(pXamlDirectObject, eventIndex, pHandler, false);
-}
-
-_Check_return_ HRESULT XamlDirect::AddEventHandler_HandledEventsTooImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlEventIndex eventIndex,
-    _In_ IInspectable* pHandler,
-    _In_ BOOLEAN handledEventsToo)
-{
-    ctl::ComPtr<DependencyObject> peer;
-    IFC_RETURN(DXamlCore::GetCurrent()->GetPeer(ctl::impl_cast<CDependencyObject>(pXamlDirectObject), &peer));
-
-    UIElement* pUIElement = static_cast<UIElement*>(peer.Get());
-    IFC_RETURN(pUIElement->EventAddHandlerByIndex(GetKnownEventIndex(static_cast<Parser::StableEventIndex>(eventIndex)), pHandler, handledEventsToo));
-
-    return S_OK;
-}
-
-_Check_return_ HRESULT XamlDirect::RemoveEventHandlerImpl(
-    _In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject,
-    _In_ xaml::Core::Direct::XamlEventIndex eventIndex,
-    _In_ IInspectable* pHandler)
-{
-    ctl::ComPtr<DependencyObject> peer;
-    IFC_RETURN(DXamlCore::GetCurrent()->GetPeer(ctl::impl_cast<CDependencyObject>(pXamlDirectObject), &peer));
-
-    UIElement* pUIElement = static_cast<UIElement*>(peer.Get());
-    IFC_RETURN(pUIElement->EventRemoveHandlerByIndex(GetKnownEventIndex(static_cast<Parser::StableEventIndex>(eventIndex)), pHandler));
-
-    return S_OK;
-}
-
-#pragma endregion
-
-#pragma region Helpers
-
-void XamlDirect::CheckPropertyIndex(_In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex)
-{
-    auto typedIndex = static_cast<std::underlying_type<Parser::StableXbfPropertyIndex>::type>(propertyIndex);
-    if (typedIndex <= 0 || typedIndex >= Parser::StableXbfPropertyCount)
-    {
-        IFCFAILFAST(E_INVALIDARG);
-    }
-}
-
-_Check_return_ HRESULT XamlDirect::CheckNeedsPeer(
-    _In_ CDependencyObject *pCDO,
-    _In_ const CDependencyProperty *pDP)
-{
-    if (pCDO->ParticipatesInManagedTree() && pDP->IsSparse())
-    {
-        IFC_RETURN(pCDO->EnsurePeerDuringCreate());
-    }
-
-    return S_OK;
-}
-
-#pragma endregion
diff --git a/src/dxaml/xcp/dxaml/lib/XamlDirect_Partial.h b/src/dxaml/xcp/dxaml/lib/XamlDirect_Partial.h
deleted file mode 100644
index 3c7db66a0b..0000000000
--- a/src/dxaml/xcp/dxaml/lib/XamlDirect_Partial.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-#pragma once
-
-#include "XamlDirect.g.h"
-
-namespace DirectUI
-{
-    PARTIAL_CLASS(XamlDirect)
-    {
-        friend class XamlDirectFactory;
-
-    public:
-        XamlDirect();
-        ~XamlDirect() override;
-
-        _Check_return_ HRESULT AddEventHandlerImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXaml, _In_ xaml::Core::Direct::XamlEventIndex eventIndex, _In_ IInspectable* pHandler);
-        _Check_return_ HRESULT AddEventHandler_HandledEventsTooImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlEventIndex eventIndex, _In_ IInspectable* pHandler, _In_ BOOLEAN handledEventsToo);
-        _Check_return_ HRESULT AddToCollectionImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::IXamlDirectObject* pValue);
-        _Check_return_ HRESULT ClearCollectionImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject);
-        _Check_return_ HRESULT ClearPropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex);
-        _Check_return_ HRESULT CreateInstanceImpl(_In_ xaml::Core::Direct::XamlTypeIndex typeIndex, _Outptr_ xaml::Core::Direct::IXamlDirectObject** ppResult);
-        _Check_return_ HRESULT GetBooleanPropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ BOOLEAN* pResult);
-        _Check_return_ HRESULT GetCollectionCountImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _Out_ UINT* pResult);
-        _Check_return_ HRESULT GetColorPropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ wu::Color* pResult);
-        _Check_return_ HRESULT GetCornerRadiusPropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ xaml::CornerRadius* pResult);
-        _Check_return_ HRESULT GetDateTimePropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ wf::DateTime* pResult);
-        _Check_return_ HRESULT GetObjectImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _Outptr_ IInspectable** ppResult);
-        _Check_return_ HRESULT GetDoublePropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ DOUBLE* pResult);
-        _Check_return_ HRESULT GetDurationPropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ xaml::Duration* pResult);
-        _Check_return_ HRESULT GetEnumPropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ UINT* pResult);
-        _Check_return_ HRESULT GetGridLengthPropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ xaml::GridLength* pResult);
-        _Check_return_ HRESULT GetInt32PropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ INT* pResult);
-        _Check_return_ HRESULT GetMatrix3DPropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ xaml_media::Media3D::Matrix3D* pResult);
-        _Check_return_ HRESULT GetMatrixPropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ xaml_media::Matrix* pResult);
-        _Check_return_ HRESULT GetObjectPropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Outptr_ IInspectable** ppResult);
-        _Check_return_ HRESULT GetPointPropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ wf::Point* pResult);
-        _Check_return_ HRESULT GetRectPropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ wf::Rect* pResult);
-        _Check_return_ HRESULT GetSizePropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ wf::Size* pResult);
-        _Check_return_ HRESULT GetStringPropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ HSTRING* pResult);
-        _Check_return_ HRESULT GetThicknessPropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ xaml::Thickness* pResult);
-        _Check_return_ HRESULT GetTimeSpanPropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ wf::TimeSpan* pResult);
-        _Check_return_ HRESULT GetXamlDirectObjectImpl(_In_ IInspectable* pObject, _Outptr_ xaml::Core::Direct::IXamlDirectObject** ppResult);
-        _Check_return_ HRESULT GetXamlDirectObjectFromCollectionAtImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ UINT index, _Outptr_ xaml::Core::Direct::IXamlDirectObject** ppResult);
-        _Check_return_ HRESULT GetXamlDirectObjectPropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Outptr_ xaml::Core::Direct::IXamlDirectObject** ppResult);
-        _Check_return_ HRESULT InsertIntoCollectionAtImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ UINT index, _In_ xaml::Core::Direct::IXamlDirectObject* pValue);
-        _Check_return_ HRESULT RemoveEventHandlerImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlEventIndex eventIndex, _In_ IInspectable* pHandler);
-        _Check_return_ HRESULT RemoveFromCollectionImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::IXamlDirectObject* pValue, _Out_ BOOLEAN* pResult);
-        _Check_return_ HRESULT RemoveFromCollectionAtImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ UINT index);
-        _Check_return_ HRESULT SetBooleanPropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ BOOLEAN value);
-        _Check_return_ HRESULT SetColorPropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ wu::Color value);
-        _Check_return_ HRESULT SetCornerRadiusPropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ xaml::CornerRadius value);
-        _Check_return_ HRESULT SetDateTimePropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ wf::DateTime value);
-        _Check_return_ HRESULT SetDoublePropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ DOUBLE value);
-        _Check_return_ HRESULT SetDurationPropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ xaml::Duration value);
-        _Check_return_ HRESULT SetEnumPropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ UINT value);
-        _Check_return_ HRESULT SetGridLengthPropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ xaml::GridLength value);
-        _Check_return_ HRESULT SetInt32PropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ INT value);
-        _Check_return_ HRESULT SetMatrix3DPropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ xaml_media::Media3D::Matrix3D value);
-        _Check_return_ HRESULT SetMatrixPropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ xaml_media::Matrix value);
-        _Check_return_ HRESULT SetObjectPropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_opt_ IInspectable* pValue);
-        _Check_return_ HRESULT SetPointPropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ wf::Point value);
-        _Check_return_ HRESULT SetRectPropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ wf::Rect value);
-        _Check_return_ HRESULT SetSizePropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ wf::Size value);
-        _Check_return_ HRESULT SetStringPropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_opt_ HSTRING value);
-        _Check_return_ HRESULT SetThicknessPropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ xaml::Thickness value);
-        _Check_return_ HRESULT SetTimeSpanPropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ wf::TimeSpan value);
-        _Check_return_ HRESULT SetXamlDirectObjectPropertyImpl(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_opt_ xaml::Core::Direct::IXamlDirectObject* pValue);
-
-    private:
-        template<typename T>
-        _Check_return_ HRESULT SetValueByIndex(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ T inputValue);
-
-        template<typename T>
-        _Check_return_ HRESULT GetValueByIndex(_In_ xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ T* pResult);
-
-        void CheckPropertyIndex(_In_ xaml::Core::Direct::XamlPropertyIndex propertyIndex);
-        _Check_return_ HRESULT CheckNeedsPeer(_In_ CDependencyObject *pCDO, _In_ const CDependencyProperty *pDP);
-    };
-}
diff --git a/src/dxaml/xcp/dxaml/lib/XamlIsland_Partial.cpp b/src/dxaml/xcp/dxaml/lib/XamlIsland_Partial.cpp
index bccb77b0c8..52a03f32f5 100644
--- a/src/dxaml/xcp/dxaml/lib/XamlIsland_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/XamlIsland_Partial.cpp
@@ -237,16 +237,24 @@ _Check_return_ HRESULT XamlIsland::put_ContentImpl(_In_opt_ xaml::IUIElement* pV
     // Determine and set the content's layout direction.
     if (pValue)
     {
-        ctl::ComPtr<xaml::IUIElement> content = pValue;
-
-        auto contentAsFE = content.AsOrNull<xaml::IFrameworkElement>();
         ixp::ContentLayoutDirection layoutDirection;
         m_pXamlIslandCore->GetContentIsland()->get_LayoutDirection(&layoutDirection);
 
-        contentAsFE->put_FlowDirection(
-            layoutDirection == ixp::ContentLayoutDirection_RightToLeft ? 
-            xaml::FlowDirection_RightToLeft : 
-            xaml::FlowDirection_LeftToRight);
+        // https://task.ms/43100993: In a Xaml island, we have no access to a bridge or HWND to
+        // enforce the LTR layout that Xaml needs to perform layout correctly.
+        // Until Xaml correctly handles the RTL coordinate space, this will lead to issues with input and
+        // output, as the underlying HWND will be in RTL, so we FAILFAST here. Once RTL is properly
+        // handled, we should be able to respond correctly to the ContentIsland's LayoutDirection.
+
+        if (layoutDirection == ixp::ContentLayoutDirection_RightToLeft)
+        {
+            ::RoOriginateError(
+                E_NOT_SUPPORTED,
+                wrl_wrappers::HStringReference(
+                L"RTL layout on the ContentIsland is not supported for XamlIsland. Use Xaml FlowDirection to set RTL on the content instead."
+                ).Get());
+            IFC_RETURN(E_NOT_SUPPORTED);        
+        }
     }
 
     IFC_RETURN(m_spXamlIsland->put_Content(pValue));
@@ -321,7 +329,7 @@ _Check_return_ HRESULT XamlIsland::put_SystemBackdropImpl(_In_opt_ xaml::Media::
 
             ctl::ComPtr<DirectUI::SystemBackdrop> systemBackdrop;
             IFC_RETURN(m_systemBackdrop.As(&systemBackdrop));
-            systemBackdrop->InvokeOnTargetConnected(this, xamlRoot.Get());
+            IFC_RETURN(systemBackdrop->InvokeOnTargetConnected(this, xamlRoot.Get()));
         }
     }
 
diff --git a/src/dxaml/xcp/dxaml/lib/XamlIsland_Partial.h b/src/dxaml/xcp/dxaml/lib/XamlIsland_Partial.h
index 938fa4be65..74adad2fe6 100644
--- a/src/dxaml/xcp/dxaml/lib/XamlIsland_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/XamlIsland_Partial.h
@@ -49,7 +49,7 @@ namespace DirectUI
         ctl::ComPtr<WindowsXamlManager> m_spXamlCore;
         ctl::ComPtr<xaml_hosting::IXamlIslandRoot> m_spXamlIsland;
         XamlIslandRoot * m_xamlIsland;
-        CXamlIslandRoot * m_pXamlIslandCore;
+        CXamlIslandRoot * m_pXamlIslandCore{};
         ctl::ComPtr<ABI::Microsoft::UI::Input::IInputFocusController2> m_inputFocusController2;
         EventRegistrationToken m_focusNavigationRequestedToken = {};
         EventRegistrationToken m_islandConnectedToken = {};
diff --git a/src/dxaml/xcp/dxaml/lib/XamlRoot_Partial.cpp b/src/dxaml/xcp/dxaml/lib/XamlRoot_Partial.cpp
index b310c227b0..fcc1597aea 100644
--- a/src/dxaml/xcp/dxaml/lib/XamlRoot_Partial.cpp
+++ b/src/dxaml/xcp/dxaml/lib/XamlRoot_Partial.cpp
@@ -10,6 +10,8 @@
 #include "WindowChrome_Partial.h"
 #include "ContentDialogMetadata.h"
 #include "RootScrollViewer.g.h"
+#include <Microsoft.UI.Content.Private.h>
+#include <windowing.h>
 
 using namespace DirectUI;
 
@@ -50,7 +52,7 @@ XamlRoot::~XamlRoot()
     }
 }
 
-HRESULT XamlRoot::QueryInterfaceImpl(_In_ REFIID iid, _Outptr_ void** ppObject)
+_Check_return_ HRESULT XamlRoot::QueryInterfaceImpl(_In_ REFIID iid, _Outptr_ void** ppObject)
 {
     if (InlineIsEqualGUID(iid, __uuidof(IXamlRootNative)))
     {
@@ -119,7 +121,7 @@ _Check_return_ HRESULT XamlRoot::get_IsInputActiveImpl(_Out_ BOOLEAN* pValue)
 }
 
 _Check_return_ HRESULT XamlRoot::get_ContentIslandEnvironmentImpl(
-    _Outptr_ ixp::IContentIslandEnvironment** value)
+    _Outptr_result_maybenull_ ixp::IContentIslandEnvironment** value)
 {
     *value = nullptr;
     if (CContentRoot* contentRoot = m_visualTree->GetContentRootNoRef())
@@ -129,6 +131,38 @@ _Check_return_ HRESULT XamlRoot::get_ContentIslandEnvironmentImpl(
     return S_OK;
 }
 
+_Check_return_ HRESULT STDMETHODCALLTYPE XamlRoot::get_CoordinateConverterImpl(_Outptr_ ixp::IContentCoordinateConverter** coordinateConverter)
+{
+    *coordinateConverter = nullptr;
+
+    if (auto xamlIsland = GetVisualTreeNoRef()->GetContentRootNoRef()->GetXamlIslandRootNoRef())
+    {
+        // Get the partner interface for the ContentIsland.
+        ctl::ComPtr<ixp::IContentIsland> contentIsland = xamlIsland->GetContentIsland();
+        IFC_RETURN(contentIsland->get_CoordinateConverter(coordinateConverter));
+    }
+
+    return S_OK;
+}
+
+_Check_return_ HRESULT STDMETHODCALLTYPE XamlRoot::TryGetContentIslandImpl(_Outptr_result_maybenull_ ixp::IContentIsland** contentIsland)
+{
+    *contentIsland = nullptr;
+
+    if (auto xamlIsland = GetVisualTreeNoRef()->GetContentRootNoRef()->GetXamlIslandRootNoRef())
+    {
+        // Get the partner interface for the ContentIsland.
+        ixp::IContentIsland* resultIsland = xamlIsland->GetContentIsland();
+        if (resultIsland)
+        {
+            *contentIsland = resultIsland;
+            (*contentIsland)->AddRef();
+        }
+    }
+
+    return S_OK;
+}
+
 _Check_return_ HRESULT XamlRoot::GetChangedEventSourceNoRef(_Outptr_ ChangedEventSourceType** ppEventSource)
 {
     if (!m_changedEventSource)
@@ -238,17 +272,28 @@ _Check_return_ HRESULT XamlRoot::get_HostWindow(_Out_ HWND* pValue)
 
             // Bug https://task.ms/48685229: For now, there are still calls to this method that cannot be
             // easily replaced with a ContentIsland API, specifically in WebView2.cpp. This means that we
-            // have to return a hosting HWND even in the XamlIsland scenario. The InputSite gives us a
-            // way to retrieve this HWND as long as InputSite velocity key 45720437 is disabled. Once
-            // this key is enabled for this repo, this will no longer be the case, as the InputSite will
-            // return an HWND that works for input but not for hosting or positioning. At this point,
-            // we will return null and callers will need to make an equivalent call to the ContentIsland.
-            wrl::ComPtr<ixp::IIslandInputSitePartner> inputSite = 
-            GetVisualTreeNoRef()->GetContentRootNoRef()->GetXamlIslandRootNoRef()->GetIslandInputSite();
-
-            if (inputSite)
+            // have to return a hosting HWND even in the XamlIsland scenario. We've added a temporary
+            // partner interface on the ContentIsland to retrieve this bridge/HWND. This is only a
+            // workaround, and new calls to this method and the partner method on the island should
+            // not be added. Once work is completed to make it so that there is full functionality
+            // without an HWND, this call should be removed.
+    
+            if (auto xamlIsland = GetVisualTreeNoRef()->GetContentRootNoRef()->GetXamlIslandRootNoRef())
             {
-                hwnd = CInputServices::GetUnderlyingInputHwndFromIslandInputSite(inputSite.Get());
+                // Get the partner interface for the ContentIsland.
+                ctl::ComPtr<ixp::IContentIslandPartner> contentIslandPartner;
+                ctl::ComPtr<ixp::IContentIsland> contentIsland = xamlIsland->GetContentIsland();
+                IFCFAILFAST(contentIsland.As(&contentIslandPartner));
+
+                // Use the partner interface to retrieve the DesktopSiteBridge, then use that to get
+                // to the WindowId.
+                ctl::ComPtr<ixp::IDesktopSiteBridge> desktopSiteBridge;
+                IFC_RETURN(contentIslandPartner->get_TEMP_DesktopSiteBridge(&desktopSiteBridge));
+
+                // Translate the WindowId to an HWND.
+                ABI::Microsoft::UI::WindowId windowId;
+                IFC_RETURN(desktopSiteBridge->get_WindowId(&windowId));
+                IFC_RETURN(Windowing_GetWindowFromWindowId(windowId, &hwnd));
             }
         }
 
@@ -302,7 +347,7 @@ LayoutBoundsChangedHelper* XamlRoot::GetLayoutBoundsHelperNoRef()
         IFCFAILFAST(ctl::make(&m_layoutBoundsChangedHelper));
 
         m_layoutBoundsChangedHelper->UpdatePeg(true);
-        m_layoutBoundsChangedHelper->InitializeSizeChangedHandlers(static_cast<xaml::IXamlRoot*>(this));
+        IFCFAILFAST(m_layoutBoundsChangedHelper->InitializeSizeChangedHandlers(static_cast<xaml::IXamlRoot*>(this)));
     }
 
     return m_layoutBoundsChangedHelper.Get();
@@ -342,4 +387,4 @@ void XamlRoot::SetSimulatedInputPaneOccludedRect(const wf::Rect& rect)
             {m_simulatedInputPaneOccludedRect.X, m_simulatedInputPaneOccludedRect.Y, m_simulatedInputPaneOccludedRect.Width, m_simulatedInputPaneOccludedRect.Height}
         ));
     }
-}
\ No newline at end of file
+}
diff --git a/src/dxaml/xcp/dxaml/lib/XamlRoot_Partial.h b/src/dxaml/xcp/dxaml/lib/XamlRoot_Partial.h
index 406df6401e..7bf2329ddc 100644
--- a/src/dxaml/xcp/dxaml/lib/XamlRoot_Partial.h
+++ b/src/dxaml/xcp/dxaml/lib/XamlRoot_Partial.h
@@ -31,7 +31,10 @@ namespace DirectUI
         _Check_return_ HRESULT STDMETHODCALLTYPE get_IsHostVisibleImpl(_Out_ BOOLEAN* pValue);
         _Check_return_ HRESULT STDMETHODCALLTYPE get_CompositorImpl(_Outptr_ WUComp::ICompositor** compositor);
         _Check_return_ HRESULT STDMETHODCALLTYPE get_IsInputActiveImpl(_Out_ BOOLEAN* pValue);
-        _Check_return_ HRESULT STDMETHODCALLTYPE get_ContentIslandEnvironmentImpl(_Outptr_ ixp::IContentIslandEnvironment** contentIslandEnvironment);
+        _Check_return_ HRESULT STDMETHODCALLTYPE get_ContentIslandEnvironmentImpl(_Outptr_result_maybenull_ ixp::IContentIslandEnvironment** contentIslandEnvironment);
+        _Check_return_ HRESULT STDMETHODCALLTYPE get_CoordinateConverterImpl(_Outptr_ ixp::IContentCoordinateConverter** coordinateConverter);
+
+        _Check_return_ HRESULT STDMETHODCALLTYPE TryGetContentIslandImpl(_Outptr_result_maybenull_ ixp::IContentIsland** contentIsland);
 
         _Check_return_ HRESULT GetChangedEventSourceNoRef(_Outptr_ ChangedEventSourceType** ppEventSource) override;
         _Check_return_ HRESULT GetInputActivationChangedEventSourceNoRef(_Outptr_ InputActivationChangedEventSourceType** ppEventSource) override;
@@ -53,7 +56,7 @@ namespace DirectUI
             _In_ DirectUI::DependencyObject* pElement,
             _In_ xaml::IXamlRoot* pXamlRoot);
 
-        IFACEMETHOD(get_HostWindow)(_Out_ HWND* pValue) override;
+        _Check_return_ IFACEMETHOD(get_HostWindow)(_Out_ HWND* pValue) override;
 
         _Check_return_ HRESULT GetContentDialogMetadata(_Outptr_ ContentDialogMetadata** ppContentDialogMetadata);
 
diff --git a/src/dxaml/xcp/dxaml/lib/comTemplateLibrary.h b/src/dxaml/xcp/dxaml/lib/comTemplateLibrary.h
index ab3b4a7e2e..a6627d4e40 100644
--- a/src/dxaml/xcp/dxaml/lib/comTemplateLibrary.h
+++ b/src/dxaml/xcp/dxaml/lib/comTemplateLibrary.h
@@ -417,7 +417,12 @@ namespace ctl
     }
 
     template <typename TConcrete, typename TInterface>
-    _Check_return_ HRESULT ValidateFactoryCreateInstanceWithAggregableActivationFactory(_In_opt_ IInspectable* const pOuter, _In_ IInspectable** const ppInner, _Inout_ IUnknown** ppInstance, _In_ KnownTypeIndex typeIndex, bool isFreeThreaded)
+    _Check_return_ HRESULT ValidateFactoryCreateInstanceWithAggregableActivationFactory(
+        _In_opt_ IInspectable* const pOuter,
+        _In_ IInspectable** const ppInner,
+        _Outptr_ IUnknown** ppInstance,
+        _In_ KnownTypeIndex typeIndex,
+        bool isFreeThreaded)
     {
         UNREFERENCED_PARAMETER(typeIndex);
         ComPtr<IInspectable> spInner;
diff --git a/src/dxaml/xcp/dxaml/lib/synonyms.g.h b/src/dxaml/xcp/dxaml/lib/synonyms.g.h
index 86b3b32758..b90885adda 100644
--- a/src/dxaml/xcp/dxaml/lib/synonyms.g.h
+++ b/src/dxaml/xcp/dxaml/lib/synonyms.g.h
@@ -122,6 +122,7 @@ namespace DirectUISynonyms
     typedef ABI::Microsoft::UI::Xaml::IXamlResourceReferenceFailedEventArgs IXamlResourceReferenceFailedEventArgs;
     typedef ABI::Microsoft::UI::Xaml::IXamlRoot IXamlRoot;
     typedef ABI::Microsoft::UI::Xaml::IXamlRoot2 IXamlRoot2;
+    typedef ABI::Microsoft::UI::Xaml::IXamlRootFeature_ExperimentalApi IXamlRootFeature_ExperimentalApi;
     typedef ABI::Microsoft::UI::Xaml::IXamlRootChangedEventArgs IXamlRootChangedEventArgs;
     typedef ABI::Microsoft::UI::Xaml::Automation::IAnnotationPatternIdentifiers IAnnotationPatternIdentifiers;
     typedef ABI::Microsoft::UI::Xaml::Automation::IAutomationAnnotation IAutomationAnnotation;
@@ -518,8 +519,6 @@ namespace DirectUISynonyms
     typedef ABI::Microsoft::UI::Xaml::Controls::Primitives::IToggleButtonOverrides IToggleButtonOverrides;
     typedef ABI::Microsoft::UI::Xaml::Controls::Primitives::IToggleSwitchTemplateSettings IToggleSwitchTemplateSettings;
     typedef ABI::Microsoft::UI::Xaml::Controls::Primitives::IToolTipTemplateSettings IToolTipTemplateSettings;
-    typedef ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject IXamlDirectObject;
-    typedef ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirect IXamlDirect;
     typedef ABI::Microsoft::UI::Xaml::Data::IBinding IBinding;
     typedef ABI::Microsoft::UI::Xaml::Data::IBindingBase IBindingBase;
     typedef ABI::Microsoft::UI::Xaml::Data::IBindingExpression IBindingExpression;
diff --git a/src/dxaml/xcp/dxaml/lib/winrtcontrols3/wrtdxamlcontrols3.vcxproj b/src/dxaml/xcp/dxaml/lib/winrtcontrols3/wrtdxamlcontrols3.vcxproj
index 232396ca28..380d70468d 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtcontrols3/wrtdxamlcontrols3.vcxproj
+++ b/src/dxaml/xcp/dxaml/lib/winrtcontrols3/wrtdxamlcontrols3.vcxproj
@@ -103,7 +103,6 @@
         <ClCompile Include="..\XamlUICommand_Partial.cpp"/>
         <ClCompile Include="..\StandardUICommand_Partial.cpp"/>
         <ClCompile Include="..\CommandingHelpers.cpp"/>
-        <ClCompile Include="..\XamlDirect_Partial.cpp"/>
         <ClCompile Include="..\ThemeShadow_Partial.cpp"/>
         <ClCompile Include="..\ThemeShadowFactory_Partial.cpp"/>
         <ClCompile Include="..\CommandingContainer_Partial.cpp"/>
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AccessKeyDisplayRequestedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AccessKeyDisplayRequestedEventArgs.g.cpp
index 9e97eeac78..186c5b397d 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AccessKeyDisplayRequestedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AccessKeyDisplayRequestedEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::AccessKeyDisplayRequestedEventArgs::get_PressedKeys(_Ou
     xstring_ptr valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CAccessKeyDisplayRequestedEventArgs*>(pCoreEventArgsNoRef)->get_PressedKeys(&valueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AccessKeyInvokedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AccessKeyInvokedEventArgs.g.cpp
index 074338cf23..46ffe9d8dd 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AccessKeyInvokedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AccessKeyInvokedEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::AccessKeyInvokedEventArgs::get_Handled(_Out_ BOOLEAN* p
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CAccessKeyInvokedEventArgs*>(pCoreEventArgsNoRef)->get_Handled(&valueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AccessKeyManager.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AccessKeyManager.g.cpp
index 9740dead5f..b563139d67 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AccessKeyManager.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AccessKeyManager.g.cpp
@@ -45,6 +45,7 @@ IFACEMETHODIMP DirectUI::AccessKeyManagerFactory::get_IsDisplayModeEnabled(_Out_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckActivationAllowed());
     IFC(get_IsDisplayModeEnabledImpl(pValue));
 Cleanup:
@@ -54,6 +55,7 @@ IFACEMETHODIMP DirectUI::AccessKeyManagerFactory::get_AreKeyTipsEnabled(_Out_ BO
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckActivationAllowed());
     IFC(get_AreKeyTipsEnabledImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AddPagesEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AddPagesEventArgs.g.cpp
index 8101cd1685..b974df37cc 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AddPagesEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AddPagesEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::AddPagesEventArgsGenerated::get_PrintTaskOptions(_Outpt
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<AddPagesEventArgs*>(this)->get_PrintTaskOptionsImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Aggregate.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Aggregate.g.cpp
index b558152a6d..368322b961 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Aggregate.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Aggregate.g.cpp
@@ -778,4 +778,3 @@ using namespace DirectUI;
 #include "XamlIslandRoot.g.cpp"
 #include "XamlShutdownCompletedOnThreadEventArgs.g.cpp"
 #include "XamlSourceFocusNavigationRequest.g.cpp"
-#include "XamlDirect.g.cpp"
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AppBar.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AppBar.g.cpp
index cc547902bd..80cdd501a7 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AppBar.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AppBar.g.cpp
@@ -327,6 +327,7 @@ IFACEMETHODIMP DirectUI::AppBarGenerated::OnBackButtonPressed(_Out_ BOOLEAN* pRe
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AppBar_OnBackButtonPressed", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AppBar*>(this)->OnBackButtonPressedImpl(pResult));
@@ -505,7 +506,7 @@ _Check_return_ HRESULT DirectUI::AppBarGenerated::EventAddHandlerByIndex(_In_ Kn
     case KnownEventIndex::AppBar_Closed:
         {
             ctl::ComPtr<ABI::Windows::Foundation::IEventHandler<IInspectable*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -522,7 +523,7 @@ _Check_return_ HRESULT DirectUI::AppBarGenerated::EventAddHandlerByIndex(_In_ Kn
     case KnownEventIndex::AppBar_Closing:
         {
             ctl::ComPtr<ABI::Windows::Foundation::IEventHandler<IInspectable*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -539,7 +540,7 @@ _Check_return_ HRESULT DirectUI::AppBarGenerated::EventAddHandlerByIndex(_In_ Kn
     case KnownEventIndex::AppBar_Opened:
         {
             ctl::ComPtr<ABI::Windows::Foundation::IEventHandler<IInspectable*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -556,7 +557,7 @@ _Check_return_ HRESULT DirectUI::AppBarGenerated::EventAddHandlerByIndex(_In_ Kn
     case KnownEventIndex::AppBar_Opening:
         {
             ctl::ComPtr<ABI::Windows::Foundation::IEventHandler<IInspectable*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AppBarAutomationPeer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AppBarAutomationPeer.g.cpp
index 1baf7bc429..e6d7fb60e2 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AppBarAutomationPeer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AppBarAutomationPeer.g.cpp
@@ -57,6 +57,7 @@ IFACEMETHODIMP DirectUI::AppBarAutomationPeerGenerated::get_ExpandCollapseState(
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<AppBarAutomationPeer*>(this)->get_ExpandCollapseStateImpl(pValue));
 Cleanup:
@@ -66,6 +67,7 @@ IFACEMETHODIMP DirectUI::AppBarAutomationPeerGenerated::get_InteractionState(_Ou
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<AppBarAutomationPeer*>(this)->get_InteractionStateImpl(pValue));
 Cleanup:
@@ -75,6 +77,7 @@ IFACEMETHODIMP DirectUI::AppBarAutomationPeerGenerated::get_IsModal(_Out_ BOOLEA
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<AppBarAutomationPeer*>(this)->get_IsModalImpl(pValue));
 Cleanup:
@@ -84,6 +87,7 @@ IFACEMETHODIMP DirectUI::AppBarAutomationPeerGenerated::get_IsTopmost(_Out_ BOOL
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<AppBarAutomationPeer*>(this)->get_IsTopmostImpl(pValue));
 Cleanup:
@@ -93,6 +97,7 @@ IFACEMETHODIMP DirectUI::AppBarAutomationPeerGenerated::get_Maximizable(_Out_ BO
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<AppBarAutomationPeer*>(this)->get_MaximizableImpl(pValue));
 Cleanup:
@@ -102,6 +107,7 @@ IFACEMETHODIMP DirectUI::AppBarAutomationPeerGenerated::get_Minimizable(_Out_ BO
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<AppBarAutomationPeer*>(this)->get_MinimizableImpl(pValue));
 Cleanup:
@@ -111,6 +117,7 @@ IFACEMETHODIMP DirectUI::AppBarAutomationPeerGenerated::get_ToggleState(_Out_ AB
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<AppBarAutomationPeer*>(this)->get_ToggleStateImpl(pValue));
 Cleanup:
@@ -120,6 +127,7 @@ IFACEMETHODIMP DirectUI::AppBarAutomationPeerGenerated::get_VisualState(_Out_ AB
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<AppBarAutomationPeer*>(this)->get_VisualStateImpl(pValue));
 Cleanup:
@@ -227,6 +235,7 @@ IFACEMETHODIMP DirectUI::AppBarAutomationPeerGenerated::WaitForInputIdle(_In_ IN
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AppBarAutomationPeer_WaitForInputIdle", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AppBarAutomationPeer*>(this)->WaitForInputIdleImpl(milliseconds, pReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AppBarButton.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AppBarButton.g.cpp
index e3aaf4591a..741aae0484 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AppBarButton.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AppBarButton.g.cpp
@@ -90,6 +90,7 @@ IFACEMETHODIMP DirectUI::AppBarButtonGenerated::get_IsInOverflow(_Out_ BOOLEAN*
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<AppBarButton*>(this)->get_IsInOverflowImpl(pValue));
 Cleanup:
@@ -99,6 +100,7 @@ IFACEMETHODIMP DirectUI::AppBarButtonGenerated::get_IsSubMenuOpen(_Out_ BOOLEAN*
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<AppBarButton*>(this)->get_IsSubMenuOpenImpl(pValue));
 Cleanup:
@@ -108,6 +110,7 @@ IFACEMETHODIMP DirectUI::AppBarButtonGenerated::get_IsSubMenuPositionedAbsolutel
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<AppBarButton*>(this)->get_IsSubMenuPositionedAbsolutelyImpl(pValue));
 Cleanup:
@@ -117,6 +120,7 @@ IFACEMETHODIMP DirectUI::AppBarButtonGenerated::get_KeyboardAcceleratorTextOverr
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<AppBarButton*>(this)->get_KeyboardAcceleratorTextOverrideImpl(pValue));
 Cleanup:
@@ -154,6 +158,7 @@ IFACEMETHODIMP DirectUI::AppBarButtonGenerated::get_ParentOwner(_Outptr_result_m
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<AppBarButton*>(this)->get_ParentOwnerImpl(ppValue));
 Cleanup:
@@ -289,6 +294,7 @@ IFACEMETHODIMP DirectUI::AppBarButtonGenerated::GetHasBottomLabel(_Out_ BOOLEAN*
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AppBarButton_GetHasBottomLabel", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AppBarButton*>(this)->GetHasBottomLabelImpl(pResult));
@@ -307,6 +313,7 @@ IFACEMETHODIMP DirectUI::AppBarButtonGenerated::GetHasRightLabel(_Out_ BOOLEAN*
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AppBarButton_GetHasRightLabel", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AppBarButton*>(this)->GetHasRightLabelImpl(pResult));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AppBarButtonAutomationPeer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AppBarButtonAutomationPeer.g.cpp
index bd2030d4ac..6e2e3cc83a 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AppBarButtonAutomationPeer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AppBarButtonAutomationPeer.g.cpp
@@ -49,6 +49,7 @@ IFACEMETHODIMP DirectUI::AppBarButtonAutomationPeerGenerated::get_ExpandCollapse
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<AppBarButtonAutomationPeer*>(this)->get_ExpandCollapseStateImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AppBarElementContainer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AppBarElementContainer.g.cpp
index 83c413d964..7e0bb443dc 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AppBarElementContainer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AppBarElementContainer.g.cpp
@@ -71,6 +71,7 @@ IFACEMETHODIMP DirectUI::AppBarElementContainerGenerated::get_IsInOverflow(_Out_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<AppBarElementContainer*>(this)->get_IsInOverflowImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AppBarSeparator.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AppBarSeparator.g.cpp
index ff058e6ea9..ad754895da 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AppBarSeparator.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AppBarSeparator.g.cpp
@@ -71,6 +71,7 @@ IFACEMETHODIMP DirectUI::AppBarSeparatorGenerated::get_IsInOverflow(_Out_ BOOLEA
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<AppBarSeparator*>(this)->get_IsInOverflowImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AppBarToggleButton.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AppBarToggleButton.g.cpp
index 6bf3981670..501a0b584b 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AppBarToggleButton.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AppBarToggleButton.g.cpp
@@ -86,6 +86,7 @@ IFACEMETHODIMP DirectUI::AppBarToggleButtonGenerated::get_IsInOverflow(_Out_ BOO
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<AppBarToggleButton*>(this)->get_IsInOverflowImpl(pValue));
 Cleanup:
@@ -95,6 +96,7 @@ IFACEMETHODIMP DirectUI::AppBarToggleButtonGenerated::get_KeyboardAcceleratorTex
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<AppBarToggleButton*>(this)->get_KeyboardAcceleratorTextOverrideImpl(pValue));
 Cleanup:
@@ -158,6 +160,7 @@ IFACEMETHODIMP DirectUI::AppBarToggleButtonGenerated::GetHasBottomLabel(_Out_ BO
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AppBarToggleButton_GetHasBottomLabel", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AppBarToggleButton*>(this)->GetHasBottomLabelImpl(pResult));
@@ -176,6 +179,7 @@ IFACEMETHODIMP DirectUI::AppBarToggleButtonGenerated::GetHasRightLabel(_Out_ BOO
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AppBarToggleButton_GetHasRightLabel", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AppBarToggleButton*>(this)->GetHasRightLabelImpl(pResult));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AutoSuggestBox.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AutoSuggestBox.g.cpp
index 0b9a386571..4f52fe6fcf 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AutoSuggestBox.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AutoSuggestBox.g.cpp
@@ -523,7 +523,7 @@ _Check_return_ HRESULT DirectUI::AutoSuggestBoxGenerated::EventAddHandlerByIndex
     case KnownEventIndex::AutoSuggestBox_QuerySubmitted:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::Controls::AutoSuggestBox*, ABI::Microsoft::UI::Xaml::Controls::AutoSuggestBoxQuerySubmittedEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -540,7 +540,7 @@ _Check_return_ HRESULT DirectUI::AutoSuggestBoxGenerated::EventAddHandlerByIndex
     case KnownEventIndex::AutoSuggestBox_SuggestionChosen:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::Controls::AutoSuggestBox*, ABI::Microsoft::UI::Xaml::Controls::AutoSuggestBoxSuggestionChosenEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -557,7 +557,7 @@ _Check_return_ HRESULT DirectUI::AutoSuggestBoxGenerated::EventAddHandlerByIndex
     case KnownEventIndex::AutoSuggestBox_TextChanged:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::Controls::AutoSuggestBox*, ABI::Microsoft::UI::Xaml::Controls::AutoSuggestBoxTextChangedEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -653,12 +653,6 @@ HRESULT DirectUI::AutoSuggestBoxFactory::QueryInterfaceImpl(_In_ REFIID iid, _Ou
     {
         *ppObject = static_cast<ABI::Microsoft::UI::Xaml::Controls::IAutoSuggestBoxStaticsFeature_HeaderPlacement*>(this);
     }
-#endif
-#if WI_IS_FEATURE_PRESENT(Feature_InputValidation)
-    else if (InlineIsEqualGUID(iid, __uuidof(ABI::Microsoft::UI::Xaml::Controls::IAutoSuggestBoxStaticsFeature_InputValidation)))
-    {
-        *ppObject = static_cast<ABI::Microsoft::UI::Xaml::Controls::IAutoSuggestBoxStaticsFeature_InputValidation*>(this);
-    }
 #endif
     else
     {
@@ -728,18 +722,9 @@ IFACEMETHODIMP DirectUI::AutoSuggestBoxFactory::get_HeaderPlacementProperty(_Out
 
 
 
-IFACEMETHODIMP DirectUI::AutoSuggestBoxFactory::get_ErrorTemplateProperty(_Out_ ABI::Microsoft::UI::Xaml::IDependencyProperty** ppValue)
-{
-    RRETURN(MetadataAPI::GetIDependencyProperty(KnownPropertyIndex::AutoSuggestBox_ErrorTemplate, ppValue));
-}
-IFACEMETHODIMP DirectUI::AutoSuggestBoxFactory::get_InputValidationModeProperty(_Out_ ABI::Microsoft::UI::Xaml::IDependencyProperty** ppValue)
-{
-    RRETURN(MetadataAPI::GetIDependencyProperty(KnownPropertyIndex::AutoSuggestBox_InputValidationMode, ppValue));
-}
-IFACEMETHODIMP DirectUI::AutoSuggestBoxFactory::get_InputValidationKindProperty(_Out_ ABI::Microsoft::UI::Xaml::IDependencyProperty** ppValue)
-{
-    RRETURN(MetadataAPI::GetIDependencyProperty(KnownPropertyIndex::AutoSuggestBox_InputValidationKind, ppValue));
-}
+
+
+
 
 
 // Attached properties.
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AutoSuggestBox.g.h b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AutoSuggestBox.g.h
index 826c828226..e092b6d507 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AutoSuggestBox.g.h
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AutoSuggestBox.g.h
@@ -175,18 +175,12 @@ namespace DirectUI
         , public ABI::Microsoft::UI::Xaml::Controls::IAutoSuggestBoxStatics
 #if WI_IS_FEATURE_PRESENT(Feature_HeaderPlacement)
         , public ABI::Microsoft::UI::Xaml::Controls::IAutoSuggestBoxStaticsFeature_HeaderPlacement
-#endif
-#if WI_IS_FEATURE_PRESENT(Feature_InputValidation)
-        , public ABI::Microsoft::UI::Xaml::Controls::IAutoSuggestBoxStaticsFeature_InputValidation
 #endif
     {
         BEGIN_INTERFACE_MAP(AutoSuggestBoxFactory, ctl::BetterCoreObjectActivationFactory)
             INTERFACE_ENTRY(AutoSuggestBoxFactory, ABI::Microsoft::UI::Xaml::Controls::IAutoSuggestBoxStatics)
 #if WI_IS_FEATURE_PRESENT(Feature_HeaderPlacement)
             INTERFACE_ENTRY(AutoSuggestBoxFactory, ABI::Microsoft::UI::Xaml::Controls::IAutoSuggestBoxStaticsFeature_HeaderPlacement)
-#endif
-#if WI_IS_FEATURE_PRESENT(Feature_InputValidation)
-            INTERFACE_ENTRY(AutoSuggestBoxFactory, ABI::Microsoft::UI::Xaml::Controls::IAutoSuggestBoxStaticsFeature_InputValidation)
 #endif
         END_INTERFACE_MAP(AutoSuggestBoxFactory, ctl::BetterCoreObjectActivationFactory)
 
@@ -212,9 +206,9 @@ namespace DirectUI
         
         
         
-        IFACEMETHOD(get_ErrorTemplateProperty)(_Out_ ABI::Microsoft::UI::Xaml::IDependencyProperty** ppValue) FEATURE_INPUTVALIDATION_OVERRIDE;
-        IFACEMETHOD(get_InputValidationModeProperty)(_Out_ ABI::Microsoft::UI::Xaml::IDependencyProperty** ppValue) FEATURE_INPUTVALIDATION_OVERRIDE;
-        IFACEMETHOD(get_InputValidationKindProperty)(_Out_ ABI::Microsoft::UI::Xaml::IDependencyProperty** ppValue) FEATURE_INPUTVALIDATION_OVERRIDE;
+        
+        
+        
         
 
         // Attached properties.
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AutoSuggestBoxTextChangedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AutoSuggestBoxTextChangedEventArgs.g.cpp
index 4430248027..b261bbea9b 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AutoSuggestBoxTextChangedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AutoSuggestBoxTextChangedEventArgs.g.cpp
@@ -62,6 +62,7 @@ IFACEMETHODIMP DirectUI::AutoSuggestBoxTextChangedEventArgsGenerated::CheckCurre
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutoSuggestBoxTextChangedEventArgs_CheckCurrent", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutoSuggestBoxTextChangedEventArgs*>(this)->CheckCurrentImpl(pReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AutomationPeer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AutomationPeer.g.cpp
index 458c107e92..6b91152edd 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AutomationPeer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/AutomationPeer.g.cpp
@@ -98,6 +98,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetAcceleratorKeyCore(_Out_ HS
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetAcceleratorKey", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetAcceleratorKeyCoreImpl(pReturnValue));
@@ -138,6 +139,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetAccessKeyCore(_Out_ HSTRING
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetAccessKey", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetAccessKeyCoreImpl(pReturnValue));
@@ -178,6 +180,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetAnnotationsCore(_Outptr_ AB
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetAnnotations", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetAnnotationsCoreImpl(ppReturnValue));
@@ -218,6 +221,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetAutomationControlTypeCore(_
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetAutomationControlType", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetAutomationControlTypeCoreImpl(pReturnValue));
@@ -258,6 +262,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetAutomationIdCore(_Out_ HSTR
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetAutomationId", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetAutomationIdCoreImpl(pReturnValue));
@@ -298,6 +303,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetBoundingRectangleCore(_Out_
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetBoundingRectangle", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetBoundingRectangleCoreImpl(pReturnValue));
@@ -316,6 +322,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetChildren(_Outptr_ ABI::Wind
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetChildren", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetChildrenImpl(ppReturnValue));
@@ -334,6 +341,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetChildrenCore(_Outptr_ ABI::
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetChildrenCore", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetChildrenCoreImpl(ppReturnValue));
@@ -396,6 +404,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetClassNameCore(_Out_ HSTRING
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetClassName", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetClassNameCoreImpl(pReturnValue));
@@ -436,6 +445,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetClickablePointCore(_Out_ AB
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetClickablePoint", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetClickablePointCoreImpl(pReturnValue));
@@ -454,6 +464,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetControlledPeers(_Outptr_ AB
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetControlledPeers", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetControlledPeersImpl(ppReturnValue));
@@ -472,6 +483,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetControlledPeersCore(_Outptr
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetControlledPeersCore", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetControlledPeersCoreImpl(ppReturnValue));
@@ -534,6 +546,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetCultureCore(_Out_ INT* pRet
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetCulture", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetCultureCoreImpl(pReturnValue));
@@ -552,6 +565,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetDescribedByCore(_Outptr_ AB
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetDescribedByCore", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetDescribedByCoreImpl(ppReturnValue));
@@ -614,6 +628,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetElementFromPointCore(_In_ A
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetElementFromPoint", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetElementFromPointCoreImpl(pointInWindowCoordinates, ppReturnValue));
@@ -632,6 +647,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetFlowsFromCore(_Outptr_ ABI:
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetFlowsFromCore", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetFlowsFromCoreImpl(ppReturnValue));
@@ -672,6 +688,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetFlowsToCore(_Outptr_ ABI::W
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetFlowsToCore", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetFlowsToCoreImpl(ppReturnValue));
@@ -734,6 +751,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetFocusedElementCore(_Outptr_
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetFocusedElement", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetFocusedElementCoreImpl(ppReturnValue));
@@ -774,6 +792,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetFullDescriptionCore(_Out_ H
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetFullDescription", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetFullDescriptionCoreImpl(pReturnValue));
@@ -814,6 +833,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetHeadingLevelCore(_Out_ ABI:
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetHeadingLevel", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetHeadingLevelCoreImpl(pReturnValue));
@@ -854,6 +874,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetHelpTextCore(_Out_ HSTRING*
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetHelpText", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetHelpTextCoreImpl(pReturnValue));
@@ -894,6 +915,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetItemStatusCore(_Out_ HSTRIN
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetItemStatus", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetItemStatusCoreImpl(pReturnValue));
@@ -934,6 +956,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetItemTypeCore(_Out_ HSTRING*
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetItemType", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetItemTypeCoreImpl(pReturnValue));
@@ -974,6 +997,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetLabeledByCore(_Outptr_ ABI:
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetLabeledBy", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetLabeledByCoreImpl(ppReturnValue));
@@ -1014,6 +1038,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetLandmarkTypeCore(_Out_ ABI:
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetLandmarkType", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetLandmarkTypeCoreImpl(pReturnValue));
@@ -1054,6 +1079,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetLevelCore(_Out_ INT* pRetur
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetLevel", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetLevelCoreImpl(pReturnValue));
@@ -1094,6 +1120,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetLiveSettingCore(_Out_ ABI::
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetLiveSetting", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetLiveSettingCoreImpl(pReturnValue));
@@ -1134,6 +1161,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetLocalizedControlTypeCore(_O
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetLocalizedControlType", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetLocalizedControlTypeCoreImpl(pReturnValue));
@@ -1174,6 +1202,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetLocalizedLandmarkTypeCore(_
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetLocalizedLandmarkType", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetLocalizedLandmarkTypeCoreImpl(pReturnValue));
@@ -1214,6 +1243,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetNameCore(_Out_ HSTRING* pRe
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetName", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetNameCoreImpl(pReturnValue));
@@ -1254,6 +1284,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetOrientationCore(_Out_ ABI::
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetOrientation", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetOrientationCoreImpl(pReturnValue));
@@ -1272,6 +1303,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetParent(_Outptr_ ABI::Micros
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetParent", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetParentImpl(ppReturnValue));
@@ -1312,6 +1344,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetPatternCore(_In_ ABI::Micro
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetPattern", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetPatternCoreImpl(patternInterface, ppReturnValue));
@@ -1330,6 +1363,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetPeerFromPoint(_In_ ABI::Win
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetPeerFromPoint", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetPeerFromPointImpl(point, ppReturnValue));
@@ -1348,6 +1382,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetPeerFromPointCore(_In_ ABI:
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetPeerFromPointCore", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetPeerFromPointCoreImpl(point, ppReturnValue));
@@ -1410,6 +1445,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetPositionInSetCore(_Out_ INT
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetPositionInSet", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetPositionInSetCoreImpl(pReturnValue));
@@ -1450,6 +1486,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::GetSizeOfSetCore(_Out_ INT* pR
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_GetSizeOfSet", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->GetSizeOfSetCoreImpl(pReturnValue));
@@ -1490,6 +1527,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::HasKeyboardFocusCore(_Out_ BOO
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_HasKeyboardFocus", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->HasKeyboardFocusCoreImpl(pReturnValue));
@@ -1548,6 +1586,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::IsContentElementCore(_Out_ BOO
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_IsContentElement", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->IsContentElementCoreImpl(pReturnValue));
@@ -1588,6 +1627,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::IsControlElementCore(_Out_ BOO
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_IsControlElement", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->IsControlElementCoreImpl(pReturnValue));
@@ -1628,6 +1668,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::IsDataValidForFormCore(_Out_ B
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_IsDataValidForForm", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->IsDataValidForFormCoreImpl(pReturnValue));
@@ -1668,6 +1709,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::IsDialogCore(_Out_ BOOLEAN* pR
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_IsDialog", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->IsDialogCoreImpl(pReturnValue));
@@ -1708,6 +1750,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::IsEnabledCore(_Out_ BOOLEAN* p
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_IsEnabled", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->IsEnabledCoreImpl(pReturnValue));
@@ -1748,6 +1791,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::IsKeyboardFocusableCore(_Out_
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_IsKeyboardFocusable", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->IsKeyboardFocusableCoreImpl(pReturnValue));
@@ -1788,6 +1832,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::IsOffscreenCore(_Out_ BOOLEAN*
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_IsOffscreen", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->IsOffscreenCoreImpl(pReturnValue));
@@ -1828,6 +1873,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::IsPasswordCore(_Out_ BOOLEAN*
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_IsPassword", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->IsPasswordCoreImpl(pReturnValue));
@@ -1868,6 +1914,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::IsPeripheralCore(_Out_ BOOLEAN
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_IsPeripheral", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->IsPeripheralCoreImpl(pReturnValue));
@@ -1908,6 +1955,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::IsRequiredForFormCore(_Out_ BO
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_IsRequiredForForm", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->IsRequiredForFormCoreImpl(pReturnValue));
@@ -1948,6 +1996,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::NavigateCore(_In_ ABI::Microso
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "AutomationPeer_Navigate", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->NavigateCoreImpl(direction, ppReturnValue));
@@ -1967,6 +2016,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::PeerFromProvider(_In_ ABI::Mic
     }
     ARG_NOTNULL(pProvider, "provider");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->PeerFromProviderImpl(pProvider, ppReturnValue));
@@ -1986,6 +2036,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerGenerated::ProviderFromPeer(_In_ ABI::Mic
     }
     ARG_NOTNULL(pPeer, "peer");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<AutomationPeer*>(this)->ProviderFromPeerImpl(pPeer, ppReturnValue));
@@ -2284,6 +2335,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerFactory::ListenerExists(_In_ ABI::Microso
         XamlTelemetry::PublicApiCall(true, 0, "AutomationPeer_ListenerExists", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(ListenerExistsImpl(eventId, pReturnValue));
 Cleanup:
@@ -2301,6 +2353,7 @@ IFACEMETHODIMP DirectUI::AutomationPeerFactory::GenerateRawElementProviderRuntim
         XamlTelemetry::PublicApiCall(true, 0, "AutomationPeer_GenerateRawElementProviderRuntimeId", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(GenerateRawElementProviderRuntimeIdImpl(pReturnValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Binding.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Binding.g.cpp
index 3e32115243..f3362b0ec5 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Binding.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Binding.g.cpp
@@ -105,6 +105,7 @@ IFACEMETHODIMP DirectUI::BindingGenerated::get_Path(_Outptr_result_maybenull_ AB
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<Binding*>(this)->get_PathImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/BindingExpression.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/BindingExpression.g.cpp
index 15fd09fdcc..5074168deb 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/BindingExpression.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/BindingExpression.g.cpp
@@ -46,6 +46,7 @@ IFACEMETHODIMP DirectUI::BindingExpressionGenerated::get_DataItem(_Outptr_result
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<BindingExpression*>(this)->get_DataItemImpl(ppValue));
 Cleanup:
@@ -55,6 +56,7 @@ IFACEMETHODIMP DirectUI::BindingExpressionGenerated::get_ParentBinding(_Outptr_r
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<BindingExpression*>(this)->get_ParentBindingImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/BitmapSource.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/BitmapSource.g.cpp
index 5601a72c6c..4b8fdfabdb 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/BitmapSource.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/BitmapSource.g.cpp
@@ -80,6 +80,7 @@ IFACEMETHODIMP DirectUI::BitmapSourceGenerated::SetSourceAsync(_In_ ABI::Windows
     }
     ARG_NOTNULL(pStreamSource, "streamSource");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<BitmapSource*>(this)->SetSourceAsyncImpl(pStreamSource, ppReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/BringIntoViewOptions.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/BringIntoViewOptions.g.cpp
index 1241d44f15..c8cfd47bf6 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/BringIntoViewOptions.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/BringIntoViewOptions.g.cpp
@@ -62,6 +62,7 @@ IFACEMETHODIMP DirectUI::BringIntoViewOptionsGenerated::get_HorizontalAlignmentR
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<BringIntoViewOptions*>(this)->get_HorizontalAlignmentRatioImpl(pValue));
 Cleanup:
@@ -80,6 +81,7 @@ IFACEMETHODIMP DirectUI::BringIntoViewOptionsGenerated::get_HorizontalOffset(_Ou
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<BringIntoViewOptions*>(this)->get_HorizontalOffsetImpl(pValue));
 Cleanup:
@@ -115,6 +117,7 @@ IFACEMETHODIMP DirectUI::BringIntoViewOptionsGenerated::get_VerticalAlignmentRat
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<BringIntoViewOptions*>(this)->get_VerticalAlignmentRatioImpl(pValue));
 Cleanup:
@@ -133,6 +136,7 @@ IFACEMETHODIMP DirectUI::BringIntoViewOptionsGenerated::get_VerticalOffset(_Out_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<BringIntoViewOptions*>(this)->get_VerticalOffsetImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/BringIntoViewRequestedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/BringIntoViewRequestedEventArgs.g.cpp
index dcc012cfc7..00e9a8fd83 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/BringIntoViewRequestedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/BringIntoViewRequestedEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::BringIntoViewRequestedEventArgs::get_TargetElement(_Out
     CUIElement* pValueCore = nullptr;
 
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CBringIntoViewRequestedEventArgs*>(pCoreEventArgsNoRef)->get_TargetElement(&pValueCore));
@@ -86,6 +87,7 @@ IFACEMETHODIMP DirectUI::BringIntoViewRequestedEventArgs::get_AnimationDesired(_
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CBringIntoViewRequestedEventArgs*>(pCoreEventArgsNoRef)->get_AnimationDesired(&valueCore));
@@ -119,6 +121,7 @@ IFACEMETHODIMP DirectUI::BringIntoViewRequestedEventArgs::get_TargetRect(_Out_ A
     ABI::Windows::Foundation::Rect valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CBringIntoViewRequestedEventArgs*>(pCoreEventArgsNoRef)->get_TargetRect(&valueCore));
@@ -152,6 +155,7 @@ IFACEMETHODIMP DirectUI::BringIntoViewRequestedEventArgs::get_HorizontalAlignmen
     DOUBLE valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CBringIntoViewRequestedEventArgs*>(pCoreEventArgsNoRef)->get_HorizontalAlignmentRatio(&valueCore));
@@ -169,6 +173,7 @@ IFACEMETHODIMP DirectUI::BringIntoViewRequestedEventArgs::get_VerticalAlignmentR
     DOUBLE valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CBringIntoViewRequestedEventArgs*>(pCoreEventArgsNoRef)->get_VerticalAlignmentRatio(&valueCore));
@@ -186,6 +191,7 @@ IFACEMETHODIMP DirectUI::BringIntoViewRequestedEventArgs::get_HorizontalOffset(_
     DOUBLE valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CBringIntoViewRequestedEventArgs*>(pCoreEventArgsNoRef)->get_HorizontalOffset(&valueCore));
@@ -219,6 +225,7 @@ IFACEMETHODIMP DirectUI::BringIntoViewRequestedEventArgs::get_VerticalOffset(_Ou
     DOUBLE valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CBringIntoViewRequestedEventArgs*>(pCoreEventArgsNoRef)->get_VerticalOffset(&valueCore));
@@ -252,6 +259,7 @@ IFACEMETHODIMP DirectUI::BringIntoViewRequestedEventArgs::get_Handled(_Out_ BOOL
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CBringIntoViewRequestedEventArgs*>(pCoreEventArgsNoRef)->get_Handled(&valueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/BudgetManager.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/BudgetManager.g.cpp
index 34160ac6b9..57b3d27de1 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/BudgetManager.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/BudgetManager.g.cpp
@@ -49,6 +49,7 @@ _Check_return_ HRESULT DirectUI::BudgetManagerGenerated::GetElapsedMilliSecondsS
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "BudgetManager_GetElapsedMilliSecondsSinceLastUITick", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<BudgetManager*>(this)->GetElapsedMilliSecondsSinceLastUITickImpl(pReturnValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ButtonBase.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ButtonBase.g.cpp
index 48d5a1db55..94ab42337b 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ButtonBase.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ButtonBase.g.cpp
@@ -153,7 +153,7 @@ _Check_return_ HRESULT DirectUI::ButtonBaseGenerated::EventAddHandlerByIndex(_In
     case KnownEventIndex::ButtonBase_Click:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::IRoutedEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarDatePicker.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarDatePicker.g.cpp
index 8ec697ea93..1b786a6ae0 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarDatePicker.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarDatePicker.g.cpp
@@ -488,7 +488,7 @@ _Check_return_ HRESULT DirectUI::CalendarDatePickerGenerated::EventAddHandlerByI
     case KnownEventIndex::CalendarDatePicker_CalendarViewDayItemChanging:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Controls::ICalendarViewDayItemChangingEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -505,7 +505,7 @@ _Check_return_ HRESULT DirectUI::CalendarDatePickerGenerated::EventAddHandlerByI
     case KnownEventIndex::CalendarDatePicker_Closed:
         {
             ctl::ComPtr<ABI::Windows::Foundation::IEventHandler<IInspectable*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -522,7 +522,7 @@ _Check_return_ HRESULT DirectUI::CalendarDatePickerGenerated::EventAddHandlerByI
     case KnownEventIndex::CalendarDatePicker_DateChanged:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::Controls::CalendarDatePicker*, ABI::Microsoft::UI::Xaml::Controls::CalendarDatePickerDateChangedEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -539,7 +539,7 @@ _Check_return_ HRESULT DirectUI::CalendarDatePickerGenerated::EventAddHandlerByI
     case KnownEventIndex::CalendarDatePicker_Opened:
         {
             ctl::ComPtr<ABI::Windows::Foundation::IEventHandler<IInspectable*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarDatePickerAutomationPeer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarDatePickerAutomationPeer.g.cpp
index 1378de29f5..9f14aa7ac5 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarDatePickerAutomationPeer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarDatePickerAutomationPeer.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::CalendarDatePickerAutomationPeerGenerated::get_IsReadOn
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CalendarDatePickerAutomationPeer*>(this)->get_IsReadOnlyImpl(pValue));
 Cleanup:
@@ -62,6 +63,7 @@ IFACEMETHODIMP DirectUI::CalendarDatePickerAutomationPeerGenerated::get_Value(_O
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CalendarDatePickerAutomationPeer*>(this)->get_ValueImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarDatePickerDateChangedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarDatePickerDateChangedEventArgs.g.cpp
index 0509114569..a9daf15fcb 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarDatePickerDateChangedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarDatePickerDateChangedEventArgs.g.cpp
@@ -49,6 +49,7 @@ IFACEMETHODIMP DirectUI::CalendarDatePickerDateChangedEventArgsGenerated::get_Ne
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<CalendarDatePickerDateChangedEventArgs*>(this)->get_NewDateImpl(ppValue));
 Cleanup:
@@ -67,6 +68,7 @@ IFACEMETHODIMP DirectUI::CalendarDatePickerDateChangedEventArgsGenerated::get_Ol
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<CalendarDatePickerDateChangedEventArgs*>(this)->get_OldDateImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarLayoutStrategy.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarLayoutStrategy.g.cpp
index 717a3b54db..8168eb77fe 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarLayoutStrategy.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarLayoutStrategy.g.cpp
@@ -87,6 +87,7 @@ IFACEMETHODIMP DirectUI::CalendarLayoutStrategyGenerated::EstimateElementBounds(
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CalendarLayoutStrategy_EstimateElementBounds", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<CalendarLayoutStrategy*>(this)->EstimateElementBoundsImpl(elementType, elementIndex, headerReference, containerReference, window, pResult));
 Cleanup:
@@ -104,6 +105,7 @@ IFACEMETHODIMP DirectUI::CalendarLayoutStrategyGenerated::EstimateElementIndex(_
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CalendarLayoutStrategy_EstimateElementIndex", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<CalendarLayoutStrategy*>(this)->EstimateElementIndexImpl(elementType, headerReference, containerReference, window, pTargetRect, pResult));
 Cleanup:
@@ -138,6 +140,7 @@ IFACEMETHODIMP DirectUI::CalendarLayoutStrategyGenerated::EstimatePanelExtent(_I
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CalendarLayoutStrategy_EstimatePanelExtent", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<CalendarLayoutStrategy*>(this)->EstimatePanelExtentImpl(lastHeaderReference, lastContainerReference, windowConstraint, pResult));
 Cleanup:
@@ -155,6 +158,7 @@ IFACEMETHODIMP DirectUI::CalendarLayoutStrategyGenerated::GetElementArrangeBound
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CalendarLayoutStrategy_GetElementArrangeBounds", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<CalendarLayoutStrategy*>(this)->GetElementArrangeBoundsImpl(elementType, elementIndex, containerBounds, windowConstraint, finalSize, pResult));
 Cleanup:
@@ -172,6 +176,7 @@ IFACEMETHODIMP DirectUI::CalendarLayoutStrategyGenerated::GetElementBounds(_In_
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CalendarLayoutStrategy_GetElementBounds", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<CalendarLayoutStrategy*>(this)->GetElementBoundsImpl(elementType, elementIndex, containerDesiredSize, referenceInformation, windowConstraint, pResult));
 Cleanup:
@@ -189,6 +194,7 @@ IFACEMETHODIMP DirectUI::CalendarLayoutStrategyGenerated::GetElementMeasureSize(
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CalendarLayoutStrategy_GetElementMeasureSize", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<CalendarLayoutStrategy*>(this)->GetElementMeasureSizeImpl(elementType, elementIndex, windowConstraint, pResult));
 Cleanup:
@@ -206,6 +212,7 @@ IFACEMETHODIMP DirectUI::CalendarLayoutStrategyGenerated::GetElementTransitionsB
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CalendarLayoutStrategy_GetElementTransitionsBounds", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<CalendarLayoutStrategy*>(this)->GetElementTransitionsBoundsImpl(elementType, elementIndex, windowConstraint, pResult));
 Cleanup:
@@ -223,6 +230,7 @@ IFACEMETHODIMP DirectUI::CalendarLayoutStrategyGenerated::GetIsWrappingStrategy(
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CalendarLayoutStrategy_GetIsWrappingStrategy", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<CalendarLayoutStrategy*>(this)->GetIsWrappingStrategyImpl(pResult));
 Cleanup:
@@ -240,6 +248,7 @@ IFACEMETHODIMP DirectUI::CalendarLayoutStrategyGenerated::GetPositionOfFirstElem
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CalendarLayoutStrategy_GetPositionOfFirstElement", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<CalendarLayoutStrategy*>(this)->GetPositionOfFirstElementImpl(pResult));
 Cleanup:
@@ -257,6 +266,7 @@ IFACEMETHODIMP DirectUI::CalendarLayoutStrategyGenerated::GetRegularSnapPoints(_
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CalendarLayoutStrategy_GetRegularSnapPoints", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<CalendarLayoutStrategy*>(this)->GetRegularSnapPointsImpl(pNearOffset, pFarOffset, pSpacing, pResult));
 Cleanup:
@@ -291,6 +301,7 @@ IFACEMETHODIMP DirectUI::CalendarLayoutStrategyGenerated::GetVirtualizationDirec
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CalendarLayoutStrategy_GetVirtualizationDirection", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<CalendarLayoutStrategy*>(this)->GetVirtualizationDirectionImpl(pResult));
 Cleanup:
@@ -308,6 +319,7 @@ IFACEMETHODIMP DirectUI::CalendarLayoutStrategyGenerated::HasIrregularSnapPoints
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CalendarLayoutStrategy_HasIrregularSnapPoints", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<CalendarLayoutStrategy*>(this)->HasIrregularSnapPointsImpl(elementType, pResult));
 Cleanup:
@@ -325,6 +337,7 @@ IFACEMETHODIMP DirectUI::CalendarLayoutStrategyGenerated::HasSnapPointOnElement(
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CalendarLayoutStrategy_HasSnapPointOnElement", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<CalendarLayoutStrategy*>(this)->HasSnapPointOnElementImpl(elementType, elementIndex, pResult));
 Cleanup:
@@ -376,6 +389,7 @@ IFACEMETHODIMP DirectUI::CalendarLayoutStrategyGenerated::ShouldContinueFillingU
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CalendarLayoutStrategy_ShouldContinueFillingUpSpace", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<CalendarLayoutStrategy*>(this)->ShouldContinueFillingUpSpaceImpl(elementType, elementIndex, referenceInformation, windowToFill, pResult));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarPanel.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarPanel.g.cpp
index 833d56b8b6..531a16174a 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarPanel.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarPanel.g.cpp
@@ -65,6 +65,7 @@ _Check_return_ HRESULT DirectUI::CalendarPanelGenerated::get_FirstCacheIndex(_Ou
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CalendarPanel*>(this)->get_FirstCacheIndexImpl(pValue));
 Cleanup:
@@ -74,6 +75,7 @@ _Check_return_ HRESULT DirectUI::CalendarPanelGenerated::get_FirstVisibleIndex(_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CalendarPanel*>(this)->get_FirstVisibleIndexImpl(pValue));
 Cleanup:
@@ -99,6 +101,7 @@ _Check_return_ HRESULT DirectUI::CalendarPanelGenerated::get_LastCacheIndex(_Out
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CalendarPanel*>(this)->get_LastCacheIndexImpl(pValue));
 Cleanup:
@@ -108,6 +111,7 @@ _Check_return_ HRESULT DirectUI::CalendarPanelGenerated::get_LastVisibleIndex(_O
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CalendarPanel*>(this)->get_LastVisibleIndexImpl(pValue));
 Cleanup:
@@ -133,6 +137,7 @@ _Check_return_ HRESULT DirectUI::CalendarPanelGenerated::get_ScrollingDirection(
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CalendarPanel*>(this)->get_ScrollingDirectionImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarView.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarView.g.cpp
index 33ed7a5cb3..48df21f325 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarView.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarView.g.cpp
@@ -894,7 +894,7 @@ _Check_return_ HRESULT DirectUI::CalendarViewGenerated::EventAddHandlerByIndex(_
     case KnownEventIndex::CalendarView_CalendarViewDayItemChanging:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::Controls::CalendarView*, ABI::Microsoft::UI::Xaml::Controls::CalendarViewDayItemChangingEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -911,7 +911,7 @@ _Check_return_ HRESULT DirectUI::CalendarViewGenerated::EventAddHandlerByIndex(_
     case KnownEventIndex::CalendarView_SelectedDatesChanged:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::Controls::CalendarView*, ABI::Microsoft::UI::Xaml::Controls::CalendarViewSelectedDatesChangedEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarViewAutomationPeer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarViewAutomationPeer.g.cpp
index 819bef98d8..23b32f3718 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarViewAutomationPeer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarViewAutomationPeer.g.cpp
@@ -58,6 +58,7 @@ IFACEMETHODIMP DirectUI::CalendarViewAutomationPeerGenerated::get_CanSelectMulti
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CalendarViewAutomationPeer*>(this)->get_CanSelectMultipleImpl(pValue));
 Cleanup:
@@ -67,6 +68,7 @@ IFACEMETHODIMP DirectUI::CalendarViewAutomationPeerGenerated::get_ColumnCount(_O
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CalendarViewAutomationPeer*>(this)->get_ColumnCountImpl(pValue));
 Cleanup:
@@ -76,6 +78,7 @@ IFACEMETHODIMP DirectUI::CalendarViewAutomationPeerGenerated::get_IsReadOnly(_Ou
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CalendarViewAutomationPeer*>(this)->get_IsReadOnlyImpl(pValue));
 Cleanup:
@@ -85,6 +88,7 @@ IFACEMETHODIMP DirectUI::CalendarViewAutomationPeerGenerated::get_IsSelectionReq
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CalendarViewAutomationPeer*>(this)->get_IsSelectionRequiredImpl(pValue));
 Cleanup:
@@ -94,6 +98,7 @@ IFACEMETHODIMP DirectUI::CalendarViewAutomationPeerGenerated::get_RowCount(_Out_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CalendarViewAutomationPeer*>(this)->get_RowCountImpl(pValue));
 Cleanup:
@@ -103,6 +108,7 @@ IFACEMETHODIMP DirectUI::CalendarViewAutomationPeerGenerated::get_RowOrColumnMaj
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CalendarViewAutomationPeer*>(this)->get_RowOrColumnMajorImpl(pValue));
 Cleanup:
@@ -112,6 +118,7 @@ IFACEMETHODIMP DirectUI::CalendarViewAutomationPeerGenerated::get_Value(_Out_ HS
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CalendarViewAutomationPeer*>(this)->get_ValueImpl(pValue));
 Cleanup:
@@ -129,6 +136,7 @@ IFACEMETHODIMP DirectUI::CalendarViewAutomationPeerGenerated::GetColumnHeaders(_
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CalendarViewAutomationPeer_GetColumnHeaders", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<CalendarViewAutomationPeer*>(this)->GetColumnHeadersImpl(pReturnValueCount, ppReturnValue));
@@ -147,6 +155,7 @@ IFACEMETHODIMP DirectUI::CalendarViewAutomationPeerGenerated::GetItem(_In_ INT r
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CalendarViewAutomationPeer_GetItem", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<CalendarViewAutomationPeer*>(this)->GetItemImpl(row, column, ppReturnValue));
@@ -165,6 +174,7 @@ IFACEMETHODIMP DirectUI::CalendarViewAutomationPeerGenerated::GetRowHeaders(_Out
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CalendarViewAutomationPeer_GetRowHeaders", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<CalendarViewAutomationPeer*>(this)->GetRowHeadersImpl(pReturnValueCount, ppReturnValue));
@@ -183,6 +193,7 @@ IFACEMETHODIMP DirectUI::CalendarViewAutomationPeerGenerated::GetSelection(_Out_
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CalendarViewAutomationPeer_GetSelection", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<CalendarViewAutomationPeer*>(this)->GetSelectionImpl(pReturnValueCount, ppReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarViewBaseItemAutomationPeer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarViewBaseItemAutomationPeer.g.cpp
index 67ca5e0c15..ea743bcb72 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarViewBaseItemAutomationPeer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarViewBaseItemAutomationPeer.g.cpp
@@ -50,6 +50,7 @@ IFACEMETHODIMP DirectUI::CalendarViewBaseItemAutomationPeerGenerated::get_Column
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CalendarViewBaseItemAutomationPeer*>(this)->get_ColumnImpl(pValue));
 Cleanup:
@@ -59,6 +60,7 @@ IFACEMETHODIMP DirectUI::CalendarViewBaseItemAutomationPeerGenerated::get_Column
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CalendarViewBaseItemAutomationPeer*>(this)->get_ColumnSpanImpl(pValue));
 Cleanup:
@@ -68,6 +70,7 @@ IFACEMETHODIMP DirectUI::CalendarViewBaseItemAutomationPeerGenerated::get_Contai
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<CalendarViewBaseItemAutomationPeer*>(this)->get_ContainingGridImpl(ppValue));
 Cleanup:
@@ -77,6 +80,7 @@ IFACEMETHODIMP DirectUI::CalendarViewBaseItemAutomationPeerGenerated::get_Row(_O
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CalendarViewBaseItemAutomationPeer*>(this)->get_RowImpl(pValue));
 Cleanup:
@@ -86,6 +90,7 @@ IFACEMETHODIMP DirectUI::CalendarViewBaseItemAutomationPeerGenerated::get_RowSpa
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CalendarViewBaseItemAutomationPeer*>(this)->get_RowSpanImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarViewDayItemAutomationPeer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarViewDayItemAutomationPeer.g.cpp
index 4aa61c5707..3173baa60c 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarViewDayItemAutomationPeer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarViewDayItemAutomationPeer.g.cpp
@@ -50,6 +50,7 @@ IFACEMETHODIMP DirectUI::CalendarViewDayItemAutomationPeerGenerated::get_IsSelec
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CalendarViewDayItemAutomationPeer*>(this)->get_IsSelectedImpl(pValue));
 Cleanup:
@@ -59,6 +60,7 @@ IFACEMETHODIMP DirectUI::CalendarViewDayItemAutomationPeerGenerated::get_Selecti
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<CalendarViewDayItemAutomationPeer*>(this)->get_SelectionContainerImpl(ppValue));
 Cleanup:
@@ -94,6 +96,7 @@ IFACEMETHODIMP DirectUI::CalendarViewDayItemAutomationPeerGenerated::GetColumnHe
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CalendarViewDayItemAutomationPeer_GetColumnHeaderItems", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<CalendarViewDayItemAutomationPeer*>(this)->GetColumnHeaderItemsImpl(pReturnValueCount, ppReturnValue));
@@ -112,6 +115,7 @@ IFACEMETHODIMP DirectUI::CalendarViewDayItemAutomationPeerGenerated::GetRowHeade
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CalendarViewDayItemAutomationPeer_GetRowHeaderItems", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<CalendarViewDayItemAutomationPeer*>(this)->GetRowHeaderItemsImpl(pReturnValueCount, ppReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarViewItemAutomationPeer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarViewItemAutomationPeer.g.cpp
index 0ff9b942d6..04752046f6 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarViewItemAutomationPeer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CalendarViewItemAutomationPeer.g.cpp
@@ -58,6 +58,7 @@ IFACEMETHODIMP DirectUI::CalendarViewItemAutomationPeerGenerated::GetColumnHeade
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CalendarViewItemAutomationPeer_GetColumnHeaderItems", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<CalendarViewItemAutomationPeer*>(this)->GetColumnHeaderItemsImpl(pReturnValueCount, ppReturnValue));
@@ -76,6 +77,7 @@ IFACEMETHODIMP DirectUI::CalendarViewItemAutomationPeerGenerated::GetRowHeaderIt
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CalendarViewItemAutomationPeer_GetRowHeaderItems", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<CalendarViewItemAutomationPeer*>(this)->GetRowHeaderItemsImpl(pReturnValueCount, ppReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CandidateWindowBoundsChangedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CandidateWindowBoundsChangedEventArgs.g.cpp
index 9d3669febb..78bf0c90f6 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CandidateWindowBoundsChangedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CandidateWindowBoundsChangedEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::CandidateWindowBoundsChangedEventArgs::get_Bounds(_Out_
     ABI::Windows::Foundation::Rect valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CCandidateWindowBoundsChangedEventArgs*>(pCoreEventArgsNoRef)->get_Bounds(&valueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CarouselPanel.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CarouselPanel.g.cpp
index c3f54b4591..2c20c88e54 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CarouselPanel.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CarouselPanel.g.cpp
@@ -54,6 +54,7 @@ IFACEMETHODIMP DirectUI::CarouselPanelGenerated::get_AreHorizontalSnapPointsRegu
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CarouselPanel*>(this)->get_AreHorizontalSnapPointsRegularImpl(pValue));
 Cleanup:
@@ -63,6 +64,7 @@ IFACEMETHODIMP DirectUI::CarouselPanelGenerated::get_AreVerticalSnapPointsRegula
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CarouselPanel*>(this)->get_AreVerticalSnapPointsRegularImpl(pValue));
 Cleanup:
@@ -72,6 +74,7 @@ IFACEMETHODIMP DirectUI::CarouselPanelGenerated::get_CanHorizontallyScroll(_Out_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CarouselPanel*>(this)->get_CanHorizontallyScrollImpl(pValue));
 Cleanup:
@@ -91,6 +94,7 @@ IFACEMETHODIMP DirectUI::CarouselPanelGenerated::get_CanVerticallyScroll(_Out_ B
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CarouselPanel*>(this)->get_CanVerticallyScrollImpl(pValue));
 Cleanup:
@@ -110,6 +114,7 @@ IFACEMETHODIMP DirectUI::CarouselPanelGenerated::get_ExtentHeight(_Out_ DOUBLE*
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CarouselPanel*>(this)->get_ExtentHeightImpl(pValue));
 Cleanup:
@@ -119,6 +124,7 @@ IFACEMETHODIMP DirectUI::CarouselPanelGenerated::get_ExtentWidth(_Out_ DOUBLE* p
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CarouselPanel*>(this)->get_ExtentWidthImpl(pValue));
 Cleanup:
@@ -128,6 +134,7 @@ IFACEMETHODIMP DirectUI::CarouselPanelGenerated::get_HorizontalOffset(_Out_ DOUB
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CarouselPanel*>(this)->get_HorizontalOffsetImpl(pValue));
 Cleanup:
@@ -137,6 +144,7 @@ IFACEMETHODIMP DirectUI::CarouselPanelGenerated::get_MinHorizontalOffset(_Out_ D
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CarouselPanel*>(this)->get_MinHorizontalOffsetImpl(pValue));
 Cleanup:
@@ -146,6 +154,7 @@ IFACEMETHODIMP DirectUI::CarouselPanelGenerated::get_MinVerticalOffset(_Out_ DOU
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CarouselPanel*>(this)->get_MinVerticalOffsetImpl(pValue));
 Cleanup:
@@ -155,6 +164,7 @@ IFACEMETHODIMP DirectUI::CarouselPanelGenerated::get_ScrollOwner(_Outptr_result_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<CarouselPanel*>(this)->get_ScrollOwnerImpl(ppValue));
 Cleanup:
@@ -174,6 +184,7 @@ IFACEMETHODIMP DirectUI::CarouselPanelGenerated::get_VerticalOffset(_Out_ DOUBLE
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CarouselPanel*>(this)->get_VerticalOffsetImpl(pValue));
 Cleanup:
@@ -183,6 +194,7 @@ IFACEMETHODIMP DirectUI::CarouselPanelGenerated::get_ViewportHeight(_Out_ DOUBLE
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CarouselPanel*>(this)->get_ViewportHeightImpl(pValue));
 Cleanup:
@@ -192,6 +204,7 @@ IFACEMETHODIMP DirectUI::CarouselPanelGenerated::get_ViewportWidth(_Out_ DOUBLE*
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CarouselPanel*>(this)->get_ViewportWidthImpl(pValue));
 Cleanup:
@@ -319,6 +332,7 @@ IFACEMETHODIMP DirectUI::CarouselPanelGenerated::GetIrregularSnapPoints(_In_ ABI
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CarouselPanel_GetIrregularSnapPoints", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<CarouselPanel*>(this)->GetIrregularSnapPointsImpl(orientation, alignment, ppReturnValue));
@@ -337,6 +351,7 @@ IFACEMETHODIMP DirectUI::CarouselPanelGenerated::GetRegularSnapPoints(_In_ ABI::
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CarouselPanel_GetRegularSnapPoints", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<CarouselPanel*>(this)->GetRegularSnapPointsImpl(orientation, alignment, pOffset, pReturnValue));
@@ -428,6 +443,7 @@ IFACEMETHODIMP DirectUI::CarouselPanelGenerated::MakeVisible(_In_ ABI::Microsoft
     }
     ARG_NOTNULL(pVisual, "visual");
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<CarouselPanel*>(this)->MakeVisibleImpl(pVisual, rectangle, pReturnValue));
@@ -644,7 +660,7 @@ _Check_return_ HRESULT DirectUI::CarouselPanelGenerated::EventAddHandlerByIndex(
     case KnownEventIndex::CarouselPanel_HorizontalSnapPointsChanged:
         {
             ctl::ComPtr<ABI::Windows::Foundation::IEventHandler<IInspectable*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -661,7 +677,7 @@ _Check_return_ HRESULT DirectUI::CarouselPanelGenerated::EventAddHandlerByIndex(
     case KnownEventIndex::CarouselPanel_VerticalSnapPointsChanged:
         {
             ctl::ComPtr<ABI::Windows::Foundation::IEventHandler<IInspectable*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CharacterReceivedRoutedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CharacterReceivedRoutedEventArgs.g.cpp
index cbee1f6a7c..a2679c444e 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CharacterReceivedRoutedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CharacterReceivedRoutedEventArgs.g.cpp
@@ -49,6 +49,7 @@ IFACEMETHODIMP DirectUI::CharacterReceivedRoutedEventArgs::get_Character(_Out_ W
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CharacterReceivedRoutedEventArgs*>(this)->get_CharacterImpl(pValue));
 Cleanup:
@@ -58,6 +59,7 @@ IFACEMETHODIMP DirectUI::CharacterReceivedRoutedEventArgs::get_KeyStatus(_Out_ A
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CharacterReceivedRoutedEventArgs*>(this)->get_KeyStatusImpl(pValue));
 Cleanup:
@@ -71,6 +73,7 @@ IFACEMETHODIMP DirectUI::CharacterReceivedRoutedEventArgs::get_Handled(_Out_ BOO
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CCharacterReceivedRoutedEventArgs*>(pCoreEventArgsNoRef)->get_Handled(&valueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CollectionView.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CollectionView.g.cpp
index 71aa3589e0..7efb09b64d 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CollectionView.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CollectionView.g.cpp
@@ -65,6 +65,7 @@ IFACEMETHODIMP DirectUI::CollectionViewGenerated::get_CollectionGroups(_Outptr_r
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<CollectionView*>(this)->get_CollectionGroupsImpl(ppValue));
 Cleanup:
@@ -74,6 +75,7 @@ IFACEMETHODIMP DirectUI::CollectionViewGenerated::get_CurrentItem(_Outptr_result
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<CollectionView*>(this)->get_CurrentItemImpl(ppValue));
 Cleanup:
@@ -83,6 +85,7 @@ IFACEMETHODIMP DirectUI::CollectionViewGenerated::get_CurrentPosition(_Out_ INT*
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CollectionView*>(this)->get_CurrentPositionImpl(pValue));
 Cleanup:
@@ -92,6 +95,7 @@ IFACEMETHODIMP DirectUI::CollectionViewGenerated::get_HasMoreItems(_Out_ BOOLEAN
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CollectionView*>(this)->get_HasMoreItemsImpl(pValue));
 Cleanup:
@@ -101,6 +105,7 @@ IFACEMETHODIMP DirectUI::CollectionViewGenerated::get_IsCurrentAfterLast(_Out_ B
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CollectionView*>(this)->get_IsCurrentAfterLastImpl(pValue));
 Cleanup:
@@ -110,6 +115,7 @@ IFACEMETHODIMP DirectUI::CollectionViewGenerated::get_IsCurrentBeforeFirst(_Out_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CollectionView*>(this)->get_IsCurrentBeforeFirstImpl(pValue));
 Cleanup:
@@ -119,6 +125,7 @@ IFACEMETHODIMP DirectUI::CollectionViewGenerated::get_Type(_Out_ ABI::Windows::U
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CollectionView*>(this)->get_TypeImpl(pValue));
 Cleanup:
@@ -192,6 +199,7 @@ IFACEMETHODIMP DirectUI::CollectionViewGenerated::GetCustomProperty(_In_ HSTRING
     }
     ARG_NOTNULL(name, "name");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<CollectionView*>(this)->GetCustomPropertyImpl(name, ppReturnValue));
@@ -211,6 +219,7 @@ IFACEMETHODIMP DirectUI::CollectionViewGenerated::GetIndexedProperty(_In_ HSTRIN
     }
     ARG_NOTNULL(name, "name");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<CollectionView*>(this)->GetIndexedPropertyImpl(name, type, ppReturnValue));
@@ -229,6 +238,7 @@ IFACEMETHODIMP DirectUI::CollectionViewGenerated::GetStringRepresentation(_Out_
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CollectionView_GetStringRepresentation", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<CollectionView*>(this)->GetStringRepresentationImpl(pReturnValue));
@@ -247,6 +257,7 @@ IFACEMETHODIMP DirectUI::CollectionViewGenerated::LoadMoreItemsAsync(_In_ UINT c
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CollectionView_LoadMoreItemsAsync", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<CollectionView*>(this)->LoadMoreItemsAsyncImpl(count, ppReturnValue));
@@ -265,6 +276,7 @@ IFACEMETHODIMP DirectUI::CollectionViewGenerated::MoveCurrentTo(_In_opt_ IInspec
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CollectionView_MoveCurrentTo", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<CollectionView*>(this)->MoveCurrentToImpl(pItem, pReturnValue));
@@ -283,6 +295,7 @@ IFACEMETHODIMP DirectUI::CollectionViewGenerated::MoveCurrentToFirst(_Out_ BOOLE
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CollectionView_MoveCurrentToFirst", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<CollectionView*>(this)->MoveCurrentToFirstImpl(pReturnValue));
@@ -301,6 +314,7 @@ IFACEMETHODIMP DirectUI::CollectionViewGenerated::MoveCurrentToLast(_Out_ BOOLEA
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CollectionView_MoveCurrentToLast", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<CollectionView*>(this)->MoveCurrentToLastImpl(pReturnValue));
@@ -319,6 +333,7 @@ IFACEMETHODIMP DirectUI::CollectionViewGenerated::MoveCurrentToNext(_Out_ BOOLEA
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CollectionView_MoveCurrentToNext", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<CollectionView*>(this)->MoveCurrentToNextImpl(pReturnValue));
@@ -337,6 +352,7 @@ IFACEMETHODIMP DirectUI::CollectionViewGenerated::MoveCurrentToPosition(_In_ INT
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CollectionView_MoveCurrentToPosition", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<CollectionView*>(this)->MoveCurrentToPositionImpl(index, pReturnValue));
@@ -355,6 +371,7 @@ IFACEMETHODIMP DirectUI::CollectionViewGenerated::MoveCurrentToPrevious(_Out_ BO
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CollectionView_MoveCurrentToPrevious", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<CollectionView*>(this)->MoveCurrentToPreviousImpl(pReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CollectionViewGroup.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CollectionViewGroup.g.cpp
index a9b916f63a..8b0d3d6741 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CollectionViewGroup.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CollectionViewGroup.g.cpp
@@ -49,6 +49,7 @@ IFACEMETHODIMP DirectUI::CollectionViewGroupGenerated::get_Group(_Outptr_result_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<CollectionViewGroup*>(this)->get_GroupImpl(ppValue));
 Cleanup:
@@ -58,6 +59,7 @@ IFACEMETHODIMP DirectUI::CollectionViewGroupGenerated::get_GroupItems(_Outptr_re
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<CollectionViewGroup*>(this)->get_GroupItemsImpl(ppValue));
 Cleanup:
@@ -67,6 +69,7 @@ IFACEMETHODIMP DirectUI::CollectionViewGroupGenerated::get_Type(_Out_ ABI::Windo
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CollectionViewGroup*>(this)->get_TypeImpl(pValue));
 Cleanup:
@@ -85,6 +88,7 @@ IFACEMETHODIMP DirectUI::CollectionViewGroupGenerated::GetCustomProperty(_In_ HS
     }
     ARG_NOTNULL(name, "name");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<CollectionViewGroup*>(this)->GetCustomPropertyImpl(name, ppReturnValue));
@@ -104,6 +108,7 @@ IFACEMETHODIMP DirectUI::CollectionViewGroupGenerated::GetIndexedProperty(_In_ H
     }
     ARG_NOTNULL(name, "name");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<CollectionViewGroup*>(this)->GetIndexedPropertyImpl(name, type, ppReturnValue));
@@ -122,6 +127,7 @@ IFACEMETHODIMP DirectUI::CollectionViewGroupGenerated::GetStringRepresentation(_
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "CollectionViewGroup_GetStringRepresentation", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<CollectionViewGroup*>(this)->GetStringRepresentationImpl(pReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ColorDisplayNameHelper.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ColorDisplayNameHelper.g.cpp
index f3db2e7b3e..22da18bc15 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ColorDisplayNameHelper.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ColorDisplayNameHelper.g.cpp
@@ -46,6 +46,7 @@ IFACEMETHODIMP DirectUI::ColorDisplayNameHelperFactory::ToDisplayName(_In_ ABI::
         XamlTelemetry::PublicApiCall(true, 0, "ColorDisplayNameHelper_ToDisplayName", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     
     IFC(ToDisplayNameImpl(color, pResult));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ComboBox.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ComboBox.g.cpp
index d612153b73..f4aa1d5880 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ComboBox.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ComboBox.g.cpp
@@ -617,6 +617,7 @@ IFACEMETHODIMP DirectUI::ComboBoxGenerated::OnBackButtonPressed(_Out_ BOOLEAN* p
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ComboBox_OnBackButtonPressed", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ComboBox*>(this)->OnBackButtonPressedImpl(pResult));
@@ -715,7 +716,7 @@ _Check_return_ HRESULT DirectUI::ComboBoxGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::ComboBox_DropDownClosed:
         {
             ctl::ComPtr<ABI::Windows::Foundation::IEventHandler<IInspectable*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -732,7 +733,7 @@ _Check_return_ HRESULT DirectUI::ComboBoxGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::ComboBox_DropDownOpened:
         {
             ctl::ComPtr<ABI::Windows::Foundation::IEventHandler<IInspectable*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -815,12 +816,6 @@ HRESULT DirectUI::ComboBoxFactory::QueryInterfaceImpl(_In_ REFIID iid, _Outptr_
     {
         *ppObject = static_cast<ABI::Microsoft::UI::Xaml::Controls::IComboBoxStaticsFeature_HeaderPlacement*>(this);
     }
-#endif
-#if WI_IS_FEATURE_PRESENT(Feature_InputValidation)
-    else if (InlineIsEqualGUID(iid, __uuidof(ABI::Microsoft::UI::Xaml::Controls::IComboBoxStaticsFeature_InputValidation)))
-    {
-        *ppObject = static_cast<ABI::Microsoft::UI::Xaml::Controls::IComboBoxStaticsFeature_InputValidation*>(this);
-    }
 #endif
     else
     {
@@ -918,18 +913,9 @@ IFACEMETHODIMP DirectUI::ComboBoxFactory::get_HeaderPlacementProperty(_Out_ ABI:
 
 
 
-IFACEMETHODIMP DirectUI::ComboBoxFactory::get_ErrorTemplateProperty(_Out_ ABI::Microsoft::UI::Xaml::IDependencyProperty** ppValue)
-{
-    RRETURN(MetadataAPI::GetIDependencyProperty(KnownPropertyIndex::ComboBox_ErrorTemplate, ppValue));
-}
-IFACEMETHODIMP DirectUI::ComboBoxFactory::get_InputValidationModeProperty(_Out_ ABI::Microsoft::UI::Xaml::IDependencyProperty** ppValue)
-{
-    RRETURN(MetadataAPI::GetIDependencyProperty(KnownPropertyIndex::ComboBox_InputValidationMode, ppValue));
-}
-IFACEMETHODIMP DirectUI::ComboBoxFactory::get_InputValidationKindProperty(_Out_ ABI::Microsoft::UI::Xaml::IDependencyProperty** ppValue)
-{
-    RRETURN(MetadataAPI::GetIDependencyProperty(KnownPropertyIndex::ComboBox_InputValidationKind, ppValue));
-}
+
+
+
 
 
 // Attached properties.
@@ -939,6 +925,7 @@ IFACEMETHODIMP DirectUI::ComboBoxFactory::get_IsEditableProperty(_Outptr_result_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckActivationAllowed());
     IFC(get_IsEditablePropertyImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ComboBox.g.h b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ComboBox.g.h
index 95f22d1460..db3572b6af 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ComboBox.g.h
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ComboBox.g.h
@@ -206,9 +206,6 @@ namespace DirectUI
         , public ABI::Microsoft::UI::Xaml::Controls::IComboBoxStatics
 #if WI_IS_FEATURE_PRESENT(Feature_HeaderPlacement)
         , public ABI::Microsoft::UI::Xaml::Controls::IComboBoxStaticsFeature_HeaderPlacement
-#endif
-#if WI_IS_FEATURE_PRESENT(Feature_InputValidation)
-        , public ABI::Microsoft::UI::Xaml::Controls::IComboBoxStaticsFeature_InputValidation
 #endif
     {
         BEGIN_INTERFACE_MAP(ComboBoxFactory, ctl::BetterAggregableCoreObjectActivationFactory)
@@ -216,9 +213,6 @@ namespace DirectUI
             INTERFACE_ENTRY(ComboBoxFactory, ABI::Microsoft::UI::Xaml::Controls::IComboBoxStatics)
 #if WI_IS_FEATURE_PRESENT(Feature_HeaderPlacement)
             INTERFACE_ENTRY(ComboBoxFactory, ABI::Microsoft::UI::Xaml::Controls::IComboBoxStaticsFeature_HeaderPlacement)
-#endif
-#if WI_IS_FEATURE_PRESENT(Feature_InputValidation)
-            INTERFACE_ENTRY(ComboBoxFactory, ABI::Microsoft::UI::Xaml::Controls::IComboBoxStaticsFeature_InputValidation)
 #endif
         END_INTERFACE_MAP(ComboBoxFactory, ctl::BetterAggregableCoreObjectActivationFactory)
 
@@ -251,9 +245,9 @@ namespace DirectUI
         
         
         
-        IFACEMETHOD(get_ErrorTemplateProperty)(_Out_ ABI::Microsoft::UI::Xaml::IDependencyProperty** ppValue) FEATURE_INPUTVALIDATION_OVERRIDE;
-        IFACEMETHOD(get_InputValidationModeProperty)(_Out_ ABI::Microsoft::UI::Xaml::IDependencyProperty** ppValue) FEATURE_INPUTVALIDATION_OVERRIDE;
-        IFACEMETHOD(get_InputValidationKindProperty)(_Out_ ABI::Microsoft::UI::Xaml::IDependencyProperty** ppValue) FEATURE_INPUTVALIDATION_OVERRIDE;
+        
+        
+        
         
 
         // Attached properties.
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ComboBoxAutomationPeer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ComboBoxAutomationPeer.g.cpp
index 513b6b7256..8f5e3a0c30 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ComboBoxAutomationPeer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ComboBoxAutomationPeer.g.cpp
@@ -57,6 +57,7 @@ IFACEMETHODIMP DirectUI::ComboBoxAutomationPeerGenerated::get_ExpandCollapseStat
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ComboBoxAutomationPeer*>(this)->get_ExpandCollapseStateImpl(pValue));
 Cleanup:
@@ -66,6 +67,7 @@ IFACEMETHODIMP DirectUI::ComboBoxAutomationPeerGenerated::get_InteractionState(_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ComboBoxAutomationPeer*>(this)->get_InteractionStateImpl(pValue));
 Cleanup:
@@ -75,6 +77,7 @@ IFACEMETHODIMP DirectUI::ComboBoxAutomationPeerGenerated::get_IsModal(_Out_ BOOL
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ComboBoxAutomationPeer*>(this)->get_IsModalImpl(pValue));
 Cleanup:
@@ -84,6 +87,7 @@ IFACEMETHODIMP DirectUI::ComboBoxAutomationPeerGenerated::get_IsReadOnly(_Out_ B
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ComboBoxAutomationPeer*>(this)->get_IsReadOnlyImpl(pValue));
 Cleanup:
@@ -93,6 +97,7 @@ IFACEMETHODIMP DirectUI::ComboBoxAutomationPeerGenerated::get_IsTopmost(_Out_ BO
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ComboBoxAutomationPeer*>(this)->get_IsTopmostImpl(pValue));
 Cleanup:
@@ -102,6 +107,7 @@ IFACEMETHODIMP DirectUI::ComboBoxAutomationPeerGenerated::get_Maximizable(_Out_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ComboBoxAutomationPeer*>(this)->get_MaximizableImpl(pValue));
 Cleanup:
@@ -111,6 +117,7 @@ IFACEMETHODIMP DirectUI::ComboBoxAutomationPeerGenerated::get_Minimizable(_Out_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ComboBoxAutomationPeer*>(this)->get_MinimizableImpl(pValue));
 Cleanup:
@@ -120,6 +127,7 @@ IFACEMETHODIMP DirectUI::ComboBoxAutomationPeerGenerated::get_Value(_Out_ HSTRIN
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ComboBoxAutomationPeer*>(this)->get_ValueImpl(pValue));
 Cleanup:
@@ -129,6 +137,7 @@ IFACEMETHODIMP DirectUI::ComboBoxAutomationPeerGenerated::get_VisualState(_Out_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ComboBoxAutomationPeer*>(this)->get_VisualStateImpl(pValue));
 Cleanup:
@@ -236,6 +245,7 @@ IFACEMETHODIMP DirectUI::ComboBoxAutomationPeerGenerated::WaitForInputIdle(_In_
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ComboBoxAutomationPeer_WaitForInputIdle", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ComboBoxAutomationPeer*>(this)->WaitForInputIdleImpl(milliseconds, pReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ComboBoxTextSubmittedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ComboBoxTextSubmittedEventArgs.g.cpp
index 6a6730cb5b..664432565e 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ComboBoxTextSubmittedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ComboBoxTextSubmittedEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::ComboBoxTextSubmittedEventArgs::get_Text(_Out_ HSTRING*
     xstring_ptr valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CComboBoxTextSubmittedEventArgs*>(pCoreEventArgsNoRef)->get_Text(&valueCore));
@@ -70,6 +71,7 @@ IFACEMETHODIMP DirectUI::ComboBoxTextSubmittedEventArgs::get_Handled(_Out_ BOOLE
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CComboBoxTextSubmittedEventArgs*>(pCoreEventArgsNoRef)->get_Handled(&valueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CommandBar.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CommandBar.g.cpp
index 22b6c205ea..d0eadfa6f8 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CommandBar.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CommandBar.g.cpp
@@ -97,6 +97,7 @@ IFACEMETHODIMP DirectUI::CommandBarGenerated::get_ParentMenu(_Outptr_result_mayb
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<CommandBar*>(this)->get_ParentMenuImpl(ppValue));
 Cleanup:
@@ -224,7 +225,7 @@ _Check_return_ HRESULT DirectUI::CommandBarGenerated::EventAddHandlerByIndex(_In
     case KnownEventIndex::CommandBar_DynamicOverflowItemsChanging:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::Controls::CommandBar*, ABI::Microsoft::UI::Xaml::Controls::DynamicOverflowItemsChangingEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -365,6 +366,7 @@ IFACEMETHODIMP DirectUI::CommandBarFactory::GetCurrentBottomCommandBar(_In_ ABI:
     }
     ARG_NOTNULL(pXamlRoot, "xamlRoot");
     ARG_VALIDRETURNPOINTER(ppResult);
+    *ppResult={};
     IFC(CheckActivationAllowed());
     IFC(GetCurrentBottomCommandBarImpl(pXamlRoot, ppResult));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CommandingContainer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CommandingContainer.g.cpp
index 6f1758094e..fdf2f7e058 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CommandingContainer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CommandingContainer.g.cpp
@@ -119,7 +119,7 @@ _Check_return_ HRESULT DirectUI::CommandingContainerGenerated::EventAddHandlerBy
     case KnownEventIndex::CommandingContainer_ContextChanged:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::Controls::CommandingContainer*, ABI::Microsoft::UI::Xaml::Controls::CommandingContextChangedEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ConnectedAnimation.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ConnectedAnimation.g.cpp
index 1b424901aa..8be095ceaf 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ConnectedAnimation.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ConnectedAnimation.g.cpp
@@ -47,6 +47,7 @@ IFACEMETHODIMP DirectUI::ConnectedAnimationGenerated::get_Configuration(_Outptr_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<ConnectedAnimation*>(this)->get_ConfigurationImpl(ppValue));
 Cleanup:
@@ -66,6 +67,7 @@ IFACEMETHODIMP DirectUI::ConnectedAnimationGenerated::get_IsScaleAnimationEnable
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ConnectedAnimation*>(this)->get_IsScaleAnimationEnabledImpl(pValue));
 Cleanup:
@@ -185,6 +187,7 @@ IFACEMETHODIMP DirectUI::ConnectedAnimationGenerated::TryStart(_In_ ABI::Microso
     }
     ARG_NOTNULL(pDestination, "destination");
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ConnectedAnimation*>(this)->TryStartImpl(pDestination, pReturnValue));
@@ -205,6 +208,7 @@ IFACEMETHODIMP DirectUI::ConnectedAnimationGenerated::TryStartWithCoordinatedEle
     ARG_NOTNULL(pDestination, "destination");
     ARG_NOTNULL(pCoordinatedElements, "coordinatedElements");
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ConnectedAnimation*>(this)->TryStartWithCoordinatedElementsImpl(pDestination, pCoordinatedElements, pReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ConnectedAnimationService.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ConnectedAnimationService.g.cpp
index 41c0a5dd43..b832981d0f 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ConnectedAnimationService.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ConnectedAnimationService.g.cpp
@@ -47,6 +47,7 @@ IFACEMETHODIMP DirectUI::ConnectedAnimationServiceGenerated::get_DefaultDuration
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ConnectedAnimationService*>(this)->get_DefaultDurationImpl(pValue));
 Cleanup:
@@ -66,6 +67,7 @@ IFACEMETHODIMP DirectUI::ConnectedAnimationServiceGenerated::get_DefaultEasingFu
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<ConnectedAnimationService*>(this)->get_DefaultEasingFunctionImpl(ppValue));
 Cleanup:
@@ -94,6 +96,7 @@ IFACEMETHODIMP DirectUI::ConnectedAnimationServiceGenerated::GetAnimation(_In_ H
     }
     ARG_NOTNULL(key, "key");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ConnectedAnimationService*>(this)->GetAnimationImpl(key, ppReturnValue));
@@ -114,6 +117,7 @@ IFACEMETHODIMP DirectUI::ConnectedAnimationServiceGenerated::PrepareToAnimate(_I
     ARG_NOTNULL(key, "key");
     ARG_NOTNULL(pSource, "source");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ConnectedAnimationService*>(this)->PrepareToAnimateImpl(key, pSource, ppReturnValue));
@@ -158,6 +162,7 @@ IFACEMETHODIMP DirectUI::ConnectedAnimationServiceFactory::GetForCurrentView(_Ou
         XamlTelemetry::PublicApiCall(true, 0, "ConnectedAnimationService_GetForCurrentView", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(GetForCurrentViewImpl(ppReturnValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ContainerContentChangingEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ContainerContentChangingEventArgs.g.cpp
index f2eeeac09c..8f6cd9db84 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ContainerContentChangingEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ContainerContentChangingEventArgs.g.cpp
@@ -131,6 +131,7 @@ IFACEMETHODIMP DirectUI::ContainerContentChangingEventArgsGenerated::get_ItemCon
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<ContainerContentChangingEventArgs*>(this)->get_ItemContainerImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ContentControl.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ContentControl.g.cpp
index 52f96bc7cb..8f54de9522 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ContentControl.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ContentControl.g.cpp
@@ -75,6 +75,7 @@ IFACEMETHODIMP DirectUI::ContentControlGenerated::get_ContentTemplateRoot(_Outpt
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<ContentControl*>(this)->get_ContentTemplateRootImpl(ppValue));
 Cleanup:
@@ -118,6 +119,7 @@ IFACEMETHODIMP DirectUI::ContentControlGenerated::GetGlobalBounds(_Out_ ABI::Win
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ContentControl_GetGlobalBounds", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ContentControl*>(this)->GetGlobalBoundsImpl(pResult));
@@ -136,6 +138,7 @@ IFACEMETHODIMP DirectUI::ContentControlGenerated::GetRasterizationScale(_Out_ FL
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ContentControl_GetRasterizationScale", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ContentControl*>(this)->GetRasterizationScaleImpl(pResult));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ContentDialog.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ContentDialog.g.cpp
index 37644ad195..055e726fe6 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ContentDialog.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ContentDialog.g.cpp
@@ -627,6 +627,7 @@ IFACEMETHODIMP DirectUI::ContentDialogGenerated::OnBackButtonPressed(_Out_ BOOLE
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ContentDialog_OnBackButtonPressed", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ContentDialog*>(this)->OnBackButtonPressedImpl(pResult));
@@ -645,6 +646,7 @@ IFACEMETHODIMP DirectUI::ContentDialogGenerated::ShowAsync(_Outptr_ ABI::Windows
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ContentDialog_ShowAsync", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ContentDialog*>(this)->ShowAsyncImpl(ppReturnValue));
@@ -663,6 +665,7 @@ IFACEMETHODIMP DirectUI::ContentDialogGenerated::ShowAsyncWithPlacement(_In_ ABI
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ContentDialog_ShowAsyncWithPlacement", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ContentDialog*>(this)->ShowAsyncWithPlacementImpl(placement, ppReturnValue));
@@ -681,7 +684,7 @@ _Check_return_ HRESULT DirectUI::ContentDialogGenerated::EventAddHandlerByIndex(
     case KnownEventIndex::ContentDialog_CloseButtonClick:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::Controls::ContentDialog*, ABI::Microsoft::UI::Xaml::Controls::ContentDialogButtonClickEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -698,7 +701,7 @@ _Check_return_ HRESULT DirectUI::ContentDialogGenerated::EventAddHandlerByIndex(
     case KnownEventIndex::ContentDialog_Closed:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::Controls::ContentDialog*, ABI::Microsoft::UI::Xaml::Controls::ContentDialogClosedEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -715,7 +718,7 @@ _Check_return_ HRESULT DirectUI::ContentDialogGenerated::EventAddHandlerByIndex(
     case KnownEventIndex::ContentDialog_Closing:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::Controls::ContentDialog*, ABI::Microsoft::UI::Xaml::Controls::ContentDialogClosingEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -732,7 +735,7 @@ _Check_return_ HRESULT DirectUI::ContentDialogGenerated::EventAddHandlerByIndex(
     case KnownEventIndex::ContentDialog_Opened:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::Controls::ContentDialog*, ABI::Microsoft::UI::Xaml::Controls::ContentDialogOpenedEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -749,7 +752,7 @@ _Check_return_ HRESULT DirectUI::ContentDialogGenerated::EventAddHandlerByIndex(
     case KnownEventIndex::ContentDialog_PrimaryButtonClick:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::Controls::ContentDialog*, ABI::Microsoft::UI::Xaml::Controls::ContentDialogButtonClickEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -766,7 +769,7 @@ _Check_return_ HRESULT DirectUI::ContentDialogGenerated::EventAddHandlerByIndex(
     case KnownEventIndex::ContentDialog_SecondaryButtonClick:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::Controls::ContentDialog*, ABI::Microsoft::UI::Xaml::Controls::ContentDialogButtonClickEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ContentDialogButtonClickEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ContentDialogButtonClickEventArgs.g.cpp
index 199b358e05..3fd67f84ed 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ContentDialogButtonClickEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ContentDialogButtonClickEventArgs.g.cpp
@@ -72,6 +72,7 @@ IFACEMETHODIMP DirectUI::ContentDialogButtonClickEventArgsGenerated::GetDeferral
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ContentDialogButtonClickEventArgs_GetDeferral", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<ContentDialogButtonClickEventArgs*>(this)->GetDeferralImpl(ppReturnValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ContentDialogClosingEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ContentDialogClosingEventArgs.g.cpp
index dbd221ced4..8690b7fc5e 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ContentDialogClosingEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ContentDialogClosingEventArgs.g.cpp
@@ -89,6 +89,7 @@ IFACEMETHODIMP DirectUI::ContentDialogClosingEventArgsGenerated::GetDeferral(_Ou
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ContentDialogClosingEventArgs_GetDeferral", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<ContentDialogClosingEventArgs*>(this)->GetDeferralImpl(ppReturnValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ContextMenuEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ContextMenuEventArgs.g.cpp
index 2c6f7b286e..5892bf9f41 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ContextMenuEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ContextMenuEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::ContextMenuEventArgsGenerated::get_Handled(_Out_ BOOLEA
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CContextMenuEventArgs*>(pCoreEventArgsNoRef)->get_Handled(&valueCore));
@@ -86,6 +87,7 @@ IFACEMETHODIMP DirectUI::ContextMenuEventArgsGenerated::get_CursorLeft(_Out_ DOU
     DOUBLE valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CContextMenuEventArgs*>(pCoreEventArgsNoRef)->get_CursorLeft(&valueCore));
@@ -119,6 +121,7 @@ IFACEMETHODIMP DirectUI::ContextMenuEventArgsGenerated::get_CursorTop(_Out_ DOUB
     DOUBLE valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CContextMenuEventArgs*>(pCoreEventArgsNoRef)->get_CursorTop(&valueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ContextRequestedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ContextRequestedEventArgs.g.cpp
index 90d8add09e..381060b005 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ContextRequestedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ContextRequestedEventArgs.g.cpp
@@ -57,6 +57,7 @@ IFACEMETHODIMP DirectUI::ContextRequestedEventArgs::get_Handled(_Out_ BOOLEAN* p
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CContextRequestedEventArgs*>(pCoreEventArgsNoRef)->get_Handled(&valueCore));
@@ -92,6 +93,7 @@ IFACEMETHODIMP DirectUI::ContextRequestedEventArgs::TryGetPosition(_In_opt_ ABI:
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ContextRequestedEventArgs_TryGetPosition", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<ContextRequestedEventArgs*>(this)->TryGetPositionImpl(pRelativeTo, pPoint, pReturnValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Control.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Control.g.cpp
index bc957b8e57..4bffa87f9f 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Control.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Control.g.cpp
@@ -484,6 +484,7 @@ IFACEMETHODIMP DirectUI::ControlGenerated::ApplyTemplate(_Out_ BOOLEAN* pReturnV
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "Control_ApplyTemplate", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<Control*>(this)->ApplyTemplateImpl(pReturnValue));
@@ -505,6 +506,7 @@ _Check_return_ HRESULT DirectUI::ControlGenerated::GetImplementationRoot(_Outptr
     CUIElement* pReturnValueCore = nullptr;
 
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
 
     IFC(CheckThread());
 
@@ -528,6 +530,7 @@ IFACEMETHODIMP DirectUI::ControlGenerated::GetTemplateChild(_In_ HSTRING childNa
     }
     ARG_NOTNULL(childName, "childName");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<Control*>(this)->GetTemplateChildImpl(childName, ppReturnValue));
@@ -1684,7 +1687,7 @@ _Check_return_ HRESULT DirectUI::ControlGenerated::EventAddHandlerByIndex(_In_ K
     case KnownEventIndex::Control_FocusDisengaged:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::Controls::Control*, ABI::Microsoft::UI::Xaml::Controls::FocusDisengagedEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -1701,7 +1704,7 @@ _Check_return_ HRESULT DirectUI::ControlGenerated::EventAddHandlerByIndex(_In_ K
     case KnownEventIndex::Control_FocusEngaged:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::Controls::Control*, ABI::Microsoft::UI::Xaml::Controls::FocusEngagedEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CurrentChangingEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CurrentChangingEventArgs.g.cpp
index 4860b2b1b7..98835d3b55 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CurrentChangingEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CurrentChangingEventArgs.g.cpp
@@ -49,6 +49,7 @@ IFACEMETHODIMP DirectUI::CurrentChangingEventArgsGenerated::get_Cancel(_Out_ BOO
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CurrentChangingEventArgs*>(this)->get_CancelImpl(pValue));
 Cleanup:
@@ -67,6 +68,7 @@ IFACEMETHODIMP DirectUI::CurrentChangingEventArgsGenerated::get_IsCancelable(_Ou
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<CurrentChangingEventArgs*>(this)->get_IsCancelableImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CustomXamlResourceLoader.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CustomXamlResourceLoader.g.cpp
index 9720997c69..bc67977755 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CustomXamlResourceLoader.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/CustomXamlResourceLoader.g.cpp
@@ -61,6 +61,7 @@ IFACEMETHODIMP DirectUI::CustomXamlResourceLoader::GetResource(_In_ HSTRING reso
     ARG_NOTNULL(propertyName, "propertyName");
     ARG_NOTNULL(propertyType, "propertyType");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<CustomXamlResourceLoader*>(this)->GetResourceImpl(resourceId, objectType, propertyName, propertyType, ppReturnValue));
 Cleanup:
@@ -135,6 +136,7 @@ IFACEMETHODIMP DirectUI::CustomXamlResourceLoaderFactory::get_Current(_Outptr_re
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckActivationAllowed());
     IFC(get_CurrentImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DataTemplate.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DataTemplate.g.cpp
index e733ede721..6c471bd925 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DataTemplate.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DataTemplate.g.cpp
@@ -61,6 +61,7 @@ IFACEMETHODIMP DirectUI::DataTemplateGenerated::GetElement(_In_ ABI::Microsoft::
     }
     ARG_NOTNULL(pArgs, "args");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<DataTemplate*>(this)->GetElementImpl(pArgs, ppReturnValue));
@@ -79,6 +80,7 @@ IFACEMETHODIMP DirectUI::DataTemplateGenerated::LoadContent(_Outptr_ ABI::Micros
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "DataTemplate_LoadContent", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<DataTemplate*>(this)->LoadContentImpl(ppReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DataTemplateKey.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DataTemplateKey.g.cpp
index 4223ec5d0a..c2586f5126 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DataTemplateKey.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DataTemplateKey.g.cpp
@@ -45,6 +45,7 @@ IFACEMETHODIMP DirectUI::DataTemplateKeyGenerated::get_DataType(_Outptr_result_m
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<DataTemplateKey*>(this)->get_DataTypeImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DataTemplateSelector.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DataTemplateSelector.g.cpp
index 82432c5530..2f1cb77df9 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DataTemplateSelector.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DataTemplateSelector.g.cpp
@@ -66,6 +66,7 @@ IFACEMETHODIMP DirectUI::DataTemplateSelectorGenerated::GetElement(_In_ ABI::Mic
     }
     ARG_NOTNULL(pArgs, "args");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<DataTemplateSelector*>(this)->GetElementImpl(pArgs, ppReturnValue));
 Cleanup:
@@ -123,6 +124,7 @@ IFACEMETHODIMP DirectUI::DataTemplateSelectorGenerated::SelectTemplateCore(_In_o
     }
     ARG_NOTNULL(pContainer, "container");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<DataTemplateSelector*>(this)->SelectTemplateCoreImpl(pItem, pContainer, ppReturnValue));
 Cleanup:
@@ -162,6 +164,7 @@ IFACEMETHODIMP DirectUI::DataTemplateSelectorGenerated::SelectTemplateForItemCor
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "DataTemplateSelector_SelectTemplateForItem", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<DataTemplateSelector*>(this)->SelectTemplateForItemCoreImpl(pItem, ppReturnValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DatePicker.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DatePicker.g.cpp
index 8560d571df..f0da6b102d 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DatePicker.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DatePicker.g.cpp
@@ -314,7 +314,7 @@ _Check_return_ HRESULT DirectUI::DatePickerGenerated::EventAddHandlerByIndex(_In
     case KnownEventIndex::DatePicker_DateChanged:
         {
             ctl::ComPtr<ABI::Windows::Foundation::IEventHandler<ABI::Microsoft::UI::Xaml::Controls::DatePickerValueChangedEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -331,7 +331,7 @@ _Check_return_ HRESULT DirectUI::DatePickerGenerated::EventAddHandlerByIndex(_In
     case KnownEventIndex::DatePicker_SelectedDateChanged:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::Controls::DatePicker*, ABI::Microsoft::UI::Xaml::Controls::DatePickerSelectedValueChangedEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DebugSettings.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DebugSettings.g.cpp
index ec88668b89..9efd259d25 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DebugSettings.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DebugSettings.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::DebugSettingsGenerated::get_EnableFrameRateCounter(_Out
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     
     IFC(static_cast<DebugSettings*>(this)->get_EnableFrameRateCounterImpl(pValue));
 Cleanup:
@@ -71,6 +72,7 @@ IFACEMETHODIMP DirectUI::DebugSettingsGenerated::get_FailFastOnErrors(_Out_ BOOL
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     
     IFC(static_cast<DebugSettings*>(this)->get_FailFastOnErrorsImpl(pValue));
 Cleanup:
@@ -89,6 +91,7 @@ IFACEMETHODIMP DirectUI::DebugSettingsGenerated::get_IsBindingTracingEnabled(_Ou
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     
     IFC(static_cast<DebugSettings*>(this)->get_IsBindingTracingEnabledImpl(pValue));
 Cleanup:
@@ -107,6 +110,7 @@ IFACEMETHODIMP DirectUI::DebugSettingsGenerated::get_IsTextPerformanceVisualizat
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     
     IFC(static_cast<DebugSettings*>(this)->get_IsTextPerformanceVisualizationEnabledImpl(pValue));
 Cleanup:
@@ -125,6 +129,7 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::DebugSettingsGenerated::get_I
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     
     IFC(static_cast<DebugSettings*>(this)->get_IsXamlResourceReferenceTracingEnabledImpl(pValue));
 Cleanup:
@@ -143,6 +148,7 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::DebugSettingsGenerated::get_L
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     
     IFC(static_cast<DebugSettings*>(this)->get_LayoutCycleDebugBreakLevelImpl(pValue));
 Cleanup:
@@ -161,6 +167,7 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::DebugSettingsGenerated::get_L
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     
     IFC(static_cast<DebugSettings*>(this)->get_LayoutCycleTracingLevelImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DependencyPropertyChangedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DependencyPropertyChangedEventArgs.g.cpp
index 4a550e8d93..8c22c28d65 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DependencyPropertyChangedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DependencyPropertyChangedEventArgs.g.cpp
@@ -79,6 +79,7 @@ IFACEMETHODIMP DirectUI::DependencyPropertyChangedEventArgsGenerated::get_Proper
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<DependencyPropertyChangedEventArgs*>(this)->get_PropertyImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DesktopWindowXamlSource.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DesktopWindowXamlSource.g.cpp
index a4c2361f7e..ec54e65734 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DesktopWindowXamlSource.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DesktopWindowXamlSource.g.cpp
@@ -60,6 +60,7 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::DesktopWindowXamlSourceGenera
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(static_cast<DesktopWindowXamlSource*>(this)->get_ContentImpl(ppValue));
 Cleanup:
@@ -78,6 +79,7 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::DesktopWindowXamlSourceGenera
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     
     IFC(static_cast<DesktopWindowXamlSource*>(this)->get_HasFocusImpl(pValue));
 Cleanup:
@@ -87,6 +89,7 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::DesktopWindowXamlSourceGenera
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     
     IFC(static_cast<DesktopWindowXamlSource*>(this)->get_ShouldConstrainPopupsToWorkAreaImpl(pValue));
 Cleanup:
@@ -105,6 +108,7 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::DesktopWindowXamlSourceGenera
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(static_cast<DesktopWindowXamlSource*>(this)->get_SiteBridgeImpl(ppValue));
 Cleanup:
@@ -114,6 +118,7 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::DesktopWindowXamlSourceGenera
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(static_cast<DesktopWindowXamlSource*>(this)->get_SystemBackdropImpl(ppValue));
 Cleanup:
@@ -229,6 +234,7 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::DesktopWindowXamlSourceGenera
     }
     ARG_NOTNULL(pRequest, "request");
     ARG_VALIDRETURNPOINTER(ppResult);
+    *ppResult={};
     
     IFC(static_cast<DesktopWindowXamlSource*>(this)->NavigateFocusImpl(pRequest, ppResult));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DispatcherTimer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DispatcherTimer.g.cpp
index 7b5f8fe0a6..889714050b 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DispatcherTimer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DispatcherTimer.g.cpp
@@ -54,6 +54,7 @@ IFACEMETHODIMP DirectUI::DispatcherTimerGenerated::get_IsEnabled(_Out_ BOOLEAN*
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<DispatcherTimer*>(this)->get_IsEnabledImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DoubleTappedRoutedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DoubleTappedRoutedEventArgs.g.cpp
index 0451a99a98..672a0bde79 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DoubleTappedRoutedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DoubleTappedRoutedEventArgs.g.cpp
@@ -57,6 +57,7 @@ IFACEMETHODIMP DirectUI::DoubleTappedRoutedEventArgs::get_PointerDeviceType(_Out
     DirectUI::PointerDeviceType valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CDoubleTappedEventArgs*>(pCoreEventArgsNoRef)->get_PointerDeviceType(&valueCore));
@@ -74,6 +75,7 @@ IFACEMETHODIMP DirectUI::DoubleTappedRoutedEventArgs::get_Handled(_Out_ BOOLEAN*
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CDoubleTappedEventArgs*>(pCoreEventArgsNoRef)->get_Handled(&valueCore));
@@ -114,6 +116,7 @@ IFACEMETHODIMP DirectUI::DoubleTappedRoutedEventArgs::GetPosition(_In_opt_ ABI::
     ABI::Windows::Foundation::Point returnValueCore;
 
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CDoubleTappedEventArgs*>(pCoreEventArgsNoRef)->GetPosition(pRelativeToCore, &returnValueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DownloadProgressEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DownloadProgressEventArgs.g.cpp
index e0c48da53a..a54bcca879 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DownloadProgressEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DownloadProgressEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::DownloadProgressEventArgs::get_Progress(_Out_ INT* pVal
     INT valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CDownloadProgressEventArgs*>(pCoreEventArgsNoRef)->get_Progress(&valueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DragCompletedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DragCompletedEventArgs.g.cpp
index fc4a61701d..4e33426598 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DragCompletedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DragCompletedEventArgs.g.cpp
@@ -49,6 +49,7 @@ IFACEMETHODIMP DirectUI::DragCompletedEventArgsGenerated::get_HorizontalChange(_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<DragCompletedEventArgs*>(this)->get_HorizontalChangeImpl(pValue));
 Cleanup:
@@ -67,6 +68,7 @@ IFACEMETHODIMP DirectUI::DragCompletedEventArgsGenerated::get_VerticalChange(_Ou
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<DragCompletedEventArgs*>(this)->get_VerticalChangeImpl(pValue));
 Cleanup:
@@ -85,6 +87,7 @@ IFACEMETHODIMP DirectUI::DragCompletedEventArgsGenerated::get_Canceled(_Out_ BOO
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<DragCompletedEventArgs*>(this)->get_CanceledImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DragDeltaEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DragDeltaEventArgs.g.cpp
index 10ac80ec57..77c3df9ffc 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DragDeltaEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DragDeltaEventArgs.g.cpp
@@ -49,6 +49,7 @@ IFACEMETHODIMP DirectUI::DragDeltaEventArgsGenerated::get_HorizontalChange(_Out_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<DragDeltaEventArgs*>(this)->get_HorizontalChangeImpl(pValue));
 Cleanup:
@@ -67,6 +68,7 @@ IFACEMETHODIMP DirectUI::DragDeltaEventArgsGenerated::get_VerticalChange(_Out_ D
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<DragDeltaEventArgs*>(this)->get_VerticalChangeImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DragEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DragEventArgs.g.cpp
index 17a42b3c14..33fc6a65ba 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DragEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DragEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::DragEventArgsGenerated::get_Handled(_Out_ BOOLEAN* pVal
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CDragEventArgs*>(pCoreEventArgsNoRef)->get_Handled(&valueCore));
@@ -103,6 +104,7 @@ _Check_return_ HRESULT DirectUI::DragEventArgsGenerated::get_AllowDataAccess(_Ou
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CDragEventArgs*>(pCoreEventArgsNoRef)->get_AllowDataAccess(&valueCore));
@@ -132,6 +134,7 @@ IFACEMETHODIMP DirectUI::DragEventArgsGenerated::get_Data(_Outptr_result_maybenu
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<DragEventArgs*>(this)->get_DataImpl(ppValue));
 Cleanup:
@@ -150,6 +153,7 @@ IFACEMETHODIMP DirectUI::DragEventArgsGenerated::get_DataView(_Outptr_result_may
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<DragEventArgs*>(this)->get_DataViewImpl(ppValue));
 Cleanup:
@@ -159,6 +163,7 @@ IFACEMETHODIMP DirectUI::DragEventArgsGenerated::get_DragUIOverride(_Outptr_resu
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<DragEventArgs*>(this)->get_DragUIOverrideImpl(ppValue));
 Cleanup:
@@ -168,6 +173,7 @@ IFACEMETHODIMP DirectUI::DragEventArgsGenerated::get_Modifiers(_Out_ ABI::Window
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<DragEventArgs*>(this)->get_ModifiersImpl(pValue));
 Cleanup:
@@ -181,6 +187,7 @@ IFACEMETHODIMP DirectUI::DragEventArgsGenerated::get_AcceptedOperation(_Out_ ABI
     DirectUI::DataPackageOperation valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CDragEventArgs*>(pCoreEventArgsNoRef)->get_AcceptedOperation(&valueCore));
@@ -214,6 +221,7 @@ IFACEMETHODIMP DirectUI::DragEventArgsGenerated::get_AllowedOperations(_Out_ ABI
     DirectUI::DataPackageOperation valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CDragEventArgs*>(pCoreEventArgsNoRef)->get_AllowedOperations(&valueCore));
@@ -249,6 +257,7 @@ IFACEMETHODIMP DirectUI::DragEventArgsGenerated::GetDeferral(_Outptr_ ABI::Micro
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "DragEventArgs_GetDeferral", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<DragEventArgs*>(this)->GetDeferralImpl(ppReturnValue));
 Cleanup:
@@ -271,6 +280,7 @@ IFACEMETHODIMP DirectUI::DragEventArgsGenerated::GetPosition(_In_opt_ ABI::Micro
     ABI::Windows::Foundation::Point returnValueCore;
 
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CDragEventArgs*>(pCoreEventArgsNoRef)->GetPosition(pRelativeToCore, &returnValueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DragStartedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DragStartedEventArgs.g.cpp
index e7db969f3a..d1dfe39a52 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DragStartedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DragStartedEventArgs.g.cpp
@@ -49,6 +49,7 @@ IFACEMETHODIMP DirectUI::DragStartedEventArgsGenerated::get_HorizontalOffset(_Ou
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<DragStartedEventArgs*>(this)->get_HorizontalOffsetImpl(pValue));
 Cleanup:
@@ -67,6 +68,7 @@ IFACEMETHODIMP DirectUI::DragStartedEventArgsGenerated::get_VerticalOffset(_Out_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<DragStartedEventArgs*>(this)->get_VerticalOffsetImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DragStartingEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DragStartingEventArgs.g.cpp
index 37ea4057cd..678bbfab97 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DragStartingEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DragStartingEventArgs.g.cpp
@@ -87,6 +87,7 @@ IFACEMETHODIMP DirectUI::DragStartingEventArgsGenerated::get_DragUI(_Outptr_resu
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<DragStartingEventArgs*>(this)->get_DragUIImpl(ppValue));
 Cleanup:
@@ -119,6 +120,7 @@ IFACEMETHODIMP DirectUI::DragStartingEventArgsGenerated::GetDeferral(_Outptr_ AB
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "DragStartingEventArgs_GetDeferral", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<DragStartingEventArgs*>(this)->GetDeferralImpl(ppReturnValue));
 Cleanup:
@@ -136,6 +138,7 @@ IFACEMETHODIMP DirectUI::DragStartingEventArgsGenerated::GetPosition(_In_opt_ AB
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "DragStartingEventArgs_GetPosition", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<DragStartingEventArgs*>(this)->GetPositionImpl(pRelativeTo, pReturnValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DragUIOverride.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DragUIOverride.g.cpp
index 6afc27c09c..9ec722e188 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DragUIOverride.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DragUIOverride.g.cpp
@@ -46,6 +46,7 @@ IFACEMETHODIMP DirectUI::DragUIOverrideGenerated::get_Caption(_Out_ HSTRING* pVa
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<DragUIOverride*>(this)->get_CaptionImpl(pValue));
 Cleanup:
@@ -64,6 +65,7 @@ IFACEMETHODIMP DirectUI::DragUIOverrideGenerated::get_IsCaptionVisible(_Out_ BOO
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<DragUIOverride*>(this)->get_IsCaptionVisibleImpl(pValue));
 Cleanup:
@@ -82,6 +84,7 @@ IFACEMETHODIMP DirectUI::DragUIOverrideGenerated::get_IsContentVisible(_Out_ BOO
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<DragUIOverride*>(this)->get_IsContentVisibleImpl(pValue));
 Cleanup:
@@ -100,6 +103,7 @@ IFACEMETHODIMP DirectUI::DragUIOverrideGenerated::get_IsGlyphVisible(_Out_ BOOLE
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<DragUIOverride*>(this)->get_IsGlyphVisibleImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DxamlCoreTestHooks.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DxamlCoreTestHooks.g.cpp
index 37bb296489..82a5ce95d1 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DxamlCoreTestHooks.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/DxamlCoreTestHooks.g.cpp
@@ -79,6 +79,7 @@ IFACEMETHODIMP DirectUI::DxamlCoreTestHooksFactory::GetForCurrentThread(_Outptr_
         XamlTelemetry::PublicApiCall(true, 0, "DxamlCoreTestHooks_GetForCurrentThread", 0);
     }
     ARG_VALIDRETURNPOINTER(ppResult);
+    *ppResult={};
     IFC(CheckActivationAllowed());
     IFC(GetForCurrentThreadImpl(ppResult));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/EasingFunctionBase.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/EasingFunctionBase.g.cpp
index 8331f4acdd..87f09850c5 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/EasingFunctionBase.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/EasingFunctionBase.g.cpp
@@ -62,6 +62,7 @@ IFACEMETHODIMP DirectUI::EasingFunctionBaseGenerated::Ease(_In_ DOUBLE normalize
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "EasingFunctionBase_Ease", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<EasingFunctionBase*>(this)->EaseImpl(normalizedTime, pReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/EffectiveViewportChangedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/EffectiveViewportChangedEventArgs.g.cpp
index b6d1db3375..f81d4c55e8 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/EffectiveViewportChangedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/EffectiveViewportChangedEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::EffectiveViewportChangedEventArgs::get_EffectiveViewpor
     ABI::Windows::Foundation::Rect valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CEffectiveViewportChangedEventArgs*>(pCoreEventArgsNoRef)->get_EffectiveViewport(&valueCore));
@@ -70,6 +71,7 @@ IFACEMETHODIMP DirectUI::EffectiveViewportChangedEventArgs::get_MaxViewport(_Out
     ABI::Windows::Foundation::Rect valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CEffectiveViewportChangedEventArgs*>(pCoreEventArgsNoRef)->get_MaxViewport(&valueCore));
@@ -87,6 +89,7 @@ IFACEMETHODIMP DirectUI::EffectiveViewportChangedEventArgs::get_BringIntoViewDis
     DOUBLE valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CEffectiveViewportChangedEventArgs*>(pCoreEventArgsNoRef)->get_BringIntoViewDistanceX(&valueCore));
@@ -104,6 +107,7 @@ IFACEMETHODIMP DirectUI::EffectiveViewportChangedEventArgs::get_BringIntoViewDis
     DOUBLE valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CEffectiveViewportChangedEventArgs*>(pCoreEventArgsNoRef)->get_BringIntoViewDistanceY(&valueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ElementCompositionPreview.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ElementCompositionPreview.g.cpp
index a2ace95fa2..fc95700fcd 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ElementCompositionPreview.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ElementCompositionPreview.g.cpp
@@ -49,6 +49,7 @@ IFACEMETHODIMP DirectUI::ElementCompositionPreviewFactory::GetElementVisual(_In_
     }
     ARG_NOTNULL(pElement, "element");
     ARG_VALIDRETURNPOINTER(ppResult);
+    *ppResult={};
     IFC(CheckActivationAllowed());
     IFC(GetElementVisualImpl(pElement, ppResult));
 Cleanup:
@@ -67,6 +68,7 @@ IFACEMETHODIMP DirectUI::ElementCompositionPreviewFactory::GetElementChildVisual
     }
     ARG_NOTNULL(pElement, "element");
     ARG_VALIDRETURNPOINTER(ppResult);
+    *ppResult={};
     IFC(CheckActivationAllowed());
     IFC(GetElementChildVisualImpl(pElement, ppResult));
 Cleanup:
@@ -102,6 +104,7 @@ IFACEMETHODIMP DirectUI::ElementCompositionPreviewFactory::GetScrollViewerManipu
     }
     ARG_NOTNULL(pScrollViewer, "scrollViewer");
     ARG_VALIDRETURNPOINTER(ppResult);
+    *ppResult={};
     IFC(CheckActivationAllowed());
     IFC(GetScrollViewerManipulationPropertySetImpl(pScrollViewer, ppResult));
 Cleanup:
@@ -171,6 +174,7 @@ IFACEMETHODIMP DirectUI::ElementCompositionPreviewFactory::GetPointerPositionPro
     }
     ARG_NOTNULL(pTargetElement, "targetElement");
     ARG_VALIDRETURNPOINTER(ppResult);
+    *ppResult={};
     IFC(CheckActivationAllowed());
     IFC(GetPointerPositionPropertySetImpl(pTargetElement, ppResult));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ElementSoundPlayer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ElementSoundPlayer.g.cpp
index 6eb86f51ad..718182e934 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ElementSoundPlayer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ElementSoundPlayer.g.cpp
@@ -77,6 +77,7 @@ IFACEMETHODIMP DirectUI::ElementSoundPlayerFactory::get_Volume(_Out_ DOUBLE* pVa
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckActivationAllowed());
     IFC(get_VolumeImpl(pValue));
 Cleanup:
@@ -95,6 +96,7 @@ IFACEMETHODIMP DirectUI::ElementSoundPlayerFactory::get_State(_Out_ ABI::Microso
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckActivationAllowed());
     IFC(get_StateImpl(pValue));
 Cleanup:
@@ -113,6 +115,7 @@ IFACEMETHODIMP DirectUI::ElementSoundPlayerFactory::get_SpatialAudioMode(_Out_ A
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckActivationAllowed());
     IFC(get_SpatialAudioModeImpl(pValue));
 Cleanup:
@@ -172,6 +175,7 @@ IFACEMETHODIMP DirectUI::ElementSoundPlayerFactory::GetEffectiveSoundMode(_In_ A
     }
     ARG_NOTNULL(pElement, "element");
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckActivationAllowed());
     IFC(GetEffectiveSoundModeImpl(pElement, pResult));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/EventTrigger.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/EventTrigger.g.cpp
index d93af88d71..dff7804288 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/EventTrigger.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/EventTrigger.g.cpp
@@ -51,6 +51,7 @@ IFACEMETHODIMP DirectUI::EventTriggerGenerated::get_RoutedEvent(_Outptr_result_m
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<EventTrigger*>(this)->get_RoutedEventImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ExceptionRoutedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ExceptionRoutedEventArgs.g.cpp
index 4a008afb19..055788a01a 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ExceptionRoutedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ExceptionRoutedEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::ExceptionRoutedEventArgs::get_ErrorMessage(_Out_ HSTRIN
     xstring_ptr valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CExceptionRoutedEventArgs*>(pCoreEventArgsNoRef)->get_ErrorMessage(&valueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FlyoutBase.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FlyoutBase.g.cpp
index 8363a7c33e..4cbc9881aa 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FlyoutBase.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FlyoutBase.g.cpp
@@ -108,6 +108,7 @@ IFACEMETHODIMP DirectUI::FlyoutBaseGenerated::get_IsConstrainedToRootBounds(_Out
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<FlyoutBase*>(this)->get_IsConstrainedToRootBoundsImpl(pValue));
 Cleanup:
@@ -117,6 +118,7 @@ IFACEMETHODIMP DirectUI::FlyoutBaseGenerated::get_IsLightDismissOverlayEnabled(_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<FlyoutBase*>(this)->get_IsLightDismissOverlayEnabledImpl(pValue));
 Cleanup:
@@ -136,6 +138,7 @@ IFACEMETHODIMP DirectUI::FlyoutBaseGenerated::get_IsOpen(_Out_ BOOLEAN* pValue)
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<FlyoutBase*>(this)->get_IsOpenImpl(pValue));
 Cleanup:
@@ -208,6 +211,7 @@ IFACEMETHODIMP DirectUI::FlyoutBaseGenerated::get_UsePickerFlyoutTheme(_Out_ BOO
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<FlyoutBase*>(this)->get_UsePickerFlyoutThemeImpl(pValue));
 Cleanup:
@@ -227,6 +231,7 @@ IFACEMETHODIMP DirectUI::FlyoutBaseGenerated::get_XamlRoot(_Outptr_result_mayben
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<FlyoutBase*>(this)->get_XamlRootImpl(ppValue));
 Cleanup:
@@ -474,6 +479,7 @@ IFACEMETHODIMP DirectUI::FlyoutBaseGenerated::CreatePresenter(_Outptr_ ABI::Micr
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "FlyoutBase_CreatePresenter", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<FlyoutBase*>(this)->CreatePresenterImpl(ppReturnValue));
@@ -770,6 +776,7 @@ IFACEMETHODIMP DirectUI::FlyoutBaseFactory::get_TargetProperty(_Outptr_result_ma
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckActivationAllowed());
     IFC(get_TargetPropertyImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FocusManager.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FocusManager.g.cpp
index 31248ff997..fc13e5efc0 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FocusManager.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FocusManager.g.cpp
@@ -54,6 +54,7 @@ IFACEMETHODIMP DirectUI::FocusManagerFactory::TryFocusAsync(_In_ ABI::Microsoft:
     }
     ARG_NOTNULL(pElement, "element");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(TryFocusAsyncImpl(pElement, value, ppReturnValue));
 Cleanup:
@@ -71,6 +72,7 @@ IFACEMETHODIMP DirectUI::FocusManagerFactory::TryMoveFocusAsync(_In_ ABI::Micros
         XamlTelemetry::PublicApiCall(true, 0, "FocusManager_TryMoveFocusAsync", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(TryMoveFocusAsyncImpl(focusNavigationDirection, ppReturnValue));
 Cleanup:
@@ -89,6 +91,7 @@ IFACEMETHODIMP DirectUI::FocusManagerFactory::TryMoveFocusWithOptionsAsync(_In_
     }
     ARG_NOTNULL(pFocusNavigationOptions, "focusNavigationOptions");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(TryMoveFocusWithOptionsAsyncImpl(focusNavigationDirection, pFocusNavigationOptions, ppReturnValue));
 Cleanup:
@@ -107,6 +110,7 @@ IFACEMETHODIMP DirectUI::FocusManagerFactory::TryMoveFocusWithOptions(_In_ ABI::
     }
     ARG_NOTNULL(pFocusNavigationOptions, "focusNavigationOptions");
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(TryMoveFocusWithOptionsImpl(focusNavigationDirection, pFocusNavigationOptions, pReturnValue));
 Cleanup:
@@ -124,6 +128,7 @@ IFACEMETHODIMP DirectUI::FocusManagerFactory::FindNextElement(_In_ ABI::Microsof
         XamlTelemetry::PublicApiCall(true, 0, "FocusManager_FindNextElement", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(FindNextElementImpl(focusNavigationDirection, ppReturnValue));
 Cleanup:
@@ -141,6 +146,7 @@ IFACEMETHODIMP DirectUI::FocusManagerFactory::FindFirstFocusableElement(_In_opt_
         XamlTelemetry::PublicApiCall(true, 0, "FocusManager_FindFirstFocusableElement", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(FindFirstFocusableElementImpl(pSearchScope, ppReturnValue));
 Cleanup:
@@ -158,6 +164,7 @@ IFACEMETHODIMP DirectUI::FocusManagerFactory::FindLastFocusableElement(_In_opt_
         XamlTelemetry::PublicApiCall(true, 0, "FocusManager_FindLastFocusableElement", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(FindLastFocusableElementImpl(pSearchScope, ppReturnValue));
 Cleanup:
@@ -176,6 +183,7 @@ IFACEMETHODIMP DirectUI::FocusManagerFactory::FindNextElementWithOptions(_In_ AB
     }
     ARG_NOTNULL(pFocusNavigationOptions, "focusNavigationOptions");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(FindNextElementWithOptionsImpl(focusNavigationDirection, pFocusNavigationOptions, ppReturnValue));
 Cleanup:
@@ -193,6 +201,7 @@ IFACEMETHODIMP DirectUI::FocusManagerFactory::FindNextFocusableElement(_In_ ABI:
         XamlTelemetry::PublicApiCall(true, 0, "FocusManager_FindNextFocusableElement", 0);
     }
     ARG_VALIDRETURNPOINTER(ppResult);
+    *ppResult={};
     IFC(CheckActivationAllowed());
     IFC(FindNextFocusableElementImpl(focusNavigationDirection, ppResult));
 Cleanup:
@@ -210,6 +219,7 @@ IFACEMETHODIMP DirectUI::FocusManagerFactory::FindNextFocusableElementWithHint(_
         XamlTelemetry::PublicApiCall(true, 0, "FocusManager_FindNextFocusableElementWithHint", 0);
     }
     ARG_VALIDRETURNPOINTER(ppResult);
+    *ppResult={};
     IFC(CheckActivationAllowed());
     IFC(FindNextFocusableElementWithHintImpl(focusNavigationDirection, hintRect, ppResult));
 Cleanup:
@@ -227,6 +237,7 @@ IFACEMETHODIMP DirectUI::FocusManagerFactory::TryMoveFocus(_In_ ABI::Microsoft::
         XamlTelemetry::PublicApiCall(true, 0, "FocusManager_TryMoveFocus", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(TryMoveFocusImpl(focusNavigationDirection, pReturnValue));
 Cleanup:
@@ -244,6 +255,7 @@ IFACEMETHODIMP DirectUI::FocusManagerFactory::GetFocusedElement(_Outptr_ IInspec
         XamlTelemetry::PublicApiCall(true, 0, "FocusManager_GetFocusedElement", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(GetFocusedElementImpl(ppReturnValue));
 Cleanup:
@@ -253,7 +265,7 @@ IFACEMETHODIMP DirectUI::FocusManagerFactory::GetFocusedElement(_Outptr_ IInspec
     }
     RRETURN(hr);
 }
-IFACEMETHODIMP DirectUI::FocusManagerFactory::GetFocusedElementWithRoot(_In_ ABI::Microsoft::UI::Xaml::IXamlRoot* pXamlRoot, _Outptr_ IInspectable** ppReturnValue)
+IFACEMETHODIMP DirectUI::FocusManagerFactory::GetFocusedElementWithRoot(_In_ ABI::Microsoft::UI::Xaml::IXamlRoot* pXamlRoot, _Outptr_result_maybenull_ IInspectable** ppReturnValue)
 {
     HRESULT hr = S_OK;
     if (EventEnabledApiFunctionCallStart())
@@ -262,6 +274,7 @@ IFACEMETHODIMP DirectUI::FocusManagerFactory::GetFocusedElementWithRoot(_In_ ABI
     }
     ARG_NOTNULL(pXamlRoot, "xamlRoot");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(GetFocusedElementWithRootImpl(pXamlRoot, ppReturnValue));
 Cleanup:
@@ -280,6 +293,7 @@ IFACEMETHODIMP DirectUI::FocusManagerFactory::FindNextFocusWithSearchRootIgnoreE
     }
     ARG_NOTNULL(pSearchRoot, "searchRoot");
     ARG_VALIDRETURNPOINTER(ppResult);
+    *ppResult={};
     IFC(CheckActivationAllowed());
     IFC(FindNextFocusWithSearchRootIgnoreEngagementImpl(focusNavigationDirection, pSearchRoot, ppResult));
 Cleanup:
@@ -298,6 +312,7 @@ IFACEMETHODIMP DirectUI::FocusManagerFactory::FindNextFocusWithSearchRootIgnoreE
     }
     ARG_NOTNULL(pSearchRoot, "searchRoot");
     ARG_VALIDRETURNPOINTER(ppResult);
+    *ppResult={};
     IFC(CheckActivationAllowed());
     IFC(FindNextFocusWithSearchRootIgnoreEngagementWithHintRectImpl(focusNavigationDirection, pSearchRoot, hintRect, exclusionRect, ppResult));
 Cleanup:
@@ -316,6 +331,7 @@ IFACEMETHODIMP DirectUI::FocusManagerFactory::FindNextFocusWithSearchRootIgnoreE
     }
     ARG_NOTNULL(pSearchRoot, "searchRoot");
     ARG_VALIDRETURNPOINTER(ppResult);
+    *ppResult={};
     IFC(CheckActivationAllowed());
     IFC(FindNextFocusWithSearchRootIgnoreEngagementWithClipImpl(focusNavigationDirection, pSearchRoot, ignoreClipping, ignoreCone, ppResult));
 Cleanup:
@@ -351,6 +367,7 @@ IFACEMETHODIMP DirectUI::FocusManagerFactory::SetFocusedElementWithDirection(_In
     }
     ARG_NOTNULL(pElement, "element");
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckActivationAllowed());
     IFC(SetFocusedElementWithDirectionImpl(pElement, focusState, animateIfBringIntoView, forceBringIntoView, focusNavigationDirection, requestInputActivation, pResult));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FocusManager.g.h b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FocusManager.g.h
index 8ac50e201f..a2e046b562 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FocusManager.g.h
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FocusManager.g.h
@@ -54,7 +54,7 @@ namespace DirectUI
         IFACEMETHOD(FindNextFocusableElementWithHint)(_In_ ABI::Microsoft::UI::Xaml::Input::FocusNavigationDirection focusNavigationDirection, _In_ ABI::Windows::Foundation::Rect hintRect, _Outptr_ ABI::Microsoft::UI::Xaml::IUIElement** ppResult) override;
         IFACEMETHOD(TryMoveFocus)(_In_ ABI::Microsoft::UI::Xaml::Input::FocusNavigationDirection focusNavigationDirection, _Out_ BOOLEAN* pReturnValue) override;
         IFACEMETHOD(GetFocusedElement)(_Outptr_ IInspectable** ppReturnValue) override;
-        IFACEMETHOD(GetFocusedElementWithRoot)(_In_ ABI::Microsoft::UI::Xaml::IXamlRoot* pXamlRoot, _Outptr_ IInspectable** ppReturnValue) override;
+        IFACEMETHOD(GetFocusedElementWithRoot)(_In_ ABI::Microsoft::UI::Xaml::IXamlRoot* pXamlRoot, _Outptr_result_maybenull_ IInspectable** ppReturnValue) override;
         IFACEMETHOD(FindNextFocusWithSearchRootIgnoreEngagement)(_In_ ABI::Microsoft::UI::Xaml::Input::FocusNavigationDirection focusNavigationDirection, _In_ IInspectable* pSearchRoot, _Outptr_ IInspectable** ppResult) override;
         IFACEMETHOD(FindNextFocusWithSearchRootIgnoreEngagementWithHintRect)(_In_ ABI::Microsoft::UI::Xaml::Input::FocusNavigationDirection focusNavigationDirection, _In_ IInspectable* pSearchRoot, _In_ ABI::Windows::Foundation::Rect hintRect, _In_ ABI::Windows::Foundation::Rect exclusionRect, _Outptr_ IInspectable** ppResult) override;
         IFACEMETHOD(FindNextFocusWithSearchRootIgnoreEngagementWithClip)(_In_ ABI::Microsoft::UI::Xaml::Input::FocusNavigationDirection focusNavigationDirection, _In_ IInspectable* pSearchRoot, _In_ BOOLEAN ignoreClipping, _In_ BOOLEAN ignoreCone, _Outptr_ IInspectable** ppResult) override;
@@ -95,7 +95,7 @@ namespace DirectUI
          _Check_return_ HRESULT FindNextFocusableElementWithHintImpl(_In_ ABI::Microsoft::UI::Xaml::Input::FocusNavigationDirection focusNavigationDirection, _In_ ABI::Windows::Foundation::Rect hintRect, _Outptr_ ABI::Microsoft::UI::Xaml::IUIElement** ppResult); 
          _Check_return_ HRESULT TryMoveFocusImpl(_In_ ABI::Microsoft::UI::Xaml::Input::FocusNavigationDirection focusNavigationDirection, _Out_ BOOLEAN* pReturnValue); 
          _Check_return_ HRESULT GetFocusedElementImpl(_Outptr_ IInspectable** ppReturnValue); 
-         _Check_return_ HRESULT GetFocusedElementWithRootImpl(_In_ ABI::Microsoft::UI::Xaml::IXamlRoot* pXamlRoot, _Outptr_ IInspectable** ppReturnValue); 
+         _Check_return_ HRESULT GetFocusedElementWithRootImpl(_In_ ABI::Microsoft::UI::Xaml::IXamlRoot* pXamlRoot, _Outptr_result_maybenull_ IInspectable** ppReturnValue); 
          _Check_return_ HRESULT FindNextFocusWithSearchRootIgnoreEngagementImpl(_In_ ABI::Microsoft::UI::Xaml::Input::FocusNavigationDirection focusNavigationDirection, _In_ IInspectable* pSearchRoot, _Outptr_ IInspectable** ppResult); 
          _Check_return_ HRESULT FindNextFocusWithSearchRootIgnoreEngagementWithHintRectImpl(_In_ ABI::Microsoft::UI::Xaml::Input::FocusNavigationDirection focusNavigationDirection, _In_ IInspectable* pSearchRoot, _In_ ABI::Windows::Foundation::Rect hintRect, _In_ ABI::Windows::Foundation::Rect exclusionRect, _Outptr_ IInspectable** ppResult); 
          _Check_return_ HRESULT FindNextFocusWithSearchRootIgnoreEngagementWithClipImpl(_In_ ABI::Microsoft::UI::Xaml::Input::FocusNavigationDirection focusNavigationDirection, _In_ IInspectable* pSearchRoot, _In_ BOOLEAN ignoreClipping, _In_ BOOLEAN ignoreCone, _Outptr_ IInspectable** ppResult); 
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FocusManagerGotFocusEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FocusManagerGotFocusEventArgs.g.cpp
index abbb10e8a5..e501ef7789 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FocusManagerGotFocusEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FocusManagerGotFocusEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::FocusManagerGotFocusEventArgs::get_NewFocusedElement(_O
     CDependencyObject* pValueCore = nullptr;
 
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CFocusManagerGotFocusEventArgs*>(pCoreEventArgsNoRef)->get_NewFocusedElement(&pValueCore));
@@ -70,6 +71,7 @@ IFACEMETHODIMP DirectUI::FocusManagerGotFocusEventArgs::get_CorrelationId(_Out_
     GUID valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CFocusManagerGotFocusEventArgs*>(pCoreEventArgsNoRef)->get_CorrelationId(&valueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FocusManagerLostFocusEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FocusManagerLostFocusEventArgs.g.cpp
index 42030c1009..a8f8225855 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FocusManagerLostFocusEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FocusManagerLostFocusEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::FocusManagerLostFocusEventArgs::get_OldFocusedElement(_
     CDependencyObject* pValueCore = nullptr;
 
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CFocusManagerLostFocusEventArgs*>(pCoreEventArgsNoRef)->get_OldFocusedElement(&pValueCore));
@@ -70,6 +71,7 @@ IFACEMETHODIMP DirectUI::FocusManagerLostFocusEventArgs::get_CorrelationId(_Out_
     GUID valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CFocusManagerLostFocusEventArgs*>(pCoreEventArgsNoRef)->get_CorrelationId(&valueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FocusedElementRemovedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FocusedElementRemovedEventArgs.g.cpp
index 86318d34a4..f43f53d589 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FocusedElementRemovedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FocusedElementRemovedEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::FocusedElementRemovedEventArgs::get_OldFocusedElement(_
     CDependencyObject* pValueCore = nullptr;
 
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CFocusedElementRemovedEventArgs*>(pCoreEventArgsNoRef)->get_OldFocusedElement(&pValueCore));
@@ -70,6 +71,7 @@ IFACEMETHODIMP DirectUI::FocusedElementRemovedEventArgs::get_NewFocusedElement(_
     CDependencyObject* pValueCore = nullptr;
 
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CFocusedElementRemovedEventArgs*>(pCoreEventArgsNoRef)->get_NewFocusedElement(&pValueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FontFamily.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FontFamily.g.cpp
index 1b1dd6116f..f8a18397b1 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FontFamily.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FontFamily.g.cpp
@@ -48,6 +48,7 @@ IFACEMETHODIMP DirectUI::FontFamily::get_Source(_Out_ HSTRING* pValue)
     xstring_ptr valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(CheckThread());
 
@@ -120,6 +121,7 @@ IFACEMETHODIMP DirectUI::FontFamilyFactory::get_XamlAutoFontFamily(_Outptr_resul
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckActivationAllowed());
     IFC(get_XamlAutoFontFamilyImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Frame.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Frame.g.cpp
index e0faff724d..00c40a26fc 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Frame.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Frame.g.cpp
@@ -55,6 +55,7 @@ IFACEMETHODIMP DirectUI::FrameGenerated::get_BackStack(_Outptr_result_maybenull_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<Frame*>(this)->get_BackStackImpl(ppValue));
 Cleanup:
@@ -109,6 +110,7 @@ IFACEMETHODIMP DirectUI::FrameGenerated::get_ForwardStack(_Outptr_result_maybenu
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<Frame*>(this)->get_ForwardStackImpl(ppValue));
 Cleanup:
@@ -364,6 +366,7 @@ IFACEMETHODIMP DirectUI::FrameGenerated::GetNavigationState(_Out_ HSTRING* pRetu
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "Frame_GetNavigationState", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<Frame*>(this)->GetNavigationStateImpl(pReturnValue));
@@ -454,6 +457,7 @@ IFACEMETHODIMP DirectUI::FrameGenerated::Navigate(_In_ ABI::Windows::UI::Xaml::I
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "Frame_Navigate", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<Frame*>(this)->NavigateImpl(sourcePageType, pParameter, pReturnValue));
@@ -472,6 +476,7 @@ IFACEMETHODIMP DirectUI::FrameGenerated::Navigate(_In_ ABI::Windows::UI::Xaml::I
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "Frame_Navigate", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<Frame*>(this)->NavigateImpl(sourcePageType, pReturnValue));
@@ -490,6 +495,7 @@ IFACEMETHODIMP DirectUI::FrameGenerated::NavigateToType(_In_ ABI::Windows::UI::X
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "Frame_NavigateToType", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<Frame*>(this)->NavigateToTypeImpl(sourcePageType, pParameter, pNavigationOptions, pReturnValue));
@@ -508,6 +514,7 @@ IFACEMETHODIMP DirectUI::FrameGenerated::NavigateWithTransitionInfo(_In_ ABI::Wi
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "Frame_NavigateWithTransitionInfo", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<Frame*>(this)->NavigateWithTransitionInfoImpl(sourcePageType, pParameter, pInfoOverride, pReturnValue));
@@ -580,7 +587,7 @@ _Check_return_ HRESULT DirectUI::FrameGenerated::EventAddHandlerByIndex(_In_ Kno
     case KnownEventIndex::Frame_Navigated:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Navigation::INavigatedEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -597,7 +604,7 @@ _Check_return_ HRESULT DirectUI::FrameGenerated::EventAddHandlerByIndex(_In_ Kno
     case KnownEventIndex::Frame_Navigating:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Navigation::INavigatingCancelEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -614,7 +621,7 @@ _Check_return_ HRESULT DirectUI::FrameGenerated::EventAddHandlerByIndex(_In_ Kno
     case KnownEventIndex::Frame_NavigationFailed:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Navigation::INavigationFailedEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -631,7 +638,7 @@ _Check_return_ HRESULT DirectUI::FrameGenerated::EventAddHandlerByIndex(_In_ Kno
     case KnownEventIndex::Frame_NavigationStopped:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Navigation::INavigationStoppedEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FrameworkApplication.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FrameworkApplication.g.cpp
index a0b4de9a1f..c25f7f93b7 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FrameworkApplication.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FrameworkApplication.g.cpp
@@ -76,6 +76,7 @@ IFACEMETHODIMP DirectUI::FrameworkApplicationGenerated::get_DebugSettings(_Outpt
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(static_cast<FrameworkApplication*>(this)->get_DebugSettingsImpl(ppValue));
 Cleanup:
@@ -85,6 +86,7 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::FrameworkApplicationGenerated
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     
     IFC(static_cast<FrameworkApplication*>(this)->get_DispatcherShutdownModeImpl(pValue));
 Cleanup:
@@ -103,6 +105,7 @@ IFACEMETHODIMP DirectUI::FrameworkApplicationGenerated::get_FocusVisualKind(_Out
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     
     IFC(static_cast<FrameworkApplication*>(this)->get_FocusVisualKindImpl(pValue));
 Cleanup:
@@ -121,6 +124,7 @@ IFACEMETHODIMP DirectUI::FrameworkApplicationGenerated::get_HighContrastAdjustme
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     
     IFC(static_cast<FrameworkApplication*>(this)->get_HighContrastAdjustmentImpl(pValue));
 Cleanup:
@@ -139,6 +143,7 @@ IFACEMETHODIMP DirectUI::FrameworkApplicationGenerated::get_RequestedTheme(_Out_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     
     IFC(static_cast<FrameworkApplication*>(this)->get_RequestedThemeImpl(pValue));
 Cleanup:
@@ -157,6 +162,7 @@ IFACEMETHODIMP DirectUI::FrameworkApplicationGenerated::get_RequiresPointerMode(
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     
     IFC(static_cast<FrameworkApplication*>(this)->get_RequiresPointerModeImpl(pValue));
 Cleanup:
@@ -175,6 +181,7 @@ IFACEMETHODIMP DirectUI::FrameworkApplicationGenerated::get_Resources(_Outptr_re
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(static_cast<FrameworkApplication*>(this)->get_ResourcesImpl(ppValue));
 Cleanup:
@@ -193,6 +200,7 @@ IFACEMETHODIMP DirectUI::FrameworkApplicationGenerated::get_ShutdownModel(_Out_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     
     IFC(static_cast<FrameworkApplication*>(this)->get_ShutdownModelImpl(pValue));
 Cleanup:
@@ -211,6 +219,7 @@ IFACEMETHODIMP DirectUI::FrameworkApplicationGenerated::get_Windows(_Outptr_resu
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(static_cast<FrameworkApplication*>(this)->get_WindowsImpl(ppValue));
 Cleanup:
@@ -239,6 +248,7 @@ IFACEMETHODIMP DirectUI::FrameworkApplicationGenerated::CreateIslandRoot(_Outptr
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "FrameworkApplication_CreateIslandRoot", 0);
     }
     ARG_VALIDRETURNPOINTER(ppResult);
+    *ppResult={};
     
     IFC(static_cast<FrameworkApplication*>(this)->CreateIslandRootImpl(ppResult));
 Cleanup:
@@ -257,6 +267,7 @@ IFACEMETHODIMP DirectUI::FrameworkApplicationGenerated::CreateIslandRootWithCont
     }
     ARG_NOTNULL(pOwner, "owner");
     ARG_VALIDRETURNPOINTER(ppResult);
+    *ppResult={};
     
     IFC(static_cast<FrameworkApplication*>(this)->CreateIslandRootWithContentBridgeImpl(pOwner, pContentBridge, ppResult));
 Cleanup:
@@ -812,6 +823,7 @@ IFACEMETHODIMP DirectUI::FrameworkApplicationFactory::get_Current(_Outptr_result
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_CurrentImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FrameworkElement.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FrameworkElement.g.cpp
index eb2f67eab0..5c485df419 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FrameworkElement.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FrameworkElement.g.cpp
@@ -89,6 +89,7 @@ IFACEMETHODIMP DirectUI::FrameworkElementGenerated::get_BaseUri(_Outptr_result_m
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<FrameworkElement*>(this)->get_BaseUriImpl(ppValue));
 Cleanup:
@@ -149,6 +150,7 @@ IFACEMETHODIMP DirectUI::FrameworkElementGenerated::get_FocusVisualPrimaryBrush(
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<FrameworkElement*>(this)->get_FocusVisualPrimaryBrushImpl(ppValue));
 Cleanup:
@@ -177,6 +179,7 @@ IFACEMETHODIMP DirectUI::FrameworkElementGenerated::get_FocusVisualSecondaryBrus
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<FrameworkElement*>(this)->get_FocusVisualSecondaryBrushImpl(ppValue));
 Cleanup:
@@ -223,6 +226,7 @@ IFACEMETHODIMP DirectUI::FrameworkElementGenerated::get_IsLoaded(_Out_ BOOLEAN*
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<FrameworkElement*>(this)->get_IsLoadedImpl(pValue));
 Cleanup:
@@ -875,6 +879,7 @@ IFACEMETHODIMP DirectUI::FrameworkElementGenerated::ArrangeOverride(_In_ ABI::Wi
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "FrameworkElement_ArrangeOverride", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<FrameworkElement*>(this)->ArrangeOverrideImpl(finalSize, pReturnValue));
@@ -916,6 +921,7 @@ IFACEMETHODIMP DirectUI::FrameworkElementGenerated::FindName(_In_ HSTRING name,
     }
     ARG_NOTNULL(name, "name");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<FrameworkElement*>(this)->FindNameImpl(name, ppReturnValue));
@@ -935,6 +941,7 @@ IFACEMETHODIMP DirectUI::FrameworkElementGenerated::GetBindingExpression(_In_ AB
     }
     ARG_NOTNULL(pDp, "dp");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<FrameworkElement*>(this)->GetBindingExpressionImpl(pDp, ppReturnValue));
@@ -954,6 +961,7 @@ IFACEMETHODIMP DirectUI::FrameworkElementGenerated::GoToElementStateCore(_In_ HS
     }
     ARG_NOTNULL(stateName, "stateName");
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<FrameworkElement*>(this)->GoToElementStateCoreImpl(stateName, useTransitions, pReturnValue));
@@ -1015,6 +1023,7 @@ _Check_return_ HRESULT DirectUI::FrameworkElementGenerated::InvokeApplyTemplate(
     BOOLEAN returnValueCore;
 
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
 
     IFC(CheckThread());
 
@@ -1041,6 +1050,7 @@ _Check_return_ HRESULT DirectUI::FrameworkElementGenerated::InvokeFocus(_In_ ABI
     BOOLEAN returnValueCore;
 
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
 
     IFC(CheckThread());
 
@@ -1063,6 +1073,7 @@ IFACEMETHODIMP DirectUI::FrameworkElementGenerated::MeasureOverride(_In_ ABI::Wi
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "FrameworkElement_MeasureOverride", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<FrameworkElement*>(this)->MeasureOverrideImpl(availableSize, pReturnValue));
@@ -1168,7 +1179,7 @@ _Check_return_ HRESULT DirectUI::FrameworkElementGenerated::EventAddHandlerByInd
     case KnownEventIndex::FrameworkElement_DataContextChanged:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::FrameworkElement*, ABI::Microsoft::UI::Xaml::DataContextChangedEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -1185,7 +1196,7 @@ _Check_return_ HRESULT DirectUI::FrameworkElementGenerated::EventAddHandlerByInd
     case KnownEventIndex::FrameworkElement_LayoutUpdated:
         {
             ctl::ComPtr<ABI::Windows::Foundation::IEventHandler<IInspectable*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -1202,7 +1213,7 @@ _Check_return_ HRESULT DirectUI::FrameworkElementGenerated::EventAddHandlerByInd
     case KnownEventIndex::FrameworkElement_SizeChanged:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::ISizeChangedEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FrameworkElementAutomationPeer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FrameworkElementAutomationPeer.g.cpp
index 1d55a3f9d3..b4c4d8bf00 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FrameworkElementAutomationPeer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FrameworkElementAutomationPeer.g.cpp
@@ -63,6 +63,7 @@ IFACEMETHODIMP DirectUI::FrameworkElementAutomationPeerGenerated::GetAutomationP
     }
     ARG_NOTNULL(pElement, "element");
     ARG_VALIDRETURNPOINTER(ppResult);
+    *ppResult={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<FrameworkElementAutomationPeer*>(this)->GetAutomationPeersForChildrenOfElementImpl(pElement, ppResult));
@@ -122,6 +123,7 @@ IFACEMETHODIMP DirectUI::FrameworkElementAutomationPeerFactory::FromElement(_In_
     }
     ARG_NOTNULL(pElement, "element");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(FromElementImpl(pElement, ppReturnValue));
 Cleanup:
@@ -140,6 +142,7 @@ IFACEMETHODIMP DirectUI::FrameworkElementAutomationPeerFactory::CreatePeerForEle
     }
     ARG_NOTNULL(pElement, "element");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(CreatePeerForElementImpl(pElement, ppReturnValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FullWindowMediaRootAutomationPeer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FullWindowMediaRootAutomationPeer.g.cpp
index 8127c03e55..48e395aa8a 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FullWindowMediaRootAutomationPeer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/FullWindowMediaRootAutomationPeer.g.cpp
@@ -45,6 +45,7 @@ IFACEMETHODIMP DirectUI::FullWindowMediaRootAutomationPeerGenerated::get_Interac
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<FullWindowMediaRootAutomationPeer*>(this)->get_InteractionStateImpl(pValue));
 Cleanup:
@@ -54,6 +55,7 @@ IFACEMETHODIMP DirectUI::FullWindowMediaRootAutomationPeerGenerated::get_IsModal
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<FullWindowMediaRootAutomationPeer*>(this)->get_IsModalImpl(pValue));
 Cleanup:
@@ -63,6 +65,7 @@ IFACEMETHODIMP DirectUI::FullWindowMediaRootAutomationPeerGenerated::get_IsTopmo
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<FullWindowMediaRootAutomationPeer*>(this)->get_IsTopmostImpl(pValue));
 Cleanup:
@@ -72,6 +75,7 @@ IFACEMETHODIMP DirectUI::FullWindowMediaRootAutomationPeerGenerated::get_Maximiz
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<FullWindowMediaRootAutomationPeer*>(this)->get_MaximizableImpl(pValue));
 Cleanup:
@@ -81,6 +85,7 @@ IFACEMETHODIMP DirectUI::FullWindowMediaRootAutomationPeerGenerated::get_Minimiz
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<FullWindowMediaRootAutomationPeer*>(this)->get_MinimizableImpl(pValue));
 Cleanup:
@@ -90,6 +95,7 @@ IFACEMETHODIMP DirectUI::FullWindowMediaRootAutomationPeerGenerated::get_VisualS
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<FullWindowMediaRootAutomationPeer*>(this)->get_VisualStateImpl(pValue));
 Cleanup:
@@ -143,6 +149,7 @@ IFACEMETHODIMP DirectUI::FullWindowMediaRootAutomationPeerGenerated::WaitForInpu
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "FullWindowMediaRootAutomationPeer_WaitForInputIdle", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<FullWindowMediaRootAutomationPeer*>(this)->WaitForInputIdleImpl(milliseconds, pReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/GeneralTransform.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/GeneralTransform.g.cpp
index afdc5d3b3e..f009eb8012 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/GeneralTransform.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/GeneralTransform.g.cpp
@@ -111,6 +111,7 @@ IFACEMETHODIMP DirectUI::GeneralTransform::TransformPoint(_In_ ABI::Windows::Fou
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "GeneralTransform_TransformPoint", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<GeneralTransform*>(this)->TransformPointImpl(point, pReturnValue));
@@ -129,6 +130,7 @@ _Check_return_ HRESULT DirectUI::GeneralTransform::TransformXY(_In_ DOUBLE x, _I
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "GeneralTransform_TransformXY", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Geometry.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Geometry.g.cpp
index 4bd7eee060..01b1b56e0e 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Geometry.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Geometry.g.cpp
@@ -96,6 +96,7 @@ IFACEMETHODIMP DirectUI::GeometryFactory::get_Empty(_Outptr_result_maybenull_ AB
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckActivationAllowed());
     IFC(get_EmptyImpl(ppValue));
 Cleanup:
@@ -105,6 +106,7 @@ IFACEMETHODIMP DirectUI::GeometryFactory::get_StandardFlatteningTolerance(_Out_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckActivationAllowed());
     IFC(get_StandardFlatteningToleranceImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/GettingFocusEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/GettingFocusEventArgs.g.cpp
index e757fec4c5..0d2a5f4f7b 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/GettingFocusEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/GettingFocusEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::GettingFocusEventArgs::get_OldFocusedElement(_Outptr_re
     CDependencyObject* pValueCore = nullptr;
 
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CGettingFocusEventArgs*>(pCoreEventArgsNoRef)->get_OldFocusedElement(&pValueCore));
@@ -70,6 +71,7 @@ IFACEMETHODIMP DirectUI::GettingFocusEventArgs::get_NewFocusedElement(_Outptr_re
     CDependencyObject* pValueCore = nullptr;
 
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CGettingFocusEventArgs*>(pCoreEventArgsNoRef)->get_NewFocusedElement(&pValueCore));
@@ -103,6 +105,7 @@ IFACEMETHODIMP DirectUI::GettingFocusEventArgs::get_FocusState(_Out_ ABI::Micros
     DirectUI::FocusState valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CGettingFocusEventArgs*>(pCoreEventArgsNoRef)->get_FocusState(&valueCore));
@@ -120,6 +123,7 @@ IFACEMETHODIMP DirectUI::GettingFocusEventArgs::get_Direction(_Out_ ABI::Microso
     DirectUI::FocusNavigationDirection valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CGettingFocusEventArgs*>(pCoreEventArgsNoRef)->get_Direction(&valueCore));
@@ -137,6 +141,7 @@ IFACEMETHODIMP DirectUI::GettingFocusEventArgs::get_Handled(_Out_ BOOLEAN* pValu
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CGettingFocusEventArgs*>(pCoreEventArgsNoRef)->get_Handled(&valueCore));
@@ -170,6 +175,7 @@ IFACEMETHODIMP DirectUI::GettingFocusEventArgs::get_InputDevice(_Out_ ABI::Micro
     DirectUI::FocusInputDeviceKind valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CGettingFocusEventArgs*>(pCoreEventArgsNoRef)->get_InputDevice(&valueCore));
@@ -187,6 +193,7 @@ IFACEMETHODIMP DirectUI::GettingFocusEventArgs::get_Cancel(_Out_ BOOLEAN* pValue
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CGettingFocusEventArgs*>(pCoreEventArgsNoRef)->get_Cancel(&valueCore));
@@ -220,6 +227,7 @@ IFACEMETHODIMP DirectUI::GettingFocusEventArgs::get_CorrelationId(_Out_ GUID* pV
     GUID valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CGettingFocusEventArgs*>(pCoreEventArgsNoRef)->get_CorrelationId(&valueCore));
@@ -239,6 +247,7 @@ IFACEMETHODIMP DirectUI::GettingFocusEventArgs::TryCancel(_Out_ BOOLEAN* pReturn
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "GettingFocusEventArgs_TryCancel", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<GettingFocusEventArgs*>(this)->TryCancelImpl(pReturnValue));
 Cleanup:
@@ -257,6 +266,7 @@ IFACEMETHODIMP DirectUI::GettingFocusEventArgs::TrySetNewFocusedElement(_In_ ABI
     }
     ARG_NOTNULL(pElement, "element");
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<GettingFocusEventArgs*>(this)->TrySetNewFocusedElementImpl(pElement, pReturnValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/GravityConnectedAnimationConfiguration.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/GravityConnectedAnimationConfiguration.g.cpp
index 8bb90fd614..f1ea99ac47 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/GravityConnectedAnimationConfiguration.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/GravityConnectedAnimationConfiguration.g.cpp
@@ -45,6 +45,7 @@ IFACEMETHODIMP DirectUI::GravityConnectedAnimationConfigurationGenerated::get_Is
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<GravityConnectedAnimationConfiguration*>(this)->get_IsShadowEnabledImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/GridViewItemPresenter.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/GridViewItemPresenter.g.cpp
index ae1a104bc4..a5eb13208c 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/GridViewItemPresenter.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/GridViewItemPresenter.g.cpp
@@ -127,6 +127,7 @@ IFACEMETHODIMP DirectUI::GridViewItemPresenterGenerated::get_GridViewItemPresent
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<GridViewItemPresenter*>(this)->get_GridViewItemPresenterHorizontalContentAlignmentImpl(pValue));
 Cleanup:
@@ -146,6 +147,7 @@ IFACEMETHODIMP DirectUI::GridViewItemPresenterGenerated::get_GridViewItemPresent
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<GridViewItemPresenter*>(this)->get_GridViewItemPresenterPaddingImpl(pValue));
 Cleanup:
@@ -165,6 +167,7 @@ IFACEMETHODIMP DirectUI::GridViewItemPresenterGenerated::get_GridViewItemPresent
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<GridViewItemPresenter*>(this)->get_GridViewItemPresenterVerticalContentAlignmentImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/GroupStyleSelector.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/GroupStyleSelector.g.cpp
index 01078ce53a..27d1effbdc 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/GroupStyleSelector.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/GroupStyleSelector.g.cpp
@@ -80,6 +80,7 @@ IFACEMETHODIMP DirectUI::GroupStyleSelectorGenerated::SelectGroupStyleCore(_In_o
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "GroupStyleSelector_SelectGroupStyle", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<GroupStyleSelector*>(this)->SelectGroupStyleCoreImpl(pGroup, level, ppReturnValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/HasValidationErrorsChangedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/HasValidationErrorsChangedEventArgs.g.cpp
index 1bcdc9f7b9..b1fd1e0222 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/HasValidationErrorsChangedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/HasValidationErrorsChangedEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::HasValidationErrorsChangedEventArgs::get_NewValue(_Out_
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CHasValidationErrorsChangedEventArgs*>(pCoreEventArgsNoRef)->get_NewValue(&valueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/HoldingRoutedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/HoldingRoutedEventArgs.g.cpp
index 054bed01b1..e992b9d502 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/HoldingRoutedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/HoldingRoutedEventArgs.g.cpp
@@ -57,6 +57,7 @@ IFACEMETHODIMP DirectUI::HoldingRoutedEventArgs::get_PointerDeviceType(_Out_ ABI
     DirectUI::PointerDeviceType valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CHoldingEventArgs*>(pCoreEventArgsNoRef)->get_PointerDeviceType(&valueCore));
@@ -74,6 +75,7 @@ IFACEMETHODIMP DirectUI::HoldingRoutedEventArgs::get_HoldingState(_Out_ ABI::Mic
     DirectUI::HoldingState valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CHoldingEventArgs*>(pCoreEventArgsNoRef)->get_HoldingState(&valueCore));
@@ -91,6 +93,7 @@ IFACEMETHODIMP DirectUI::HoldingRoutedEventArgs::get_Handled(_Out_ BOOLEAN* pVal
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CHoldingEventArgs*>(pCoreEventArgsNoRef)->get_Handled(&valueCore));
@@ -131,6 +134,7 @@ IFACEMETHODIMP DirectUI::HoldingRoutedEventArgs::GetPosition(_In_opt_ ABI::Micro
     ABI::Windows::Foundation::Point returnValueCore;
 
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CHoldingEventArgs*>(pCoreEventArgsNoRef)->GetPosition(pRelativeToCore, &returnValueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Hub.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Hub.g.cpp
index b529d64ec4..80a46c2484 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Hub.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Hub.g.cpp
@@ -107,6 +107,7 @@ IFACEMETHODIMP DirectUI::HubGenerated::get_SectionHeaders(_Outptr_result_maybenu
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<Hub*>(this)->get_SectionHeadersImpl(ppValue));
 Cleanup:
@@ -125,6 +126,7 @@ IFACEMETHODIMP DirectUI::HubGenerated::get_SectionsInView(_Outptr_result_maybenu
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<Hub*>(this)->get_SectionsInViewImpl(ppValue));
 Cleanup:
@@ -409,7 +411,7 @@ _Check_return_ HRESULT DirectUI::HubGenerated::EventAddHandlerByIndex(_In_ Known
     case KnownEventIndex::Hub_SectionHeaderClick:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Controls::IHubSectionHeaderClickEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -426,7 +428,7 @@ _Check_return_ HRESULT DirectUI::HubGenerated::EventAddHandlerByIndex(_In_ Known
     case KnownEventIndex::Hub_SectionsInViewChanged:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Controls::ISectionsInViewChangedEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Hyperlink.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Hyperlink.g.cpp
index 29bd351d86..03ad1e4128 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Hyperlink.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Hyperlink.g.cpp
@@ -339,6 +339,7 @@ IFACEMETHODIMP DirectUI::HyperlinkGenerated::Focus(_In_ ABI::Microsoft::UI::Xaml
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "Hyperlink_Focus", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<Hyperlink*>(this)->FocusImpl(value, pReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IconSource.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IconSource.g.cpp
index 6edcbee6d6..11052d4ad7 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IconSource.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IconSource.g.cpp
@@ -90,6 +90,7 @@ IFACEMETHODIMP DirectUI::IconSourceGenerated::CreateIconElementCore(_Outptr_ ABI
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "IconSource_CreateIconElement", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<IconSource*>(this)->CreateIconElementCoreImpl(ppReturnValue));
@@ -109,6 +110,7 @@ IFACEMETHODIMP DirectUI::IconSourceGenerated::GetIconElementPropertyCore(_In_ AB
     }
     ARG_NOTNULL(pIconSourceProperty, "iconSourceProperty");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<IconSource*>(this)->GetIconElementPropertyCoreImpl(pIconSourceProperty, ppReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Image.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Image.g.cpp
index 99fdd61991..016689e490 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Image.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Image.g.cpp
@@ -191,6 +191,7 @@ IFACEMETHODIMP DirectUI::ImageGenerated::GetAlphaMask(_Outptr_ ABI::Microsoft::U
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "Image_GetAlphaMask", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<Image*>(this)->GetAlphaMaskImpl(ppReturnValue));
@@ -209,6 +210,7 @@ IFACEMETHODIMP DirectUI::ImageGenerated::GetAsCastingSource(_Outptr_ ABI::Window
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "Image_GetAsCastingSource", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<Image*>(this)->GetAsCastingSourceImpl(ppReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/InputManager.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/InputManager.g.cpp
index ad4b934256..32e7ebf66d 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/InputManager.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/InputManager.g.cpp
@@ -46,6 +46,7 @@ IFACEMETHODIMP DirectUI::InputManagerFactory::GetLastInputDeviceType(_Out_ ABI::
         XamlTelemetry::PublicApiCall(true, 0, "InputManager_GetLastInputDeviceType", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckActivationAllowed());
     IFC(GetLastInputDeviceTypeImpl(pResult));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/InputValidationCommand.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/InputValidationCommand.g.cpp
index 1e81a767e2..742bb3a6fd 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/InputValidationCommand.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/InputValidationCommand.g.cpp
@@ -100,6 +100,7 @@ IFACEMETHODIMP DirectUI::InputValidationCommand::CanValidateCore(_In_ ABI::Micro
     }
     ARG_NOTNULL(pValidationControl, "validationControl");
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<InputValidationCommand*>(this)->CanValidateCoreImpl(pValidationControl, pResult));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/InputValidationErrorEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/InputValidationErrorEventArgs.g.cpp
index 2f9ee05246..e761561551 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/InputValidationErrorEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/InputValidationErrorEventArgs.g.cpp
@@ -55,6 +55,7 @@ IFACEMETHODIMP DirectUI::InputValidationErrorEventArgs::get_Action(_Out_ ABI::Mi
     DirectUI::InputValidationErrorEventAction valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CInputValidationErrorEventArgs*>(pCoreEventArgsNoRef)->get_Action(&valueCore));
@@ -88,6 +89,7 @@ IFACEMETHODIMP DirectUI::InputValidationErrorEventArgs::get_Error(_Outptr_result
     IUnknown* pValueCore = nullptr;
 
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CInputValidationErrorEventArgs*>(pCoreEventArgsNoRef)->get_Error(&pValueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/InteractionBase.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/InteractionBase.g.cpp
index 126e986c4a..95d2d694fc 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/InteractionBase.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/InteractionBase.g.cpp
@@ -67,6 +67,7 @@ IFACEMETHODIMP DirectUI::InteractionBaseGenerated::GetSupportedEvents(_Outptr_ A
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "InteractionBase_GetSupportedEvents", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<InteractionBase*>(this)->GetSupportedEventsImpl(ppReturnValue));
 Cleanup:
@@ -84,6 +85,7 @@ IFACEMETHODIMP DirectUI::InteractionBaseGenerated::GetSupportedEventsCore(_Outpt
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "InteractionBase_GetSupportedEventsCore", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<InteractionBase*>(this)->GetSupportedEventsCoreImpl(ppReturnValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IsApiContractNotPresent.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IsApiContractNotPresent.g.cpp
index 666f9514cc..368a767968 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IsApiContractNotPresent.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IsApiContractNotPresent.g.cpp
@@ -54,6 +54,7 @@ IFACEMETHODIMP DirectUI::IsApiContractNotPresentGenerated::Evaluate(_In_ ABI::Wi
     }
     ARG_NOTNULL(pArguments, "arguments");
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<IsApiContractNotPresent*>(this)->EvaluateImpl(pArguments, pReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IsApiContractPresent.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IsApiContractPresent.g.cpp
index 994cc265d6..e0cbdd27cf 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IsApiContractPresent.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IsApiContractPresent.g.cpp
@@ -54,6 +54,7 @@ IFACEMETHODIMP DirectUI::IsApiContractPresentGenerated::Evaluate(_In_ ABI::Windo
     }
     ARG_NOTNULL(pArguments, "arguments");
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<IsApiContractPresent*>(this)->EvaluateImpl(pArguments, pReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IsEnabledChangedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IsEnabledChangedEventArgs.g.cpp
index eb13b1f815..9f16e7263c 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IsEnabledChangedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IsEnabledChangedEventArgs.g.cpp
@@ -49,6 +49,7 @@ _Check_return_ HRESULT DirectUI::IsEnabledChangedEventArgs::get_OldValue(_Out_ B
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CIsEnabledChangedEventArgs*>(pCoreEventArgsNoRef)->get_OldValue(&valueCore));
@@ -66,6 +67,7 @@ _Check_return_ HRESULT DirectUI::IsEnabledChangedEventArgs::get_NewValue(_Out_ B
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CIsEnabledChangedEventArgs*>(pCoreEventArgsNoRef)->get_NewValue(&valueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IsPropertyNotPresent.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IsPropertyNotPresent.g.cpp
index 6ea4ad26ef..859bf44270 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IsPropertyNotPresent.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IsPropertyNotPresent.g.cpp
@@ -54,6 +54,7 @@ IFACEMETHODIMP DirectUI::IsPropertyNotPresentGenerated::Evaluate(_In_ ABI::Windo
     }
     ARG_NOTNULL(pArguments, "arguments");
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<IsPropertyNotPresent*>(this)->EvaluateImpl(pArguments, pReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IsPropertyPresent.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IsPropertyPresent.g.cpp
index 45b6796794..c1854f05bd 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IsPropertyPresent.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IsPropertyPresent.g.cpp
@@ -54,6 +54,7 @@ IFACEMETHODIMP DirectUI::IsPropertyPresentGenerated::Evaluate(_In_ ABI::Windows:
     }
     ARG_NOTNULL(pArguments, "arguments");
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<IsPropertyPresent*>(this)->EvaluateImpl(pArguments, pReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IsTypeNotPresent.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IsTypeNotPresent.g.cpp
index eb84b9a3b3..61a9b54177 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IsTypeNotPresent.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IsTypeNotPresent.g.cpp
@@ -54,6 +54,7 @@ IFACEMETHODIMP DirectUI::IsTypeNotPresentGenerated::Evaluate(_In_ ABI::Windows::
     }
     ARG_NOTNULL(pArguments, "arguments");
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<IsTypeNotPresent*>(this)->EvaluateImpl(pArguments, pReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IsTypePresent.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IsTypePresent.g.cpp
index c731be2ed1..89e13683f5 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IsTypePresent.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/IsTypePresent.g.cpp
@@ -54,6 +54,7 @@ IFACEMETHODIMP DirectUI::IsTypePresentGenerated::Evaluate(_In_ ABI::Windows::Fou
     }
     ARG_NOTNULL(pArguments, "arguments");
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<IsTypePresent*>(this)->EvaluateImpl(pArguments, pReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemContainerGenerator.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemContainerGenerator.g.cpp
index 5be2f4f1d7..885f58fc0e 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemContainerGenerator.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemContainerGenerator.g.cpp
@@ -95,6 +95,7 @@ IFACEMETHODIMP DirectUI::ItemContainerGeneratorGenerated::ContainerFromIndex(_In
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ItemContainerGenerator_ContainerFromIndex", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemContainerGenerator*>(this)->ContainerFromIndexImpl(index, ppReturnValue));
 Cleanup:
@@ -112,6 +113,7 @@ IFACEMETHODIMP DirectUI::ItemContainerGeneratorGenerated::ContainerFromItem(_In_
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ItemContainerGenerator_ContainerFromItem", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemContainerGenerator*>(this)->ContainerFromItemImpl(pItem, ppReturnValue));
 Cleanup:
@@ -129,6 +131,7 @@ IFACEMETHODIMP DirectUI::ItemContainerGeneratorGenerated::GenerateNext(_Out_ BOO
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ItemContainerGenerator_GenerateNext", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemContainerGenerator*>(this)->GenerateNextImpl(pIsNewlyRealized, ppReturnValue));
 Cleanup:
@@ -146,6 +149,7 @@ IFACEMETHODIMP DirectUI::ItemContainerGeneratorGenerated::GeneratorPositionFromI
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ItemContainerGenerator_GeneratorPositionFromIndex", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemContainerGenerator*>(this)->GeneratorPositionFromIndexImpl(itemIndex, pReturnValue));
 Cleanup:
@@ -164,6 +168,7 @@ IFACEMETHODIMP DirectUI::ItemContainerGeneratorGenerated::GetItemContainerGenera
     }
     ARG_NOTNULL(pPanel, "panel");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemContainerGenerator*>(this)->GetItemContainerGeneratorForPanelImpl(pPanel, ppReturnValue));
 Cleanup:
@@ -182,6 +187,7 @@ IFACEMETHODIMP DirectUI::ItemContainerGeneratorGenerated::IndexFromContainer(_In
     }
     ARG_NOTNULL(pContainer, "container");
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemContainerGenerator*>(this)->IndexFromContainerImpl(pContainer, pReturnValue));
 Cleanup:
@@ -199,6 +205,7 @@ IFACEMETHODIMP DirectUI::ItemContainerGeneratorGenerated::IndexFromGeneratorPosi
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ItemContainerGenerator_IndexFromGeneratorPosition", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemContainerGenerator*>(this)->IndexFromGeneratorPositionImpl(position, pReturnValue));
 Cleanup:
@@ -217,6 +224,7 @@ IFACEMETHODIMP DirectUI::ItemContainerGeneratorGenerated::ItemFromContainer(_In_
     }
     ARG_NOTNULL(pContainer, "container");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemContainerGenerator*>(this)->ItemFromContainerImpl(pContainer, ppReturnValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemIndexRange.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemIndexRange.g.cpp
index 9758c19e31..252a0428ca 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemIndexRange.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemIndexRange.g.cpp
@@ -62,6 +62,7 @@ IFACEMETHODIMP DirectUI::ItemIndexRangeGenerated::get_LastIndex(_Out_ INT* pValu
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     
     IFC(static_cast<ItemIndexRange*>(this)->get_LastIndexImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemsControl.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemsControl.g.cpp
index 14328af83a..a836dc6cd5 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemsControl.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemsControl.g.cpp
@@ -81,6 +81,7 @@ IFACEMETHODIMP DirectUI::ItemsControlGenerated::get_GroupStyle(_Outptr_result_ma
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemsControl*>(this)->get_GroupStyleImpl(ppValue));
 Cleanup:
@@ -116,6 +117,7 @@ IFACEMETHODIMP DirectUI::ItemsControlGenerated::get_ItemContainerGenerator(_Outp
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemsControl*>(this)->get_ItemContainerGeneratorImpl(ppValue));
 Cleanup:
@@ -173,6 +175,7 @@ IFACEMETHODIMP DirectUI::ItemsControlGenerated::get_ItemsPanelRoot(_Outptr_resul
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemsControl*>(this)->get_ItemsPanelRootImpl(ppValue));
 Cleanup:
@@ -209,6 +212,7 @@ IFACEMETHODIMP DirectUI::ItemsControlGenerated::get_SelectedContainer(_Outptr_re
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemsControl*>(this)->get_SelectedContainerImpl(ppValue));
 Cleanup:
@@ -294,6 +298,7 @@ IFACEMETHODIMP DirectUI::ItemsControlGenerated::ContainerFromIndex(_In_ INT inde
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ItemsControl_ContainerFromIndex", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ItemsControl*>(this)->ContainerFromIndexImpl(index, ppReturnValue));
@@ -312,6 +317,7 @@ IFACEMETHODIMP DirectUI::ItemsControlGenerated::ContainerFromItem(_In_opt_ IInsp
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ItemsControl_ContainerFromItem", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ItemsControl*>(this)->ContainerFromItemImpl(pItem, ppReturnValue));
@@ -330,6 +336,7 @@ IFACEMETHODIMP DirectUI::ItemsControlGenerated::GetContainerForItemOverride(_Out
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ItemsControl_GetContainerForItemOverride", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ItemsControl*>(this)->GetContainerForItemOverrideImpl(ppReturnValue));
@@ -371,6 +378,7 @@ IFACEMETHODIMP DirectUI::ItemsControlGenerated::GroupFromHeader(_In_ ABI::Micros
     }
     ARG_NOTNULL(pHeader, "header");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ItemsControl*>(this)->GroupFromHeaderImpl(pHeader, ppReturnValue));
@@ -390,6 +398,7 @@ IFACEMETHODIMP DirectUI::ItemsControlGenerated::GroupHeaderContainerFromItemCont
     }
     ARG_NOTNULL(pItemContainer, "itemContainer");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ItemsControl*>(this)->GroupHeaderContainerFromItemContainerImpl(pItemContainer, ppReturnValue));
@@ -409,6 +418,7 @@ IFACEMETHODIMP DirectUI::ItemsControlGenerated::HeaderFromGroup(_In_ IInspectabl
     }
     ARG_NOTNULL(pGroup, "group");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ItemsControl*>(this)->HeaderFromGroupImpl(pGroup, ppReturnValue));
@@ -427,6 +437,7 @@ IFACEMETHODIMP DirectUI::ItemsControlGenerated::HeaderFromIndex(_In_ INT index,
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ItemsControl_HeaderFromIndex", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ItemsControl*>(this)->HeaderFromIndexImpl(index, ppReturnValue));
@@ -446,6 +457,7 @@ IFACEMETHODIMP DirectUI::ItemsControlGenerated::IndexFromContainer(_In_ ABI::Mic
     }
     ARG_NOTNULL(pContainer, "container");
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ItemsControl*>(this)->IndexFromContainerImpl(pContainer, pReturnValue));
@@ -465,6 +477,7 @@ IFACEMETHODIMP DirectUI::ItemsControlGenerated::IndexFromHeader(_In_ ABI::Micros
     }
     ARG_NOTNULL(pHeader, "header");
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ItemsControl*>(this)->IndexFromHeaderImpl(pHeader, excludeHiddenEmptyGroups, pReturnValue));
@@ -484,6 +497,7 @@ IFACEMETHODIMP DirectUI::ItemsControlGenerated::IsCompatible(_In_ ABI::Microsoft
     }
     ARG_NOTNULL(pCandidate, "candidate");
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ItemsControl*>(this)->IsCompatibleImpl(pCandidate, pReturnValue));
@@ -502,6 +516,7 @@ IFACEMETHODIMP DirectUI::ItemsControlGenerated::IsItemItsOwnContainerOverride(_I
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ItemsControl_IsItemItsOwnContainerOverride", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ItemsControl*>(this)->IsItemItsOwnContainerOverrideImpl(pItem, pReturnValue));
@@ -543,6 +558,7 @@ IFACEMETHODIMP DirectUI::ItemsControlGenerated::ItemFromContainer(_In_ ABI::Micr
     }
     ARG_NOTNULL(pContainer, "container");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ItemsControl*>(this)->ItemFromContainerImpl(pContainer, ppReturnValue));
@@ -975,6 +991,7 @@ IFACEMETHODIMP DirectUI::ItemsControlFactory::GetItemsOwner(_In_ ABI::Microsoft:
     }
     ARG_NOTNULL(pElement, "element");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(GetItemsOwnerImpl(pElement, ppReturnValue));
 Cleanup:
@@ -993,6 +1010,7 @@ IFACEMETHODIMP DirectUI::ItemsControlFactory::ItemsControlFromItemContainer(_In_
     }
     ARG_NOTNULL(pContainer, "container");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(ItemsControlFromItemContainerImpl(pContainer, ppReturnValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemsControlAutomationPeer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemsControlAutomationPeer.g.cpp
index 2ba5dc9e7c..bb2546c42b 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemsControlAutomationPeer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemsControlAutomationPeer.g.cpp
@@ -65,6 +65,7 @@ IFACEMETHODIMP DirectUI::ItemsControlAutomationPeerGenerated::CreateItemAutomati
     }
     ARG_NOTNULL(pItem, "item");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ItemsControlAutomationPeer*>(this)->CreateItemAutomationPeerImpl(pItem, ppReturnValue));
@@ -83,6 +84,7 @@ IFACEMETHODIMP DirectUI::ItemsControlAutomationPeerGenerated::FindItemByProperty
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ItemsControlAutomationPeer_FindItemByProperty", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ItemsControlAutomationPeer*>(this)->FindItemByPropertyImpl(pStartAfter, pAutomationProperty, pValue, ppReturnValue));
@@ -102,6 +104,7 @@ IFACEMETHODIMP DirectUI::ItemsControlAutomationPeerGenerated::OnCreateItemAutoma
     }
     ARG_NOTNULL(pItem, "item");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ItemsControlAutomationPeer*>(this)->OnCreateItemAutomationPeerImpl(pItem, ppReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemsPresenter.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemsPresenter.g.cpp
index 5bd6ccf061..575a232c53 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemsPresenter.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemsPresenter.g.cpp
@@ -57,6 +57,7 @@ IFACEMETHODIMP DirectUI::ItemsPresenterGenerated::get_AreHorizontalSnapPointsReg
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemsPresenter*>(this)->get_AreHorizontalSnapPointsRegularImpl(pValue));
 Cleanup:
@@ -66,6 +67,7 @@ IFACEMETHODIMP DirectUI::ItemsPresenterGenerated::get_AreVerticalSnapPointsRegul
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemsPresenter*>(this)->get_AreVerticalSnapPointsRegularImpl(pValue));
 Cleanup:
@@ -75,6 +77,7 @@ IFACEMETHODIMP DirectUI::ItemsPresenterGenerated::get_CanHorizontallyScroll(_Out
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemsPresenter*>(this)->get_CanHorizontallyScrollImpl(pValue));
 Cleanup:
@@ -94,6 +97,7 @@ IFACEMETHODIMP DirectUI::ItemsPresenterGenerated::get_CanVerticallyScroll(_Out_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemsPresenter*>(this)->get_CanVerticallyScrollImpl(pValue));
 Cleanup:
@@ -113,6 +117,7 @@ IFACEMETHODIMP DirectUI::ItemsPresenterGenerated::get_ExtentHeight(_Out_ DOUBLE*
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemsPresenter*>(this)->get_ExtentHeightImpl(pValue));
 Cleanup:
@@ -122,6 +127,7 @@ IFACEMETHODIMP DirectUI::ItemsPresenterGenerated::get_ExtentWidth(_Out_ DOUBLE*
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemsPresenter*>(this)->get_ExtentWidthImpl(pValue));
 Cleanup:
@@ -185,6 +191,7 @@ IFACEMETHODIMP DirectUI::ItemsPresenterGenerated::get_HorizontalOffset(_Out_ DOU
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemsPresenter*>(this)->get_HorizontalOffsetImpl(pValue));
 Cleanup:
@@ -202,6 +209,7 @@ IFACEMETHODIMP DirectUI::ItemsPresenterGenerated::get_MinHorizontalOffset(_Out_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemsPresenter*>(this)->get_MinHorizontalOffsetImpl(pValue));
 Cleanup:
@@ -211,6 +219,7 @@ IFACEMETHODIMP DirectUI::ItemsPresenterGenerated::get_MinVerticalOffset(_Out_ DO
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemsPresenter*>(this)->get_MinVerticalOffsetImpl(pValue));
 Cleanup:
@@ -229,6 +238,7 @@ IFACEMETHODIMP DirectUI::ItemsPresenterGenerated::get_ScrollOwner(_Outptr_result
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemsPresenter*>(this)->get_ScrollOwnerImpl(ppValue));
 Cleanup:
@@ -248,6 +258,7 @@ IFACEMETHODIMP DirectUI::ItemsPresenterGenerated::get_VerticalOffset(_Out_ DOUBL
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemsPresenter*>(this)->get_VerticalOffsetImpl(pValue));
 Cleanup:
@@ -257,6 +268,7 @@ IFACEMETHODIMP DirectUI::ItemsPresenterGenerated::get_ViewportHeight(_Out_ DOUBL
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemsPresenter*>(this)->get_ViewportHeightImpl(pValue));
 Cleanup:
@@ -266,6 +278,7 @@ IFACEMETHODIMP DirectUI::ItemsPresenterGenerated::get_ViewportWidth(_Out_ DOUBLE
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemsPresenter*>(this)->get_ViewportWidthImpl(pValue));
 Cleanup:
@@ -393,6 +406,7 @@ IFACEMETHODIMP DirectUI::ItemsPresenterGenerated::GetIrregularSnapPoints(_In_ AB
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ItemsPresenter_GetIrregularSnapPoints", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ItemsPresenter*>(this)->GetIrregularSnapPointsImpl(orientation, alignment, ppReturnValue));
@@ -411,6 +425,7 @@ IFACEMETHODIMP DirectUI::ItemsPresenterGenerated::GetRegularSnapPoints(_In_ ABI:
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ItemsPresenter_GetRegularSnapPoints", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ItemsPresenter*>(this)->GetRegularSnapPointsImpl(orientation, alignment, pOffset, pReturnValue));
@@ -627,7 +642,7 @@ _Check_return_ HRESULT DirectUI::ItemsPresenterGenerated::EventAddHandlerByIndex
     case KnownEventIndex::ItemsPresenter_HorizontalSnapPointsChanged:
         {
             ctl::ComPtr<ABI::Windows::Foundation::IEventHandler<IInspectable*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -644,7 +659,7 @@ _Check_return_ HRESULT DirectUI::ItemsPresenterGenerated::EventAddHandlerByIndex
     case KnownEventIndex::ItemsPresenter_VerticalSnapPointsChanged:
         {
             ctl::ComPtr<ABI::Windows::Foundation::IEventHandler<IInspectable*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemsStackPanel.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemsStackPanel.g.cpp
index 0ce5e4a139..f0f26a2ff0 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemsStackPanel.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemsStackPanel.g.cpp
@@ -67,6 +67,7 @@ IFACEMETHODIMP DirectUI::ItemsStackPanelGenerated::get_FirstCacheIndex(_Out_ INT
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemsStackPanel*>(this)->get_FirstCacheIndexImpl(pValue));
 Cleanup:
@@ -76,6 +77,7 @@ IFACEMETHODIMP DirectUI::ItemsStackPanelGenerated::get_FirstVisibleIndex(_Out_ I
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemsStackPanel*>(this)->get_FirstVisibleIndexImpl(pValue));
 Cleanup:
@@ -112,6 +114,7 @@ IFACEMETHODIMP DirectUI::ItemsStackPanelGenerated::get_LastCacheIndex(_Out_ INT*
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemsStackPanel*>(this)->get_LastCacheIndexImpl(pValue));
 Cleanup:
@@ -121,6 +124,7 @@ IFACEMETHODIMP DirectUI::ItemsStackPanelGenerated::get_LastVisibleIndex(_Out_ IN
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemsStackPanel*>(this)->get_LastVisibleIndexImpl(pValue));
 Cleanup:
@@ -139,6 +143,7 @@ IFACEMETHODIMP DirectUI::ItemsStackPanelGenerated::get_ScrollingDirection(_Out_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemsStackPanel*>(this)->get_ScrollingDirectionImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemsWrapGrid.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemsWrapGrid.g.cpp
index 0ecd9fcc43..d3f2e972dc 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemsWrapGrid.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemsWrapGrid.g.cpp
@@ -67,6 +67,7 @@ IFACEMETHODIMP DirectUI::ItemsWrapGridGenerated::get_FirstCacheIndex(_Out_ INT*
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemsWrapGrid*>(this)->get_FirstCacheIndexImpl(pValue));
 Cleanup:
@@ -76,6 +77,7 @@ IFACEMETHODIMP DirectUI::ItemsWrapGridGenerated::get_FirstVisibleIndex(_Out_ INT
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemsWrapGrid*>(this)->get_FirstVisibleIndexImpl(pValue));
 Cleanup:
@@ -121,6 +123,7 @@ IFACEMETHODIMP DirectUI::ItemsWrapGridGenerated::get_LastCacheIndex(_Out_ INT* p
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemsWrapGrid*>(this)->get_LastCacheIndexImpl(pValue));
 Cleanup:
@@ -130,6 +133,7 @@ IFACEMETHODIMP DirectUI::ItemsWrapGridGenerated::get_LastVisibleIndex(_Out_ INT*
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemsWrapGrid*>(this)->get_LastVisibleIndexImpl(pValue));
 Cleanup:
@@ -157,6 +161,7 @@ IFACEMETHODIMP DirectUI::ItemsWrapGridGenerated::get_ScrollingDirection(_Out_ AB
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ItemsWrapGrid*>(this)->get_ScrollingDirectionImpl(pValue));
 Cleanup:
@@ -169,13 +174,17 @@ IFACEMETHODIMP DirectUI::ItemsWrapGridGenerated::get_ScrollingDirection(_Out_ AB
 
 HRESULT DirectUI::ItemsWrapGridFactory::QueryInterfaceImpl(_In_ REFIID iid, _Outptr_ void** ppObject)
 {
-    if (InlineIsEqualGUID(iid, __uuidof(ABI::Microsoft::UI::Xaml::Controls::IItemsWrapGridStatics)))
+    if (InlineIsEqualGUID(iid, __uuidof(ABI::Microsoft::UI::Xaml::Controls::IItemsWrapGridFactory)))
+    {
+        *ppObject = static_cast<ABI::Microsoft::UI::Xaml::Controls::IItemsWrapGridFactory*>(this);
+    }
+    else if (InlineIsEqualGUID(iid, __uuidof(ABI::Microsoft::UI::Xaml::Controls::IItemsWrapGridStatics)))
     {
         *ppObject = static_cast<ABI::Microsoft::UI::Xaml::Controls::IItemsWrapGridStatics*>(this);
     }
     else
     {
-        RRETURN(ctl::BetterCoreObjectActivationFactory::QueryInterfaceImpl(iid, ppObject));
+        RRETURN(ctl::BetterAggregableCoreObjectActivationFactory::QueryInterfaceImpl(iid, ppObject));
     }
 
     AddRefOuter();
@@ -184,6 +193,29 @@ HRESULT DirectUI::ItemsWrapGridFactory::QueryInterfaceImpl(_In_ REFIID iid, _Out
 
 
 // Factory methods.
+IFACEMETHODIMP DirectUI::ItemsWrapGridFactory::CreateInstance(_In_opt_ IInspectable* pOuter, _Outptr_ IInspectable** ppInner, _Outptr_ ABI::Microsoft::UI::Xaml::Controls::IItemsWrapGrid** ppInstance)
+{
+
+#if DBG
+    // We play some games with reinterpret_cast and assuming that the GUID type table is accurate - which is somewhat sketchy, but
+    // really good for binary size.  This code is a sanity check that the games we play are ok.
+    const GUID uuidofGUID = __uuidof(ABI::Microsoft::UI::Xaml::Controls::IItemsWrapGrid);
+    const GUID metadataAPIGUID = MetadataAPI::GetClassInfoByIndex(GetTypeIndex())->GetGuid();
+    const KnownTypeIndex typeIndex = GetTypeIndex();
+
+    if(uuidofGUID != metadataAPIGUID)
+    {
+        XAML_FAIL_FAST();
+    }
+#endif
+
+    // Can't just IFC(_RETURN) this because for some validate calls (those with multiple template parameters), the
+    // preprocessor gets confused at the "," in the template type-list before the function's opening parenthesis.
+    // So we'll use IFC_RETURN syntax with a local hr variable, kind of weirdly.
+    const HRESULT hr = ctl::ValidateFactoryCreateInstanceWithBetterAggregableCoreObjectActivationFactory(pOuter, ppInner, reinterpret_cast<IUnknown**>(ppInstance), GetTypeIndex(), false /*isFreeThreaded*/);
+    IFC_RETURN(hr);
+    return S_OK;
+}
 
 // Dependency properties.
 IFACEMETHODIMP DirectUI::ItemsWrapGridFactory::get_GroupPaddingProperty(_Out_ ABI::Microsoft::UI::Xaml::IDependencyProperty** ppValue)
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemsWrapGrid.g.h b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemsWrapGrid.g.h
index 6d4a865468..84bf30aea0 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemsWrapGrid.g.h
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ItemsWrapGrid.g.h
@@ -99,15 +99,18 @@ namespace DirectUI
     // fold together.  This is significant for binary size in Microsoft.UI.Xaml.dll so change this only with great
     // care.
     class __declspec(novtable) ItemsWrapGridFactory:
-       public ctl::BetterCoreObjectActivationFactory
+       public ctl::BetterAggregableCoreObjectActivationFactory
+        , public ABI::Microsoft::UI::Xaml::Controls::IItemsWrapGridFactory
         , public ABI::Microsoft::UI::Xaml::Controls::IItemsWrapGridStatics
     {
-        BEGIN_INTERFACE_MAP(ItemsWrapGridFactory, ctl::BetterCoreObjectActivationFactory)
+        BEGIN_INTERFACE_MAP(ItemsWrapGridFactory, ctl::BetterAggregableCoreObjectActivationFactory)
+            INTERFACE_ENTRY(ItemsWrapGridFactory, ABI::Microsoft::UI::Xaml::Controls::IItemsWrapGridFactory)
             INTERFACE_ENTRY(ItemsWrapGridFactory, ABI::Microsoft::UI::Xaml::Controls::IItemsWrapGridStatics)
-        END_INTERFACE_MAP(ItemsWrapGridFactory, ctl::BetterCoreObjectActivationFactory)
+        END_INTERFACE_MAP(ItemsWrapGridFactory, ctl::BetterAggregableCoreObjectActivationFactory)
 
     public:
         // Factory methods.
+        IFACEMETHOD(CreateInstance)(_In_opt_ IInspectable* pOuter, _Outptr_ IInspectable** ppInner, _Outptr_ ABI::Microsoft::UI::Xaml::Controls::IItemsWrapGrid** ppInstance);
 
         // Static properties.
 
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/KeyRoutedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/KeyRoutedEventArgs.g.cpp
index 613ed2eab6..02eaa91b05 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/KeyRoutedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/KeyRoutedEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::KeyRoutedEventArgsGenerated::get_Key(_Out_ ABI::Windows
     DirectUI::VirtualKey valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CKeyEventArgs*>(pCoreEventArgsNoRef)->get_Key(&valueCore));
@@ -66,6 +67,7 @@ IFACEMETHODIMP DirectUI::KeyRoutedEventArgsGenerated::get_KeyStatus(_Out_ ABI::W
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<KeyRoutedEventArgs*>(this)->get_KeyStatusImpl(pValue));
 Cleanup:
@@ -79,6 +81,7 @@ _Check_return_ HRESULT DirectUI::KeyRoutedEventArgsGenerated::get_Shift(_Out_ BO
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CKeyEventArgs*>(pCoreEventArgsNoRef)->get_Shift(&valueCore));
@@ -112,6 +115,7 @@ _Check_return_ HRESULT DirectUI::KeyRoutedEventArgsGenerated::get_Ctrl(_Out_ BOO
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CKeyEventArgs*>(pCoreEventArgsNoRef)->get_Ctrl(&valueCore));
@@ -145,6 +149,7 @@ IFACEMETHODIMP DirectUI::KeyRoutedEventArgsGenerated::get_Handled(_Out_ BOOLEAN*
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CKeyEventArgs*>(pCoreEventArgsNoRef)->get_Handled(&valueCore));
@@ -178,6 +183,7 @@ IFACEMETHODIMP DirectUI::KeyRoutedEventArgsGenerated::get_OriginalKey(_Out_ ABI:
     DirectUI::VirtualKey valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CKeyEventArgs*>(pCoreEventArgsNoRef)->get_OriginalKey(&valueCore));
@@ -195,6 +201,7 @@ IFACEMETHODIMP DirectUI::KeyRoutedEventArgsGenerated::get_DeviceId(_Out_ HSTRING
     xstring_ptr valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CKeyEventArgs*>(pCoreEventArgsNoRef)->get_DeviceId(&valueCore));
@@ -212,6 +219,7 @@ _Check_return_ HRESULT DirectUI::KeyRoutedEventArgsGenerated::get_HandledShouldN
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CKeyEventArgs*>(pCoreEventArgsNoRef)->get_HandledShouldNotImpedeTextInput(&valueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/LayoutTransitionElementUtilities.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/LayoutTransitionElementUtilities.g.cpp
index e8dd2add8c..e2849bcdc6 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/LayoutTransitionElementUtilities.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/LayoutTransitionElementUtilities.g.cpp
@@ -77,6 +77,7 @@ IFACEMETHODIMP DirectUI::LayoutTransitionElementUtilitiesFactory::CreateLayoutTr
     }
     ARG_NOTNULL(pSource, "source");
     ARG_VALIDRETURNPOINTER(ppResult);
+    *ppResult={};
     IFC(CheckActivationAllowed());
     IFC(CreateLayoutTransitionElementImpl(pSource, pParent, ppResult));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/LinearGradientBrush.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/LinearGradientBrush.g.cpp
index 8552a69f23..2036a921e4 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/LinearGradientBrush.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/LinearGradientBrush.g.cpp
@@ -51,6 +51,7 @@ _Check_return_ HRESULT DirectUI::LinearGradientBrushGenerated::get_AnimatedCente
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<LinearGradientBrush*>(this)->get_AnimatedCenterPointImpl(pValue));
 Cleanup:
@@ -69,6 +70,7 @@ _Check_return_ HRESULT DirectUI::LinearGradientBrushGenerated::get_AnimatedRotat
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<LinearGradientBrush*>(this)->get_AnimatedRotationImpl(pValue));
 Cleanup:
@@ -87,6 +89,7 @@ _Check_return_ HRESULT DirectUI::LinearGradientBrushGenerated::get_AnimatedScale
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<LinearGradientBrush*>(this)->get_AnimatedScaleImpl(pValue));
 Cleanup:
@@ -105,6 +108,7 @@ _Check_return_ HRESULT DirectUI::LinearGradientBrushGenerated::get_AnimatedTrans
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<LinearGradientBrush*>(this)->get_AnimatedTransformMatrixImpl(pValue));
 Cleanup:
@@ -123,6 +127,7 @@ _Check_return_ HRESULT DirectUI::LinearGradientBrushGenerated::get_AnimatedTrans
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<LinearGradientBrush*>(this)->get_AnimatedTranslationImpl(pValue));
 Cleanup:
@@ -141,6 +146,7 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::LinearGradientBrushGenerated:
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<LinearGradientBrush*>(this)->get_CenterPointImpl(pValue));
 Cleanup:
@@ -169,6 +175,7 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::LinearGradientBrushGenerated:
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<LinearGradientBrush*>(this)->get_RotationImpl(pValue));
 Cleanup:
@@ -188,6 +195,7 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::LinearGradientBrushGenerated:
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<LinearGradientBrush*>(this)->get_ScaleImpl(pValue));
 Cleanup:
@@ -216,6 +224,7 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::LinearGradientBrushGenerated:
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<LinearGradientBrush*>(this)->get_TransformMatrixImpl(pValue));
 Cleanup:
@@ -235,6 +244,7 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::LinearGradientBrushGenerated:
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<LinearGradientBrush*>(this)->get_TranslationImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ListBox.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ListBox.g.cpp
index fce3ac3ae4..1303fd2543 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ListBox.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ListBox.g.cpp
@@ -45,6 +45,7 @@ IFACEMETHODIMP DirectUI::ListBoxGenerated::get_SelectedItems(_Outptr_result_mayb
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<ListBox*>(this)->get_SelectedItemsImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ListViewBase.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ListViewBase.g.cpp
index ee1ee89f6f..4815caef30 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ListViewBase.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ListViewBase.g.cpp
@@ -239,6 +239,7 @@ IFACEMETHODIMP DirectUI::ListViewBaseGenerated::get_SelectedItems(_Outptr_result
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<ListViewBase*>(this)->get_SelectedItemsImpl(ppValue));
 Cleanup:
@@ -248,6 +249,7 @@ IFACEMETHODIMP DirectUI::ListViewBaseGenerated::get_SelectedRanges(_Outptr_resul
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<ListViewBase*>(this)->get_SelectedRangesImpl(ppValue));
 Cleanup:
@@ -631,6 +633,7 @@ IFACEMETHODIMP DirectUI::ListViewBaseGenerated::BuildTree(_Out_ BOOLEAN* pReturn
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ListViewBase_BuildTree", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ListViewBase*>(this)->BuildTreeImpl(pReturnValue));
@@ -724,6 +727,7 @@ _Check_return_ HRESULT DirectUI::ListViewBaseGenerated::GetRelativeScrollPositio
     }
     ARG_NOTNULL(pItemToKeyProvider, "itemToKeyProvider");
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<ListViewBase*>(this)->GetRelativeScrollPositionImpl(pItemToKeyProvider, pReturnValue));
 Cleanup:
@@ -759,6 +763,7 @@ IFACEMETHODIMP DirectUI::ListViewBaseGenerated::IsBuildTreeSuspended(_Out_ BOOLE
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ListViewBase_IsBuildTreeSuspended", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ListViewBase*>(this)->IsBuildTreeSuspendedImpl(pReturnValue));
@@ -777,6 +782,7 @@ IFACEMETHODIMP DirectUI::ListViewBaseGenerated::IsDragSource(_Out_ BOOLEAN* pRet
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ListViewBase_IsDragSource", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ListViewBase*>(this)->IsDragSourceImpl(pReturnValue));
@@ -795,6 +801,7 @@ IFACEMETHODIMP DirectUI::ListViewBaseGenerated::LoadMoreItemsAsync(_Outptr_ ABI:
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ListViewBase_LoadMoreItemsAsync", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ListViewBase*>(this)->LoadMoreItemsAsyncImpl(ppReturnValue));
@@ -831,6 +838,7 @@ IFACEMETHODIMP DirectUI::ListViewBaseGenerated::OnBackButtonPressed(_Out_ BOOLEA
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ListViewBase_OnBackButtonPressed", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ListViewBase*>(this)->OnBackButtonPressedImpl(pResult));
@@ -852,6 +860,7 @@ IFACEMETHODIMP DirectUI::ListViewBaseGenerated::PrepareConnectedAnimation(_In_ H
     ARG_NOTNULL(pItem, "item");
     ARG_NOTNULL(elementName, "elementName");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ListViewBase*>(this)->PrepareConnectedAnimationImpl(key, pItem, elementName, ppReturnValue));
@@ -980,6 +989,7 @@ _Check_return_ HRESULT DirectUI::ListViewBaseGenerated::SetRelativeScrollPositio
     ARG_NOTNULL(relativeScrollPosition, "relativeScrollPosition");
     ARG_NOTNULL(pKeyToItemProvider, "keyToItemProvider");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<ListViewBase*>(this)->SetRelativeScrollPositionAsyncImpl(relativeScrollPosition, pKeyToItemProvider, ppReturnValue));
 Cleanup:
@@ -1056,6 +1066,7 @@ IFACEMETHODIMP DirectUI::ListViewBaseGenerated::TryStartConnectedAnimationAsync(
     ARG_NOTNULL(pItem, "item");
     ARG_NOTNULL(elementName, "elementName");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ListViewBase*>(this)->TryStartConnectedAnimationAsyncImpl(pAnimation, pItem, elementName, ppReturnValue));
@@ -1074,7 +1085,7 @@ _Check_return_ HRESULT DirectUI::ListViewBaseGenerated::EventAddHandlerByIndex(_
     case KnownEventIndex::ListViewBase_ChoosingGroupHeaderContainer:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::Controls::ListViewBase*, ABI::Microsoft::UI::Xaml::Controls::ChoosingGroupHeaderContainerEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -1091,7 +1102,7 @@ _Check_return_ HRESULT DirectUI::ListViewBaseGenerated::EventAddHandlerByIndex(_
     case KnownEventIndex::ListViewBase_ChoosingItemContainer:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::Controls::ListViewBase*, ABI::Microsoft::UI::Xaml::Controls::ChoosingItemContainerEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -1108,7 +1119,7 @@ _Check_return_ HRESULT DirectUI::ListViewBaseGenerated::EventAddHandlerByIndex(_
     case KnownEventIndex::ListViewBase_ContainerContentChanging:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::Controls::ListViewBase*, ABI::Microsoft::UI::Xaml::Controls::ContainerContentChangingEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -1125,7 +1136,7 @@ _Check_return_ HRESULT DirectUI::ListViewBaseGenerated::EventAddHandlerByIndex(_
     case KnownEventIndex::ListViewBase_DragItemsCompleted:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::Controls::ListViewBase*, ABI::Microsoft::UI::Xaml::Controls::DragItemsCompletedEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -1142,7 +1153,7 @@ _Check_return_ HRESULT DirectUI::ListViewBaseGenerated::EventAddHandlerByIndex(_
     case KnownEventIndex::ListViewBase_DragItemsStarting:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Controls::IDragItemsStartingEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -1159,7 +1170,7 @@ _Check_return_ HRESULT DirectUI::ListViewBaseGenerated::EventAddHandlerByIndex(_
     case KnownEventIndex::ListViewBase_ItemClick:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Controls::IItemClickEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ListViewBaseAutomationPeer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ListViewBaseAutomationPeer.g.cpp
index 82a0061553..b990749eb4 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ListViewBaseAutomationPeer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ListViewBaseAutomationPeer.g.cpp
@@ -49,6 +49,7 @@ IFACEMETHODIMP DirectUI::ListViewBaseAutomationPeerGenerated::get_DropEffect(_Ou
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ListViewBaseAutomationPeer*>(this)->get_DropEffectImpl(pValue));
 Cleanup:
@@ -58,6 +59,7 @@ IFACEMETHODIMP DirectUI::ListViewBaseAutomationPeerGenerated::get_DropEffects(_O
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ListViewBaseAutomationPeer*>(this)->get_DropEffectsImpl(pCount, pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ListViewBaseItemAutomationPeer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ListViewBaseItemAutomationPeer.g.cpp
index 6ab1217432..499305fa49 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ListViewBaseItemAutomationPeer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ListViewBaseItemAutomationPeer.g.cpp
@@ -46,6 +46,7 @@ IFACEMETHODIMP DirectUI::ListViewBaseItemAutomationPeerGenerated::get_DropEffect
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ListViewBaseItemAutomationPeer*>(this)->get_DropEffectImpl(pValue));
 Cleanup:
@@ -55,6 +56,7 @@ IFACEMETHODIMP DirectUI::ListViewBaseItemAutomationPeerGenerated::get_DropEffect
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ListViewBaseItemAutomationPeer*>(this)->get_DropEffectsImpl(pCount, pValue));
 Cleanup:
@@ -64,6 +66,7 @@ IFACEMETHODIMP DirectUI::ListViewBaseItemAutomationPeerGenerated::get_IsGrabbed(
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ListViewBaseItemAutomationPeer*>(this)->get_IsGrabbedImpl(pValue));
 Cleanup:
@@ -81,6 +84,7 @@ IFACEMETHODIMP DirectUI::ListViewBaseItemAutomationPeerGenerated::GetGrabbedItem
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ListViewBaseItemAutomationPeer_GetGrabbedItems", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ListViewBaseItemAutomationPeer*>(this)->GetGrabbedItemsImpl(pReturnValueCount, ppReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ListViewItemPresenter.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ListViewItemPresenter.g.cpp
index 5ba52e2009..e43ec2389e 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ListViewItemPresenter.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ListViewItemPresenter.g.cpp
@@ -280,6 +280,7 @@ IFACEMETHODIMP DirectUI::ListViewItemPresenterGenerated::get_ListViewItemPresent
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ListViewItemPresenter*>(this)->get_ListViewItemPresenterHorizontalContentAlignmentImpl(pValue));
 Cleanup:
@@ -299,6 +300,7 @@ IFACEMETHODIMP DirectUI::ListViewItemPresenterGenerated::get_ListViewItemPresent
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ListViewItemPresenter*>(this)->get_ListViewItemPresenterPaddingImpl(pValue));
 Cleanup:
@@ -318,6 +320,7 @@ IFACEMETHODIMP DirectUI::ListViewItemPresenterGenerated::get_ListViewItemPresent
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ListViewItemPresenter*>(this)->get_ListViewItemPresenterVerticalContentAlignmentImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ListViewPersistenceHelper.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ListViewPersistenceHelper.g.cpp
index 730b9590c7..0c291c4b67 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ListViewPersistenceHelper.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ListViewPersistenceHelper.g.cpp
@@ -49,6 +49,7 @@ IFACEMETHODIMP DirectUI::ListViewPersistenceHelperFactory::GetRelativeScrollPosi
     ARG_NOTNULL(pListViewBase, "listViewBase");
     ARG_NOTNULL(pItemToKeyHandler, "itemToKeyHandler");
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(GetRelativeScrollPositionImpl(pListViewBase, pItemToKeyHandler, pReturnValue));
 Cleanup:
@@ -69,6 +70,7 @@ IFACEMETHODIMP DirectUI::ListViewPersistenceHelperFactory::SetRelativeScrollPosi
     ARG_NOTNULL(relativeScrollPosition, "relativeScrollPosition");
     ARG_NOTNULL(pKeyToItemHandler, "keyToItemHandler");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(SetRelativeScrollPositionAsyncImpl(pListViewBase, relativeScrollPosition, pKeyToItemHandler, ppReturnValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/LoadedImageSourceLoadCompletedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/LoadedImageSourceLoadCompletedEventArgs.g.cpp
index c038f6dee1..80332eab09 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/LoadedImageSourceLoadCompletedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/LoadedImageSourceLoadCompletedEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::LoadedImageSourceLoadCompletedEventArgs::get_Status(_Ou
     DirectUI::LoadedImageSourceLoadStatus valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CLoadedImageSourceLoadCompletedEventArgs*>(pCoreEventArgsNoRef)->get_Status(&valueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/LoadedImageSurface.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/LoadedImageSurface.g.cpp
index 24bdd4ffb9..16246f5b11 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/LoadedImageSurface.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/LoadedImageSurface.g.cpp
@@ -173,6 +173,7 @@ IFACEMETHODIMP DirectUI::LoadedImageSurfaceFactory::StartLoadFromUriWithSize(_In
     }
     ARG_NOTNULL(pUri, "uri");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(StartLoadFromUriWithSizeImpl(pUri, desiredMaxSize, ppReturnValue));
 Cleanup:
@@ -191,6 +192,7 @@ IFACEMETHODIMP DirectUI::LoadedImageSurfaceFactory::StartLoadFromUri(_In_ ABI::W
     }
     ARG_NOTNULL(pUri, "uri");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(StartLoadFromUriImpl(pUri, ppReturnValue));
 Cleanup:
@@ -209,6 +211,7 @@ IFACEMETHODIMP DirectUI::LoadedImageSurfaceFactory::StartLoadFromStreamWithSize(
     }
     ARG_NOTNULL(pStream, "stream");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(StartLoadFromStreamWithSizeImpl(pStream, desiredMaxSize, ppReturnValue));
 Cleanup:
@@ -227,6 +230,7 @@ IFACEMETHODIMP DirectUI::LoadedImageSurfaceFactory::StartLoadFromStream(_In_ ABI
     }
     ARG_NOTNULL(pStream, "stream");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(StartLoadFromStreamImpl(pStream, ppReturnValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/LosingFocusEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/LosingFocusEventArgs.g.cpp
index 235e4a7597..cc64b3f7fd 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/LosingFocusEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/LosingFocusEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::LosingFocusEventArgs::get_OldFocusedElement(_Outptr_res
     CDependencyObject* pValueCore = nullptr;
 
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CLosingFocusEventArgs*>(pCoreEventArgsNoRef)->get_OldFocusedElement(&pValueCore));
@@ -70,6 +71,7 @@ IFACEMETHODIMP DirectUI::LosingFocusEventArgs::get_NewFocusedElement(_Outptr_res
     CDependencyObject* pValueCore = nullptr;
 
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CLosingFocusEventArgs*>(pCoreEventArgsNoRef)->get_NewFocusedElement(&pValueCore));
@@ -103,6 +105,7 @@ IFACEMETHODIMP DirectUI::LosingFocusEventArgs::get_FocusState(_Out_ ABI::Microso
     DirectUI::FocusState valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CLosingFocusEventArgs*>(pCoreEventArgsNoRef)->get_FocusState(&valueCore));
@@ -120,6 +123,7 @@ IFACEMETHODIMP DirectUI::LosingFocusEventArgs::get_Direction(_Out_ ABI::Microsof
     DirectUI::FocusNavigationDirection valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CLosingFocusEventArgs*>(pCoreEventArgsNoRef)->get_Direction(&valueCore));
@@ -137,6 +141,7 @@ IFACEMETHODIMP DirectUI::LosingFocusEventArgs::get_Handled(_Out_ BOOLEAN* pValue
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CLosingFocusEventArgs*>(pCoreEventArgsNoRef)->get_Handled(&valueCore));
@@ -170,6 +175,7 @@ IFACEMETHODIMP DirectUI::LosingFocusEventArgs::get_InputDevice(_Out_ ABI::Micros
     DirectUI::FocusInputDeviceKind valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CLosingFocusEventArgs*>(pCoreEventArgsNoRef)->get_InputDevice(&valueCore));
@@ -187,6 +193,7 @@ IFACEMETHODIMP DirectUI::LosingFocusEventArgs::get_Cancel(_Out_ BOOLEAN* pValue)
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CLosingFocusEventArgs*>(pCoreEventArgsNoRef)->get_Cancel(&valueCore));
@@ -220,6 +227,7 @@ IFACEMETHODIMP DirectUI::LosingFocusEventArgs::get_CorrelationId(_Out_ GUID* pVa
     GUID valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CLosingFocusEventArgs*>(pCoreEventArgsNoRef)->get_CorrelationId(&valueCore));
@@ -239,6 +247,7 @@ IFACEMETHODIMP DirectUI::LosingFocusEventArgs::TryCancel(_Out_ BOOLEAN* pReturnV
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "LosingFocusEventArgs_TryCancel", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<LosingFocusEventArgs*>(this)->TryCancelImpl(pReturnValue));
 Cleanup:
@@ -257,6 +266,7 @@ IFACEMETHODIMP DirectUI::LosingFocusEventArgs::TrySetNewFocusedElement(_In_ ABI:
     }
     ARG_NOTNULL(pElement, "element");
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<LosingFocusEventArgs*>(this)->TrySetNewFocusedElementImpl(pElement, pReturnValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ManipulationCompletedRoutedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ManipulationCompletedRoutedEventArgs.g.cpp
index 2f6cea7e16..b83a78d8bb 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ManipulationCompletedRoutedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ManipulationCompletedRoutedEventArgs.g.cpp
@@ -57,6 +57,7 @@ IFACEMETHODIMP DirectUI::ManipulationCompletedRoutedEventArgs::get_Container(_Ou
     CUIElement* pValueCore = nullptr;
 
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CManipulationCompletedEventArgs*>(pCoreEventArgsNoRef)->get_Container(&pValueCore));
@@ -74,6 +75,7 @@ IFACEMETHODIMP DirectUI::ManipulationCompletedRoutedEventArgs::get_Position(_Out
     ABI::Windows::Foundation::Point valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CManipulationCompletedEventArgs*>(pCoreEventArgsNoRef)->get_Position(&valueCore));
@@ -91,6 +93,7 @@ IFACEMETHODIMP DirectUI::ManipulationCompletedRoutedEventArgs::get_IsInertial(_O
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CManipulationCompletedEventArgs*>(pCoreEventArgsNoRef)->get_IsInertial(&valueCore));
@@ -104,6 +107,7 @@ IFACEMETHODIMP DirectUI::ManipulationCompletedRoutedEventArgs::get_Cumulative(_O
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ManipulationCompletedRoutedEventArgs*>(this)->get_CumulativeImpl(pValue));
 Cleanup:
@@ -113,6 +117,7 @@ IFACEMETHODIMP DirectUI::ManipulationCompletedRoutedEventArgs::get_Velocities(_O
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ManipulationCompletedRoutedEventArgs*>(this)->get_VelocitiesImpl(pValue));
 Cleanup:
@@ -126,6 +131,7 @@ IFACEMETHODIMP DirectUI::ManipulationCompletedRoutedEventArgs::get_Handled(_Out_
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CManipulationCompletedEventArgs*>(pCoreEventArgsNoRef)->get_Handled(&valueCore));
@@ -159,6 +165,7 @@ IFACEMETHODIMP DirectUI::ManipulationCompletedRoutedEventArgs::get_PointerDevice
     DirectUI::PointerDeviceType valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CManipulationCompletedEventArgs*>(pCoreEventArgsNoRef)->get_PointerDeviceType(&valueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ManipulationDeltaRoutedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ManipulationDeltaRoutedEventArgs.g.cpp
index 51a1c2df5f..6b2d2b02ee 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ManipulationDeltaRoutedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ManipulationDeltaRoutedEventArgs.g.cpp
@@ -57,6 +57,7 @@ IFACEMETHODIMP DirectUI::ManipulationDeltaRoutedEventArgsGenerated::get_Containe
     CUIElement* pValueCore = nullptr;
 
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CManipulationDeltaEventArgs*>(pCoreEventArgsNoRef)->get_Container(&pValueCore));
@@ -74,6 +75,7 @@ IFACEMETHODIMP DirectUI::ManipulationDeltaRoutedEventArgsGenerated::get_Position
     ABI::Windows::Foundation::Point valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CManipulationDeltaEventArgs*>(pCoreEventArgsNoRef)->get_Position(&valueCore));
@@ -91,6 +93,7 @@ IFACEMETHODIMP DirectUI::ManipulationDeltaRoutedEventArgsGenerated::get_IsInerti
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CManipulationDeltaEventArgs*>(pCoreEventArgsNoRef)->get_IsInertial(&valueCore));
@@ -104,6 +107,7 @@ IFACEMETHODIMP DirectUI::ManipulationDeltaRoutedEventArgsGenerated::get_Delta(_O
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ManipulationDeltaRoutedEventArgs*>(this)->get_DeltaImpl(pValue));
 Cleanup:
@@ -113,6 +117,7 @@ IFACEMETHODIMP DirectUI::ManipulationDeltaRoutedEventArgsGenerated::get_Cumulati
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ManipulationDeltaRoutedEventArgs*>(this)->get_CumulativeImpl(pValue));
 Cleanup:
@@ -122,6 +127,7 @@ IFACEMETHODIMP DirectUI::ManipulationDeltaRoutedEventArgsGenerated::get_Velociti
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ManipulationDeltaRoutedEventArgs*>(this)->get_VelocitiesImpl(pValue));
 Cleanup:
@@ -135,6 +141,7 @@ IFACEMETHODIMP DirectUI::ManipulationDeltaRoutedEventArgsGenerated::get_Handled(
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CManipulationDeltaEventArgs*>(pCoreEventArgsNoRef)->get_Handled(&valueCore));
@@ -168,6 +175,7 @@ IFACEMETHODIMP DirectUI::ManipulationDeltaRoutedEventArgsGenerated::get_PointerD
     DirectUI::PointerDeviceType valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CManipulationDeltaEventArgs*>(pCoreEventArgsNoRef)->get_PointerDeviceType(&valueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ManipulationInertiaStartingRoutedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ManipulationInertiaStartingRoutedEventArgs.g.cpp
index c5aa088138..797164ff3e 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ManipulationInertiaStartingRoutedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ManipulationInertiaStartingRoutedEventArgs.g.cpp
@@ -57,6 +57,7 @@ IFACEMETHODIMP DirectUI::ManipulationInertiaStartingRoutedEventArgs::get_Contain
     CUIElement* pValueCore = nullptr;
 
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CManipulationInertiaStartingEventArgs*>(pCoreEventArgsNoRef)->get_Container(&pValueCore));
@@ -70,6 +71,7 @@ IFACEMETHODIMP DirectUI::ManipulationInertiaStartingRoutedEventArgs::get_Expansi
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<ManipulationInertiaStartingRoutedEventArgs*>(this)->get_ExpansionBehaviorImpl(ppValue));
 Cleanup:
@@ -88,6 +90,7 @@ IFACEMETHODIMP DirectUI::ManipulationInertiaStartingRoutedEventArgs::get_Rotatio
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<ManipulationInertiaStartingRoutedEventArgs*>(this)->get_RotationBehaviorImpl(ppValue));
 Cleanup:
@@ -106,6 +109,7 @@ IFACEMETHODIMP DirectUI::ManipulationInertiaStartingRoutedEventArgs::get_Transla
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<ManipulationInertiaStartingRoutedEventArgs*>(this)->get_TranslationBehaviorImpl(ppValue));
 Cleanup:
@@ -128,6 +132,7 @@ IFACEMETHODIMP DirectUI::ManipulationInertiaStartingRoutedEventArgs::get_Handled
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CManipulationInertiaStartingEventArgs*>(pCoreEventArgsNoRef)->get_Handled(&valueCore));
@@ -161,6 +166,7 @@ IFACEMETHODIMP DirectUI::ManipulationInertiaStartingRoutedEventArgs::get_Pointer
     DirectUI::PointerDeviceType valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CManipulationInertiaStartingEventArgs*>(pCoreEventArgsNoRef)->get_PointerDeviceType(&valueCore));
@@ -174,6 +180,7 @@ IFACEMETHODIMP DirectUI::ManipulationInertiaStartingRoutedEventArgs::get_Delta(_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ManipulationInertiaStartingRoutedEventArgs*>(this)->get_DeltaImpl(pValue));
 Cleanup:
@@ -183,6 +190,7 @@ IFACEMETHODIMP DirectUI::ManipulationInertiaStartingRoutedEventArgs::get_Cumulat
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ManipulationInertiaStartingRoutedEventArgs*>(this)->get_CumulativeImpl(pValue));
 Cleanup:
@@ -192,6 +200,7 @@ IFACEMETHODIMP DirectUI::ManipulationInertiaStartingRoutedEventArgs::get_Velocit
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ManipulationInertiaStartingRoutedEventArgs*>(this)->get_VelocitiesImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ManipulationStartedRoutedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ManipulationStartedRoutedEventArgs.g.cpp
index 8ab7095f73..5d8b61086d 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ManipulationStartedRoutedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ManipulationStartedRoutedEventArgs.g.cpp
@@ -57,6 +57,7 @@ IFACEMETHODIMP DirectUI::ManipulationStartedRoutedEventArgs::get_Container(_Outp
     CUIElement* pValueCore = nullptr;
 
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CManipulationStartedEventArgs*>(pCoreEventArgsNoRef)->get_Container(&pValueCore));
@@ -74,6 +75,7 @@ IFACEMETHODIMP DirectUI::ManipulationStartedRoutedEventArgs::get_Position(_Out_
     ABI::Windows::Foundation::Point valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CManipulationStartedEventArgs*>(pCoreEventArgsNoRef)->get_Position(&valueCore));
@@ -91,6 +93,7 @@ IFACEMETHODIMP DirectUI::ManipulationStartedRoutedEventArgs::get_Handled(_Out_ B
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CManipulationStartedEventArgs*>(pCoreEventArgsNoRef)->get_Handled(&valueCore));
@@ -124,6 +127,7 @@ IFACEMETHODIMP DirectUI::ManipulationStartedRoutedEventArgs::get_PointerDeviceTy
     DirectUI::PointerDeviceType valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CManipulationStartedEventArgs*>(pCoreEventArgsNoRef)->get_PointerDeviceType(&valueCore));
@@ -137,6 +141,7 @@ IFACEMETHODIMP DirectUI::ManipulationStartedRoutedEventArgs::get_Cumulative(_Out
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ManipulationStartedRoutedEventArgs*>(this)->get_CumulativeImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ManipulationStartingRoutedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ManipulationStartingRoutedEventArgs.g.cpp
index c16804bdb0..2ec56a988f 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ManipulationStartingRoutedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ManipulationStartingRoutedEventArgs.g.cpp
@@ -57,6 +57,7 @@ IFACEMETHODIMP DirectUI::ManipulationStartingRoutedEventArgs::get_Mode(_Out_ ABI
     DirectUI::ManipulationModes valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CManipulationStartingEventArgs*>(pCoreEventArgsNoRef)->get_Mode(&valueCore));
@@ -90,6 +91,7 @@ IFACEMETHODIMP DirectUI::ManipulationStartingRoutedEventArgs::get_Container(_Out
     CUIElement* pValueCore = nullptr;
 
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CManipulationStartingEventArgs*>(pCoreEventArgsNoRef)->get_Container(&pValueCore));
@@ -123,6 +125,7 @@ IFACEMETHODIMP DirectUI::ManipulationStartingRoutedEventArgs::get_Pivot(_Outptr_
     CManipulationPivot* pValueCore = nullptr;
 
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CManipulationStartingEventArgs*>(pCoreEventArgsNoRef)->get_Pivot(&pValueCore));
@@ -156,6 +159,7 @@ IFACEMETHODIMP DirectUI::ManipulationStartingRoutedEventArgs::get_Handled(_Out_
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CManipulationStartingEventArgs*>(pCoreEventArgsNoRef)->get_Handled(&valueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MarkupExtension.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MarkupExtension.g.cpp
index 275c878817..951c419d15 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MarkupExtension.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MarkupExtension.g.cpp
@@ -57,6 +57,7 @@ IFACEMETHODIMP DirectUI::MarkupExtension::ProvideValue(_Outptr_ IInspectable** p
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "MarkupExtension_ProvideValue", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<MarkupExtension*>(this)->ProvideValueImpl(ppReturnValue));
 Cleanup:
@@ -97,6 +98,7 @@ IFACEMETHODIMP DirectUI::MarkupExtension::ProvideValueWithIXamlServiceProvider(_
     }
     ARG_NOTNULL(pServiceProvider, "serviceProvider");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<MarkupExtension*>(this)->ProvideValueWithIXamlServiceProviderImpl(pServiceProvider, ppReturnValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MediaPlayerElement.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MediaPlayerElement.g.cpp
index aba6c9d45d..792b9e4246 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MediaPlayerElement.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MediaPlayerElement.g.cpp
@@ -60,6 +60,7 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::MediaPlayerElementGenerated::
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<MediaPlayerElement*>(this)->get_AutoPlayImpl(pValue));
 Cleanup:
@@ -101,6 +102,7 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::MediaPlayerElementGenerated::
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<MediaPlayerElement*>(this)->get_SourceImpl(ppValue));
 Cleanup:
@@ -129,6 +131,7 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::MediaPlayerElementGenerated::
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<MediaPlayerElement*>(this)->get_TransportControlsImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MediaTransportControls.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MediaTransportControls.g.cpp
index e754964676..3053276361 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MediaTransportControls.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MediaTransportControls.g.cpp
@@ -355,6 +355,7 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::MediaTransportControlsGenerat
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "MediaTransportControls_OnBackButtonPressed", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<MediaTransportControls*>(this)->OnBackButtonPressedImpl(pResult));
@@ -391,7 +392,7 @@ _Check_return_ HRESULT DirectUI::MediaTransportControlsGenerated::EventAddHandle
     case KnownEventIndex::MediaTransportControls_ThumbnailRequested:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::Controls::MediaTransportControls*, ABI::Microsoft::UI::Xaml::Media::MediaTransportControlsThumbnailRequestedEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MediaTransportControlsThumbnailRequestedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MediaTransportControlsThumbnailRequestedEventArgs.g.cpp
index b0ff5b9b9f..bea89eb7ed 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MediaTransportControlsThumbnailRequestedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MediaTransportControlsThumbnailRequestedEventArgs.g.cpp
@@ -72,6 +72,7 @@ IFACEMETHODIMP DirectUI::MediaTransportControlsThumbnailRequestedEventArgsGenera
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "MediaTransportControlsThumbnailRequestedEventArgs_GetDeferral", 0);
     }
     ARG_VALIDRETURNPOINTER(ppResult);
+    *ppResult={};
     IFC(CheckThread());
     IFC(static_cast<MediaTransportControlsThumbnailRequestedEventArgs*>(this)->GetDeferralImpl(ppResult));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MenuFlyout.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MenuFlyout.g.cpp
index bfe5d4ba5e..bbe781c3ac 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MenuFlyout.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MenuFlyout.g.cpp
@@ -69,6 +69,7 @@ IFACEMETHODIMP DirectUI::MenuFlyoutGenerated::get_ParentMenu(_Outptr_result_mayb
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<MenuFlyout*>(this)->get_ParentMenuImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MenuFlyoutItem.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MenuFlyoutItem.g.cpp
index f089fe0c20..62d1a23a6a 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MenuFlyoutItem.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MenuFlyoutItem.g.cpp
@@ -74,6 +74,7 @@ IFACEMETHODIMP DirectUI::MenuFlyoutItemGenerated::get_KeyboardAcceleratorTextOve
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<MenuFlyoutItem*>(this)->get_KeyboardAcceleratorTextOverrideImpl(pValue));
 Cleanup:
@@ -182,7 +183,7 @@ _Check_return_ HRESULT DirectUI::MenuFlyoutItemGenerated::EventAddHandlerByIndex
     case KnownEventIndex::MenuFlyoutItem_Click:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::IRoutedEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -211,7 +212,7 @@ _Check_return_ HRESULT DirectUI::MenuFlyoutItemGenerated::EventRemoveHandlerByIn
     case KnownEventIndex::MenuFlyoutItem_Click:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::IRoutedEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MenuFlyoutPresenter.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MenuFlyoutPresenter.g.cpp
index 8701c2b0ea..79bff3a57f 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MenuFlyoutPresenter.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MenuFlyoutPresenter.g.cpp
@@ -64,6 +64,7 @@ IFACEMETHODIMP DirectUI::MenuFlyoutPresenterGenerated::get_Owner(_Outptr_result_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<MenuFlyoutPresenter*>(this)->get_OwnerImpl(ppValue));
 Cleanup:
@@ -83,6 +84,7 @@ IFACEMETHODIMP DirectUI::MenuFlyoutPresenterGenerated::get_OwningMenu(_Outptr_re
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<MenuFlyoutPresenter*>(this)->get_OwningMenuImpl(ppValue));
 Cleanup:
@@ -102,6 +104,7 @@ IFACEMETHODIMP DirectUI::MenuFlyoutPresenterGenerated::get_SubPresenter(_Outptr_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<MenuFlyoutPresenter*>(this)->get_SubPresenterImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MenuFlyoutSubItem.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MenuFlyoutSubItem.g.cpp
index f1aec52c5c..c8780ea294 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MenuFlyoutSubItem.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MenuFlyoutSubItem.g.cpp
@@ -59,6 +59,7 @@ IFACEMETHODIMP DirectUI::MenuFlyoutSubItemGenerated::get_IsSubMenuOpen(_Out_ BOO
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<MenuFlyoutSubItem*>(this)->get_IsSubMenuOpenImpl(pValue));
 Cleanup:
@@ -68,6 +69,7 @@ IFACEMETHODIMP DirectUI::MenuFlyoutSubItemGenerated::get_IsSubMenuPositionedAbso
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<MenuFlyoutSubItem*>(this)->get_IsSubMenuPositionedAbsolutelyImpl(pValue));
 Cleanup:
@@ -86,6 +88,7 @@ IFACEMETHODIMP DirectUI::MenuFlyoutSubItemGenerated::get_ParentOwner(_Outptr_res
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<MenuFlyoutSubItem*>(this)->get_ParentOwnerImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MenuFlyoutSubItemAutomationPeer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MenuFlyoutSubItemAutomationPeer.g.cpp
index a2f01cdea2..237ae3b754 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MenuFlyoutSubItemAutomationPeer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/MenuFlyoutSubItemAutomationPeer.g.cpp
@@ -45,6 +45,7 @@ IFACEMETHODIMP DirectUI::MenuFlyoutSubItemAutomationPeerGenerated::get_ExpandCol
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<MenuFlyoutSubItemAutomationPeer*>(this)->get_ExpandCollapseStateImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ModernCollectionBasePanel.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ModernCollectionBasePanel.g.cpp
index 93a1f30a11..2ee0b54c17 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ModernCollectionBasePanel.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ModernCollectionBasePanel.g.cpp
@@ -90,6 +90,7 @@ IFACEMETHODIMP DirectUI::ModernCollectionBasePanelGenerated::get_AreHorizontalSn
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ModernCollectionBasePanel*>(this)->get_AreHorizontalSnapPointsRegularImpl(pValue));
 Cleanup:
@@ -108,6 +109,7 @@ IFACEMETHODIMP DirectUI::ModernCollectionBasePanelGenerated::get_AreVerticalSnap
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ModernCollectionBasePanel*>(this)->get_AreVerticalSnapPointsRegularImpl(pValue));
 Cleanup:
@@ -280,6 +282,7 @@ _Check_return_ HRESULT DirectUI::ModernCollectionBasePanelGenerated::get_Panning
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ModernCollectionBasePanel*>(this)->get_PanningDirectionBaseImpl(pValue));
 Cleanup:
@@ -471,6 +474,7 @@ IFACEMETHODIMP DirectUI::ModernCollectionBasePanelGenerated::BuildTree(_Out_ BOO
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ModernCollectionBasePanel_BuildTree", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ModernCollectionBasePanel*>(this)->BuildTreeImpl(pReturnValue));
@@ -489,6 +493,7 @@ IFACEMETHODIMP DirectUI::ModernCollectionBasePanelGenerated::ContainerFromIndex(
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ModernCollectionBasePanel_ContainerFromIndex", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ModernCollectionBasePanel*>(this)->ContainerFromIndexImpl(index, ppReturnValue));
@@ -507,6 +512,7 @@ IFACEMETHODIMP DirectUI::ModernCollectionBasePanelGenerated::ContainerFromItem(_
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ModernCollectionBasePanel_ContainerFromItem", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ModernCollectionBasePanel*>(this)->ContainerFromItemImpl(pItem, ppReturnValue));
@@ -561,6 +567,7 @@ IFACEMETHODIMP DirectUI::ModernCollectionBasePanelGenerated::GenerateContainerAt
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ModernCollectionBasePanel_GenerateContainerAtIndex", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ModernCollectionBasePanel*>(this)->GenerateContainerAtIndexImpl(index, ppReturnValue));
@@ -579,6 +586,7 @@ IFACEMETHODIMP DirectUI::ModernCollectionBasePanelGenerated::GenerateHeaderAtGro
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ModernCollectionBasePanel_GenerateHeaderAtGroupIndex", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ModernCollectionBasePanel*>(this)->GenerateHeaderAtGroupIndexImpl(index, ppReturnValue));
@@ -597,6 +605,7 @@ IFACEMETHODIMP DirectUI::ModernCollectionBasePanelGenerated::GetContainerRecycle
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ModernCollectionBasePanel_GetContainerRecycleQueueEmpty", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ModernCollectionBasePanel*>(this)->GetContainerRecycleQueueEmptyImpl(pReturnValue));
@@ -615,6 +624,7 @@ IFACEMETHODIMP DirectUI::ModernCollectionBasePanelGenerated::GetContainersForInc
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ModernCollectionBasePanel_GetContainersForIncrementalVisualization", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ModernCollectionBasePanel*>(this)->GetContainersForIncrementalVisualizationImpl(ppReturnValue));
@@ -633,6 +643,7 @@ IFACEMETHODIMP DirectUI::ModernCollectionBasePanelGenerated::GetGroupHeaderMappi
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ModernCollectionBasePanel_GetGroupHeaderMapping", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ModernCollectionBasePanel*>(this)->GetGroupHeaderMappingImpl(ppReturnValue));
@@ -651,6 +662,7 @@ IFACEMETHODIMP DirectUI::ModernCollectionBasePanelGenerated::GetHeaderRecycleQue
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ModernCollectionBasePanel_GetHeaderRecycleQueueEmpty", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ModernCollectionBasePanel*>(this)->GetHeaderRecycleQueueEmptyImpl(pReturnValue));
@@ -687,6 +699,7 @@ IFACEMETHODIMP DirectUI::ModernCollectionBasePanelGenerated::GetIrregularSnapPoi
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ModernCollectionBasePanel_GetIrregularSnapPoints", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ModernCollectionBasePanel*>(this)->GetIrregularSnapPointsImpl(orientation, alignment, ppReturnValue));
@@ -705,6 +718,7 @@ IFACEMETHODIMP DirectUI::ModernCollectionBasePanelGenerated::GetItemContainerMap
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ModernCollectionBasePanel_GetItemContainerMapping", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ModernCollectionBasePanel*>(this)->GetItemContainerMappingImpl(ppReturnValue));
@@ -723,6 +737,7 @@ IFACEMETHODIMP DirectUI::ModernCollectionBasePanelGenerated::GetQueueLength(_Out
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ModernCollectionBasePanel_GetQueueLength", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ModernCollectionBasePanel*>(this)->GetQueueLengthImpl(pReturnValue));
@@ -741,6 +756,7 @@ IFACEMETHODIMP DirectUI::ModernCollectionBasePanelGenerated::GetRegularSnapPoint
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ModernCollectionBasePanel_GetRegularSnapPoints", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ModernCollectionBasePanel*>(this)->GetRegularSnapPointsImpl(orientation, alignment, pOffset, pReturnValue));
@@ -760,6 +776,7 @@ IFACEMETHODIMP DirectUI::ModernCollectionBasePanelGenerated::GroupFromHeader(_In
     }
     ARG_NOTNULL(pHeader, "header");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ModernCollectionBasePanel*>(this)->GroupFromHeaderImpl(pHeader, ppReturnValue));
@@ -779,6 +796,7 @@ IFACEMETHODIMP DirectUI::ModernCollectionBasePanelGenerated::GroupHeaderContaine
     }
     ARG_NOTNULL(pItemContainer, "itemContainer");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ModernCollectionBasePanel*>(this)->GroupHeaderContainerFromItemContainerImpl(pItemContainer, ppReturnValue));
@@ -798,6 +816,7 @@ IFACEMETHODIMP DirectUI::ModernCollectionBasePanelGenerated::HeaderFromGroup(_In
     }
     ARG_NOTNULL(pGroup, "group");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ModernCollectionBasePanel*>(this)->HeaderFromGroupImpl(pGroup, ppReturnValue));
@@ -816,6 +835,7 @@ IFACEMETHODIMP DirectUI::ModernCollectionBasePanelGenerated::HeaderFromIndex(_In
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ModernCollectionBasePanel_HeaderFromIndex", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ModernCollectionBasePanel*>(this)->HeaderFromIndexImpl(index, ppReturnValue));
@@ -835,6 +855,7 @@ IFACEMETHODIMP DirectUI::ModernCollectionBasePanelGenerated::IndexFromContainer(
     }
     ARG_NOTNULL(pContainer, "container");
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ModernCollectionBasePanel*>(this)->IndexFromContainerImpl(pContainer, pReturnValue));
@@ -854,6 +875,7 @@ IFACEMETHODIMP DirectUI::ModernCollectionBasePanelGenerated::IndexFromHeader(_In
     }
     ARG_NOTNULL(pHeader, "header");
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ModernCollectionBasePanel*>(this)->IndexFromHeaderImpl(pHeader, excludeHiddenEmptyGroups, pReturnValue));
@@ -872,6 +894,7 @@ IFACEMETHODIMP DirectUI::ModernCollectionBasePanelGenerated::IsBuildTreeSuspende
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ModernCollectionBasePanel_IsBuildTreeSuspended", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ModernCollectionBasePanel*>(this)->IsBuildTreeSuspendedImpl(pReturnValue));
@@ -891,6 +914,7 @@ IFACEMETHODIMP DirectUI::ModernCollectionBasePanelGenerated::ItemFromContainer(_
     }
     ARG_NOTNULL(pContainer, "container");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ModernCollectionBasePanel*>(this)->ItemFromContainerImpl(pContainer, ppReturnValue));
@@ -1090,6 +1114,7 @@ IFACEMETHODIMP DirectUI::ModernCollectionBasePanelGenerated::TryRecycleContainer
     }
     ARG_NOTNULL(pContainer, "container");
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ModernCollectionBasePanel*>(this)->TryRecycleContainerImpl(pContainer, pReturnValue));
@@ -1108,7 +1133,7 @@ _Check_return_ HRESULT DirectUI::ModernCollectionBasePanelGenerated::EventAddHan
     case KnownEventIndex::ModernCollectionBasePanel_HorizontalSnapPointsChanged:
         {
             ctl::ComPtr<ABI::Windows::Foundation::IEventHandler<IInspectable*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -1125,7 +1150,7 @@ _Check_return_ HRESULT DirectUI::ModernCollectionBasePanelGenerated::EventAddHan
     case KnownEventIndex::ModernCollectionBasePanel_VerticalSnapPointsChanged:
         {
             ctl::ComPtr<ABI::Windows::Foundation::IEventHandler<IInspectable*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/NavigationTransitionInfo.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/NavigationTransitionInfo.g.cpp
index 310eaa6112..b65965c60a 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/NavigationTransitionInfo.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/NavigationTransitionInfo.g.cpp
@@ -104,6 +104,7 @@ IFACEMETHODIMP DirectUI::NavigationTransitionInfoGenerated::GetNavigationStateCo
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "NavigationTransitionInfo_GetNavigationStateCore", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<NavigationTransitionInfo*>(this)->GetNavigationStateCoreImpl(pReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/NoFocusCandidateFoundEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/NoFocusCandidateFoundEventArgs.g.cpp
index d693e350fa..2d8186387e 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/NoFocusCandidateFoundEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/NoFocusCandidateFoundEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::NoFocusCandidateFoundEventArgs::get_Direction(_Out_ ABI
     DirectUI::FocusNavigationDirection valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CNoFocusCandidateFoundEventArgs*>(pCoreEventArgsNoRef)->get_Direction(&valueCore));
@@ -70,6 +71,7 @@ IFACEMETHODIMP DirectUI::NoFocusCandidateFoundEventArgs::get_Handled(_Out_ BOOLE
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CNoFocusCandidateFoundEventArgs*>(pCoreEventArgsNoRef)->get_Handled(&valueCore));
@@ -103,6 +105,7 @@ IFACEMETHODIMP DirectUI::NoFocusCandidateFoundEventArgs::get_InputDevice(_Out_ A
     DirectUI::FocusInputDeviceKind valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CNoFocusCandidateFoundEventArgs*>(pCoreEventArgsNoRef)->get_InputDevice(&valueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/OrientedVirtualizingPanel.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/OrientedVirtualizingPanel.g.cpp
index 5aaef17cf4..3437851616 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/OrientedVirtualizingPanel.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/OrientedVirtualizingPanel.g.cpp
@@ -70,6 +70,7 @@ IFACEMETHODIMP DirectUI::OrientedVirtualizingPanelGenerated::get_AreHorizontalSn
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<OrientedVirtualizingPanel*>(this)->get_AreHorizontalSnapPointsRegularImpl(pValue));
 Cleanup:
@@ -79,6 +80,7 @@ IFACEMETHODIMP DirectUI::OrientedVirtualizingPanelGenerated::get_AreVerticalSnap
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<OrientedVirtualizingPanel*>(this)->get_AreVerticalSnapPointsRegularImpl(pValue));
 Cleanup:
@@ -88,6 +90,7 @@ IFACEMETHODIMP DirectUI::OrientedVirtualizingPanelGenerated::get_CanHorizontally
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<OrientedVirtualizingPanel*>(this)->get_CanHorizontallyScrollImpl(pValue));
 Cleanup:
@@ -107,6 +110,7 @@ IFACEMETHODIMP DirectUI::OrientedVirtualizingPanelGenerated::get_CanVerticallySc
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<OrientedVirtualizingPanel*>(this)->get_CanVerticallyScrollImpl(pValue));
 Cleanup:
@@ -126,6 +130,7 @@ IFACEMETHODIMP DirectUI::OrientedVirtualizingPanelGenerated::get_ExtentHeight(_O
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<OrientedVirtualizingPanel*>(this)->get_ExtentHeightImpl(pValue));
 Cleanup:
@@ -135,6 +140,7 @@ IFACEMETHODIMP DirectUI::OrientedVirtualizingPanelGenerated::get_ExtentWidth(_Ou
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<OrientedVirtualizingPanel*>(this)->get_ExtentWidthImpl(pValue));
 Cleanup:
@@ -144,6 +150,7 @@ IFACEMETHODIMP DirectUI::OrientedVirtualizingPanelGenerated::get_HorizontalOffse
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<OrientedVirtualizingPanel*>(this)->get_HorizontalOffsetImpl(pValue));
 Cleanup:
@@ -153,6 +160,7 @@ IFACEMETHODIMP DirectUI::OrientedVirtualizingPanelGenerated::get_MinHorizontalOf
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<OrientedVirtualizingPanel*>(this)->get_MinHorizontalOffsetImpl(pValue));
 Cleanup:
@@ -162,6 +170,7 @@ IFACEMETHODIMP DirectUI::OrientedVirtualizingPanelGenerated::get_MinVerticalOffs
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<OrientedVirtualizingPanel*>(this)->get_MinVerticalOffsetImpl(pValue));
 Cleanup:
@@ -171,6 +180,7 @@ IFACEMETHODIMP DirectUI::OrientedVirtualizingPanelGenerated::get_ScrollOwner(_Ou
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<OrientedVirtualizingPanel*>(this)->get_ScrollOwnerImpl(ppValue));
 Cleanup:
@@ -190,6 +200,7 @@ IFACEMETHODIMP DirectUI::OrientedVirtualizingPanelGenerated::get_VerticalOffset(
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<OrientedVirtualizingPanel*>(this)->get_VerticalOffsetImpl(pValue));
 Cleanup:
@@ -199,6 +210,7 @@ IFACEMETHODIMP DirectUI::OrientedVirtualizingPanelGenerated::get_ViewportHeight(
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<OrientedVirtualizingPanel*>(this)->get_ViewportHeightImpl(pValue));
 Cleanup:
@@ -208,6 +220,7 @@ IFACEMETHODIMP DirectUI::OrientedVirtualizingPanelGenerated::get_ViewportWidth(_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<OrientedVirtualizingPanel*>(this)->get_ViewportWidthImpl(pValue));
 Cleanup:
@@ -353,6 +366,7 @@ IFACEMETHODIMP DirectUI::OrientedVirtualizingPanelGenerated::GetIrregularSnapPoi
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "OrientedVirtualizingPanel_GetIrregularSnapPoints", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<OrientedVirtualizingPanel*>(this)->GetIrregularSnapPointsImpl(orientation, alignment, ppReturnValue));
@@ -371,6 +385,7 @@ IFACEMETHODIMP DirectUI::OrientedVirtualizingPanelGenerated::GetRegularSnapPoint
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "OrientedVirtualizingPanel_GetRegularSnapPoints", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<OrientedVirtualizingPanel*>(this)->GetRegularSnapPointsImpl(orientation, alignment, pOffset, pReturnValue));
@@ -462,6 +477,7 @@ IFACEMETHODIMP DirectUI::OrientedVirtualizingPanelGenerated::MakeVisible(_In_ AB
     }
     ARG_NOTNULL(pVisual, "visual");
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<OrientedVirtualizingPanel*>(this)->MakeVisibleImpl(pVisual, rectangle, pReturnValue));
@@ -678,7 +694,7 @@ _Check_return_ HRESULT DirectUI::OrientedVirtualizingPanelGenerated::EventAddHan
     case KnownEventIndex::OrientedVirtualizingPanel_HorizontalSnapPointsChanged:
         {
             ctl::ComPtr<ABI::Windows::Foundation::IEventHandler<IInspectable*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -695,7 +711,7 @@ _Check_return_ HRESULT DirectUI::OrientedVirtualizingPanelGenerated::EventAddHan
     case KnownEventIndex::OrientedVirtualizingPanel_VerticalSnapPointsChanged:
         {
             ctl::ComPtr<ABI::Windows::Foundation::IEventHandler<IInspectable*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Page.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Page.g.cpp
index a368258f36..2d3aa92a2b 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Page.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Page.g.cpp
@@ -80,6 +80,7 @@ IFACEMETHODIMP DirectUI::PageGenerated::get_TopAppBar(_Outptr_result_maybenull_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<Page*>(this)->get_TopAppBarImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PaginateEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PaginateEventArgs.g.cpp
index 4f8c7be417..09e5ee7fc0 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PaginateEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PaginateEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::PaginateEventArgsGenerated::get_PrintTaskOptions(_Outpt
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<PaginateEventArgs*>(this)->get_PrintTaskOptionsImpl(ppValue));
 Cleanup:
@@ -71,6 +72,7 @@ IFACEMETHODIMP DirectUI::PaginateEventArgsGenerated::get_CurrentPreviewPageNumbe
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<PaginateEventArgs*>(this)->get_CurrentPreviewPageNumberImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ParserServiceProvider.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ParserServiceProvider.g.cpp
index f67c3782ee..51c2266e2a 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ParserServiceProvider.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ParserServiceProvider.g.cpp
@@ -61,6 +61,7 @@ IFACEMETHODIMP DirectUI::ParserServiceProviderGenerated::get_BaseUri(_Outptr_res
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<ParserServiceProvider*>(this)->get_BaseUriImpl(ppValue));
 Cleanup:
@@ -70,6 +71,7 @@ IFACEMETHODIMP DirectUI::ParserServiceProviderGenerated::get_RootObject(_Outptr_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<ParserServiceProvider*>(this)->get_RootObjectImpl(ppValue));
 Cleanup:
@@ -79,6 +81,7 @@ IFACEMETHODIMP DirectUI::ParserServiceProviderGenerated::get_TargetObject(_Outpt
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<ParserServiceProvider*>(this)->get_TargetObjectImpl(ppValue));
 Cleanup:
@@ -88,6 +91,7 @@ IFACEMETHODIMP DirectUI::ParserServiceProviderGenerated::get_TargetProperty(_Out
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<ParserServiceProvider*>(this)->get_TargetPropertyImpl(ppValue));
 Cleanup:
@@ -105,6 +109,7 @@ IFACEMETHODIMP DirectUI::ParserServiceProviderGenerated::GetService(_In_ ABI::Wi
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ParserServiceProvider_GetService", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<ParserServiceProvider*>(this)->GetServiceImpl(type, ppReturnValue));
 Cleanup:
@@ -123,6 +128,7 @@ IFACEMETHODIMP DirectUI::ParserServiceProviderGenerated::Resolve(_In_ HSTRING qu
     }
     ARG_NOTNULL(qualifiedTypeName, "qualifiedTypeName");
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<ParserServiceProvider*>(this)->ResolveImpl(qualifiedTypeName, pReturnValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PasswordBox.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PasswordBox.g.cpp
index f5dfbaa442..7fb2a4ddab 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PasswordBox.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PasswordBox.g.cpp
@@ -120,6 +120,7 @@ IFACEMETHODIMP DirectUI::PasswordBoxGenerated::get_InputScope(_Outptr_result_may
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<PasswordBox*>(this)->get_InputScopeImpl(ppValue));
 Cleanup:
@@ -657,12 +658,6 @@ HRESULT DirectUI::PasswordBoxFactory::QueryInterfaceImpl(_In_ REFIID iid, _Outpt
     {
         *ppObject = static_cast<ABI::Microsoft::UI::Xaml::Controls::IPasswordBoxStaticsFeature_HeaderPlacement*>(this);
     }
-#endif
-#if WI_IS_FEATURE_PRESENT(Feature_InputValidation)
-    else if (InlineIsEqualGUID(iid, __uuidof(ABI::Microsoft::UI::Xaml::Controls::IPasswordBoxStaticsFeature_InputValidation)))
-    {
-        *ppObject = static_cast<ABI::Microsoft::UI::Xaml::Controls::IPasswordBoxStaticsFeature_InputValidation*>(this);
-    }
 #endif
     else
     {
@@ -744,18 +739,9 @@ IFACEMETHODIMP DirectUI::PasswordBoxFactory::get_HeaderPlacementProperty(_Out_ A
 
 
 
-IFACEMETHODIMP DirectUI::PasswordBoxFactory::get_ErrorTemplateProperty(_Out_ ABI::Microsoft::UI::Xaml::IDependencyProperty** ppValue)
-{
-    RRETURN(MetadataAPI::GetIDependencyProperty(KnownPropertyIndex::PasswordBox_ErrorTemplate, ppValue));
-}
-IFACEMETHODIMP DirectUI::PasswordBoxFactory::get_InputValidationModeProperty(_Out_ ABI::Microsoft::UI::Xaml::IDependencyProperty** ppValue)
-{
-    RRETURN(MetadataAPI::GetIDependencyProperty(KnownPropertyIndex::PasswordBox_InputValidationMode, ppValue));
-}
-IFACEMETHODIMP DirectUI::PasswordBoxFactory::get_InputValidationKindProperty(_Out_ ABI::Microsoft::UI::Xaml::IDependencyProperty** ppValue)
-{
-    RRETURN(MetadataAPI::GetIDependencyProperty(KnownPropertyIndex::PasswordBox_InputValidationKind, ppValue));
-}
+
+
+
 
 
 // Attached properties.
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PasswordBox.g.h b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PasswordBox.g.h
index ea6b326311..bfdf54d75b 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PasswordBox.g.h
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PasswordBox.g.h
@@ -185,18 +185,12 @@ namespace DirectUI
         , public ABI::Microsoft::UI::Xaml::Controls::IPasswordBoxStatics
 #if WI_IS_FEATURE_PRESENT(Feature_HeaderPlacement)
         , public ABI::Microsoft::UI::Xaml::Controls::IPasswordBoxStaticsFeature_HeaderPlacement
-#endif
-#if WI_IS_FEATURE_PRESENT(Feature_InputValidation)
-        , public ABI::Microsoft::UI::Xaml::Controls::IPasswordBoxStaticsFeature_InputValidation
 #endif
     {
         BEGIN_INTERFACE_MAP(PasswordBoxFactory, ctl::BetterCoreObjectActivationFactory)
             INTERFACE_ENTRY(PasswordBoxFactory, ABI::Microsoft::UI::Xaml::Controls::IPasswordBoxStatics)
 #if WI_IS_FEATURE_PRESENT(Feature_HeaderPlacement)
             INTERFACE_ENTRY(PasswordBoxFactory, ABI::Microsoft::UI::Xaml::Controls::IPasswordBoxStaticsFeature_HeaderPlacement)
-#endif
-#if WI_IS_FEATURE_PRESENT(Feature_InputValidation)
-            INTERFACE_ENTRY(PasswordBoxFactory, ABI::Microsoft::UI::Xaml::Controls::IPasswordBoxStaticsFeature_InputValidation)
 #endif
         END_INTERFACE_MAP(PasswordBoxFactory, ctl::BetterCoreObjectActivationFactory)
 
@@ -225,9 +219,9 @@ namespace DirectUI
         
         
         
-        IFACEMETHOD(get_ErrorTemplateProperty)(_Out_ ABI::Microsoft::UI::Xaml::IDependencyProperty** ppValue) FEATURE_INPUTVALIDATION_OVERRIDE;
-        IFACEMETHOD(get_InputValidationModeProperty)(_Out_ ABI::Microsoft::UI::Xaml::IDependencyProperty** ppValue) FEATURE_INPUTVALIDATION_OVERRIDE;
-        IFACEMETHOD(get_InputValidationKindProperty)(_Out_ ABI::Microsoft::UI::Xaml::IDependencyProperty** ppValue) FEATURE_INPUTVALIDATION_OVERRIDE;
+        
+        
+        
         
 
         // Attached properties.
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PointHelper.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PointHelper.g.cpp
index a0c21d7129..b0c2bcad52 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PointHelper.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PointHelper.g.cpp
@@ -46,6 +46,7 @@ IFACEMETHODIMP DirectUI::PointHelperFactory::FromCoordinates(_In_ FLOAT x, _In_
         XamlTelemetry::PublicApiCall(true, 0, "PointHelper_FromCoordinates", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(FromCoordinatesImpl(x, y, pReturnValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PointerRoutedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PointerRoutedEventArgs.g.cpp
index 41092d3b22..14d04f6222 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PointerRoutedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PointerRoutedEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::PointerRoutedEventArgsGenerated::get_Pointer(_Outptr_re
     CPointer* pValueCore = nullptr;
 
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CPointerEventArgs*>(pCoreEventArgsNoRef)->get_Pointer(&pValueCore));
@@ -70,6 +71,7 @@ IFACEMETHODIMP DirectUI::PointerRoutedEventArgsGenerated::get_KeyModifiers(_Out_
     DirectUI::VirtualKeyModifiers valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CPointerEventArgs*>(pCoreEventArgsNoRef)->get_KeyModifiers(&valueCore));
@@ -87,6 +89,7 @@ _Check_return_ HRESULT DirectUI::PointerRoutedEventArgsGenerated::get_GestureFol
     DirectUI::GestureModes valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CPointerEventArgs*>(pCoreEventArgsNoRef)->get_GestureFollowing(&valueCore));
@@ -104,6 +107,7 @@ IFACEMETHODIMP DirectUI::PointerRoutedEventArgsGenerated::get_Handled(_Out_ BOOL
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CPointerEventArgs*>(pCoreEventArgsNoRef)->get_Handled(&valueCore));
@@ -137,6 +141,7 @@ IFACEMETHODIMP DirectUI::PointerRoutedEventArgsGenerated::get_IsGenerated(_Out_
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CPointerEventArgs*>(pCoreEventArgsNoRef)->get_IsGenerated(&valueCore));
@@ -156,6 +161,7 @@ IFACEMETHODIMP DirectUI::PointerRoutedEventArgsGenerated::GetCurrentPoint(_In_op
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "PointerRoutedEventArgs_GetCurrentPoint", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<PointerRoutedEventArgs*>(this)->GetCurrentPointImpl(pRelativeTo, ppReturnValue));
 Cleanup:
@@ -173,6 +179,7 @@ IFACEMETHODIMP DirectUI::PointerRoutedEventArgsGenerated::GetIntermediatePoints(
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "PointerRoutedEventArgs_GetIntermediatePoints", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<PointerRoutedEventArgs*>(this)->GetIntermediatePointsImpl(pRelativeTo, ppReturnValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Popup.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Popup.g.cpp
index 53f13c58ba..67425b9b23 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Popup.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Popup.g.cpp
@@ -129,6 +129,7 @@ IFACEMETHODIMP DirectUI::PopupGenerated::get_IsConstrainedToRootBounds(_Out_ BOO
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<Popup*>(this)->get_IsConstrainedToRootBoundsImpl(pValue));
 Cleanup:
@@ -406,6 +407,7 @@ IFACEMETHODIMP DirectUI::PopupGenerated::OnBackButtonPressed(_Out_ BOOLEAN* pRes
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "Popup_OnBackButtonPressed", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<Popup*>(this)->OnBackButtonPressedImpl(pResult));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PopupAutomationPeer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PopupAutomationPeer.g.cpp
index acc518e313..9e9af2fc4f 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PopupAutomationPeer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PopupAutomationPeer.g.cpp
@@ -45,6 +45,7 @@ IFACEMETHODIMP DirectUI::PopupAutomationPeerGenerated::get_InteractionState(_Out
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<PopupAutomationPeer*>(this)->get_InteractionStateImpl(pValue));
 Cleanup:
@@ -54,6 +55,7 @@ IFACEMETHODIMP DirectUI::PopupAutomationPeerGenerated::get_IsModal(_Out_ BOOLEAN
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<PopupAutomationPeer*>(this)->get_IsModalImpl(pValue));
 Cleanup:
@@ -63,6 +65,7 @@ IFACEMETHODIMP DirectUI::PopupAutomationPeerGenerated::get_IsTopmost(_Out_ BOOLE
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<PopupAutomationPeer*>(this)->get_IsTopmostImpl(pValue));
 Cleanup:
@@ -72,6 +75,7 @@ IFACEMETHODIMP DirectUI::PopupAutomationPeerGenerated::get_Maximizable(_Out_ BOO
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<PopupAutomationPeer*>(this)->get_MaximizableImpl(pValue));
 Cleanup:
@@ -81,6 +85,7 @@ IFACEMETHODIMP DirectUI::PopupAutomationPeerGenerated::get_Minimizable(_Out_ BOO
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<PopupAutomationPeer*>(this)->get_MinimizableImpl(pValue));
 Cleanup:
@@ -90,6 +95,7 @@ IFACEMETHODIMP DirectUI::PopupAutomationPeerGenerated::get_VisualState(_Out_ ABI
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<PopupAutomationPeer*>(this)->get_VisualStateImpl(pValue));
 Cleanup:
@@ -143,6 +149,7 @@ IFACEMETHODIMP DirectUI::PopupAutomationPeerGenerated::WaitForInputIdle(_In_ INT
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "PopupAutomationPeer_WaitForInputIdle", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<PopupAutomationPeer*>(this)->WaitForInputIdleImpl(milliseconds, pReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PrintDocument.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PrintDocument.g.cpp
index 22a48fe18e..da88d0cdef 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PrintDocument.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PrintDocument.g.cpp
@@ -54,6 +54,7 @@ IFACEMETHODIMP DirectUI::PrintDocumentGenerated::get_DocumentSource(_Outptr_resu
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<PrintDocument*>(this)->get_DocumentSourceImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PropertyMetadata.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PropertyMetadata.g.cpp
index 2f8bbc07c9..6fdfc808a5 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PropertyMetadata.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/PropertyMetadata.g.cpp
@@ -153,6 +153,7 @@ IFACEMETHODIMP DirectUI::PropertyMetadataFactory::CreateWithDefaultValue(_In_opt
         XamlTelemetry::PublicApiCall(true, 0, "PropertyMetadata_CreateWithDefaultValue", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     
     IFC(CreateWithDefaultValueImpl(pDefaultValue, ppReturnValue));
 Cleanup:
@@ -170,6 +171,7 @@ IFACEMETHODIMP DirectUI::PropertyMetadataFactory::CreateWithDefaultValueAndCallb
         XamlTelemetry::PublicApiCall(true, 0, "PropertyMetadata_CreateWithDefaultValueAndCallback", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     
     IFC(CreateWithDefaultValueAndCallbackImpl(pDefaultValue, pPropertyChangedCallback, ppReturnValue));
 Cleanup:
@@ -188,6 +190,7 @@ IFACEMETHODIMP DirectUI::PropertyMetadataFactory::CreateWithFactory(_In_ ABI::Mi
     }
     ARG_NOTNULL(pCreateDefaultValueCallback, "createDefaultValueCallback");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     
     IFC(CreateWithFactoryImpl(pCreateDefaultValueCallback, ppReturnValue));
 Cleanup:
@@ -206,6 +209,7 @@ IFACEMETHODIMP DirectUI::PropertyMetadataFactory::CreateWithFactoryAndCallback(_
     }
     ARG_NOTNULL(pCreateDefaultValueCallback, "createDefaultValueCallback");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     
     IFC(CreateWithFactoryAndCallbackImpl(pCreateDefaultValueCallback, pPropertyChangedCallback, ppReturnValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ProvideValueTargetProperty.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ProvideValueTargetProperty.g.cpp
index 56fc804020..d1ecc8a39d 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ProvideValueTargetProperty.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ProvideValueTargetProperty.g.cpp
@@ -45,6 +45,7 @@ IFACEMETHODIMP DirectUI::ProvideValueTargetPropertyGenerated::get_DeclaringType(
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ProvideValueTargetProperty*>(this)->get_DeclaringTypeImpl(pValue));
 Cleanup:
@@ -54,6 +55,7 @@ IFACEMETHODIMP DirectUI::ProvideValueTargetPropertyGenerated::get_Name(_Out_ HST
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ProvideValueTargetProperty*>(this)->get_NameImpl(pValue));
 Cleanup:
@@ -63,6 +65,7 @@ IFACEMETHODIMP DirectUI::ProvideValueTargetPropertyGenerated::get_Type(_Out_ ABI
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ProvideValueTargetProperty*>(this)->get_TypeImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RadioButtonAutomationPeer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RadioButtonAutomationPeer.g.cpp
index 3a2c09b5de..0715d7a65b 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RadioButtonAutomationPeer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RadioButtonAutomationPeer.g.cpp
@@ -50,6 +50,7 @@ IFACEMETHODIMP DirectUI::RadioButtonAutomationPeerGenerated::get_IsSelected(_Out
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<RadioButtonAutomationPeer*>(this)->get_IsSelectedImpl(pValue));
 Cleanup:
@@ -59,6 +60,7 @@ IFACEMETHODIMP DirectUI::RadioButtonAutomationPeerGenerated::get_SelectionContai
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<RadioButtonAutomationPeer*>(this)->get_SelectionContainerImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RangeBase.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RangeBase.g.cpp
index 359d6f6635..7190ebd1b5 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RangeBase.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RangeBase.g.cpp
@@ -277,7 +277,7 @@ _Check_return_ HRESULT DirectUI::RangeBaseGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::RangeBase_ValueChanged:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Controls::Primitives::IRangeBaseValueChangedEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RangeBaseAutomationPeer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RangeBaseAutomationPeer.g.cpp
index 5617f60daa..fc0ecd90a1 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RangeBaseAutomationPeer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RangeBaseAutomationPeer.g.cpp
@@ -49,6 +49,7 @@ IFACEMETHODIMP DirectUI::RangeBaseAutomationPeerGenerated::get_IsReadOnly(_Out_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<RangeBaseAutomationPeer*>(this)->get_IsReadOnlyImpl(pValue));
 Cleanup:
@@ -58,6 +59,7 @@ IFACEMETHODIMP DirectUI::RangeBaseAutomationPeerGenerated::get_LargeChange(_Out_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<RangeBaseAutomationPeer*>(this)->get_LargeChangeImpl(pValue));
 Cleanup:
@@ -67,6 +69,7 @@ IFACEMETHODIMP DirectUI::RangeBaseAutomationPeerGenerated::get_Maximum(_Out_ DOU
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<RangeBaseAutomationPeer*>(this)->get_MaximumImpl(pValue));
 Cleanup:
@@ -76,6 +79,7 @@ IFACEMETHODIMP DirectUI::RangeBaseAutomationPeerGenerated::get_Minimum(_Out_ DOU
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<RangeBaseAutomationPeer*>(this)->get_MinimumImpl(pValue));
 Cleanup:
@@ -85,6 +89,7 @@ IFACEMETHODIMP DirectUI::RangeBaseAutomationPeerGenerated::get_SmallChange(_Out_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<RangeBaseAutomationPeer*>(this)->get_SmallChangeImpl(pValue));
 Cleanup:
@@ -94,6 +99,7 @@ IFACEMETHODIMP DirectUI::RangeBaseAutomationPeerGenerated::get_Value(_Out_ DOUBL
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<RangeBaseAutomationPeer*>(this)->get_ValueImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RectHelper.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RectHelper.g.cpp
index e5a8fd9a55..308a5f67c7 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RectHelper.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RectHelper.g.cpp
@@ -44,6 +44,7 @@ IFACEMETHODIMP DirectUI::RectHelperFactory::get_Empty(_Out_ ABI::Windows::Founda
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckActivationAllowed());
     IFC(get_EmptyImpl(pValue));
 Cleanup:
@@ -59,6 +60,7 @@ IFACEMETHODIMP DirectUI::RectHelperFactory::FromCoordinatesAndDimensions(_In_ FL
         XamlTelemetry::PublicApiCall(true, 0, "RectHelper_FromCoordinatesAndDimensions", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(FromCoordinatesAndDimensionsImpl(x, y, width, height, pReturnValue));
 Cleanup:
@@ -76,6 +78,7 @@ IFACEMETHODIMP DirectUI::RectHelperFactory::FromPoints(_In_ ABI::Windows::Founda
         XamlTelemetry::PublicApiCall(true, 0, "RectHelper_FromPoints", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(FromPointsImpl(point1, point2, pReturnValue));
 Cleanup:
@@ -93,6 +96,7 @@ IFACEMETHODIMP DirectUI::RectHelperFactory::FromLocationAndSize(_In_ ABI::Window
         XamlTelemetry::PublicApiCall(true, 0, "RectHelper_FromLocationAndSize", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(FromLocationAndSizeImpl(location, size, pReturnValue));
 Cleanup:
@@ -110,6 +114,7 @@ IFACEMETHODIMP DirectUI::RectHelperFactory::GetIsEmpty(_In_ ABI::Windows::Founda
         XamlTelemetry::PublicApiCall(true, 0, "RectHelper_GetIsEmpty", 0);
     }
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckActivationAllowed());
     IFC(GetIsEmptyImpl(target, pValue));
 Cleanup:
@@ -127,6 +132,7 @@ IFACEMETHODIMP DirectUI::RectHelperFactory::GetBottom(_In_ ABI::Windows::Foundat
         XamlTelemetry::PublicApiCall(true, 0, "RectHelper_GetBottom", 0);
     }
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckActivationAllowed());
     IFC(GetBottomImpl(target, pValue));
 Cleanup:
@@ -144,6 +150,7 @@ IFACEMETHODIMP DirectUI::RectHelperFactory::GetLeft(_In_ ABI::Windows::Foundatio
         XamlTelemetry::PublicApiCall(true, 0, "RectHelper_GetLeft", 0);
     }
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckActivationAllowed());
     IFC(GetLeftImpl(target, pValue));
 Cleanup:
@@ -161,6 +168,7 @@ IFACEMETHODIMP DirectUI::RectHelperFactory::GetRight(_In_ ABI::Windows::Foundati
         XamlTelemetry::PublicApiCall(true, 0, "RectHelper_GetRight", 0);
     }
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckActivationAllowed());
     IFC(GetRightImpl(target, pValue));
 Cleanup:
@@ -178,6 +186,7 @@ IFACEMETHODIMP DirectUI::RectHelperFactory::GetTop(_In_ ABI::Windows::Foundation
         XamlTelemetry::PublicApiCall(true, 0, "RectHelper_GetTop", 0);
     }
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckActivationAllowed());
     IFC(GetTopImpl(target, pValue));
 Cleanup:
@@ -195,6 +204,7 @@ IFACEMETHODIMP DirectUI::RectHelperFactory::Contains(_In_ ABI::Windows::Foundati
         XamlTelemetry::PublicApiCall(true, 0, "RectHelper_Contains", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(ContainsImpl(target, point, pReturnValue));
 Cleanup:
@@ -212,6 +222,7 @@ IFACEMETHODIMP DirectUI::RectHelperFactory::Equals(_In_ ABI::Windows::Foundation
         XamlTelemetry::PublicApiCall(true, 0, "RectHelper_Equals", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(EqualsImpl(target, value, pReturnValue));
 Cleanup:
@@ -229,6 +240,7 @@ IFACEMETHODIMP DirectUI::RectHelperFactory::Intersect(_In_ ABI::Windows::Foundat
         XamlTelemetry::PublicApiCall(true, 0, "RectHelper_Intersect", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(IntersectImpl(target, rect, pReturnValue));
 Cleanup:
@@ -246,6 +258,7 @@ IFACEMETHODIMP DirectUI::RectHelperFactory::UnionWithPoint(_In_ ABI::Windows::Fo
         XamlTelemetry::PublicApiCall(true, 0, "RectHelper_UnionWithPoint", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(UnionWithPointImpl(target, point, pReturnValue));
 Cleanup:
@@ -263,6 +276,7 @@ IFACEMETHODIMP DirectUI::RectHelperFactory::UnionWithRect(_In_ ABI::Windows::Fou
         XamlTelemetry::PublicApiCall(true, 0, "RectHelper_UnionWithRect", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(UnionWithRectImpl(target, rect, pReturnValue));
 Cleanup:
@@ -280,6 +294,7 @@ IFACEMETHODIMP DirectUI::RectHelperFactory::DipsRectToPhysicalRect(_In_ ABI::Win
         XamlTelemetry::PublicApiCall(true, 0, "RectHelper_DipsRectToPhysicalRect", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckActivationAllowed());
     IFC(DipsRectToPhysicalRectImpl(dipsRect, pResult));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RenderTargetBitmap.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RenderTargetBitmap.g.cpp
index 1dd74ff17c..5edd993253 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RenderTargetBitmap.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RenderTargetBitmap.g.cpp
@@ -62,6 +62,7 @@ IFACEMETHODIMP DirectUI::RenderTargetBitmapGenerated::GetPixelsAsync(_Outptr_ AB
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "RenderTargetBitmap_GetPixelsAsync", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<RenderTargetBitmap*>(this)->GetPixelsAsyncImpl(ppReturnValue));
@@ -80,6 +81,7 @@ IFACEMETHODIMP DirectUI::RenderTargetBitmapGenerated::RenderAsync(_In_opt_ ABI::
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "RenderTargetBitmap_RenderAsync", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<RenderTargetBitmap*>(this)->RenderAsyncImpl(pElement, ppReturnValue));
@@ -98,6 +100,7 @@ IFACEMETHODIMP DirectUI::RenderTargetBitmapGenerated::RenderToSizeAsync(_In_opt_
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "RenderTargetBitmap_RenderToSizeAsync", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<RenderTargetBitmap*>(this)->RenderToSizeAsyncImpl(pElement, scaledWidth, scaledHeight, ppReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RenderedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RenderedEventArgs.g.cpp
index 9998c7d490..bdd6f8e06d 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RenderedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RenderedEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::RenderedEventArgs::get_FrameDuration(_Out_ ABI::Windows
     ABI::Windows::Foundation::TimeSpan valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CRenderedEventArgs*>(pCoreEventArgsNoRef)->get_FrameDuration(&valueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RenderingEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RenderingEventArgs.g.cpp
index b2358043c3..609593418e 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RenderingEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RenderingEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::RenderingEventArgs::get_RenderingTime(_Out_ ABI::Window
     ABI::Windows::Foundation::TimeSpan valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CRenderingEventArgs*>(pCoreEventArgsNoRef)->get_RenderingTime(&valueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RichEditBox.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RichEditBox.g.cpp
index a8352d21dd..839522261f 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RichEditBox.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RichEditBox.g.cpp
@@ -113,6 +113,7 @@ IFACEMETHODIMP DirectUI::RichEditBoxGenerated::get_Document(_Outptr_result_maybe
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<RichEditBox*>(this)->get_DocumentImpl(ppValue));
 Cleanup:
@@ -279,6 +280,7 @@ IFACEMETHODIMP DirectUI::RichEditBoxGenerated::get_TextDocument(_Outptr_result_m
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<RichEditBox*>(this)->get_TextDocumentImpl(ppValue));
 Cleanup:
@@ -974,6 +976,7 @@ IFACEMETHODIMP DirectUI::RichEditBoxGenerated::GetLinguisticAlternativesAsync(_O
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "RichEditBox_GetLinguisticAlternativesAsync", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<RichEditBox*>(this)->GetLinguisticAlternativesAsyncImpl(ppReturnValue));
@@ -992,7 +995,7 @@ _Check_return_ HRESULT DirectUI::RichEditBoxGenerated::EventAddHandlerByIndex(_I
     case KnownEventIndex::RichEditBox_TextChanging:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::Controls::RichEditBox*, ABI::Microsoft::UI::Xaml::Controls::RichEditBoxTextChangingEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -1021,7 +1024,7 @@ _Check_return_ HRESULT DirectUI::RichEditBoxGenerated::EventRemoveHandlerByIndex
     case KnownEventIndex::RichEditBox_TextChanging:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::Controls::RichEditBox*, ABI::Microsoft::UI::Xaml::Controls::RichEditBoxTextChangingEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RichTextBlock.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RichTextBlock.g.cpp
index 9066b2af6a..8fd82396c9 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RichTextBlock.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RichTextBlock.g.cpp
@@ -52,6 +52,7 @@ IFACEMETHODIMP DirectUI::RichTextBlockGenerated::get_BaselineOffset(_Out_ DOUBLE
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<RichTextBlock*>(this)->get_BaselineOffsetImpl(pValue));
 Cleanup:
@@ -74,6 +75,7 @@ IFACEMETHODIMP DirectUI::RichTextBlockGenerated::get_ContentEnd(_Outptr_result_m
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<RichTextBlock*>(this)->get_ContentEndImpl(ppValue));
 Cleanup:
@@ -83,6 +85,7 @@ IFACEMETHODIMP DirectUI::RichTextBlockGenerated::get_ContentStart(_Outptr_result
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<RichTextBlock*>(this)->get_ContentStartImpl(ppValue));
 Cleanup:
@@ -248,6 +251,7 @@ IFACEMETHODIMP DirectUI::RichTextBlockGenerated::get_SelectionEnd(_Outptr_result
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<RichTextBlock*>(this)->get_SelectionEndImpl(ppValue));
 Cleanup:
@@ -275,6 +279,7 @@ IFACEMETHODIMP DirectUI::RichTextBlockGenerated::get_SelectionStart(_Outptr_resu
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<RichTextBlock*>(this)->get_SelectionStartImpl(ppValue));
 Cleanup:
@@ -542,6 +547,7 @@ IFACEMETHODIMP DirectUI::RichTextBlockGenerated::GetPositionFromPoint(_In_ ABI::
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "RichTextBlock_GetPositionFromPoint", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<RichTextBlock*>(this)->GetPositionFromPointImpl(point, ppReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RichTextBlockOverflow.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RichTextBlockOverflow.g.cpp
index d07f975174..7ff65087ff 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RichTextBlockOverflow.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RichTextBlockOverflow.g.cpp
@@ -47,6 +47,7 @@ IFACEMETHODIMP DirectUI::RichTextBlockOverflowGenerated::get_BaselineOffset(_Out
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<RichTextBlockOverflow*>(this)->get_BaselineOffsetImpl(pValue));
 Cleanup:
@@ -56,6 +57,7 @@ IFACEMETHODIMP DirectUI::RichTextBlockOverflowGenerated::get_ContentEnd(_Outptr_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<RichTextBlockOverflow*>(this)->get_ContentEndImpl(ppValue));
 Cleanup:
@@ -65,6 +67,7 @@ IFACEMETHODIMP DirectUI::RichTextBlockOverflowGenerated::get_ContentSource(_Outp
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<RichTextBlockOverflow*>(this)->get_ContentSourceImpl(ppValue));
 Cleanup:
@@ -74,6 +77,7 @@ IFACEMETHODIMP DirectUI::RichTextBlockOverflowGenerated::get_ContentStart(_Outpt
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<RichTextBlockOverflow*>(this)->get_ContentStartImpl(ppValue));
 Cleanup:
@@ -181,6 +185,7 @@ IFACEMETHODIMP DirectUI::RichTextBlockOverflowGenerated::GetPositionFromPoint(_I
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "RichTextBlockOverflow_GetPositionFromPoint", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<RichTextBlockOverflow*>(this)->GetPositionFromPointImpl(point, ppReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RightTappedRoutedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RightTappedRoutedEventArgs.g.cpp
index 926fc5e7f9..0ecdac809b 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RightTappedRoutedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RightTappedRoutedEventArgs.g.cpp
@@ -57,6 +57,7 @@ IFACEMETHODIMP DirectUI::RightTappedRoutedEventArgs::get_PointerDeviceType(_Out_
     DirectUI::PointerDeviceType valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CRightTappedEventArgs*>(pCoreEventArgsNoRef)->get_PointerDeviceType(&valueCore));
@@ -74,6 +75,7 @@ IFACEMETHODIMP DirectUI::RightTappedRoutedEventArgs::get_Handled(_Out_ BOOLEAN*
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CRightTappedEventArgs*>(pCoreEventArgsNoRef)->get_Handled(&valueCore));
@@ -114,6 +116,7 @@ IFACEMETHODIMP DirectUI::RightTappedRoutedEventArgs::GetPosition(_In_opt_ ABI::M
     ABI::Windows::Foundation::Point returnValueCore;
 
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CRightTappedEventArgs*>(pCoreEventArgsNoRef)->GetPosition(pRelativeToCore, &returnValueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RoutedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RoutedEventArgs.g.cpp
index efe0db1d50..cddfed6867 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RoutedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/RoutedEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::RoutedEventArgsGenerated::get_OriginalSource(_Outptr_re
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<RoutedEventArgs*>(this)->get_OriginalSourceImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ScrollBar.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ScrollBar.g.cpp
index 70351f77f3..67353a5c5e 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ScrollBar.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ScrollBar.g.cpp
@@ -243,7 +243,7 @@ _Check_return_ HRESULT DirectUI::ScrollBarGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::ScrollBar_Scroll:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Controls::Primitives::IScrollEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ScrollContentPresenter.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ScrollContentPresenter.g.cpp
index e58366988d..782166d04f 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ScrollContentPresenter.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ScrollContentPresenter.g.cpp
@@ -59,6 +59,7 @@ IFACEMETHODIMP DirectUI::ScrollContentPresenterGenerated::get_CanHorizontallyScr
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollContentPresenter*>(this)->get_CanHorizontallyScrollImpl(pValue));
 Cleanup:
@@ -78,6 +79,7 @@ IFACEMETHODIMP DirectUI::ScrollContentPresenterGenerated::get_CanVerticallyScrol
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollContentPresenter*>(this)->get_CanVerticallyScrollImpl(pValue));
 Cleanup:
@@ -97,6 +99,7 @@ IFACEMETHODIMP DirectUI::ScrollContentPresenterGenerated::get_ExtentHeight(_Out_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollContentPresenter*>(this)->get_ExtentHeightImpl(pValue));
 Cleanup:
@@ -106,6 +109,7 @@ IFACEMETHODIMP DirectUI::ScrollContentPresenterGenerated::get_ExtentWidth(_Out_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollContentPresenter*>(this)->get_ExtentWidthImpl(pValue));
 Cleanup:
@@ -115,6 +119,7 @@ IFACEMETHODIMP DirectUI::ScrollContentPresenterGenerated::get_HorizontalOffset(_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollContentPresenter*>(this)->get_HorizontalOffsetImpl(pValue));
 Cleanup:
@@ -124,6 +129,7 @@ IFACEMETHODIMP DirectUI::ScrollContentPresenterGenerated::get_MinHorizontalOffse
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollContentPresenter*>(this)->get_MinHorizontalOffsetImpl(pValue));
 Cleanup:
@@ -133,6 +139,7 @@ IFACEMETHODIMP DirectUI::ScrollContentPresenterGenerated::get_MinVerticalOffset(
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollContentPresenter*>(this)->get_MinVerticalOffsetImpl(pValue));
 Cleanup:
@@ -142,6 +149,7 @@ IFACEMETHODIMP DirectUI::ScrollContentPresenterGenerated::get_ScrollOwner(_Outpt
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollContentPresenter*>(this)->get_ScrollOwnerImpl(ppValue));
 Cleanup:
@@ -170,6 +178,7 @@ IFACEMETHODIMP DirectUI::ScrollContentPresenterGenerated::get_VerticalOffset(_Ou
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollContentPresenter*>(this)->get_VerticalOffsetImpl(pValue));
 Cleanup:
@@ -179,6 +188,7 @@ IFACEMETHODIMP DirectUI::ScrollContentPresenterGenerated::get_ViewportHeight(_Ou
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollContentPresenter*>(this)->get_ViewportHeightImpl(pValue));
 Cleanup:
@@ -188,6 +198,7 @@ IFACEMETHODIMP DirectUI::ScrollContentPresenterGenerated::get_ViewportWidth(_Out
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollContentPresenter*>(this)->get_ViewportWidthImpl(pValue));
 Cleanup:
@@ -278,6 +289,7 @@ IFACEMETHODIMP DirectUI::ScrollContentPresenterGenerated::MakeVisible(_In_ ABI::
     }
     ARG_NOTNULL(pVisual, "visual");
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ScrollContentPresenter*>(this)->MakeVisibleImpl(pVisual, rectangle, pReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ScrollEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ScrollEventArgs.g.cpp
index 225dda25ac..f5487bbe20 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ScrollEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ScrollEventArgs.g.cpp
@@ -49,6 +49,7 @@ IFACEMETHODIMP DirectUI::ScrollEventArgsGenerated::get_NewValue(_Out_ DOUBLE* pV
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollEventArgs*>(this)->get_NewValueImpl(pValue));
 Cleanup:
@@ -67,6 +68,7 @@ IFACEMETHODIMP DirectUI::ScrollEventArgsGenerated::get_ScrollEventType(_Out_ ABI
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollEventArgs*>(this)->get_ScrollEventTypeImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ScrollViewer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ScrollViewer.g.cpp
index 9973931323..b6680f0c9a 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ScrollViewer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ScrollViewer.g.cpp
@@ -54,6 +54,7 @@ IFACEMETHODIMP DirectUI::ScrollViewerGenerated::get_ArePointerWheelEventsIgnored
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollViewer*>(this)->get_ArePointerWheelEventsIgnoredImpl(pValue));
 Cleanup:
@@ -73,6 +74,7 @@ IFACEMETHODIMP DirectUI::ScrollViewerGenerated::get_BringIntoViewOnFocusChange(_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollViewer*>(this)->get_BringIntoViewOnFocusChangeImpl(pValue));
 Cleanup:
@@ -92,6 +94,7 @@ IFACEMETHODIMP DirectUI::ScrollViewerGenerated::get_CanContentRenderOutsideBound
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollViewer*>(this)->get_CanContentRenderOutsideBoundsImpl(pValue));
 Cleanup:
@@ -129,6 +132,7 @@ IFACEMETHODIMP DirectUI::ScrollViewerGenerated::get_CurrentAnchor(_Outptr_result
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollViewer*>(this)->get_CurrentAnchorImpl(ppValue));
 Cleanup:
@@ -174,6 +178,7 @@ IFACEMETHODIMP DirectUI::ScrollViewerGenerated::get_HorizontalScrollBarVisibilit
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollViewer*>(this)->get_HorizontalScrollBarVisibilityImpl(pValue));
 Cleanup:
@@ -193,6 +198,7 @@ IFACEMETHODIMP DirectUI::ScrollViewerGenerated::get_HorizontalScrollMode(_Out_ A
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollViewer*>(this)->get_HorizontalScrollModeImpl(pValue));
 Cleanup:
@@ -230,6 +236,7 @@ IFACEMETHODIMP DirectUI::ScrollViewerGenerated::get_IsDeferredScrollingEnabled(_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollViewer*>(this)->get_IsDeferredScrollingEnabledImpl(pValue));
 Cleanup:
@@ -249,6 +256,7 @@ IFACEMETHODIMP DirectUI::ScrollViewerGenerated::get_IsHorizontalRailEnabled(_Out
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollViewer*>(this)->get_IsHorizontalRailEnabledImpl(pValue));
 Cleanup:
@@ -268,6 +276,7 @@ IFACEMETHODIMP DirectUI::ScrollViewerGenerated::get_IsHorizontalScrollChainingEn
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollViewer*>(this)->get_IsHorizontalScrollChainingEnabledImpl(pValue));
 Cleanup:
@@ -287,6 +296,7 @@ IFACEMETHODIMP DirectUI::ScrollViewerGenerated::get_IsInActiveDirectManipulation
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollViewer*>(this)->get_IsInActiveDirectManipulationImpl(pValue));
 Cleanup:
@@ -296,6 +306,7 @@ IFACEMETHODIMP DirectUI::ScrollViewerGenerated::get_IsInDirectManipulation(_Out_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollViewer*>(this)->get_IsInDirectManipulationImpl(pValue));
 Cleanup:
@@ -305,6 +316,7 @@ IFACEMETHODIMP DirectUI::ScrollViewerGenerated::get_IsRequestBringIntoViewIgnore
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollViewer*>(this)->get_IsRequestBringIntoViewIgnoredImpl(pValue));
 Cleanup:
@@ -324,6 +336,7 @@ IFACEMETHODIMP DirectUI::ScrollViewerGenerated::get_IsScrollInertiaEnabled(_Out_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollViewer*>(this)->get_IsScrollInertiaEnabledImpl(pValue));
 Cleanup:
@@ -343,6 +356,7 @@ IFACEMETHODIMP DirectUI::ScrollViewerGenerated::get_IsVerticalRailEnabled(_Out_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollViewer*>(this)->get_IsVerticalRailEnabledImpl(pValue));
 Cleanup:
@@ -362,6 +376,7 @@ IFACEMETHODIMP DirectUI::ScrollViewerGenerated::get_IsVerticalScrollChainingEnab
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollViewer*>(this)->get_IsVerticalScrollChainingEnabledImpl(pValue));
 Cleanup:
@@ -381,6 +396,7 @@ IFACEMETHODIMP DirectUI::ScrollViewerGenerated::get_IsZoomChainingEnabled(_Out_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollViewer*>(this)->get_IsZoomChainingEnabledImpl(pValue));
 Cleanup:
@@ -400,6 +416,7 @@ IFACEMETHODIMP DirectUI::ScrollViewerGenerated::get_IsZoomInertiaEnabled(_Out_ B
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollViewer*>(this)->get_IsZoomInertiaEnabledImpl(pValue));
 Cleanup:
@@ -509,6 +526,7 @@ IFACEMETHODIMP DirectUI::ScrollViewerGenerated::get_VerticalScrollBarVisibility(
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollViewer*>(this)->get_VerticalScrollBarVisibilityImpl(pValue));
 Cleanup:
@@ -528,6 +546,7 @@ IFACEMETHODIMP DirectUI::ScrollViewerGenerated::get_VerticalScrollMode(_Out_ ABI
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollViewer*>(this)->get_VerticalScrollModeImpl(pValue));
 Cleanup:
@@ -592,6 +611,7 @@ IFACEMETHODIMP DirectUI::ScrollViewerGenerated::get_ZoomMode(_Out_ ABI::Microsof
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollViewer*>(this)->get_ZoomModeImpl(pValue));
 Cleanup:
@@ -611,6 +631,7 @@ IFACEMETHODIMP DirectUI::ScrollViewerGenerated::get_ZoomSnapPoints(_Outptr_resul
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollViewer*>(this)->get_ZoomSnapPointsImpl(ppValue));
 Cleanup:
@@ -912,6 +933,7 @@ IFACEMETHODIMP DirectUI::ScrollViewerGenerated::ChangeView(_In_ ABI::Windows::Fo
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ScrollViewer_ChangeView", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ScrollViewer*>(this)->ChangeViewImpl(pHorizontalOffset, pVerticalOffset, pZoomFactor, pReturnValue));
@@ -930,6 +952,7 @@ IFACEMETHODIMP DirectUI::ScrollViewerGenerated::ChangeViewWithOptionalAnimation(
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "ScrollViewer_ChangeViewWithOptionalAnimation", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<ScrollViewer*>(this)->ChangeViewWithOptionalAnimationImpl(pHorizontalOffset, pVerticalOffset, pZoomFactor, disableAnimation, pReturnValue));
@@ -1110,7 +1133,7 @@ _Check_return_ HRESULT DirectUI::ScrollViewerGenerated::EventAddHandlerByIndex(_
     case KnownEventIndex::ScrollViewer_AnchorRequested:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::Controls::ScrollViewer*, ABI::Microsoft::UI::Xaml::Controls::AnchorRequestedEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -1127,7 +1150,7 @@ _Check_return_ HRESULT DirectUI::ScrollViewerGenerated::EventAddHandlerByIndex(_
     case KnownEventIndex::ScrollViewer_DirectManipulationCompleted:
         {
             ctl::ComPtr<ABI::Windows::Foundation::IEventHandler<IInspectable*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -1144,7 +1167,7 @@ _Check_return_ HRESULT DirectUI::ScrollViewerGenerated::EventAddHandlerByIndex(_
     case KnownEventIndex::ScrollViewer_DirectManipulationStarted:
         {
             ctl::ComPtr<ABI::Windows::Foundation::IEventHandler<IInspectable*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -1161,7 +1184,7 @@ _Check_return_ HRESULT DirectUI::ScrollViewerGenerated::EventAddHandlerByIndex(_
     case KnownEventIndex::ScrollViewer_ViewChanged:
         {
             ctl::ComPtr<ABI::Windows::Foundation::IEventHandler<ABI::Microsoft::UI::Xaml::Controls::ScrollViewerViewChangedEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -1178,7 +1201,7 @@ _Check_return_ HRESULT DirectUI::ScrollViewerGenerated::EventAddHandlerByIndex(_
     case KnownEventIndex::ScrollViewer_ViewChanging:
         {
             ctl::ComPtr<ABI::Windows::Foundation::IEventHandler<ABI::Microsoft::UI::Xaml::Controls::ScrollViewerViewChangingEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ScrollViewerAutomationPeer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ScrollViewerAutomationPeer.g.cpp
index ceeb81190a..50dc7d37e7 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ScrollViewerAutomationPeer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ScrollViewerAutomationPeer.g.cpp
@@ -49,6 +49,7 @@ IFACEMETHODIMP DirectUI::ScrollViewerAutomationPeerGenerated::get_HorizontallySc
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollViewerAutomationPeer*>(this)->get_HorizontallyScrollableImpl(pValue));
 Cleanup:
@@ -58,6 +59,7 @@ IFACEMETHODIMP DirectUI::ScrollViewerAutomationPeerGenerated::get_HorizontalScro
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollViewerAutomationPeer*>(this)->get_HorizontalScrollPercentImpl(pValue));
 Cleanup:
@@ -67,6 +69,7 @@ IFACEMETHODIMP DirectUI::ScrollViewerAutomationPeerGenerated::get_HorizontalView
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollViewerAutomationPeer*>(this)->get_HorizontalViewSizeImpl(pValue));
 Cleanup:
@@ -76,6 +79,7 @@ IFACEMETHODIMP DirectUI::ScrollViewerAutomationPeerGenerated::get_VerticallyScro
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollViewerAutomationPeer*>(this)->get_VerticallyScrollableImpl(pValue));
 Cleanup:
@@ -85,6 +89,7 @@ IFACEMETHODIMP DirectUI::ScrollViewerAutomationPeerGenerated::get_VerticalScroll
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollViewerAutomationPeer*>(this)->get_VerticalScrollPercentImpl(pValue));
 Cleanup:
@@ -94,6 +99,7 @@ IFACEMETHODIMP DirectUI::ScrollViewerAutomationPeerGenerated::get_VerticalViewSi
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ScrollViewerAutomationPeer*>(this)->get_VerticalViewSizeImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SecondaryContentRelationship.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SecondaryContentRelationship.g.cpp
index 90a18de121..63811efc46 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SecondaryContentRelationship.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SecondaryContentRelationship.g.cpp
@@ -279,6 +279,7 @@ IFACEMETHODIMP DirectUI::SecondaryContentRelationshipFactory::CreateStickyHeader
     ARG_NOTNULL(pPanelTransform, "panelTransform");
     ARG_NOTNULL(pHeaderTransform, "headerTransform");
     ARG_VALIDRETURNPOINTER(ppResult);
+    *ppResult={};
     IFC(CheckActivationAllowed());
     IFC(CreateStickyHeaderRelationshipImpl(pScrollViewer, pPanelObject, pPanelTransform, pHeaderTransform, groupTopY, groupBottomY, headerHeight, ppResult));
 Cleanup:
@@ -299,6 +300,7 @@ IFACEMETHODIMP DirectUI::SecondaryContentRelationshipFactory::CreateClipTransfor
     ARG_NOTNULL(pClipOwner, "clipOwner");
     ARG_NOTNULL(pClipTransform, "clipTransform");
     ARG_VALIDRETURNPOINTER(ppResult);
+    *ppResult={};
     IFC(CheckActivationAllowed());
     IFC(CreateClipTransformRelationshipImpl(pScrollViewer, pClipOwner, pClipTransform, listExtentHeight, listViewportHeight, ppResult));
 Cleanup:
@@ -319,6 +321,7 @@ IFACEMETHODIMP DirectUI::SecondaryContentRelationshipFactory::CreateParallaxRela
     ARG_NOTNULL(pHeaderObject, "headerObject");
     ARG_NOTNULL(pHeaderTransform, "headerTransform");
     ARG_VALIDRETURNPOINTER(ppResult);
+    *ppResult={};
     IFC(CheckActivationAllowed());
     IFC(CreateParallaxRelationshipImpl(pScrollViewer, pHeaderObject, pHeaderTransform, primaryOffsetsCount, primaryOffsets, secondaryOffsetsCount, secondaryOffsets, ppResult));
 Cleanup:
@@ -339,6 +342,7 @@ IFACEMETHODIMP DirectUI::SecondaryContentRelationshipFactory::CreateStaticElemen
     ARG_NOTNULL(pStaticElement, "staticElement");
     ARG_NOTNULL(pElementTransform, "elementTransform");
     ARG_VALIDRETURNPOINTER(ppResult);
+    *ppResult={};
     IFC(CheckActivationAllowed());
     IFC(CreateStaticElementRelationshipImpl(pScrollViewer, pStaticElement, pElementTransform, isHorizontallyStatic, isInverted, ppResult));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SectionsInViewChangedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SectionsInViewChangedEventArgs.g.cpp
index e1b6075345..82e5ab2494 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SectionsInViewChangedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SectionsInViewChangedEventArgs.g.cpp
@@ -49,6 +49,7 @@ IFACEMETHODIMP DirectUI::SectionsInViewChangedEventArgsGenerated::get_AddedSecti
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<SectionsInViewChangedEventArgs*>(this)->get_AddedSectionsImpl(ppValue));
 Cleanup:
@@ -67,6 +68,7 @@ IFACEMETHODIMP DirectUI::SectionsInViewChangedEventArgsGenerated::get_RemovedSec
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<SectionsInViewChangedEventArgs*>(this)->get_RemovedSectionsImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SeekSliderAutomationPeer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SeekSliderAutomationPeer.g.cpp
index 6cda61e696..965df9bf5e 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SeekSliderAutomationPeer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SeekSliderAutomationPeer.g.cpp
@@ -45,6 +45,7 @@ IFACEMETHODIMP DirectUI::SeekSliderAutomationPeerGenerated::get_IsReadOnly(_Out_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<SeekSliderAutomationPeer*>(this)->get_IsReadOnlyImpl(pValue));
 Cleanup:
@@ -54,6 +55,7 @@ IFACEMETHODIMP DirectUI::SeekSliderAutomationPeerGenerated::get_Value(_Out_ HSTR
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<SeekSliderAutomationPeer*>(this)->get_ValueImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SelectionChangedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SelectionChangedEventArgs.g.cpp
index e40376f31f..3186760b2a 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SelectionChangedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SelectionChangedEventArgs.g.cpp
@@ -49,6 +49,7 @@ IFACEMETHODIMP DirectUI::SelectionChangedEventArgsGenerated::get_AddedItems(_Out
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<SelectionChangedEventArgs*>(this)->get_AddedItemsImpl(ppValue));
 Cleanup:
@@ -67,6 +68,7 @@ IFACEMETHODIMP DirectUI::SelectionChangedEventArgsGenerated::get_RemovedItems(_O
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<SelectionChangedEventArgs*>(this)->get_RemovedItemsImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Selector.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Selector.g.cpp
index f02ba14c04..cf0e46e284 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Selector.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Selector.g.cpp
@@ -201,7 +201,7 @@ _Check_return_ HRESULT DirectUI::SelectorGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::Selector_SelectionChanged:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Controls::ISelectionChangedEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -311,6 +311,7 @@ IFACEMETHODIMP DirectUI::SelectorFactory::GetIsSelectionActive(_In_ ABI::Microso
     }
     ARG_NOTNULL(pElement, "element");
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(GetIsSelectionActiveImpl(pElement, pReturnValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SelectorAutomationPeer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SelectorAutomationPeer.g.cpp
index 061c6fc497..5a23ebabf8 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SelectorAutomationPeer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SelectorAutomationPeer.g.cpp
@@ -50,6 +50,7 @@ IFACEMETHODIMP DirectUI::SelectorAutomationPeerGenerated::get_CanSelectMultiple(
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<SelectorAutomationPeer*>(this)->get_CanSelectMultipleImpl(pValue));
 Cleanup:
@@ -59,6 +60,7 @@ IFACEMETHODIMP DirectUI::SelectorAutomationPeerGenerated::get_IsSelectionRequire
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<SelectorAutomationPeer*>(this)->get_IsSelectionRequiredImpl(pValue));
 Cleanup:
@@ -76,6 +78,7 @@ IFACEMETHODIMP DirectUI::SelectorAutomationPeerGenerated::GetSelection(_Out_ UIN
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "SelectorAutomationPeer_GetSelection", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<SelectorAutomationPeer*>(this)->GetSelectionImpl(pReturnValueCount, ppReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SelectorItem.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SelectorItem.g.cpp
index aaa2cecbe7..8a1c5d065a 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SelectorItem.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SelectorItem.g.cpp
@@ -62,6 +62,7 @@ IFACEMETHODIMP DirectUI::SelectorItemGenerated::get_IsSelected(_Out_ BOOLEAN* pV
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<SelectorItem*>(this)->get_IsSelectedImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SelectorItemAutomationPeer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SelectorItemAutomationPeer.g.cpp
index 7c71aecade..3fc6d054c4 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SelectorItemAutomationPeer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SelectorItemAutomationPeer.g.cpp
@@ -50,6 +50,7 @@ IFACEMETHODIMP DirectUI::SelectorItemAutomationPeerGenerated::get_IsSelected(_Ou
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<SelectorItemAutomationPeer*>(this)->get_IsSelectedImpl(pValue));
 Cleanup:
@@ -59,6 +60,7 @@ IFACEMETHODIMP DirectUI::SelectorItemAutomationPeerGenerated::get_SelectionConta
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<SelectorItemAutomationPeer*>(this)->get_SelectionContainerImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SemanticZoom.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SemanticZoom.g.cpp
index 00ce49a137..2311b58ece 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SemanticZoom.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SemanticZoom.g.cpp
@@ -212,6 +212,7 @@ IFACEMETHODIMP DirectUI::SemanticZoomGenerated::OnBackButtonPressed(_Out_ BOOLEA
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "SemanticZoom_OnBackButtonPressed", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<SemanticZoom*>(this)->OnBackButtonPressedImpl(pResult));
@@ -248,7 +249,7 @@ _Check_return_ HRESULT DirectUI::SemanticZoomGenerated::EventAddHandlerByIndex(_
     case KnownEventIndex::SemanticZoom_ViewChangeCompleted:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Controls::ISemanticZoomViewChangedEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -265,7 +266,7 @@ _Check_return_ HRESULT DirectUI::SemanticZoomGenerated::EventAddHandlerByIndex(_
     case KnownEventIndex::SemanticZoom_ViewChangeStarted:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Controls::ISemanticZoomViewChangedEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -294,7 +295,7 @@ _Check_return_ HRESULT DirectUI::SemanticZoomGenerated::EventRemoveHandlerByInde
     case KnownEventIndex::SemanticZoom_ViewChangeCompleted:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Controls::ISemanticZoomViewChangedEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SemanticZoomAutomationPeer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SemanticZoomAutomationPeer.g.cpp
index ca28eabe6b..82ff1a7fcf 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SemanticZoomAutomationPeer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SemanticZoomAutomationPeer.g.cpp
@@ -49,6 +49,7 @@ IFACEMETHODIMP DirectUI::SemanticZoomAutomationPeerGenerated::get_ToggleState(_O
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<SemanticZoomAutomationPeer*>(this)->get_ToggleStateImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Setter.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Setter.g.cpp
index ddaf2a221b..7dae62d0b0 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Setter.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Setter.g.cpp
@@ -46,6 +46,7 @@ IFACEMETHODIMP DirectUI::Setter::get_Property(_Outptr_result_maybenull_ ABI::Mic
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<Setter*>(this)->get_PropertyImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Shape.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Shape.g.cpp
index 7434b7a6eb..3231daf34c 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Shape.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Shape.g.cpp
@@ -159,6 +159,7 @@ IFACEMETHODIMP DirectUI::Shape::GetAlphaMask(_Outptr_ ABI::Microsoft::UI::Compos
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "Shape_GetAlphaMask", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<Shape*>(this)->GetAlphaMaskImpl(ppReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SizeChangedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SizeChangedEventArgs.g.cpp
index 3b3b356edd..2e370df293 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SizeChangedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SizeChangedEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::SizeChangedEventArgs::get_PreviousSize(_Out_ ABI::Windo
     ABI::Windows::Foundation::Size valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CSizeChangedEventArgs*>(pCoreEventArgsNoRef)->get_PreviousSize(&valueCore));
@@ -70,6 +71,7 @@ IFACEMETHODIMP DirectUI::SizeChangedEventArgs::get_NewSize(_Out_ ABI::Windows::F
     ABI::Windows::Foundation::Size valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CSizeChangedEventArgs*>(pCoreEventArgsNoRef)->get_NewSize(&valueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SizeHelper.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SizeHelper.g.cpp
index d1becc218b..96bde472a8 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SizeHelper.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SizeHelper.g.cpp
@@ -40,6 +40,7 @@ IFACEMETHODIMP DirectUI::SizeHelperFactory::get_Empty(_Out_ ABI::Windows::Founda
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckActivationAllowed());
     IFC(get_EmptyImpl(pValue));
 Cleanup:
@@ -55,6 +56,7 @@ IFACEMETHODIMP DirectUI::SizeHelperFactory::FromDimensions(_In_ FLOAT width, _In
         XamlTelemetry::PublicApiCall(true, 0, "SizeHelper_FromDimensions", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(FromDimensionsImpl(width, height, pReturnValue));
 Cleanup:
@@ -72,6 +74,7 @@ IFACEMETHODIMP DirectUI::SizeHelperFactory::GetIsEmpty(_In_ ABI::Windows::Founda
         XamlTelemetry::PublicApiCall(true, 0, "SizeHelper_GetIsEmpty", 0);
     }
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckActivationAllowed());
     IFC(GetIsEmptyImpl(target, pValue));
 Cleanup:
@@ -89,6 +92,7 @@ IFACEMETHODIMP DirectUI::SizeHelperFactory::Equals(_In_ ABI::Windows::Foundation
         XamlTelemetry::PublicApiCall(true, 0, "SizeHelper_Equals", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(EqualsImpl(target, value, pReturnValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SoftwareBitmapSource.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SoftwareBitmapSource.g.cpp
index d0c4c83994..83cd12ddc3 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SoftwareBitmapSource.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SoftwareBitmapSource.g.cpp
@@ -57,6 +57,7 @@ IFACEMETHODIMP DirectUI::SoftwareBitmapSourceGenerated::SetBitmapAsync(_In_opt_
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "SoftwareBitmapSource_SetBitmapAsync", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<SoftwareBitmapSource*>(this)->SetBitmapAsyncImpl(pSoftwareBitmap, ppReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SplitView.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SplitView.g.cpp
index b3fb6816d0..acd1d57e83 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SplitView.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SplitView.g.cpp
@@ -365,6 +365,7 @@ IFACEMETHODIMP DirectUI::SplitViewGenerated::OnBackButtonPressed(_Out_ BOOLEAN*
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "SplitView_OnBackButtonPressed", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<SplitView*>(this)->OnBackButtonPressedImpl(pResult));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SplitViewPaneAutomationPeer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SplitViewPaneAutomationPeer.g.cpp
index aab05a84fe..910a31240a 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SplitViewPaneAutomationPeer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SplitViewPaneAutomationPeer.g.cpp
@@ -45,6 +45,7 @@ IFACEMETHODIMP DirectUI::SplitViewPaneAutomationPeerGenerated::get_InteractionSt
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<SplitViewPaneAutomationPeer*>(this)->get_InteractionStateImpl(pValue));
 Cleanup:
@@ -54,6 +55,7 @@ IFACEMETHODIMP DirectUI::SplitViewPaneAutomationPeerGenerated::get_IsModal(_Out_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<SplitViewPaneAutomationPeer*>(this)->get_IsModalImpl(pValue));
 Cleanup:
@@ -63,6 +65,7 @@ IFACEMETHODIMP DirectUI::SplitViewPaneAutomationPeerGenerated::get_IsTopmost(_Ou
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<SplitViewPaneAutomationPeer*>(this)->get_IsTopmostImpl(pValue));
 Cleanup:
@@ -72,6 +75,7 @@ IFACEMETHODIMP DirectUI::SplitViewPaneAutomationPeerGenerated::get_Maximizable(_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<SplitViewPaneAutomationPeer*>(this)->get_MaximizableImpl(pValue));
 Cleanup:
@@ -81,6 +85,7 @@ IFACEMETHODIMP DirectUI::SplitViewPaneAutomationPeerGenerated::get_Minimizable(_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<SplitViewPaneAutomationPeer*>(this)->get_MinimizableImpl(pValue));
 Cleanup:
@@ -90,6 +95,7 @@ IFACEMETHODIMP DirectUI::SplitViewPaneAutomationPeerGenerated::get_VisualState(_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<SplitViewPaneAutomationPeer*>(this)->get_VisualStateImpl(pValue));
 Cleanup:
@@ -143,6 +149,7 @@ IFACEMETHODIMP DirectUI::SplitViewPaneAutomationPeerGenerated::WaitForInputIdle(
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "SplitViewPaneAutomationPeer_WaitForInputIdle", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<SplitViewPaneAutomationPeer*>(this)->WaitForInputIdleImpl(milliseconds, pReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SplitViewPaneClosingEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SplitViewPaneClosingEventArgs.g.cpp
index 0ac4d37581..2e63316a64 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SplitViewPaneClosingEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SplitViewPaneClosingEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::SplitViewPaneClosingEventArgs::get_Cancel(_Out_ BOOLEAN
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CSplitViewPaneClosingEventArgs*>(pCoreEventArgsNoRef)->get_Cancel(&valueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/StackPanel.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/StackPanel.g.cpp
index fcf734729f..c4a8405b3b 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/StackPanel.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/StackPanel.g.cpp
@@ -62,6 +62,7 @@ IFACEMETHODIMP DirectUI::StackPanelGenerated::get_AreHorizontalSnapPointsRegular
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<StackPanel*>(this)->get_AreHorizontalSnapPointsRegularImpl(pValue));
 Cleanup:
@@ -80,6 +81,7 @@ IFACEMETHODIMP DirectUI::StackPanelGenerated::get_AreVerticalSnapPointsRegular(_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<StackPanel*>(this)->get_AreVerticalSnapPointsRegularImpl(pValue));
 Cleanup:
@@ -288,6 +290,7 @@ IFACEMETHODIMP DirectUI::StackPanelGenerated::GetIrregularSnapPoints(_In_ ABI::M
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "StackPanel_GetIrregularSnapPoints", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<StackPanel*>(this)->GetIrregularSnapPointsImpl(orientation, alignment, ppReturnValue));
@@ -306,6 +309,7 @@ IFACEMETHODIMP DirectUI::StackPanelGenerated::GetRegularSnapPoints(_In_ ABI::Mic
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "StackPanel_GetRegularSnapPoints", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<StackPanel*>(this)->GetRegularSnapPointsImpl(orientation, alignment, pOffset, pReturnValue));
@@ -324,7 +328,7 @@ _Check_return_ HRESULT DirectUI::StackPanelGenerated::EventAddHandlerByIndex(_In
     case KnownEventIndex::StackPanel_HorizontalSnapPointsChanged:
         {
             ctl::ComPtr<ABI::Windows::Foundation::IEventHandler<IInspectable*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -341,7 +345,7 @@ _Check_return_ HRESULT DirectUI::StackPanelGenerated::EventAddHandlerByIndex(_In
     case KnownEventIndex::StackPanel_VerticalSnapPointsChanged:
         {
             ctl::ComPtr<ABI::Windows::Foundation::IEventHandler<IInspectable*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/StackingLayoutStrategy.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/StackingLayoutStrategy.g.cpp
index f6ca0efa32..54f3828388 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/StackingLayoutStrategy.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/StackingLayoutStrategy.g.cpp
@@ -87,6 +87,7 @@ IFACEMETHODIMP DirectUI::StackingLayoutStrategyGenerated::EstimateElementBounds(
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "StackingLayoutStrategy_EstimateElementBounds", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<StackingLayoutStrategy*>(this)->EstimateElementBoundsImpl(elementType, elementIndex, headerReference, containerReference, window, pResult));
 Cleanup:
@@ -104,6 +105,7 @@ IFACEMETHODIMP DirectUI::StackingLayoutStrategyGenerated::EstimateElementIndex(_
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "StackingLayoutStrategy_EstimateElementIndex", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<StackingLayoutStrategy*>(this)->EstimateElementIndexImpl(elementType, headerReference, containerReference, window, pTargetRect, pResult));
 Cleanup:
@@ -138,6 +140,7 @@ IFACEMETHODIMP DirectUI::StackingLayoutStrategyGenerated::EstimatePanelExtent(_I
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "StackingLayoutStrategy_EstimatePanelExtent", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<StackingLayoutStrategy*>(this)->EstimatePanelExtentImpl(lastHeaderReference, lastContainerReference, windowConstraint, pResult));
 Cleanup:
@@ -155,6 +158,7 @@ IFACEMETHODIMP DirectUI::StackingLayoutStrategyGenerated::GetElementArrangeBound
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "StackingLayoutStrategy_GetElementArrangeBounds", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<StackingLayoutStrategy*>(this)->GetElementArrangeBoundsImpl(elementType, elementIndex, containerBounds, windowConstraint, finalSize, pResult));
 Cleanup:
@@ -172,6 +176,7 @@ IFACEMETHODIMP DirectUI::StackingLayoutStrategyGenerated::GetElementBounds(_In_
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "StackingLayoutStrategy_GetElementBounds", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<StackingLayoutStrategy*>(this)->GetElementBoundsImpl(elementType, elementIndex, containerDesiredSize, referenceInformation, windowConstraint, pResult));
 Cleanup:
@@ -189,6 +194,7 @@ IFACEMETHODIMP DirectUI::StackingLayoutStrategyGenerated::GetElementMeasureSize(
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "StackingLayoutStrategy_GetElementMeasureSize", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<StackingLayoutStrategy*>(this)->GetElementMeasureSizeImpl(elementType, elementIndex, windowConstraint, pResult));
 Cleanup:
@@ -206,6 +212,7 @@ IFACEMETHODIMP DirectUI::StackingLayoutStrategyGenerated::GetElementTransitionsB
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "StackingLayoutStrategy_GetElementTransitionsBounds", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<StackingLayoutStrategy*>(this)->GetElementTransitionsBoundsImpl(elementType, elementIndex, windowConstraint, pResult));
 Cleanup:
@@ -223,6 +230,7 @@ IFACEMETHODIMP DirectUI::StackingLayoutStrategyGenerated::GetIsWrappingStrategy(
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "StackingLayoutStrategy_GetIsWrappingStrategy", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<StackingLayoutStrategy*>(this)->GetIsWrappingStrategyImpl(pResult));
 Cleanup:
@@ -240,6 +248,7 @@ IFACEMETHODIMP DirectUI::StackingLayoutStrategyGenerated::GetPositionOfFirstElem
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "StackingLayoutStrategy_GetPositionOfFirstElement", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<StackingLayoutStrategy*>(this)->GetPositionOfFirstElementImpl(pResult));
 Cleanup:
@@ -257,6 +266,7 @@ IFACEMETHODIMP DirectUI::StackingLayoutStrategyGenerated::GetRegularSnapPoints(_
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "StackingLayoutStrategy_GetRegularSnapPoints", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<StackingLayoutStrategy*>(this)->GetRegularSnapPointsImpl(pNearOffset, pFarOffset, pSpacing, pResult));
 Cleanup:
@@ -291,6 +301,7 @@ IFACEMETHODIMP DirectUI::StackingLayoutStrategyGenerated::GetVirtualizationDirec
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "StackingLayoutStrategy_GetVirtualizationDirection", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<StackingLayoutStrategy*>(this)->GetVirtualizationDirectionImpl(pResult));
 Cleanup:
@@ -308,6 +319,7 @@ IFACEMETHODIMP DirectUI::StackingLayoutStrategyGenerated::HasIrregularSnapPoints
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "StackingLayoutStrategy_HasIrregularSnapPoints", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<StackingLayoutStrategy*>(this)->HasIrregularSnapPointsImpl(elementType, pResult));
 Cleanup:
@@ -325,6 +337,7 @@ IFACEMETHODIMP DirectUI::StackingLayoutStrategyGenerated::HasSnapPointOnElement(
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "StackingLayoutStrategy_HasSnapPointOnElement", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<StackingLayoutStrategy*>(this)->HasSnapPointOnElementImpl(elementType, elementIndex, pResult));
 Cleanup:
@@ -376,6 +389,7 @@ IFACEMETHODIMP DirectUI::StackingLayoutStrategyGenerated::ShouldContinueFillingU
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "StackingLayoutStrategy_ShouldContinueFillingUpSpace", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<StackingLayoutStrategy*>(this)->ShouldContinueFillingUpSpaceImpl(elementType, elementIndex, referenceInformation, windowToFill, pResult));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/StandardUICommand.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/StandardUICommand.g.cpp
index bc50ae88d3..55bd179852 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/StandardUICommand.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/StandardUICommand.g.cpp
@@ -119,6 +119,7 @@ IFACEMETHODIMP DirectUI::StandardUICommandFactory::get_KindProperty(_Outptr_resu
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckActivationAllowed());
     IFC(get_KindPropertyImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Storyboard.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Storyboard.g.cpp
index 7740023aa7..6cbf953d68 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Storyboard.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Storyboard.g.cpp
@@ -91,6 +91,7 @@ IFACEMETHODIMP DirectUI::StoryboardGenerated::GetCurrentState(_Out_ ABI::Microso
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "Storyboard_GetCurrentState", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<Storyboard*>(this)->GetCurrentStateImpl(pReturnValue));
@@ -109,6 +110,7 @@ IFACEMETHODIMP DirectUI::StoryboardGenerated::GetCurrentTime(_Out_ ABI::Windows:
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "Storyboard_GetCurrentTime", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<Storyboard*>(this)->GetCurrentTimeImpl(pReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/StyleSelector.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/StyleSelector.g.cpp
index 21ffd80012..5b35a350b4 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/StyleSelector.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/StyleSelector.g.cpp
@@ -81,6 +81,7 @@ IFACEMETHODIMP DirectUI::StyleSelectorGenerated::SelectStyleCore(_In_opt_ IInspe
     }
     ARG_NOTNULL(pContainer, "container");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<StyleSelector*>(this)->SelectStyleCoreImpl(pItem, pContainer, ppReturnValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SvgImageSource.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SvgImageSource.g.cpp
index d934092323..a96d768579 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SvgImageSource.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SvgImageSource.g.cpp
@@ -191,6 +191,7 @@ IFACEMETHODIMP DirectUI::SvgImageSourceGenerated::SetSourceAsync(_In_ ABI::Windo
     }
     ARG_NOTNULL(pStreamSource, "streamSource");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<SvgImageSource*>(this)->SetSourceAsyncImpl(pStreamSource, ppReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SvgImageSourceFailedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SvgImageSourceFailedEventArgs.g.cpp
index e745be8fd4..7157a5a1b1 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SvgImageSourceFailedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SvgImageSourceFailedEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::SvgImageSourceFailedEventArgs::get_Status(_Out_ ABI::Mi
     DirectUI::SvgImageSourceLoadStatus valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CSvgImageSourceFailedEventArgs*>(pCoreEventArgsNoRef)->get_Status(&valueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SwapChainPanel.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SwapChainPanel.g.cpp
index 79fcdd016a..a010919655 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SwapChainPanel.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SwapChainPanel.g.cpp
@@ -116,6 +116,7 @@ IFACEMETHODIMP DirectUI::SwapChainPanelGenerated::CreateCoreIndependentInputSour
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "SwapChainPanel_CreateCoreIndependentInputSource", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<SwapChainPanel*>(this)->CreateCoreIndependentInputSourceImpl(deviceKinds, ppReturnValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SystemBackdrop.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SystemBackdrop.g.cpp
index 5f44611b59..1513a23c62 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SystemBackdrop.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/SystemBackdrop.g.cpp
@@ -60,6 +60,7 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::SystemBackdropGenerated::GetD
     ARG_NOTNULL(pTarget, "target");
     ARG_NOTNULL(pXamlRoot, "xamlRoot");
     ARG_VALIDRETURNPOINTER(ppResult);
+    *ppResult={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<SystemBackdrop*>(this)->GetDefaultSystemBackdropConfigurationImpl(pTarget, pXamlRoot, ppResult));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TappedRoutedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TappedRoutedEventArgs.g.cpp
index b6fb973da3..578e91ed82 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TappedRoutedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TappedRoutedEventArgs.g.cpp
@@ -57,6 +57,7 @@ IFACEMETHODIMP DirectUI::TappedRoutedEventArgs::get_PointerDeviceType(_Out_ ABI:
     DirectUI::PointerDeviceType valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CTappedEventArgs*>(pCoreEventArgsNoRef)->get_PointerDeviceType(&valueCore));
@@ -74,6 +75,7 @@ IFACEMETHODIMP DirectUI::TappedRoutedEventArgs::get_Handled(_Out_ BOOLEAN* pValu
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CTappedEventArgs*>(pCoreEventArgsNoRef)->get_Handled(&valueCore));
@@ -114,6 +116,7 @@ IFACEMETHODIMP DirectUI::TappedRoutedEventArgs::GetPosition(_In_opt_ ABI::Micros
     ABI::Windows::Foundation::Point returnValueCore;
 
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CTappedEventArgs*>(pCoreEventArgsNoRef)->GetPosition(pRelativeToCore, &returnValueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextAdapter.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextAdapter.g.cpp
index c06b3efad2..6ecb2d8801 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextAdapter.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextAdapter.g.cpp
@@ -47,6 +47,7 @@ IFACEMETHODIMP DirectUI::TextAdapterGenerated::get_DocumentRange(_Outptr_result_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<TextAdapter*>(this)->get_DocumentRangeImpl(ppValue));
 Cleanup:
@@ -60,6 +61,7 @@ IFACEMETHODIMP DirectUI::TextAdapterGenerated::get_SupportedTextSelection(_Out_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<TextAdapter*>(this)->get_SupportedTextSelectionImpl(pValue));
 Cleanup:
@@ -77,6 +79,7 @@ IFACEMETHODIMP DirectUI::TextAdapterGenerated::GetSelection(_Out_ UINT* pReturnV
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "TextAdapter_GetSelection", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<TextAdapter*>(this)->GetSelectionImpl(pReturnValueCount, ppReturnValue));
@@ -95,6 +98,7 @@ IFACEMETHODIMP DirectUI::TextAdapterGenerated::GetVisibleRanges(_Out_ UINT* pRet
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "TextAdapter_GetVisibleRanges", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<TextAdapter*>(this)->GetVisibleRangesImpl(pReturnValueCount, ppReturnValue));
@@ -114,6 +118,7 @@ IFACEMETHODIMP DirectUI::TextAdapterGenerated::RangeFromChild(_In_ ABI::Microsof
     }
     ARG_NOTNULL(pChildElement, "childElement");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<TextAdapter*>(this)->RangeFromChildImpl(pChildElement, ppReturnValue));
@@ -132,6 +137,7 @@ IFACEMETHODIMP DirectUI::TextAdapterGenerated::RangeFromPoint(_In_ ABI::Windows:
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "TextAdapter_RangeFromPoint", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<TextAdapter*>(this)->RangeFromPointImpl(screenLocation, ppReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextBlock.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextBlock.g.cpp
index 9b65b82ee9..6df38f69c6 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextBlock.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextBlock.g.cpp
@@ -51,6 +51,7 @@ IFACEMETHODIMP DirectUI::TextBlockGenerated::get_BaselineOffset(_Out_ DOUBLE* pV
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<TextBlock*>(this)->get_BaselineOffsetImpl(pValue));
 Cleanup:
@@ -69,6 +70,7 @@ IFACEMETHODIMP DirectUI::TextBlockGenerated::get_ContentEnd(_Outptr_result_maybe
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<TextBlock*>(this)->get_ContentEndImpl(ppValue));
 Cleanup:
@@ -78,6 +80,7 @@ IFACEMETHODIMP DirectUI::TextBlockGenerated::get_ContentStart(_Outptr_result_may
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<TextBlock*>(this)->get_ContentStartImpl(ppValue));
 Cleanup:
@@ -239,6 +242,7 @@ IFACEMETHODIMP DirectUI::TextBlockGenerated::get_SelectionEnd(_Outptr_result_may
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<TextBlock*>(this)->get_SelectionEndImpl(ppValue));
 Cleanup:
@@ -266,6 +270,7 @@ IFACEMETHODIMP DirectUI::TextBlockGenerated::get_SelectionStart(_Outptr_result_m
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<TextBlock*>(this)->get_SelectionStartImpl(ppValue));
 Cleanup:
@@ -533,6 +538,7 @@ IFACEMETHODIMP DirectUI::TextBlockGenerated::GetAlphaMask(_Outptr_ ABI::Microsof
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "TextBlock_GetAlphaMask", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<TextBlock*>(this)->GetAlphaMaskImpl(ppReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextBox.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextBox.g.cpp
index 8814bd06c5..7c7771fd34 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextBox.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextBox.g.cpp
@@ -217,6 +217,7 @@ IFACEMETHODIMP DirectUI::TextBoxGenerated::get_IsDesktopPopupMenuEnabled(_Out_ B
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<TextBox*>(this)->get_IsDesktopPopupMenuEnabledImpl(pValue));
 Cleanup:
@@ -1342,6 +1343,7 @@ IFACEMETHODIMP DirectUI::TextBoxGenerated::GetLinguisticAlternativesAsync(_Outpt
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "TextBox_GetLinguisticAlternativesAsync", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<TextBox*>(this)->GetLinguisticAlternativesAsyncImpl(ppReturnValue));
@@ -1365,6 +1367,7 @@ IFACEMETHODIMP DirectUI::TextBoxGenerated::GetRectFromCharacterIndex(_In_ INT ch
     ABI::Windows::Foundation::Rect returnValueCore;
 
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
 
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
@@ -1500,12 +1503,6 @@ HRESULT DirectUI::TextBoxFactory::QueryInterfaceImpl(_In_ REFIID iid, _Outptr_ v
     {
         *ppObject = static_cast<ABI::Microsoft::UI::Xaml::Controls::ITextBoxStaticsFeature_HeaderPlacement*>(this);
     }
-#endif
-#if WI_IS_FEATURE_PRESENT(Feature_InputValidation)
-    else if (InlineIsEqualGUID(iid, __uuidof(ABI::Microsoft::UI::Xaml::Controls::ITextBoxStaticsFeature_InputValidation)))
-    {
-        *ppObject = static_cast<ABI::Microsoft::UI::Xaml::Controls::ITextBoxStaticsFeature_InputValidation*>(this);
-    }
 #endif
     else
     {
@@ -1664,18 +1661,9 @@ IFACEMETHODIMP DirectUI::TextBoxFactory::get_HeaderPlacementProperty(_Out_ ABI::
 
 
 
-IFACEMETHODIMP DirectUI::TextBoxFactory::get_ErrorTemplateProperty(_Out_ ABI::Microsoft::UI::Xaml::IDependencyProperty** ppValue)
-{
-    RRETURN(MetadataAPI::GetIDependencyProperty(KnownPropertyIndex::TextBox_ErrorTemplate, ppValue));
-}
-IFACEMETHODIMP DirectUI::TextBoxFactory::get_InputValidationModeProperty(_Out_ ABI::Microsoft::UI::Xaml::IDependencyProperty** ppValue)
-{
-    RRETURN(MetadataAPI::GetIDependencyProperty(KnownPropertyIndex::TextBox_InputValidationMode, ppValue));
-}
-IFACEMETHODIMP DirectUI::TextBoxFactory::get_InputValidationKindProperty(_Out_ ABI::Microsoft::UI::Xaml::IDependencyProperty** ppValue)
-{
-    RRETURN(MetadataAPI::GetIDependencyProperty(KnownPropertyIndex::TextBox_InputValidationKind, ppValue));
-}
+
+
+
 
 
 // Attached properties.
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextBox.g.h b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextBox.g.h
index eabadcbd14..d61be5106b 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextBox.g.h
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextBox.g.h
@@ -271,9 +271,6 @@ namespace DirectUI
         , public ABI::Microsoft::UI::Xaml::Controls::ITextBoxStatics
 #if WI_IS_FEATURE_PRESENT(Feature_HeaderPlacement)
         , public ABI::Microsoft::UI::Xaml::Controls::ITextBoxStaticsFeature_HeaderPlacement
-#endif
-#if WI_IS_FEATURE_PRESENT(Feature_InputValidation)
-        , public ABI::Microsoft::UI::Xaml::Controls::ITextBoxStaticsFeature_InputValidation
 #endif
     {
         BEGIN_INTERFACE_MAP(TextBoxFactory, ctl::BetterAggregableCoreObjectActivationFactory)
@@ -281,9 +278,6 @@ namespace DirectUI
             INTERFACE_ENTRY(TextBoxFactory, ABI::Microsoft::UI::Xaml::Controls::ITextBoxStatics)
 #if WI_IS_FEATURE_PRESENT(Feature_HeaderPlacement)
             INTERFACE_ENTRY(TextBoxFactory, ABI::Microsoft::UI::Xaml::Controls::ITextBoxStaticsFeature_HeaderPlacement)
-#endif
-#if WI_IS_FEATURE_PRESENT(Feature_InputValidation)
-            INTERFACE_ENTRY(TextBoxFactory, ABI::Microsoft::UI::Xaml::Controls::ITextBoxStaticsFeature_InputValidation)
 #endif
         END_INTERFACE_MAP(TextBoxFactory, ctl::BetterAggregableCoreObjectActivationFactory)
 
@@ -331,9 +325,9 @@ namespace DirectUI
         
         
         
-        IFACEMETHOD(get_ErrorTemplateProperty)(_Out_ ABI::Microsoft::UI::Xaml::IDependencyProperty** ppValue) FEATURE_INPUTVALIDATION_OVERRIDE;
-        IFACEMETHOD(get_InputValidationModeProperty)(_Out_ ABI::Microsoft::UI::Xaml::IDependencyProperty** ppValue) FEATURE_INPUTVALIDATION_OVERRIDE;
-        IFACEMETHOD(get_InputValidationKindProperty)(_Out_ ABI::Microsoft::UI::Xaml::IDependencyProperty** ppValue) FEATURE_INPUTVALIDATION_OVERRIDE;
+        
+        
+        
         
 
         // Attached properties.
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextBoxView.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextBoxView.g.cpp
index 62d9c43151..abcdb63fe8 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextBoxView.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextBoxView.g.cpp
@@ -46,6 +46,7 @@ IFACEMETHODIMP DirectUI::TextBoxViewGenerated::get_CanHorizontallyScroll(_Out_ B
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<TextBoxView*>(this)->get_CanHorizontallyScrollImpl(pValue));
 Cleanup:
@@ -65,6 +66,7 @@ IFACEMETHODIMP DirectUI::TextBoxViewGenerated::get_CanVerticallyScroll(_Out_ BOO
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<TextBoxView*>(this)->get_CanVerticallyScrollImpl(pValue));
 Cleanup:
@@ -84,6 +86,7 @@ IFACEMETHODIMP DirectUI::TextBoxViewGenerated::get_ExtentHeight(_Out_ DOUBLE* pV
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<TextBoxView*>(this)->get_ExtentHeightImpl(pValue));
 Cleanup:
@@ -93,6 +96,7 @@ IFACEMETHODIMP DirectUI::TextBoxViewGenerated::get_ExtentWidth(_Out_ DOUBLE* pVa
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<TextBoxView*>(this)->get_ExtentWidthImpl(pValue));
 Cleanup:
@@ -102,6 +106,7 @@ IFACEMETHODIMP DirectUI::TextBoxViewGenerated::get_HorizontalOffset(_Out_ DOUBLE
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<TextBoxView*>(this)->get_HorizontalOffsetImpl(pValue));
 Cleanup:
@@ -111,6 +116,7 @@ IFACEMETHODIMP DirectUI::TextBoxViewGenerated::get_MinHorizontalOffset(_Out_ DOU
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<TextBoxView*>(this)->get_MinHorizontalOffsetImpl(pValue));
 Cleanup:
@@ -120,6 +126,7 @@ IFACEMETHODIMP DirectUI::TextBoxViewGenerated::get_MinVerticalOffset(_Out_ DOUBL
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<TextBoxView*>(this)->get_MinVerticalOffsetImpl(pValue));
 Cleanup:
@@ -129,6 +136,7 @@ IFACEMETHODIMP DirectUI::TextBoxViewGenerated::get_ScrollOwner(_Outptr_result_ma
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<TextBoxView*>(this)->get_ScrollOwnerImpl(ppValue));
 Cleanup:
@@ -148,6 +156,7 @@ IFACEMETHODIMP DirectUI::TextBoxViewGenerated::get_VerticalOffset(_Out_ DOUBLE*
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<TextBoxView*>(this)->get_VerticalOffsetImpl(pValue));
 Cleanup:
@@ -157,6 +166,7 @@ IFACEMETHODIMP DirectUI::TextBoxViewGenerated::get_ViewportHeight(_Out_ DOUBLE*
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<TextBoxView*>(this)->get_ViewportHeightImpl(pValue));
 Cleanup:
@@ -166,6 +176,7 @@ IFACEMETHODIMP DirectUI::TextBoxViewGenerated::get_ViewportWidth(_Out_ DOUBLE* p
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<TextBoxView*>(this)->get_ViewportWidthImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextCompositionChangedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextCompositionChangedEventArgs.g.cpp
index 24845b3647..50d4e9fa13 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextCompositionChangedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextCompositionChangedEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::TextCompositionChangedEventArgs::get_StartIndex(_Out_ I
     INT valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CTextCompositionChangedEventArgs*>(pCoreEventArgsNoRef)->get_StartIndex(&valueCore));
@@ -86,6 +87,7 @@ IFACEMETHODIMP DirectUI::TextCompositionChangedEventArgs::get_Length(_Out_ INT*
     INT valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CTextCompositionChangedEventArgs*>(pCoreEventArgsNoRef)->get_Length(&valueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextCompositionEndedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextCompositionEndedEventArgs.g.cpp
index 2efb58fd99..ca49c06a10 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextCompositionEndedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextCompositionEndedEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::TextCompositionEndedEventArgs::get_StartIndex(_Out_ INT
     INT valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CTextCompositionEndedEventArgs*>(pCoreEventArgsNoRef)->get_StartIndex(&valueCore));
@@ -86,6 +87,7 @@ IFACEMETHODIMP DirectUI::TextCompositionEndedEventArgs::get_Length(_Out_ INT* pV
     INT valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CTextCompositionEndedEventArgs*>(pCoreEventArgsNoRef)->get_Length(&valueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextCompositionStartedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextCompositionStartedEventArgs.g.cpp
index 1e52d3d5d1..e643b9c2fd 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextCompositionStartedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextCompositionStartedEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::TextCompositionStartedEventArgs::get_StartIndex(_Out_ I
     INT valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CTextCompositionStartedEventArgs*>(pCoreEventArgsNoRef)->get_StartIndex(&valueCore));
@@ -86,6 +87,7 @@ IFACEMETHODIMP DirectUI::TextCompositionStartedEventArgs::get_Length(_Out_ INT*
     INT valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CTextCompositionStartedEventArgs*>(pCoreEventArgsNoRef)->get_Length(&valueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextControlCopyingToClipboardEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextControlCopyingToClipboardEventArgs.g.cpp
index 01de434d7a..1a72272323 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextControlCopyingToClipboardEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextControlCopyingToClipboardEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::TextControlCopyingToClipboardEventArgs::get_Handled(_Ou
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CTextControlCopyingToClipboardEventArgs*>(pCoreEventArgsNoRef)->get_Handled(&valueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextControlCuttingToClipboardEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextControlCuttingToClipboardEventArgs.g.cpp
index 5cd824b91f..e16ff87548 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextControlCuttingToClipboardEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextControlCuttingToClipboardEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::TextControlCuttingToClipboardEventArgs::get_Handled(_Ou
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CTextControlCuttingToClipboardEventArgs*>(pCoreEventArgsNoRef)->get_Handled(&valueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextControlPasteEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextControlPasteEventArgs.g.cpp
index 4c7d75b601..25cd40479a 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextControlPasteEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextControlPasteEventArgs.g.cpp
@@ -53,6 +53,7 @@ IFACEMETHODIMP DirectUI::TextControlPasteEventArgs::get_Handled(_Out_ BOOLEAN* p
     BOOLEAN valueCore;
 
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CTextControlPasteEventArgs*>(pCoreEventArgsNoRef)->get_Handled(&valueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextElement.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextElement.g.cpp
index 9dab7be1ce..f775da7e6d 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextElement.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextElement.g.cpp
@@ -63,6 +63,7 @@ IFACEMETHODIMP DirectUI::TextElementGenerated::get_AccessKeyScopeOwner(_Outptr_r
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<TextElement*>(this)->get_AccessKeyScopeOwnerImpl(ppValue));
 Cleanup:
@@ -100,6 +101,7 @@ IFACEMETHODIMP DirectUI::TextElementGenerated::get_ContentEnd(_Outptr_result_may
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<TextElement*>(this)->get_ContentEndImpl(ppValue));
 Cleanup:
@@ -109,6 +111,7 @@ IFACEMETHODIMP DirectUI::TextElementGenerated::get_ContentStart(_Outptr_result_m
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<TextElement*>(this)->get_ContentStartImpl(ppValue));
 Cleanup:
@@ -118,6 +121,7 @@ IFACEMETHODIMP DirectUI::TextElementGenerated::get_ElementEnd(_Outptr_result_may
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<TextElement*>(this)->get_ElementEndImpl(ppValue));
 Cleanup:
@@ -127,6 +131,7 @@ IFACEMETHODIMP DirectUI::TextElementGenerated::get_ElementStart(_Outptr_result_m
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<TextElement*>(this)->get_ElementStartImpl(ppValue));
 Cleanup:
@@ -253,6 +258,7 @@ IFACEMETHODIMP DirectUI::TextElementGenerated::get_Name(_Out_ HSTRING* pValue)
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<TextElement*>(this)->get_NameImpl(pValue));
 Cleanup:
@@ -271,6 +277,7 @@ IFACEMETHODIMP DirectUI::TextElementGenerated::get_XamlRoot(_Outptr_result_maybe
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<TextElement*>(this)->get_XamlRootImpl(ppValue));
 Cleanup:
@@ -464,6 +471,7 @@ IFACEMETHODIMP DirectUI::TextElementGenerated::FindName(_In_ HSTRING name, _Outp
     }
     ARG_NOTNULL(name, "name");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<TextElement*>(this)->FindNameImpl(name, ppReturnValue));
@@ -482,6 +490,7 @@ _Check_return_ HRESULT DirectUI::TextElementGenerated::OnCreateAutomationPeer(_O
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "TextElement_OnCreateAutomationPeer", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextPointer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextPointer.g.cpp
index a08d9a353d..25d6eaa575 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextPointer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextPointer.g.cpp
@@ -47,6 +47,7 @@ IFACEMETHODIMP DirectUI::TextPointerGenerated::get_LogicalDirection(_Out_ ABI::M
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<TextPointer*>(this)->get_LogicalDirectionImpl(pValue));
 Cleanup:
@@ -56,6 +57,7 @@ IFACEMETHODIMP DirectUI::TextPointerGenerated::get_Offset(_Out_ INT* pValue)
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<TextPointer*>(this)->get_OffsetImpl(pValue));
 Cleanup:
@@ -65,6 +67,7 @@ IFACEMETHODIMP DirectUI::TextPointerGenerated::get_Parent(_Outptr_result_maybenu
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<TextPointer*>(this)->get_ParentImpl(ppValue));
 Cleanup:
@@ -74,6 +77,7 @@ IFACEMETHODIMP DirectUI::TextPointerGenerated::get_VisualParent(_Outptr_result_m
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<TextPointer*>(this)->get_VisualParentImpl(ppValue));
 Cleanup:
@@ -91,6 +95,7 @@ IFACEMETHODIMP DirectUI::TextPointerGenerated::GetCharacterRect(_In_ ABI::Micros
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "TextPointer_GetCharacterRect", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<TextPointer*>(this)->GetCharacterRectImpl(direction, pReturnValue));
 Cleanup:
@@ -108,6 +113,7 @@ IFACEMETHODIMP DirectUI::TextPointerGenerated::GetPositionAtOffset(_In_ INT offs
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "TextPointer_GetPositionAtOffset", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(static_cast<TextPointer*>(this)->GetPositionAtOffsetImpl(offset, direction, ppReturnValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextRangeAdapter.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextRangeAdapter.g.cpp
index a8d874568f..7ab479ed5a 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextRangeAdapter.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TextRangeAdapter.g.cpp
@@ -77,6 +77,7 @@ IFACEMETHODIMP DirectUI::TextRangeAdapterGenerated::Clone(_Outptr_ ABI::Microsof
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "TextRangeAdapter_Clone", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<TextRangeAdapter*>(this)->CloneImpl(ppReturnValue));
@@ -96,6 +97,7 @@ IFACEMETHODIMP DirectUI::TextRangeAdapterGenerated::Compare(_In_ ABI::Microsoft:
     }
     ARG_NOTNULL(pTextRangeProvider, "textRangeProvider");
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<TextRangeAdapter*>(this)->CompareImpl(pTextRangeProvider, pReturnValue));
@@ -115,6 +117,7 @@ IFACEMETHODIMP DirectUI::TextRangeAdapterGenerated::CompareEndpoints(_In_ ABI::M
     }
     ARG_NOTNULL(pTextRangeProvider, "textRangeProvider");
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<TextRangeAdapter*>(this)->CompareEndpointsImpl(endpoint, pTextRangeProvider, targetEndpoint, pReturnValue));
@@ -152,6 +155,7 @@ IFACEMETHODIMP DirectUI::TextRangeAdapterGenerated::FindAttribute(_In_ INT attri
     }
     ARG_NOTNULL(pValue, "value");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<TextRangeAdapter*>(this)->FindAttributeImpl(attributeId, pValue, backward, ppReturnValue));
@@ -171,6 +175,7 @@ IFACEMETHODIMP DirectUI::TextRangeAdapterGenerated::FindText(_In_ HSTRING text,
     }
     ARG_NOTNULL(text, "text");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<TextRangeAdapter*>(this)->FindTextImpl(text, backward, ignoreCase, ppReturnValue));
@@ -189,6 +194,7 @@ IFACEMETHODIMP DirectUI::TextRangeAdapterGenerated::GetAttributeValue(_In_ INT a
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "TextRangeAdapter_GetAttributeValue", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<TextRangeAdapter*>(this)->GetAttributeValueImpl(attributeId, ppReturnValue));
@@ -207,6 +213,7 @@ IFACEMETHODIMP DirectUI::TextRangeAdapterGenerated::GetBoundingRectangles(_Out_
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "TextRangeAdapter_GetBoundingRectangles", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<TextRangeAdapter*>(this)->GetBoundingRectanglesImpl(pReturnValueCount, ppReturnValue));
@@ -225,6 +232,7 @@ IFACEMETHODIMP DirectUI::TextRangeAdapterGenerated::GetChildren(_Out_ UINT* pRet
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "TextRangeAdapter_GetChildren", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<TextRangeAdapter*>(this)->GetChildrenImpl(pReturnValueCount, ppReturnValue));
@@ -243,6 +251,7 @@ IFACEMETHODIMP DirectUI::TextRangeAdapterGenerated::GetEnclosingElement(_Outptr_
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "TextRangeAdapter_GetEnclosingElement", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<TextRangeAdapter*>(this)->GetEnclosingElementImpl(ppReturnValue));
@@ -261,6 +270,7 @@ IFACEMETHODIMP DirectUI::TextRangeAdapterGenerated::GetText(_In_ INT maxLength,
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "TextRangeAdapter_GetText", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<TextRangeAdapter*>(this)->GetTextImpl(maxLength, pReturnValue));
@@ -279,6 +289,7 @@ IFACEMETHODIMP DirectUI::TextRangeAdapterGenerated::Move(_In_ ABI::Microsoft::UI
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "TextRangeAdapter_Move", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<TextRangeAdapter*>(this)->MoveImpl(unit, count, pReturnValue));
@@ -315,6 +326,7 @@ IFACEMETHODIMP DirectUI::TextRangeAdapterGenerated::MoveEndpointByUnit(_In_ ABI:
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "TextRangeAdapter_MoveEndpointByUnit", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<TextRangeAdapter*>(this)->MoveEndpointByUnitImpl(endpoint, unit, count, pReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ThemeShadow.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ThemeShadow.g.cpp
index 2217b8fff2..5fc738e5db 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ThemeShadow.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ThemeShadow.g.cpp
@@ -46,6 +46,7 @@ _Check_return_ HRESULT DirectUI::ThemeShadowGenerated::get_Mask(_Outptr_result_m
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<ThemeShadow*>(this)->get_MaskImpl(ppValue));
 Cleanup:
@@ -124,6 +125,7 @@ IFACEMETHODIMP DirectUI::ThemeShadowFactory::get_IsDropShadowMode(_Out_ BOOLEAN*
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckActivationAllowed());
     IFC(get_IsDropShadowModeImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Thumb.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Thumb.g.cpp
index b25ae809f0..93c51cea44 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Thumb.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Thumb.g.cpp
@@ -262,7 +262,7 @@ _Check_return_ HRESULT DirectUI::ThumbGenerated::EventAddHandlerByIndex(_In_ Kno
     case KnownEventIndex::Thumb_DragCompleted:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Controls::Primitives::IDragCompletedEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -279,7 +279,7 @@ _Check_return_ HRESULT DirectUI::ThumbGenerated::EventAddHandlerByIndex(_In_ Kno
     case KnownEventIndex::Thumb_DragDelta:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Controls::Primitives::IDragDeltaEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -296,7 +296,7 @@ _Check_return_ HRESULT DirectUI::ThumbGenerated::EventAddHandlerByIndex(_In_ Kno
     case KnownEventIndex::Thumb_DragStarted:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Controls::Primitives::IDragStartedEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TimePicker.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TimePicker.g.cpp
index 596d78c7b9..39b4a2fd59 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TimePicker.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/TimePicker.g.cpp
@@ -242,7 +242,7 @@ _Check_return_ HRESULT DirectUI::TimePickerGenerated::EventAddHandlerByIndex(_In
     case KnownEventIndex::TimePicker_SelectedTimeChanged:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::Controls::TimePicker*, ABI::Microsoft::UI::Xaml::Controls::TimePickerSelectedValueChangedEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -259,7 +259,7 @@ _Check_return_ HRESULT DirectUI::TimePickerGenerated::EventAddHandlerByIndex(_In
     case KnownEventIndex::TimePicker_TimeChanged:
         {
             ctl::ComPtr<ABI::Windows::Foundation::IEventHandler<ABI::Microsoft::UI::Xaml::Controls::TimePickerValueChangedEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Timeline.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Timeline.g.cpp
index 81b0f6edf1..4f00ab7545 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Timeline.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Timeline.g.cpp
@@ -234,6 +234,7 @@ IFACEMETHODIMP DirectUI::TimelineFactory::get_AllowDependentAnimations(_Out_ BOO
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckActivationAllowed());
     IFC(get_AllowDependentAnimationsImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ToggleButton.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ToggleButton.g.cpp
index e5144fb6f3..a00ec1b7bd 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ToggleButton.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ToggleButton.g.cpp
@@ -280,7 +280,7 @@ _Check_return_ HRESULT DirectUI::ToggleButtonGenerated::EventAddHandlerByIndex(_
     case KnownEventIndex::ToggleButton_Checked:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::IRoutedEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -297,7 +297,7 @@ _Check_return_ HRESULT DirectUI::ToggleButtonGenerated::EventAddHandlerByIndex(_
     case KnownEventIndex::ToggleButton_Indeterminate:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::IRoutedEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -314,7 +314,7 @@ _Check_return_ HRESULT DirectUI::ToggleButtonGenerated::EventAddHandlerByIndex(_
     case KnownEventIndex::ToggleButton_Unchecked:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::IRoutedEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ToggleButtonAutomationPeer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ToggleButtonAutomationPeer.g.cpp
index d17cf79c0d..412455732b 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ToggleButtonAutomationPeer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ToggleButtonAutomationPeer.g.cpp
@@ -49,6 +49,7 @@ IFACEMETHODIMP DirectUI::ToggleButtonAutomationPeerGenerated::get_ToggleState(_O
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ToggleButtonAutomationPeer*>(this)->get_ToggleStateImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ToggleMenuFlyoutItemAutomationPeer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ToggleMenuFlyoutItemAutomationPeer.g.cpp
index 37351dccba..431eb1a2dc 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ToggleMenuFlyoutItemAutomationPeer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ToggleMenuFlyoutItemAutomationPeer.g.cpp
@@ -49,6 +49,7 @@ IFACEMETHODIMP DirectUI::ToggleMenuFlyoutItemAutomationPeerGenerated::get_Toggle
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ToggleMenuFlyoutItemAutomationPeer*>(this)->get_ToggleStateImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ToggleSwitch.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ToggleSwitch.g.cpp
index da5dd228de..eeded34981 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ToggleSwitch.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ToggleSwitch.g.cpp
@@ -361,7 +361,7 @@ _Check_return_ HRESULT DirectUI::ToggleSwitchGenerated::EventAddHandlerByIndex(_
     case KnownEventIndex::ToggleSwitch_Toggled:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::IRoutedEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ToggleSwitchAutomationPeer.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ToggleSwitchAutomationPeer.g.cpp
index aa0bd72220..99dfe74ca0 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ToggleSwitchAutomationPeer.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ToggleSwitchAutomationPeer.g.cpp
@@ -49,6 +49,7 @@ IFACEMETHODIMP DirectUI::ToggleSwitchAutomationPeerGenerated::get_ToggleState(_O
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<ToggleSwitchAutomationPeer*>(this)->get_ToggleStateImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ToolTip.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ToolTip.g.cpp
index 1bdc8fb8f4..51c40ebf5e 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ToolTip.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/ToolTip.g.cpp
@@ -228,7 +228,7 @@ _Check_return_ HRESULT DirectUI::ToolTipGenerated::EventAddHandlerByIndex(_In_ K
     case KnownEventIndex::ToolTip_Closed:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::IRoutedEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -245,7 +245,7 @@ _Check_return_ HRESULT DirectUI::ToolTipGenerated::EventAddHandlerByIndex(_In_ K
     case KnownEventIndex::ToolTip_Opened:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::IRoutedEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Transition.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Transition.g.cpp
index b6b990c344..cea4339c84 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Transition.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Transition.g.cpp
@@ -86,6 +86,7 @@ IFACEMETHODIMP DirectUI::TransitionGenerated::ParticipatesInTransition(_In_ ABI:
     }
     ARG_NOTNULL(pElement, "element");
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<Transition*>(this)->ParticipatesInTransitionImpl(pElement, transitonTrigger, pResult));
@@ -137,6 +138,7 @@ IFACEMETHODIMP DirectUI::TransitionFactory::CreateInstance(_In_ IInspectable* pO
     ARG_NOTNULL(pOuter, "outer");
     ARG_NOTNULL(ppInner, "inner");
     ARG_VALIDRETURNPOINTER(ppResult);
+    *ppResult={};
     IFC(CheckActivationAllowed());
     IFC(CreateInstanceImpl(pOuter, ppInner, ppResult));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/UIElement.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/UIElement.g.cpp
index 023239402b..27e82b418e 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/UIElement.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/UIElement.g.cpp
@@ -111,6 +111,7 @@ IFACEMETHODIMP DirectUI::UIElementGenerated::get_AccessKeyScopeOwner(_Outptr_res
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<UIElement*>(this)->get_AccessKeyScopeOwnerImpl(ppValue));
 Cleanup:
@@ -130,6 +131,7 @@ IFACEMETHODIMP DirectUI::UIElementGenerated::get_ActualOffset(_Out_ ABI::Windows
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<UIElement*>(this)->get_ActualOffsetImpl(pValue));
 Cleanup:
@@ -139,6 +141,7 @@ IFACEMETHODIMP DirectUI::UIElementGenerated::get_ActualSize(_Out_ ABI::Windows::
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<UIElement*>(this)->get_ActualSizeImpl(pValue));
 Cleanup:
@@ -157,6 +160,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::get_AnimatedCenterPoint(_Ou
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<UIElement*>(this)->get_AnimatedCenterPointImpl(pValue));
 Cleanup:
@@ -175,6 +179,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::get_AnimatedRotation(_Out_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<UIElement*>(this)->get_AnimatedRotationImpl(pValue));
 Cleanup:
@@ -193,6 +198,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::get_AnimatedRotationAxis(_O
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<UIElement*>(this)->get_AnimatedRotationAxisImpl(pValue));
 Cleanup:
@@ -211,6 +217,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::get_AnimatedScale(_Out_ ABI
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<UIElement*>(this)->get_AnimatedScaleImpl(pValue));
 Cleanup:
@@ -229,6 +236,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::get_AnimatedTransformMatrix
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<UIElement*>(this)->get_AnimatedTransformMatrixImpl(pValue));
 Cleanup:
@@ -247,6 +255,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::get_AnimatedTranslation(_Ou
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<UIElement*>(this)->get_AnimatedTranslationImpl(pValue));
 Cleanup:
@@ -300,6 +309,7 @@ IFACEMETHODIMP DirectUI::UIElementGenerated::get_CenterPoint(_Out_ ABI::Windows:
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<UIElement*>(this)->get_CenterPointImpl(pValue));
 Cleanup:
@@ -354,6 +364,7 @@ IFACEMETHODIMP DirectUI::UIElementGenerated::get_DesiredSize(_Out_ ABI::Windows:
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<UIElement*>(this)->get_DesiredSizeImpl(pValue));
 Cleanup:
@@ -425,6 +436,7 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::UIElementGenerated::get_Inter
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<UIElement*>(this)->get_InteractionsImpl(ppValue));
 Cleanup:
@@ -505,6 +517,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::get_KeepAliveCount(_Out_ IN
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<UIElement*>(this)->get_KeepAliveCountImpl(pValue));
 Cleanup:
@@ -581,6 +594,7 @@ IFACEMETHODIMP DirectUI::UIElementGenerated::get_Lights(_Outptr_result_maybenull
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<UIElement*>(this)->get_LightsImpl(ppValue));
 Cleanup:
@@ -676,6 +690,7 @@ IFACEMETHODIMP DirectUI::UIElementGenerated::get_RasterizationScale(_Out_ DOUBLE
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<UIElement*>(this)->get_RasterizationScaleImpl(pValue));
 Cleanup:
@@ -717,6 +732,7 @@ IFACEMETHODIMP DirectUI::UIElementGenerated::get_Rotation(_Out_ FLOAT* pValue)
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<UIElement*>(this)->get_RotationImpl(pValue));
 Cleanup:
@@ -736,6 +752,7 @@ IFACEMETHODIMP DirectUI::UIElementGenerated::get_RotationAxis(_Out_ ABI::Windows
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<UIElement*>(this)->get_RotationAxisImpl(pValue));
 Cleanup:
@@ -764,6 +781,7 @@ IFACEMETHODIMP DirectUI::UIElementGenerated::get_Scale(_Out_ ABI::Windows::Found
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<UIElement*>(this)->get_ScaleImpl(pValue));
 Cleanup:
@@ -838,6 +856,7 @@ IFACEMETHODIMP DirectUI::UIElementGenerated::get_TransformMatrix(_Out_ ABI::Wind
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<UIElement*>(this)->get_TransformMatrixImpl(pValue));
 Cleanup:
@@ -874,6 +893,7 @@ IFACEMETHODIMP DirectUI::UIElementGenerated::get_Translation(_Out_ ABI::Windows:
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<UIElement*>(this)->get_TranslationImpl(pValue));
 Cleanup:
@@ -929,6 +949,7 @@ IFACEMETHODIMP DirectUI::UIElementGenerated::get_XamlRoot(_Outptr_result_maybenu
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<UIElement*>(this)->get_XamlRootImpl(ppValue));
 Cleanup:
@@ -4154,6 +4175,7 @@ IFACEMETHODIMP DirectUI::UIElementGenerated::CancelDirectManipulations(_Out_ BOO
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "UIElement_CancelDirectManipulations", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<UIElement*>(this)->CancelDirectManipulationsImpl(pReturnValue));
@@ -4172,6 +4194,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::CaptureMouse(_Out_ BOOLEAN*
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "UIElement_CaptureMouse", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
 Cleanup:
@@ -4190,6 +4213,7 @@ IFACEMETHODIMP DirectUI::UIElementGenerated::CapturePointer(_In_ ABI::Microsoft:
     }
     ARG_NOTNULL(pValue, "value");
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<UIElement*>(this)->CapturePointerImpl(pValue, pReturnValue));
@@ -4208,6 +4232,7 @@ IFACEMETHODIMP DirectUI::UIElementGenerated::FindSubElementsForTouchTargeting(_I
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "UIElement_FindSubElementsForTouchTargeting", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<UIElement*>(this)->FindSubElementsForTouchTargetingImpl(point, boundingRect, ppReturnValue));
@@ -4248,6 +4273,7 @@ IFACEMETHODIMP DirectUI::UIElementGenerated::Focus(_In_ ABI::Microsoft::UI::Xaml
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "UIElement_Focus", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<UIElement*>(this)->FocusImpl(value, pReturnValue));
@@ -4285,6 +4311,7 @@ IFACEMETHODIMP DirectUI::UIElementGenerated::GetChildrenInTabFocusOrder(_Outptr_
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "UIElement_GetChildrenInTabFocusOrder", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<UIElement*>(this)->GetChildrenInTabFocusOrderImpl(ppReturnValue));
@@ -4365,6 +4392,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::LayoutRound(_In_ FLOAT valu
     FLOAT returnValueCore;
 
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
 
     IFC(CheckThread());
 
@@ -4445,6 +4473,7 @@ IFACEMETHODIMP DirectUI::UIElementGenerated::OnCreateAutomationPeer(_Outptr_ ABI
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "UIElement_OnCreateAutomationPeer", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<UIElement*>(this)->OnCreateAutomationPeerImpl(ppReturnValue));
@@ -4809,6 +4838,7 @@ IFACEMETHODIMP DirectUI::UIElementGenerated::StartDragAsync(_In_ ABI::Microsoft:
     }
     ARG_NOTNULL(pPointerPoint, "pointerPoint");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<UIElement*>(this)->StartDragAsyncImpl(pPointerPoint, ppReturnValue));
@@ -4845,6 +4875,7 @@ IFACEMETHODIMP DirectUI::UIElementGenerated::TransformToVisual(_In_opt_ ABI::Mic
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "UIElement_TransformToVisual", 0);
     }
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<UIElement*>(this)->TransformToVisualImpl(pVisual, ppReturnValue));
@@ -4905,7 +4936,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_BringIntoViewRequested:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::UIElement*, ABI::Microsoft::UI::Xaml::BringIntoViewRequestedEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -4922,7 +4953,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_CharacterReceived:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::UIElement*, ABI::Microsoft::UI::Xaml::Input::CharacterReceivedRoutedEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -4939,7 +4970,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_ContextCanceled:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::UIElement*, ABI::Microsoft::UI::Xaml::RoutedEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -4956,7 +4987,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_ContextRequested:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::UIElement*, ABI::Microsoft::UI::Xaml::Input::ContextRequestedEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -4973,7 +5004,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_DoubleTapped:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Input::IDoubleTappedEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -4990,7 +5021,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_DragEnter:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::IDragEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -5007,7 +5038,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_DragLeave:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::IDragEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -5024,7 +5055,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_DragOver:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::IDragEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -5041,7 +5072,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_DragStarting:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::UIElement*, ABI::Microsoft::UI::Xaml::DragStartingEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -5058,7 +5089,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_Drop:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::IDragEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -5075,7 +5106,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_DropCompleted:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::UIElement*, ABI::Microsoft::UI::Xaml::DropCompletedEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -5092,7 +5123,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_GettingFocus:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::UIElement*, ABI::Microsoft::UI::Xaml::Input::GettingFocusEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -5109,7 +5140,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_GotFocus:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::IRoutedEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -5126,7 +5157,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_Holding:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Input::IHoldingEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -5143,7 +5174,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_KeyDown:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Input::IKeyEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -5160,7 +5191,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_KeyUp:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Input::IKeyEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -5177,7 +5208,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_LosingFocus:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::UIElement*, ABI::Microsoft::UI::Xaml::Input::LosingFocusEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -5194,7 +5225,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_LostFocus:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::IRoutedEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -5211,7 +5242,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_ManipulationCompleted:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Input::IManipulationCompletedEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -5228,7 +5259,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_ManipulationDelta:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Input::IManipulationDeltaEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -5245,7 +5276,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_ManipulationInertiaStarting:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Input::IManipulationInertiaStartingEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -5262,7 +5293,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_ManipulationStarted:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Input::IManipulationStartedEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -5279,7 +5310,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_ManipulationStarting:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Input::IManipulationStartingEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -5296,7 +5327,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_NoFocusCandidateFound:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::UIElement*, ABI::Microsoft::UI::Xaml::Input::NoFocusCandidateFoundEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -5313,7 +5344,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_PointerCanceled:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Input::IPointerEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -5330,7 +5361,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_PointerCaptureLost:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Input::IPointerEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -5347,7 +5378,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_PointerEntered:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Input::IPointerEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -5364,7 +5395,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_PointerExited:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Input::IPointerEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -5381,7 +5412,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_PointerMoved:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Input::IPointerEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -5398,7 +5429,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_PointerPressed:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Input::IPointerEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -5415,7 +5446,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_PointerReleased:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Input::IPointerEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -5432,7 +5463,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_PointerWheelChanged:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Input::IPointerEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -5449,7 +5480,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_PreviewKeyDown:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Input::IKeyEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -5466,7 +5497,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_PreviewKeyUp:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Input::IKeyEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -5483,7 +5514,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_ProcessKeyboardAccelerators:
         {
             ctl::ComPtr<ABI::Windows::Foundation::ITypedEventHandler<ABI::Microsoft::UI::Xaml::UIElement*, ABI::Microsoft::UI::Xaml::Input::ProcessKeyboardAcceleratorEventArgs*>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -5500,7 +5531,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_RightTapped:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Input::IRightTappedEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -5517,7 +5548,7 @@ _Check_return_ HRESULT DirectUI::UIElementGenerated::EventAddHandlerByIndex(_In_
     case KnownEventIndex::UIElement_Tapped:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Input::ITappedEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
@@ -6433,6 +6464,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::get_KeyDownEvent(_Outptr_result_maybe
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_KeyDownEventImpl(ppValue));
 Cleanup:
@@ -6442,6 +6474,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::get_KeyUpEvent(_Outptr_result_maybenu
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_KeyUpEventImpl(ppValue));
 Cleanup:
@@ -6451,6 +6484,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::get_PointerEnteredEvent(_Outptr_resul
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_PointerEnteredEventImpl(ppValue));
 Cleanup:
@@ -6460,6 +6494,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::get_PointerPressedEvent(_Outptr_resul
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_PointerPressedEventImpl(ppValue));
 Cleanup:
@@ -6469,6 +6504,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::get_PointerMovedEvent(_Outptr_result_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_PointerMovedEventImpl(ppValue));
 Cleanup:
@@ -6478,6 +6514,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::get_PointerReleasedEvent(_Outptr_resu
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_PointerReleasedEventImpl(ppValue));
 Cleanup:
@@ -6487,6 +6524,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::get_PointerExitedEvent(_Outptr_result
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_PointerExitedEventImpl(ppValue));
 Cleanup:
@@ -6496,6 +6534,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::get_PointerCaptureLostEvent(_Outptr_r
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_PointerCaptureLostEventImpl(ppValue));
 Cleanup:
@@ -6505,6 +6544,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::get_PointerCanceledEvent(_Outptr_resu
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_PointerCanceledEventImpl(ppValue));
 Cleanup:
@@ -6514,6 +6554,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::get_PointerWheelChangedEvent(_Outptr_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_PointerWheelChangedEventImpl(ppValue));
 Cleanup:
@@ -6523,6 +6564,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::get_TappedEvent(_Outptr_result_mayben
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_TappedEventImpl(ppValue));
 Cleanup:
@@ -6532,6 +6574,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::get_DoubleTappedEvent(_Outptr_result_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_DoubleTappedEventImpl(ppValue));
 Cleanup:
@@ -6541,6 +6584,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::get_HoldingEvent(_Outptr_result_maybe
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_HoldingEventImpl(ppValue));
 Cleanup:
@@ -6550,6 +6594,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::get_RightTappedEvent(_Outptr_result_m
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_RightTappedEventImpl(ppValue));
 Cleanup:
@@ -6559,6 +6604,7 @@ _Check_return_ HRESULT DirectUI::UIElementFactory::get_RightTappedUnhandledEvent
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_RightTappedUnhandledEventImpl(ppValue));
 Cleanup:
@@ -6568,6 +6614,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::get_ManipulationStartingEvent(_Outptr
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_ManipulationStartingEventImpl(ppValue));
 Cleanup:
@@ -6577,6 +6624,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::get_ManipulationInertiaStartingEvent(
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_ManipulationInertiaStartingEventImpl(ppValue));
 Cleanup:
@@ -6586,6 +6634,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::get_ManipulationStartedEvent(_Outptr_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_ManipulationStartedEventImpl(ppValue));
 Cleanup:
@@ -6595,6 +6644,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::get_ManipulationDeltaEvent(_Outptr_re
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_ManipulationDeltaEventImpl(ppValue));
 Cleanup:
@@ -6604,6 +6654,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::get_ManipulationCompletedEvent(_Outpt
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_ManipulationCompletedEventImpl(ppValue));
 Cleanup:
@@ -6613,6 +6664,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::get_DragEnterEvent(_Outptr_result_may
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_DragEnterEventImpl(ppValue));
 Cleanup:
@@ -6622,6 +6674,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::get_DragLeaveEvent(_Outptr_result_may
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_DragLeaveEventImpl(ppValue));
 Cleanup:
@@ -6631,6 +6684,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::get_DragOverEvent(_Outptr_result_mayb
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_DragOverEventImpl(ppValue));
 Cleanup:
@@ -6640,6 +6694,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::get_DropEvent(_Outptr_result_maybenul
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_DropEventImpl(ppValue));
 Cleanup:
@@ -6649,6 +6704,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::get_GettingFocusEvent(_Outptr_result_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_GettingFocusEventImpl(ppValue));
 Cleanup:
@@ -6658,6 +6714,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::get_LosingFocusEvent(_Outptr_result_m
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_LosingFocusEventImpl(ppValue));
 Cleanup:
@@ -6667,6 +6724,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::get_NoFocusCandidateFoundEvent(_Outpt
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_NoFocusCandidateFoundEventImpl(ppValue));
 Cleanup:
@@ -6676,6 +6734,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::get_PreviewKeyDownEvent(_Outptr_resul
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_PreviewKeyDownEventImpl(ppValue));
 Cleanup:
@@ -6685,6 +6744,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::get_CharacterReceivedEvent(_Outptr_re
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_CharacterReceivedEventImpl(ppValue));
 Cleanup:
@@ -6694,6 +6754,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::get_PreviewKeyUpEvent(_Outptr_result_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_PreviewKeyUpEventImpl(ppValue));
 Cleanup:
@@ -6703,6 +6764,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::get_BringIntoViewRequestedEvent(_Outp
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_BringIntoViewRequestedEventImpl(ppValue));
 Cleanup:
@@ -6712,6 +6774,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::get_ContextRequestedEvent(_Outptr_res
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_ContextRequestedEventImpl(ppValue));
 Cleanup:
@@ -6728,6 +6791,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::TryStartDirectManipulation(_In_ ABI::
     }
     ARG_NOTNULL(pValue, "value");
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(TryStartDirectManipulationImpl(pValue, pReturnValue));
 Cleanup:
@@ -6763,6 +6827,7 @@ IFACEMETHODIMP DirectUI::UIElementFactory::InternalGetIsEnabled(_In_ ABI::Micros
     }
     ARG_NOTNULL(pElement, "element");
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckActivationAllowed());
     IFC(InternalGetIsEnabledImpl(pElement, pResult));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/VirtualizingPanel.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/VirtualizingPanel.g.cpp
index 1d13700de5..1815fcb91e 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/VirtualizingPanel.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/VirtualizingPanel.g.cpp
@@ -56,6 +56,7 @@ IFACEMETHODIMP DirectUI::VirtualizingPanelGenerated::get_ItemContainerGenerator(
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<VirtualizingPanel*>(this)->get_ItemContainerGeneratorImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/VirtualizingStackPanel.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/VirtualizingStackPanel.g.cpp
index 1546a1ac9e..00cffd84bb 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/VirtualizingStackPanel.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/VirtualizingStackPanel.g.cpp
@@ -171,7 +171,7 @@ _Check_return_ HRESULT DirectUI::VirtualizingStackPanelGenerated::EventAddHandle
     case KnownEventIndex::VirtualizingStackPanel_CleanUpVirtualizedItemEvent:
         {
             ctl::ComPtr<ABI::Microsoft::UI::Xaml::Controls::ICleanUpVirtualizedItemEventHandler> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/VisualState.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/VisualState.g.cpp
index 9d176aa436..0ab269d5a7 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/VisualState.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/VisualState.g.cpp
@@ -64,6 +64,7 @@ IFACEMETHODIMP DirectUI::VisualState::get_Name(_Out_ HSTRING* pValue)
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<VisualState*>(this)->get_NameImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/VisualStateChangedEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/VisualStateChangedEventArgs.g.cpp
index 8fdd0f9a3f..7d4199e795 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/VisualStateChangedEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/VisualStateChangedEventArgs.g.cpp
@@ -57,6 +57,7 @@ IFACEMETHODIMP DirectUI::VisualStateChangedEventArgs::get_OldState(_Outptr_resul
     CVisualState* pValueCore = nullptr;
 
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CVisualStateChangedEventArgs*>(pCoreEventArgsNoRef)->get_OldState(&pValueCore));
@@ -90,6 +91,7 @@ IFACEMETHODIMP DirectUI::VisualStateChangedEventArgs::get_NewState(_Outptr_resul
     CVisualState* pValueCore = nullptr;
 
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CVisualStateChangedEventArgs*>(pCoreEventArgsNoRef)->get_NewState(&pValueCore));
@@ -123,6 +125,7 @@ IFACEMETHODIMP DirectUI::VisualStateChangedEventArgs::get_Control(_Outptr_result
     CControl* pValueCore = nullptr;
 
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
 
     IFC(GetCorePeerNoRefWithValidation(&pCoreEventArgsNoRef));
     IFC(static_cast<CVisualStateChangedEventArgs*>(pCoreEventArgsNoRef)->get_Control(&pValueCore));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/VisualStateGroup.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/VisualStateGroup.g.cpp
index 28410e60fe..dab0247ef1 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/VisualStateGroup.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/VisualStateGroup.g.cpp
@@ -46,6 +46,7 @@ IFACEMETHODIMP DirectUI::VisualStateGroupGenerated::get_CurrentState(_Outptr_res
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<VisualStateGroup*>(this)->get_CurrentStateImpl(ppValue));
 Cleanup:
@@ -55,6 +56,7 @@ IFACEMETHODIMP DirectUI::VisualStateGroupGenerated::get_Name(_Out_ HSTRING* pVal
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<VisualStateGroup*>(this)->get_NameImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/VisualStateManager.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/VisualStateManager.g.cpp
index 6c4d5d897c..b972dd114d 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/VisualStateManager.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/VisualStateManager.g.cpp
@@ -66,6 +66,7 @@ IFACEMETHODIMP DirectUI::VisualStateManagerGenerated::GoToStateCore(_In_opt_ ABI
     }
     ARG_NOTNULL(pTemplateRoot, "templateRoot");
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<VisualStateManager*>(this)->GoToStateCoreImpl(pControl, pTemplateRoot, stateName, pGroup, pState, useTransitions, pReturnValue));
@@ -248,6 +249,7 @@ IFACEMETHODIMP DirectUI::VisualStateManagerFactory::GoToState(_In_opt_ ABI::Micr
         XamlTelemetry::PublicApiCall(true, 0, "VisualStateManager_GoToState", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(GoToStateImpl(pControl, stateName, useTransitions, pReturnValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Window.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Window.g.cpp
index 09c727f574..7e61e0b603 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Window.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/Window.g.cpp
@@ -59,6 +59,7 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::WindowGenerated::get_AppWindo
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<Window*>(this)->get_AppWindowImpl(ppValue));
 Cleanup:
@@ -68,6 +69,7 @@ IFACEMETHODIMP DirectUI::WindowGenerated::get_Bounds(_Out_ ABI::Windows::Foundat
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<Window*>(this)->get_BoundsImpl(pValue));
 Cleanup:
@@ -77,6 +79,7 @@ IFACEMETHODIMP DirectUI::WindowGenerated::get_Compositor(_Outptr_result_maybenul
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<Window*>(this)->get_CompositorImpl(ppValue));
 Cleanup:
@@ -86,6 +89,7 @@ IFACEMETHODIMP DirectUI::WindowGenerated::get_Content(_Outptr_result_maybenull_
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<Window*>(this)->get_ContentImpl(ppValue));
 Cleanup:
@@ -105,6 +109,7 @@ IFACEMETHODIMP DirectUI::WindowGenerated::get_CoreWindow(_Outptr_result_maybenul
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<Window*>(this)->get_CoreWindowImpl(ppValue));
 Cleanup:
@@ -114,6 +119,7 @@ IFACEMETHODIMP DirectUI::WindowGenerated::get_Dispatcher(_Outptr_result_maybenul
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(static_cast<Window*>(this)->get_DispatcherImpl(ppValue));
 Cleanup:
@@ -123,6 +129,7 @@ IFACEMETHODIMP DirectUI::WindowGenerated::get_DispatcherQueue(_Outptr_result_may
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(static_cast<Window*>(this)->get_DispatcherQueueImpl(ppValue));
 Cleanup:
@@ -132,6 +139,7 @@ IFACEMETHODIMP DirectUI::WindowGenerated::get_ExtendsContentIntoTitleBar(_Out_ B
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<Window*>(this)->get_ExtendsContentIntoTitleBarImpl(pValue));
 Cleanup:
@@ -151,6 +159,7 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::WindowGenerated::get_SystemBa
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<Window*>(this)->get_SystemBackdropImpl(ppValue));
 Cleanup:
@@ -170,6 +179,7 @@ IFACEMETHODIMP DirectUI::WindowGenerated::get_Title(_Out_ HSTRING* pValue)
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<Window*>(this)->get_TitleImpl(pValue));
 Cleanup:
@@ -189,6 +199,7 @@ IFACEMETHODIMP DirectUI::WindowGenerated::get_TransparentBackground(_Out_ BOOLEA
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<Window*>(this)->get_TransparentBackgroundImpl(pValue));
 Cleanup:
@@ -208,6 +219,7 @@ IFACEMETHODIMP DirectUI::WindowGenerated::get_Visible(_Out_ BOOLEAN* pValue)
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<Window*>(this)->get_VisibleImpl(pValue));
 Cleanup:
@@ -262,6 +274,7 @@ IFACEMETHODIMP DirectUI::WindowGenerated::GetWindowContentBoundsForElement(_In_
     }
     ARG_NOTNULL(pElement, "element");
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<Window*>(this)->GetWindowContentBoundsForElementImpl(pElement, pResult));
@@ -457,6 +470,7 @@ IFACEMETHODIMP DirectUI::WindowFactory::get_Current(_Outptr_result_maybenull_ AB
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_CurrentImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/WindowsXamlManager.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/WindowsXamlManager.g.cpp
index 3aaaecef49..c15547196b 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/WindowsXamlManager.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/WindowsXamlManager.g.cpp
@@ -136,6 +136,7 @@ IFACEMETHODIMP DirectUI::WindowsXamlManagerFactory::InitializeForCurrentThread(_
         XamlTelemetry::PublicApiCall(true, 0, "WindowsXamlManager_InitializeForCurrentThread", 0);
     }
     ARG_VALIDRETURNPOINTER(ppResult);
+    *ppResult={};
     
     IFC(InitializeForCurrentThreadImpl(ppResult));
 Cleanup:
@@ -145,7 +146,7 @@ IFACEMETHODIMP DirectUI::WindowsXamlManagerFactory::InitializeForCurrentThread(_
     }
     RRETURN(hr);
 }
-IFACEMETHODIMP DirectUI::WindowsXamlManagerFactory::GetForCurrentThread(_Outptr_ ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManager** ppResult)
+IFACEMETHODIMP DirectUI::WindowsXamlManagerFactory::GetForCurrentThread(_Outptr_result_maybenull_ ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManager** ppResult)
 {
     HRESULT hr = S_OK;
     if (EventEnabledApiFunctionCallStart())
@@ -153,6 +154,7 @@ IFACEMETHODIMP DirectUI::WindowsXamlManagerFactory::GetForCurrentThread(_Outptr_
         XamlTelemetry::PublicApiCall(true, 0, "WindowsXamlManager_GetForCurrentThread", 0);
     }
     ARG_VALIDRETURNPOINTER(ppResult);
+    *ppResult={};
     
     IFC(GetForCurrentThreadImpl(ppResult));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/WindowsXamlManager.g.h b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/WindowsXamlManager.g.h
index b1c5ac9255..b98fb0366d 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/WindowsXamlManager.g.h
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/WindowsXamlManager.g.h
@@ -113,7 +113,7 @@ namespace DirectUI
 
         // Static methods.
         IFACEMETHOD(InitializeForCurrentThread)(_Outptr_ ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManager** ppResult) override;
-        IFACEMETHOD(GetForCurrentThread)(_Outptr_ ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManager** ppResult) override;
+        IFACEMETHOD(GetForCurrentThread)(_Outptr_result_maybenull_ ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManager** ppResult) override;
 
         // Static events.
 
@@ -129,6 +129,6 @@ namespace DirectUI
 
         // Customized static  methods.
          _Check_return_ HRESULT InitializeForCurrentThreadImpl(_Outptr_ ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManager** ppResult); 
-         _Check_return_ HRESULT GetForCurrentThreadImpl(_Outptr_ ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManager** ppResult); 
+         _Check_return_ HRESULT GetForCurrentThreadImpl(_Outptr_result_maybenull_ ABI::Microsoft::UI::Xaml::Hosting::IWindowsXamlManager** ppResult); 
     };
 }
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/WrappingLayoutStrategy.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/WrappingLayoutStrategy.g.cpp
index efff7bee3f..8741d9891e 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/WrappingLayoutStrategy.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/WrappingLayoutStrategy.g.cpp
@@ -87,6 +87,7 @@ IFACEMETHODIMP DirectUI::WrappingLayoutStrategyGenerated::EstimateElementBounds(
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "WrappingLayoutStrategy_EstimateElementBounds", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<WrappingLayoutStrategy*>(this)->EstimateElementBoundsImpl(elementType, elementIndex, headerReference, containerReference, window, pResult));
 Cleanup:
@@ -104,6 +105,7 @@ IFACEMETHODIMP DirectUI::WrappingLayoutStrategyGenerated::EstimateElementIndex(_
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "WrappingLayoutStrategy_EstimateElementIndex", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<WrappingLayoutStrategy*>(this)->EstimateElementIndexImpl(elementType, headerReference, containerReference, window, pTargetRect, pResult));
 Cleanup:
@@ -138,6 +140,7 @@ IFACEMETHODIMP DirectUI::WrappingLayoutStrategyGenerated::EstimatePanelExtent(_I
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "WrappingLayoutStrategy_EstimatePanelExtent", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<WrappingLayoutStrategy*>(this)->EstimatePanelExtentImpl(lastHeaderReference, lastContainerReference, windowConstraint, pResult));
 Cleanup:
@@ -155,6 +158,7 @@ IFACEMETHODIMP DirectUI::WrappingLayoutStrategyGenerated::GetElementArrangeBound
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "WrappingLayoutStrategy_GetElementArrangeBounds", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<WrappingLayoutStrategy*>(this)->GetElementArrangeBoundsImpl(elementType, elementIndex, containerBounds, windowConstraint, finalSize, pResult));
 Cleanup:
@@ -172,6 +176,7 @@ IFACEMETHODIMP DirectUI::WrappingLayoutStrategyGenerated::GetElementBounds(_In_
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "WrappingLayoutStrategy_GetElementBounds", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<WrappingLayoutStrategy*>(this)->GetElementBoundsImpl(elementType, elementIndex, containerDesiredSize, referenceInformation, windowConstraint, pResult));
 Cleanup:
@@ -189,6 +194,7 @@ IFACEMETHODIMP DirectUI::WrappingLayoutStrategyGenerated::GetElementMeasureSize(
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "WrappingLayoutStrategy_GetElementMeasureSize", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<WrappingLayoutStrategy*>(this)->GetElementMeasureSizeImpl(elementType, elementIndex, windowConstraint, pResult));
 Cleanup:
@@ -206,6 +212,7 @@ IFACEMETHODIMP DirectUI::WrappingLayoutStrategyGenerated::GetElementTransitionsB
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "WrappingLayoutStrategy_GetElementTransitionsBounds", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<WrappingLayoutStrategy*>(this)->GetElementTransitionsBoundsImpl(elementType, elementIndex, windowConstraint, pResult));
 Cleanup:
@@ -223,6 +230,7 @@ IFACEMETHODIMP DirectUI::WrappingLayoutStrategyGenerated::GetIsWrappingStrategy(
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "WrappingLayoutStrategy_GetIsWrappingStrategy", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<WrappingLayoutStrategy*>(this)->GetIsWrappingStrategyImpl(pResult));
 Cleanup:
@@ -240,6 +248,7 @@ IFACEMETHODIMP DirectUI::WrappingLayoutStrategyGenerated::GetPositionOfFirstElem
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "WrappingLayoutStrategy_GetPositionOfFirstElement", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<WrappingLayoutStrategy*>(this)->GetPositionOfFirstElementImpl(pResult));
 Cleanup:
@@ -257,6 +266,7 @@ IFACEMETHODIMP DirectUI::WrappingLayoutStrategyGenerated::GetRegularSnapPoints(_
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "WrappingLayoutStrategy_GetRegularSnapPoints", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<WrappingLayoutStrategy*>(this)->GetRegularSnapPointsImpl(pNearOffset, pFarOffset, pSpacing, pResult));
 Cleanup:
@@ -291,6 +301,7 @@ IFACEMETHODIMP DirectUI::WrappingLayoutStrategyGenerated::GetVirtualizationDirec
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "WrappingLayoutStrategy_GetVirtualizationDirection", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<WrappingLayoutStrategy*>(this)->GetVirtualizationDirectionImpl(pResult));
 Cleanup:
@@ -308,6 +319,7 @@ IFACEMETHODIMP DirectUI::WrappingLayoutStrategyGenerated::HasIrregularSnapPoints
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "WrappingLayoutStrategy_HasIrregularSnapPoints", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<WrappingLayoutStrategy*>(this)->HasIrregularSnapPointsImpl(elementType, pResult));
 Cleanup:
@@ -325,6 +337,7 @@ IFACEMETHODIMP DirectUI::WrappingLayoutStrategyGenerated::HasSnapPointOnElement(
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "WrappingLayoutStrategy_HasSnapPointOnElement", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<WrappingLayoutStrategy*>(this)->HasSnapPointOnElementImpl(elementType, elementIndex, pResult));
 Cleanup:
@@ -376,6 +389,7 @@ IFACEMETHODIMP DirectUI::WrappingLayoutStrategyGenerated::ShouldContinueFillingU
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "WrappingLayoutStrategy_ShouldContinueFillingUpSpace", 0);
     }
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
     IFC(CheckThread());
     IFC(static_cast<WrappingLayoutStrategy*>(this)->ShouldContinueFillingUpSpaceImpl(elementType, elementIndex, referenceInformation, windowToFill, pResult));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/WriteableBitmap.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/WriteableBitmap.g.cpp
index a0c6ea55e5..24f6c08ad8 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/WriteableBitmap.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/WriteableBitmap.g.cpp
@@ -45,6 +45,7 @@ IFACEMETHODIMP DirectUI::WriteableBitmapGenerated::get_PixelBuffer(_Outptr_resul
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<WriteableBitmap*>(this)->get_PixelBufferImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlBindingHelper.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlBindingHelper.g.cpp
index d0f59e40d9..281ee788d2 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlBindingHelper.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlBindingHelper.g.cpp
@@ -108,6 +108,7 @@ IFACEMETHODIMP DirectUI::XamlBindingHelperFactoryGenerated::ConvertValue(_In_ AB
     }
     ARG_NOTNULL(pValue, "value");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(ConvertValueImpl(type, pValue, ppReturnValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlCompositionBrushBase.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlCompositionBrushBase.g.cpp
index c5ad697357..f033c997c5 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlCompositionBrushBase.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlCompositionBrushBase.g.cpp
@@ -57,6 +57,7 @@ IFACEMETHODIMP DirectUI::XamlCompositionBrushBaseGenerated::get_CompositionBrush
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<XamlCompositionBrushBase*>(this)->get_CompositionBrushImpl(ppValue));
 Cleanup:
@@ -131,6 +132,7 @@ IFACEMETHODIMP DirectUI::XamlCompositionBrushBaseGenerated::GetBrushForXamlRoot(
     }
     ARG_NOTNULL(pXamlRoot, "xamlRoot");
     ARG_VALIDRETURNPOINTER(ppResult);
+    *ppResult={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<XamlCompositionBrushBase*>(this)->GetBrushForXamlRootImpl(pXamlRoot, ppResult));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlDirect.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlDirect.g.cpp
deleted file mode 100644
index 10de651778..0000000000
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlDirect.g.cpp
+++ /dev/null
@@ -1,1018 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-//------------------------------------------------------------------------
-//
-//  Abstract:
-//
-//      XAML types.
-//      NOTE: This file was generated by a tool.
-//
-//------------------------------------------------------------------------
-
-#include "XamlDirect.g.h"
-#include "XamlTelemetry.h"
-
-// Constructors/destructors.
-DirectUI::XamlDirectGenerated::XamlDirectGenerated()
-{
-}
-
-DirectUI::XamlDirectGenerated::~XamlDirectGenerated()
-{
-}
-
-HRESULT DirectUI::XamlDirectGenerated::QueryInterfaceImpl(_In_ REFIID iid, _Outptr_ void** ppObject)
-{
-    if (InlineIsEqualGUID(iid, __uuidof(DirectUI::XamlDirect)))
-    {
-        *ppObject = static_cast<DirectUI::XamlDirect*>(this);
-    }
-#if WI_IS_FEATURE_PRESENT(Feature_XamlDirect)
-    else if (InlineIsEqualGUID(iid, __uuidof(ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirect)) && Feature_XamlDirect::IsEnabled())
-    {
-        *ppObject = ctl::interface_cast<ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirect>(this);
-    }
-#endif
-    else
-    {
-        RRETURN(ctl::WeakReferenceSource::QueryInterfaceImpl(iid, ppObject));
-    }
-
-    AddRefOuter();
-    RRETURN(S_OK);
-}
-
-// Properties.
-
-// Events.
-
-// Methods.
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::AddEventHandler(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlEventIndex eventIndex, _In_ IInspectable* pHandler)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_AddEventHandler", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    ARG_NOTNULL(pHandler, "handler");
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->AddEventHandlerImpl(pXamlDirectObject, eventIndex, pHandler));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_AddEventHandler", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::AddEventHandler_HandledEventsToo(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlEventIndex eventIndex, _In_ IInspectable* pHandler, _In_ BOOLEAN handledEventsToo)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_AddEventHandler_HandledEventsToo", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    ARG_NOTNULL(pHandler, "handler");
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->AddEventHandler_HandledEventsTooImpl(pXamlDirectObject, eventIndex, pHandler, handledEventsToo));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_AddEventHandler_HandledEventsToo", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::AddToCollection(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pValue)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_AddToCollection", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    ARG_NOTNULL(pValue, "value");
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->AddToCollectionImpl(pXamlDirectObject, pValue));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_AddToCollection", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::ClearCollection(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_ClearCollection", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->ClearCollectionImpl(pXamlDirectObject));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_ClearCollection", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::ClearProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_ClearProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->ClearPropertyImpl(pXamlDirectObject, propertyIndex));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_ClearProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::CreateInstance(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlTypeIndex typeIndex, _Outptr_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject** ppResult)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_CreateInstance", 0);
-    }
-    ARG_VALIDRETURNPOINTER(ppResult);
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->CreateInstanceImpl(typeIndex, ppResult));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_CreateInstance", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::GetBooleanProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ BOOLEAN* pResult)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_GetBooleanProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    ARG_VALIDRETURNPOINTER(pResult);
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->GetBooleanPropertyImpl(pXamlDirectObject, propertyIndex, pResult));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_GetBooleanProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::GetCollectionCount(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _Out_ UINT* pResult)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_GetCollectionCount", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    ARG_VALIDRETURNPOINTER(pResult);
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->GetCollectionCountImpl(pXamlDirectObject, pResult));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_GetCollectionCount", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::GetColorProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Windows::UI::Color* pResult)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_GetColorProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    ARG_VALIDRETURNPOINTER(pResult);
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->GetColorPropertyImpl(pXamlDirectObject, propertyIndex, pResult));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_GetColorProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::GetCornerRadiusProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Microsoft::UI::Xaml::CornerRadius* pResult)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_GetCornerRadiusProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    ARG_VALIDRETURNPOINTER(pResult);
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->GetCornerRadiusPropertyImpl(pXamlDirectObject, propertyIndex, pResult));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_GetCornerRadiusProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::GetDateTimeProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Windows::Foundation::DateTime* pResult)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_GetDateTimeProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    ARG_VALIDRETURNPOINTER(pResult);
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->GetDateTimePropertyImpl(pXamlDirectObject, propertyIndex, pResult));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_GetDateTimeProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::GetDoubleProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ DOUBLE* pResult)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_GetDoubleProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    ARG_VALIDRETURNPOINTER(pResult);
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->GetDoublePropertyImpl(pXamlDirectObject, propertyIndex, pResult));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_GetDoubleProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::GetDurationProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Microsoft::UI::Xaml::Duration* pResult)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_GetDurationProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    ARG_VALIDRETURNPOINTER(pResult);
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->GetDurationPropertyImpl(pXamlDirectObject, propertyIndex, pResult));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_GetDurationProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::GetEnumProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ UINT* pResult)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_GetEnumProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    ARG_VALIDRETURNPOINTER(pResult);
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->GetEnumPropertyImpl(pXamlDirectObject, propertyIndex, pResult));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_GetEnumProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::GetGridLengthProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Microsoft::UI::Xaml::GridLength* pResult)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_GetGridLengthProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    ARG_VALIDRETURNPOINTER(pResult);
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->GetGridLengthPropertyImpl(pXamlDirectObject, propertyIndex, pResult));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_GetGridLengthProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::GetInt32Property(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ INT* pResult)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_GetInt32Property", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    ARG_VALIDRETURNPOINTER(pResult);
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->GetInt32PropertyImpl(pXamlDirectObject, propertyIndex, pResult));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_GetInt32Property", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::GetMatrix3DProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Microsoft::UI::Xaml::Media::Media3D::Matrix3D* pResult)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_GetMatrix3DProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    ARG_VALIDRETURNPOINTER(pResult);
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->GetMatrix3DPropertyImpl(pXamlDirectObject, propertyIndex, pResult));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_GetMatrix3DProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::GetMatrixProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Microsoft::UI::Xaml::Media::Matrix* pResult)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_GetMatrixProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    ARG_VALIDRETURNPOINTER(pResult);
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->GetMatrixPropertyImpl(pXamlDirectObject, propertyIndex, pResult));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_GetMatrixProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::GetObject(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _Outptr_ IInspectable** ppResult)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_GetObject", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    ARG_VALIDRETURNPOINTER(ppResult);
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->GetObjectImpl(pXamlDirectObject, ppResult));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_GetObject", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::GetObjectProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Outptr_ IInspectable** ppResult)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_GetObjectProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    ARG_VALIDRETURNPOINTER(ppResult);
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->GetObjectPropertyImpl(pXamlDirectObject, propertyIndex, ppResult));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_GetObjectProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::GetPointProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Windows::Foundation::Point* pResult)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_GetPointProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    ARG_VALIDRETURNPOINTER(pResult);
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->GetPointPropertyImpl(pXamlDirectObject, propertyIndex, pResult));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_GetPointProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::GetRectProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Windows::Foundation::Rect* pResult)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_GetRectProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    ARG_VALIDRETURNPOINTER(pResult);
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->GetRectPropertyImpl(pXamlDirectObject, propertyIndex, pResult));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_GetRectProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::GetSizeProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Windows::Foundation::Size* pResult)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_GetSizeProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    ARG_VALIDRETURNPOINTER(pResult);
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->GetSizePropertyImpl(pXamlDirectObject, propertyIndex, pResult));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_GetSizeProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::GetStringProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ HSTRING* pResult)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_GetStringProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    ARG_VALIDRETURNPOINTER(pResult);
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->GetStringPropertyImpl(pXamlDirectObject, propertyIndex, pResult));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_GetStringProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::GetThicknessProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Microsoft::UI::Xaml::Thickness* pResult)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_GetThicknessProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    ARG_VALIDRETURNPOINTER(pResult);
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->GetThicknessPropertyImpl(pXamlDirectObject, propertyIndex, pResult));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_GetThicknessProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::GetTimeSpanProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Windows::Foundation::TimeSpan* pResult)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_GetTimeSpanProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    ARG_VALIDRETURNPOINTER(pResult);
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->GetTimeSpanPropertyImpl(pXamlDirectObject, propertyIndex, pResult));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_GetTimeSpanProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::GetXamlDirectObject(_In_ IInspectable* pObject, _Outptr_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject** ppResult)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_GetXamlDirectObject", 0);
-    }
-    ARG_NOTNULL(pObject, "object");
-    ARG_VALIDRETURNPOINTER(ppResult);
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->GetXamlDirectObjectImpl(pObject, ppResult));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_GetXamlDirectObject", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::GetXamlDirectObjectFromCollectionAt(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ UINT index, _Outptr_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject** ppResult)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_GetXamlDirectObjectFromCollectionAt", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    ARG_VALIDRETURNPOINTER(ppResult);
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->GetXamlDirectObjectFromCollectionAtImpl(pXamlDirectObject, index, ppResult));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_GetXamlDirectObjectFromCollectionAt", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::GetXamlDirectObjectProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Outptr_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject** ppResult)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_GetXamlDirectObjectProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    ARG_VALIDRETURNPOINTER(ppResult);
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->GetXamlDirectObjectPropertyImpl(pXamlDirectObject, propertyIndex, ppResult));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_GetXamlDirectObjectProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::InsertIntoCollectionAt(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ UINT index, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pValue)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_InsertIntoCollectionAt", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    ARG_NOTNULL(pValue, "value");
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->InsertIntoCollectionAtImpl(pXamlDirectObject, index, pValue));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_InsertIntoCollectionAt", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::RemoveEventHandler(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlEventIndex eventIndex, _In_ IInspectable* pHandler)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_RemoveEventHandler", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    ARG_NOTNULL(pHandler, "handler");
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->RemoveEventHandlerImpl(pXamlDirectObject, eventIndex, pHandler));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_RemoveEventHandler", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::RemoveFromCollection(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pValue, _Out_ BOOLEAN* pResult)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_RemoveFromCollection", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    ARG_NOTNULL(pValue, "value");
-    ARG_VALIDRETURNPOINTER(pResult);
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->RemoveFromCollectionImpl(pXamlDirectObject, pValue, pResult));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_RemoveFromCollection", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::RemoveFromCollectionAt(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ UINT index)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_RemoveFromCollectionAt", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->RemoveFromCollectionAtImpl(pXamlDirectObject, index));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_RemoveFromCollectionAt", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::SetBooleanProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ BOOLEAN value)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_SetBooleanProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->SetBooleanPropertyImpl(pXamlDirectObject, propertyIndex, value));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_SetBooleanProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::SetColorProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Windows::UI::Color value)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_SetColorProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->SetColorPropertyImpl(pXamlDirectObject, propertyIndex, value));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_SetColorProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::SetCornerRadiusProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Microsoft::UI::Xaml::CornerRadius value)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_SetCornerRadiusProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->SetCornerRadiusPropertyImpl(pXamlDirectObject, propertyIndex, value));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_SetCornerRadiusProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::SetDateTimeProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Windows::Foundation::DateTime value)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_SetDateTimeProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->SetDateTimePropertyImpl(pXamlDirectObject, propertyIndex, value));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_SetDateTimeProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::SetDoubleProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ DOUBLE value)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_SetDoubleProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->SetDoublePropertyImpl(pXamlDirectObject, propertyIndex, value));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_SetDoubleProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::SetDurationProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Microsoft::UI::Xaml::Duration value)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_SetDurationProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->SetDurationPropertyImpl(pXamlDirectObject, propertyIndex, value));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_SetDurationProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::SetEnumProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ UINT value)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_SetEnumProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->SetEnumPropertyImpl(pXamlDirectObject, propertyIndex, value));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_SetEnumProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::SetGridLengthProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Microsoft::UI::Xaml::GridLength value)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_SetGridLengthProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->SetGridLengthPropertyImpl(pXamlDirectObject, propertyIndex, value));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_SetGridLengthProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::SetInt32Property(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ INT value)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_SetInt32Property", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->SetInt32PropertyImpl(pXamlDirectObject, propertyIndex, value));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_SetInt32Property", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::SetMatrix3DProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Microsoft::UI::Xaml::Media::Media3D::Matrix3D value)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_SetMatrix3DProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->SetMatrix3DPropertyImpl(pXamlDirectObject, propertyIndex, value));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_SetMatrix3DProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::SetMatrixProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Microsoft::UI::Xaml::Media::Matrix value)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_SetMatrixProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->SetMatrixPropertyImpl(pXamlDirectObject, propertyIndex, value));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_SetMatrixProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::SetObjectProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_opt_ IInspectable* pValue)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_SetObjectProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->SetObjectPropertyImpl(pXamlDirectObject, propertyIndex, pValue));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_SetObjectProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::SetPointProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Windows::Foundation::Point value)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_SetPointProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->SetPointPropertyImpl(pXamlDirectObject, propertyIndex, value));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_SetPointProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::SetRectProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Windows::Foundation::Rect value)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_SetRectProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->SetRectPropertyImpl(pXamlDirectObject, propertyIndex, value));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_SetRectProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::SetSizeProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Windows::Foundation::Size value)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_SetSizeProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->SetSizePropertyImpl(pXamlDirectObject, propertyIndex, value));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_SetSizeProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::SetStringProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_opt_ HSTRING value)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_SetStringProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->SetStringPropertyImpl(pXamlDirectObject, propertyIndex, value));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_SetStringProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::SetThicknessProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Microsoft::UI::Xaml::Thickness value)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_SetThicknessProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->SetThicknessPropertyImpl(pXamlDirectObject, propertyIndex, value));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_SetThicknessProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::SetTimeSpanProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Windows::Foundation::TimeSpan value)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_SetTimeSpanProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->SetTimeSpanPropertyImpl(pXamlDirectObject, propertyIndex, value));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_SetTimeSpanProperty", hr);
-    }
-    RRETURN(hr);
-}
-_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlDirectGenerated::SetXamlDirectObjectProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_opt_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pValue)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlDirect_SetXamlDirectObjectProperty", 0);
-    }
-    ARG_NOTNULL(pXamlDirectObject, "xamlDirectObject");
-    IFC(CheckThread());
-    IFC(static_cast<XamlDirect*>(this)->SetXamlDirectObjectPropertyImpl(pXamlDirectObject, propertyIndex, pValue));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlDirect_SetXamlDirectObjectProperty", hr);
-    }
-    RRETURN(hr);
-}
-
-HRESULT DirectUI::XamlDirectFactory::QueryInterfaceImpl(_In_ REFIID iid, _Outptr_ void** ppObject)
-{
-#if WI_IS_FEATURE_PRESENT(Feature_XamlDirect)
-    if (InlineIsEqualGUID(iid, __uuidof(ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectStatics)))
-    {
-        *ppObject = static_cast<ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectStatics*>(this);
-    }
-    else
-#endif
-    {
-        RRETURN(ctl::AbstractActivationFactory::QueryInterfaceImpl(iid, ppObject));
-    }
-
-#if WI_IS_FEATURE_PRESENT(Feature_XamlDirect)
-    AddRefOuter();
-    RRETURN(S_OK);
-#endif
-}
-
-
-// Factory methods.
-
-// Dependency properties.
-
-// Attached properties.
-
-// Static properties.
-
-// Static methods.
-IFACEMETHODIMP DirectUI::XamlDirectFactory::GetDefault(_Outptr_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirect** ppResult)
-{
-    HRESULT hr = S_OK;
-    if (EventEnabledApiFunctionCallStart())
-    {
-        XamlTelemetry::PublicApiCall(true, 0, "XamlDirect_GetDefault", 0);
-    }
-    ARG_VALIDRETURNPOINTER(ppResult);
-    IFC(CheckActivationAllowed());
-    IFC(GetDefaultImpl(ppResult));
-Cleanup:
-    if (EventEnabledApiFunctionCallStop())
-    {
-        XamlTelemetry::PublicApiCall(false, 0, "XamlDirect_GetDefault", hr);
-    }
-    RRETURN(hr);
-}
-
-namespace DirectUI
-{
-    _Check_return_ IActivationFactory* CreateActivationFactory_XamlDirect()
-    {
-        RRETURN(ctl::ActivationFactoryCreator<XamlDirectFactory>::CreateActivationFactory());
-    }
-}
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlDirect.g.h b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlDirect.g.h
deleted file mode 100644
index 22bf0ff7ff..0000000000
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlDirect.g.h
+++ /dev/null
@@ -1,241 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-//------------------------------------------------------------------------
-//
-//  Abstract:
-//
-//      XAML types.
-//      NOTE: This file was generated by a tool.
-//
-//------------------------------------------------------------------------
-
-#pragma once
-
-#include "CornerRadius.g.h"
-#include "Duration.g.h"
-#include "GridLength.g.h"
-#include "Matrix.g.h"
-#include "Matrix3D.g.h"
-#include "Thickness.g.h"
-#include <FeatureFlags.h>
-#if WI_IS_FEATURE_PRESENT(Feature_XamlDirect) 
-#define FEATURE_XAMLDIRECT_OVERRIDE override
-#else
-#define FEATURE_XAMLDIRECT_OVERRIDE
-#endif
-#define __XamlDirect_GUID "6a38cf51-578f-4551-b5ef-6b3cf208b35f"
-
-#pragma region forwarders
-#if WI_IS_FEATURE_PRESENT(Feature_XamlDirect)
-namespace ctl
-{
-    template<typename impl_type>
-    class interface_forwarder< ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirect, impl_type> final
-        : public ctl::iinspectable_forwarder_base< ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirect, impl_type>
-    {
-        impl_type* This() { return this->This_helper<impl_type>(); }
-        IFACEMETHOD(AddEventHandler)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlEventIndex eventIndex, _In_ IInspectable* pHandler) override { return This()->AddEventHandler(pXamlDirectObject, eventIndex, pHandler); }
-        IFACEMETHOD(AddEventHandler_HandledEventsToo)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlEventIndex eventIndex, _In_ IInspectable* pHandler, _In_ BOOLEAN handledEventsToo) override { return This()->AddEventHandler_HandledEventsToo(pXamlDirectObject, eventIndex, pHandler, handledEventsToo); }
-        IFACEMETHOD(AddToCollection)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pValue) override { return This()->AddToCollection(pXamlDirectObject, pValue); }
-        IFACEMETHOD(ClearCollection)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject) override { return This()->ClearCollection(pXamlDirectObject); }
-        IFACEMETHOD(ClearProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex) override { return This()->ClearProperty(pXamlDirectObject, propertyIndex); }
-        IFACEMETHOD(CreateInstance)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlTypeIndex typeIndex, _Outptr_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject** ppResult) override { return This()->CreateInstance(typeIndex, ppResult); }
-        IFACEMETHOD(GetBooleanProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ BOOLEAN* pResult) override { return This()->GetBooleanProperty(pXamlDirectObject, propertyIndex, pResult); }
-        IFACEMETHOD(GetCollectionCount)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _Out_ UINT* pResult) override { return This()->GetCollectionCount(pXamlDirectObject, pResult); }
-        IFACEMETHOD(GetColorProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Windows::UI::Color* pResult) override { return This()->GetColorProperty(pXamlDirectObject, propertyIndex, pResult); }
-        IFACEMETHOD(GetCornerRadiusProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Microsoft::UI::Xaml::CornerRadius* pResult) override { return This()->GetCornerRadiusProperty(pXamlDirectObject, propertyIndex, pResult); }
-        IFACEMETHOD(GetDateTimeProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Windows::Foundation::DateTime* pResult) override { return This()->GetDateTimeProperty(pXamlDirectObject, propertyIndex, pResult); }
-        IFACEMETHOD(GetDoubleProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ DOUBLE* pResult) override { return This()->GetDoubleProperty(pXamlDirectObject, propertyIndex, pResult); }
-        IFACEMETHOD(GetDurationProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Microsoft::UI::Xaml::Duration* pResult) override { return This()->GetDurationProperty(pXamlDirectObject, propertyIndex, pResult); }
-        IFACEMETHOD(GetEnumProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ UINT* pResult) override { return This()->GetEnumProperty(pXamlDirectObject, propertyIndex, pResult); }
-        IFACEMETHOD(GetGridLengthProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Microsoft::UI::Xaml::GridLength* pResult) override { return This()->GetGridLengthProperty(pXamlDirectObject, propertyIndex, pResult); }
-        IFACEMETHOD(GetInt32Property)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ INT* pResult) override { return This()->GetInt32Property(pXamlDirectObject, propertyIndex, pResult); }
-        IFACEMETHOD(GetMatrix3DProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Microsoft::UI::Xaml::Media::Media3D::Matrix3D* pResult) override { return This()->GetMatrix3DProperty(pXamlDirectObject, propertyIndex, pResult); }
-        IFACEMETHOD(GetMatrixProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Microsoft::UI::Xaml::Media::Matrix* pResult) override { return This()->GetMatrixProperty(pXamlDirectObject, propertyIndex, pResult); }
-        IFACEMETHOD(GetObject)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _Outptr_ IInspectable** ppResult) override { return This()->GetObject(pXamlDirectObject, ppResult); }
-        IFACEMETHOD(GetObjectProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Outptr_ IInspectable** ppResult) override { return This()->GetObjectProperty(pXamlDirectObject, propertyIndex, ppResult); }
-        IFACEMETHOD(GetPointProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Windows::Foundation::Point* pResult) override { return This()->GetPointProperty(pXamlDirectObject, propertyIndex, pResult); }
-        IFACEMETHOD(GetRectProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Windows::Foundation::Rect* pResult) override { return This()->GetRectProperty(pXamlDirectObject, propertyIndex, pResult); }
-        IFACEMETHOD(GetSizeProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Windows::Foundation::Size* pResult) override { return This()->GetSizeProperty(pXamlDirectObject, propertyIndex, pResult); }
-        IFACEMETHOD(GetStringProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ HSTRING* pResult) override { return This()->GetStringProperty(pXamlDirectObject, propertyIndex, pResult); }
-        IFACEMETHOD(GetThicknessProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Microsoft::UI::Xaml::Thickness* pResult) override { return This()->GetThicknessProperty(pXamlDirectObject, propertyIndex, pResult); }
-        IFACEMETHOD(GetTimeSpanProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Windows::Foundation::TimeSpan* pResult) override { return This()->GetTimeSpanProperty(pXamlDirectObject, propertyIndex, pResult); }
-        IFACEMETHOD(GetXamlDirectObject)(_In_ IInspectable* pObject, _Outptr_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject** ppResult) override { return This()->GetXamlDirectObject(pObject, ppResult); }
-        IFACEMETHOD(GetXamlDirectObjectFromCollectionAt)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ UINT index, _Outptr_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject** ppResult) override { return This()->GetXamlDirectObjectFromCollectionAt(pXamlDirectObject, index, ppResult); }
-        IFACEMETHOD(GetXamlDirectObjectProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Outptr_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject** ppResult) override { return This()->GetXamlDirectObjectProperty(pXamlDirectObject, propertyIndex, ppResult); }
-        IFACEMETHOD(InsertIntoCollectionAt)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ UINT index, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pValue) override { return This()->InsertIntoCollectionAt(pXamlDirectObject, index, pValue); }
-        IFACEMETHOD(RemoveEventHandler)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlEventIndex eventIndex, _In_ IInspectable* pHandler) override { return This()->RemoveEventHandler(pXamlDirectObject, eventIndex, pHandler); }
-        IFACEMETHOD(RemoveFromCollection)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pValue, _Out_ BOOLEAN* pResult) override { return This()->RemoveFromCollection(pXamlDirectObject, pValue, pResult); }
-        IFACEMETHOD(RemoveFromCollectionAt)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ UINT index) override { return This()->RemoveFromCollectionAt(pXamlDirectObject, index); }
-        IFACEMETHOD(SetBooleanProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ BOOLEAN value) override { return This()->SetBooleanProperty(pXamlDirectObject, propertyIndex, value); }
-        IFACEMETHOD(SetColorProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Windows::UI::Color value) override { return This()->SetColorProperty(pXamlDirectObject, propertyIndex, value); }
-        IFACEMETHOD(SetCornerRadiusProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Microsoft::UI::Xaml::CornerRadius value) override { return This()->SetCornerRadiusProperty(pXamlDirectObject, propertyIndex, value); }
-        IFACEMETHOD(SetDateTimeProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Windows::Foundation::DateTime value) override { return This()->SetDateTimeProperty(pXamlDirectObject, propertyIndex, value); }
-        IFACEMETHOD(SetDoubleProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ DOUBLE value) override { return This()->SetDoubleProperty(pXamlDirectObject, propertyIndex, value); }
-        IFACEMETHOD(SetDurationProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Microsoft::UI::Xaml::Duration value) override { return This()->SetDurationProperty(pXamlDirectObject, propertyIndex, value); }
-        IFACEMETHOD(SetEnumProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ UINT value) override { return This()->SetEnumProperty(pXamlDirectObject, propertyIndex, value); }
-        IFACEMETHOD(SetGridLengthProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Microsoft::UI::Xaml::GridLength value) override { return This()->SetGridLengthProperty(pXamlDirectObject, propertyIndex, value); }
-        IFACEMETHOD(SetInt32Property)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ INT value) override { return This()->SetInt32Property(pXamlDirectObject, propertyIndex, value); }
-        IFACEMETHOD(SetMatrix3DProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Microsoft::UI::Xaml::Media::Media3D::Matrix3D value) override { return This()->SetMatrix3DProperty(pXamlDirectObject, propertyIndex, value); }
-        IFACEMETHOD(SetMatrixProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Microsoft::UI::Xaml::Media::Matrix value) override { return This()->SetMatrixProperty(pXamlDirectObject, propertyIndex, value); }
-        IFACEMETHOD(SetObjectProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_opt_ IInspectable* pValue) override { return This()->SetObjectProperty(pXamlDirectObject, propertyIndex, pValue); }
-        IFACEMETHOD(SetPointProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Windows::Foundation::Point value) override { return This()->SetPointProperty(pXamlDirectObject, propertyIndex, value); }
-        IFACEMETHOD(SetRectProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Windows::Foundation::Rect value) override { return This()->SetRectProperty(pXamlDirectObject, propertyIndex, value); }
-        IFACEMETHOD(SetSizeProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Windows::Foundation::Size value) override { return This()->SetSizeProperty(pXamlDirectObject, propertyIndex, value); }
-        IFACEMETHOD(SetStringProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_opt_ HSTRING value) override { return This()->SetStringProperty(pXamlDirectObject, propertyIndex, value); }
-        IFACEMETHOD(SetThicknessProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Microsoft::UI::Xaml::Thickness value) override { return This()->SetThicknessProperty(pXamlDirectObject, propertyIndex, value); }
-        IFACEMETHOD(SetTimeSpanProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Windows::Foundation::TimeSpan value) override { return This()->SetTimeSpanProperty(pXamlDirectObject, propertyIndex, value); }
-        IFACEMETHOD(SetXamlDirectObjectProperty)(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_opt_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pValue) override { return This()->SetXamlDirectObjectProperty(pXamlDirectObject, propertyIndex, pValue); }
-    };
-}
-#endif
-#pragma endregion
-
-namespace DirectUI
-{
-    class XamlDirect;
-
-    class __declspec(novtable) XamlDirectGenerated:
-        public ctl::WeakReferenceSource
-#if WI_IS_FEATURE_PRESENT(Feature_XamlDirect)
-        , public ctl::forwarder_holder< ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirect, XamlDirectGenerated >
-#endif
-    {
-        friend class DirectUI::XamlDirect;
-
-        INSPECTABLE_CLASS(L"Microsoft.UI.Xaml.Core.Direct.XamlDirect");
-
-        BEGIN_INTERFACE_MAP(XamlDirectGenerated, ctl::WeakReferenceSource)
-#if WI_IS_FEATURE_PRESENT(Feature_XamlDirect)
-            INTERFACE_ENTRY(XamlDirectGenerated, ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirect)
-#else
-            INTERFACE_ENTRY(DUMMYINTERFACE, IUnknown)
-#endif
-        END_INTERFACE_MAP(XamlDirectGenerated, ctl::WeakReferenceSource)
-
-    public:
-        XamlDirectGenerated();
-        ~XamlDirectGenerated() override;
-
-        // Event source typedefs.
-
-
-        // Properties.
-
-        // Events.
-
-        // Methods.
-        _Check_return_ HRESULT STDMETHODCALLTYPE AddEventHandler(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlEventIndex eventIndex, _In_ IInspectable* pHandler);
-        _Check_return_ HRESULT STDMETHODCALLTYPE AddEventHandler_HandledEventsToo(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlEventIndex eventIndex, _In_ IInspectable* pHandler, _In_ BOOLEAN handledEventsToo);
-        _Check_return_ HRESULT STDMETHODCALLTYPE AddToCollection(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pValue);
-        _Check_return_ HRESULT STDMETHODCALLTYPE ClearCollection(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject);
-        _Check_return_ HRESULT STDMETHODCALLTYPE ClearProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex);
-        _Check_return_ HRESULT STDMETHODCALLTYPE CreateInstance(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlTypeIndex typeIndex, _Outptr_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject** ppResult);
-        _Check_return_ HRESULT STDMETHODCALLTYPE GetBooleanProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ BOOLEAN* pResult);
-        _Check_return_ HRESULT STDMETHODCALLTYPE GetCollectionCount(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _Out_ UINT* pResult);
-        _Check_return_ HRESULT STDMETHODCALLTYPE GetColorProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Windows::UI::Color* pResult);
-        _Check_return_ HRESULT STDMETHODCALLTYPE GetCornerRadiusProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Microsoft::UI::Xaml::CornerRadius* pResult);
-        _Check_return_ HRESULT STDMETHODCALLTYPE GetDateTimeProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Windows::Foundation::DateTime* pResult);
-        _Check_return_ HRESULT STDMETHODCALLTYPE GetDoubleProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ DOUBLE* pResult);
-        _Check_return_ HRESULT STDMETHODCALLTYPE GetDurationProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Microsoft::UI::Xaml::Duration* pResult);
-        _Check_return_ HRESULT STDMETHODCALLTYPE GetEnumProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ UINT* pResult);
-        _Check_return_ HRESULT STDMETHODCALLTYPE GetGridLengthProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Microsoft::UI::Xaml::GridLength* pResult);
-        _Check_return_ HRESULT STDMETHODCALLTYPE GetInt32Property(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ INT* pResult);
-        _Check_return_ HRESULT STDMETHODCALLTYPE GetMatrix3DProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Microsoft::UI::Xaml::Media::Media3D::Matrix3D* pResult);
-        _Check_return_ HRESULT STDMETHODCALLTYPE GetMatrixProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Microsoft::UI::Xaml::Media::Matrix* pResult);
-        _Check_return_ HRESULT STDMETHODCALLTYPE GetObject(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _Outptr_ IInspectable** ppResult);
-        _Check_return_ HRESULT STDMETHODCALLTYPE GetObjectProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Outptr_ IInspectable** ppResult);
-        _Check_return_ HRESULT STDMETHODCALLTYPE GetPointProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Windows::Foundation::Point* pResult);
-        _Check_return_ HRESULT STDMETHODCALLTYPE GetRectProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Windows::Foundation::Rect* pResult);
-        _Check_return_ HRESULT STDMETHODCALLTYPE GetSizeProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Windows::Foundation::Size* pResult);
-        _Check_return_ HRESULT STDMETHODCALLTYPE GetStringProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ HSTRING* pResult);
-        _Check_return_ HRESULT STDMETHODCALLTYPE GetThicknessProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Microsoft::UI::Xaml::Thickness* pResult);
-        _Check_return_ HRESULT STDMETHODCALLTYPE GetTimeSpanProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Out_ ABI::Windows::Foundation::TimeSpan* pResult);
-        _Check_return_ HRESULT STDMETHODCALLTYPE GetXamlDirectObject(_In_ IInspectable* pObject, _Outptr_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject** ppResult);
-        _Check_return_ HRESULT STDMETHODCALLTYPE GetXamlDirectObjectFromCollectionAt(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ UINT index, _Outptr_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject** ppResult);
-        _Check_return_ HRESULT STDMETHODCALLTYPE GetXamlDirectObjectProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _Outptr_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject** ppResult);
-        _Check_return_ HRESULT STDMETHODCALLTYPE InsertIntoCollectionAt(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ UINT index, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pValue);
-        _Check_return_ HRESULT STDMETHODCALLTYPE RemoveEventHandler(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlEventIndex eventIndex, _In_ IInspectable* pHandler);
-        _Check_return_ HRESULT STDMETHODCALLTYPE RemoveFromCollection(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pValue, _Out_ BOOLEAN* pResult);
-        _Check_return_ HRESULT STDMETHODCALLTYPE RemoveFromCollectionAt(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ UINT index);
-        _Check_return_ HRESULT STDMETHODCALLTYPE SetBooleanProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ BOOLEAN value);
-        _Check_return_ HRESULT STDMETHODCALLTYPE SetColorProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Windows::UI::Color value);
-        _Check_return_ HRESULT STDMETHODCALLTYPE SetCornerRadiusProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Microsoft::UI::Xaml::CornerRadius value);
-        _Check_return_ HRESULT STDMETHODCALLTYPE SetDateTimeProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Windows::Foundation::DateTime value);
-        _Check_return_ HRESULT STDMETHODCALLTYPE SetDoubleProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ DOUBLE value);
-        _Check_return_ HRESULT STDMETHODCALLTYPE SetDurationProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Microsoft::UI::Xaml::Duration value);
-        _Check_return_ HRESULT STDMETHODCALLTYPE SetEnumProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ UINT value);
-        _Check_return_ HRESULT STDMETHODCALLTYPE SetGridLengthProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Microsoft::UI::Xaml::GridLength value);
-        _Check_return_ HRESULT STDMETHODCALLTYPE SetInt32Property(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ INT value);
-        _Check_return_ HRESULT STDMETHODCALLTYPE SetMatrix3DProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Microsoft::UI::Xaml::Media::Media3D::Matrix3D value);
-        _Check_return_ HRESULT STDMETHODCALLTYPE SetMatrixProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Microsoft::UI::Xaml::Media::Matrix value);
-        _Check_return_ HRESULT STDMETHODCALLTYPE SetObjectProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_opt_ IInspectable* pValue);
-        _Check_return_ HRESULT STDMETHODCALLTYPE SetPointProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Windows::Foundation::Point value);
-        _Check_return_ HRESULT STDMETHODCALLTYPE SetRectProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Windows::Foundation::Rect value);
-        _Check_return_ HRESULT STDMETHODCALLTYPE SetSizeProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Windows::Foundation::Size value);
-        _Check_return_ HRESULT STDMETHODCALLTYPE SetStringProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_opt_ HSTRING value);
-        _Check_return_ HRESULT STDMETHODCALLTYPE SetThicknessProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Microsoft::UI::Xaml::Thickness value);
-        _Check_return_ HRESULT STDMETHODCALLTYPE SetTimeSpanProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_ ABI::Windows::Foundation::TimeSpan value);
-        _Check_return_ HRESULT STDMETHODCALLTYPE SetXamlDirectObjectProperty(_In_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pXamlDirectObject, _In_ ABI::Microsoft::UI::Xaml::Core::Direct::XamlPropertyIndex propertyIndex, _In_opt_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectObject* pValue);
-
-
-    protected:
-        HRESULT QueryInterfaceImpl(_In_ REFIID iid, _Outptr_ void** ppObject) override;
-
-    private:
-
-        // Fields.
-    };
-}
-
-#include "XamlDirect_Partial.h"
-
-namespace DirectUI
-{
-    // Note that the ordering of the base types here is important - the base factory comes first, followed by all the
-    // interfaces specific to this type.  By doing this, we allow every Factory's CreateInstance method to be more
-    // COMDAT-folding-friendly.  Because this ensures that the first vfptr contains GetTypeIndex, it means that all
-    // CreateInstance functions with the same base factory generate the same assembly instructions and thus will
-    // fold together.  This is significant for binary size in Microsoft.UI.Xaml.dll so change this only with great
-    // care.
-    class __declspec(novtable) XamlDirectFactory:
-       public ctl::AbstractActivationFactory
-#if WI_IS_FEATURE_PRESENT(Feature_XamlDirect)
-        , public ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectStatics
-#endif
-    {
-        BEGIN_INTERFACE_MAP(XamlDirectFactory, ctl::AbstractActivationFactory)
-#if WI_IS_FEATURE_PRESENT(Feature_XamlDirect)
-            INTERFACE_ENTRY(XamlDirectFactory, ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirectStatics)
-#else
-            INTERFACE_ENTRY(DUMMYINTERFACE, IUnknown)
-#endif
-        END_INTERFACE_MAP(XamlDirectFactory, ctl::AbstractActivationFactory)
-
-    public:
-        // Factory methods.
-
-        // Static properties.
-
-        // Dependency properties.
-
-        // Attached properties.
-
-        // Static methods.
-        IFACEMETHOD(GetDefault)(_Outptr_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirect** ppResult) FEATURE_XAMLDIRECT_OVERRIDE;
-
-        // Static events.
-
-    protected:
-        HRESULT QueryInterfaceImpl(_In_ REFIID iid, _Outptr_ void** ppObject) override;
-
-
-
-    private:
-
-        // Customized static properties.
-
-        // Customized static  methods.
-         _Check_return_ HRESULT GetDefaultImpl(_Outptr_ ABI::Microsoft::UI::Xaml::Core::Direct::IXamlDirect** ppResult); 
-    };
-}
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlIsland.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlIsland.g.cpp
index 21d23351b1..6522b6a152 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlIsland.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlIsland.g.cpp
@@ -57,6 +57,7 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlIslandGenerated::get_Cont
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(static_cast<XamlIsland*>(this)->get_ContentImpl(ppValue));
 Cleanup:
@@ -75,6 +76,7 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlIslandGenerated::get_Cont
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(static_cast<XamlIsland*>(this)->get_ContentIslandImpl(ppValue));
 Cleanup:
@@ -84,6 +86,7 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlIslandGenerated::get_Syst
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(static_cast<XamlIsland*>(this)->get_SystemBackdropImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlIslandRoot.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlIslandRoot.g.cpp
index e2878fdd74..43d3648a37 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlIslandRoot.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlIslandRoot.g.cpp
@@ -46,6 +46,7 @@ IFACEMETHODIMP DirectUI::XamlIslandRootGenerated::get_Content(_Outptr_result_may
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(static_cast<XamlIslandRoot*>(this)->get_ContentImpl(ppValue));
 Cleanup:
@@ -67,6 +68,7 @@ IFACEMETHODIMP DirectUI::XamlIslandRootGenerated::get_FocusController(_Outptr_re
     IUnknown* pValueCore = nullptr;
 
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
 
     
 
@@ -116,6 +118,7 @@ IFACEMETHODIMP DirectUI::XamlIslandRootGenerated::TrySetFocus(_Out_ BOOLEAN* pRe
     BOOLEAN resultCore;
 
     ARG_VALIDRETURNPOINTER(pResult);
+    *pResult={};
 
     IFC(DefaultStrictApiCheck(this));
 
@@ -169,6 +172,7 @@ IFACEMETHODIMP DirectUI::XamlIslandRootFactory::GetIslandFromElement(_In_ ABI::M
     }
     ARG_NOTNULL(pElement, "element");
     ARG_VALIDRETURNPOINTER(ppResult);
+    *ppResult={};
     
     IFC(GetIslandFromElementImpl(pElement, ppResult));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlLight.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlLight.g.cpp
index 1716b8d158..d616a0e7f1 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlLight.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlLight.g.cpp
@@ -55,6 +55,7 @@ IFACEMETHODIMP DirectUI::XamlLight::get_CompositionLight(_Outptr_result_maybenul
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<XamlLight*>(this)->get_CompositionLightImpl(ppValue));
 Cleanup:
@@ -82,6 +83,7 @@ IFACEMETHODIMP DirectUI::XamlLight::GetId(_Out_ HSTRING* pReturnValue)
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlLight_GetId", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<XamlLight*>(this)->GetIdImpl(pReturnValue));
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlReader.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlReader.g.cpp
index 294216776a..325985ee95 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlReader.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlReader.g.cpp
@@ -47,6 +47,7 @@ IFACEMETHODIMP DirectUI::XamlReaderFactory::Load(_In_ HSTRING xaml, _Outptr_ IIn
     }
     ARG_NOTNULL(xaml, "xaml");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(LoadImpl(xaml, ppReturnValue));
 Cleanup:
@@ -65,6 +66,7 @@ IFACEMETHODIMP DirectUI::XamlReaderFactory::LoadWithInitialTemplateValidation(_I
     }
     ARG_NOTNULL(xaml, "xaml");
     ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
     IFC(CheckActivationAllowed());
     IFC(LoadWithInitialTemplateValidationImpl(xaml, ppReturnValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlRenderingBackgroundTask.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlRenderingBackgroundTask.g.cpp
index 3182e5c82a..9c770965d1 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlRenderingBackgroundTask.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlRenderingBackgroundTask.g.cpp
@@ -136,6 +136,7 @@ IFACEMETHODIMP DirectUI::XamlRenderingBackgroundTaskFactory::get_Resources(_Outp
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     
     IFC(get_ResourcesImpl(ppValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlRoot.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlRoot.g.cpp
index c3027cfaab..2f64e83b69 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlRoot.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlRoot.g.cpp
@@ -36,6 +36,12 @@ HRESULT DirectUI::XamlRootGenerated::QueryInterfaceImpl(_In_ REFIID iid, _Outptr
     {
         *ppObject = ctl::interface_cast<ABI::Microsoft::UI::Xaml::IXamlRoot2>(this);
     }
+#if WI_IS_FEATURE_PRESENT(Feature_ExperimentalApi)
+    else if (InlineIsEqualGUID(iid, __uuidof(ABI::Microsoft::UI::Xaml::IXamlRootFeature_ExperimentalApi)) && Feature_ExperimentalApi::IsEnabled())
+    {
+        *ppObject = ctl::interface_cast<ABI::Microsoft::UI::Xaml::IXamlRootFeature_ExperimentalApi>(this);
+    }
+#endif
     else
     {
         RRETURN(ctl::WeakReferenceSource::QueryInterfaceImpl(iid, ppObject));
@@ -50,6 +56,7 @@ IFACEMETHODIMP DirectUI::XamlRootGenerated::get_Content(_Outptr_result_maybenull
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<XamlRoot*>(this)->get_ContentImpl(ppValue));
 Cleanup:
@@ -59,15 +66,27 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlRootGenerated::get_Conten
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
     IFC(CheckThread());
     IFC(static_cast<XamlRoot*>(this)->get_ContentIslandEnvironmentImpl(ppValue));
 Cleanup:
     RRETURN(hr);
 }
+_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlRootGenerated::get_CoordinateConverter(_Outptr_result_maybenull_ ABI::Microsoft::UI::Content::IContentCoordinateConverter** ppValue)
+{
+    HRESULT hr = S_OK;
+    ARG_VALIDRETURNPOINTER(ppValue);
+    *ppValue={};
+    IFC(CheckThread());
+    IFC(static_cast<XamlRoot*>(this)->get_CoordinateConverterImpl(ppValue));
+Cleanup:
+    RRETURN(hr);
+}
 IFACEMETHODIMP DirectUI::XamlRootGenerated::get_IsHostVisible(_Out_ BOOLEAN* pValue)
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<XamlRoot*>(this)->get_IsHostVisibleImpl(pValue));
 Cleanup:
@@ -77,6 +96,7 @@ _Check_return_ HRESULT DirectUI::XamlRootGenerated::get_IsInputActive(_Out_ BOOL
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<XamlRoot*>(this)->get_IsInputActiveImpl(pValue));
 Cleanup:
@@ -86,6 +106,7 @@ IFACEMETHODIMP DirectUI::XamlRootGenerated::get_RasterizationScale(_Out_ DOUBLE*
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<XamlRoot*>(this)->get_RasterizationScaleImpl(pValue));
 Cleanup:
@@ -95,6 +116,7 @@ IFACEMETHODIMP DirectUI::XamlRootGenerated::get_Size(_Out_ ABI::Windows::Foundat
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     IFC(CheckThread());
     IFC(static_cast<XamlRoot*>(this)->get_SizeImpl(pValue));
 Cleanup:
@@ -175,6 +197,26 @@ _Check_return_ HRESULT DirectUI::XamlRootGenerated::remove_InputActivationChange
 }
 
 // Methods.
+#if WI_IS_FEATURE_PRESENT(Feature_ExperimentalApi)
+_Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlRootGenerated::TryGetContentIsland(_Outptr_ ABI::Microsoft::UI::Content::IContentIsland** ppReturnValue)
+{
+    HRESULT hr = S_OK;
+    if (EventEnabledApiFunctionCallStart())
+    {
+        XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlRoot_TryGetContentIsland", 0);
+    }
+    ARG_VALIDRETURNPOINTER(ppReturnValue);
+    *ppReturnValue={};
+    IFC(CheckThread());
+    IFC(static_cast<XamlRoot*>(this)->TryGetContentIslandImpl(ppReturnValue));
+Cleanup:
+    if (EventEnabledApiFunctionCallStop())
+    {
+        XamlTelemetry::PublicApiCall(false, reinterpret_cast<uint64_t>(this), "XamlRoot_TryGetContentIsland", hr);
+    }
+    RRETURN(hr);
+}
+#endif
 
 
 namespace DirectUI
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlRoot.g.h b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlRoot.g.h
index 5ab7d1a9ba..eb16a0aa51 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlRoot.g.h
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlRoot.g.h
@@ -11,7 +11,12 @@
 
 #pragma once
 
-
+#include <FeatureFlags.h>
+#if WI_IS_FEATURE_PRESENT(Feature_ExperimentalApi) 
+#define FEATURE_EXPERIMENTALAPI_OVERRIDE override
+#else
+#define FEATURE_EXPERIMENTALAPI_OVERRIDE
+#endif
 #define __XamlRoot_GUID "eaad7a20-751b-4a85-b6c9-50231742b28f"
 
 #pragma region forwarders
@@ -24,6 +29,14 @@ namespace ctl
         impl_type* This() { return this->This_helper<impl_type>(); }
         IFACEMETHOD(get_ContentIslandEnvironment)(_Outptr_result_maybenull_ ABI::Microsoft::UI::Content::IContentIslandEnvironment** ppValue) override { return This()->get_ContentIslandEnvironment(ppValue); }
     };
+    template<typename impl_type>
+    class interface_forwarder< ABI::Microsoft::UI::Xaml::IXamlRootFeature_ExperimentalApi, impl_type> final
+        : public ctl::iinspectable_forwarder_base< ABI::Microsoft::UI::Xaml::IXamlRootFeature_ExperimentalApi, impl_type>
+    {
+        impl_type* This() { return this->This_helper<impl_type>(); }
+        IFACEMETHOD(get_CoordinateConverter)(_Outptr_result_maybenull_ ABI::Microsoft::UI::Content::IContentCoordinateConverter** ppValue) override { return This()->get_CoordinateConverter(ppValue); }
+        IFACEMETHOD(TryGetContentIsland)(_Outptr_ ABI::Microsoft::UI::Content::IContentIsland** ppReturnValue) override { return This()->TryGetContentIsland(ppReturnValue); }
+    };
 }
 #pragma endregion
 
@@ -36,6 +49,9 @@ namespace DirectUI
         public ctl::WeakReferenceSource
         , public ABI::Microsoft::UI::Xaml::IXamlRoot
         , public ctl::forwarder_holder< ABI::Microsoft::UI::Xaml::IXamlRoot2, XamlRootGenerated >
+#if WI_IS_FEATURE_PRESENT(Feature_ExperimentalApi)
+        , public ctl::forwarder_holder< ABI::Microsoft::UI::Xaml::IXamlRootFeature_ExperimentalApi, XamlRootGenerated >
+#endif
     {
         friend class DirectUI::XamlRoot;
 
@@ -44,6 +60,9 @@ namespace DirectUI
         BEGIN_INTERFACE_MAP(XamlRootGenerated, ctl::WeakReferenceSource)
             INTERFACE_ENTRY(XamlRootGenerated, ABI::Microsoft::UI::Xaml::IXamlRoot)
             INTERFACE_ENTRY(XamlRootGenerated, ABI::Microsoft::UI::Xaml::IXamlRoot2)
+#if WI_IS_FEATURE_PRESENT(Feature_ExperimentalApi)
+            INTERFACE_ENTRY(XamlRootGenerated, ABI::Microsoft::UI::Xaml::IXamlRootFeature_ExperimentalApi)
+#endif
         END_INTERFACE_MAP(XamlRootGenerated, ctl::WeakReferenceSource)
 
     public:
@@ -58,6 +77,7 @@ namespace DirectUI
         // Properties.
         IFACEMETHOD(get_Content)(_Outptr_result_maybenull_ ABI::Microsoft::UI::Xaml::IUIElement** ppValue) override;
         _Check_return_ HRESULT STDMETHODCALLTYPE get_ContentIslandEnvironment(_Outptr_result_maybenull_ ABI::Microsoft::UI::Content::IContentIslandEnvironment** ppValue);
+        _Check_return_ HRESULT STDMETHODCALLTYPE get_CoordinateConverter(_Outptr_result_maybenull_ ABI::Microsoft::UI::Content::IContentCoordinateConverter** ppValue);
         IFACEMETHOD(get_IsHostVisible)(_Out_ BOOLEAN* pValue) override;
         _Check_return_ HRESULT get_IsInputActive(_Out_ BOOLEAN* pValue);
         IFACEMETHOD(get_RasterizationScale)(_Out_ DOUBLE* pValue) override;
@@ -72,6 +92,9 @@ namespace DirectUI
         _Check_return_ HRESULT remove_InputActivationChanged(_In_ EventRegistrationToken token);
 
         // Methods.
+#if WI_IS_FEATURE_PRESENT(Feature_ExperimentalApi)
+        _Check_return_ HRESULT STDMETHODCALLTYPE TryGetContentIsland(_Outptr_ ABI::Microsoft::UI::Content::IContentIsland** ppReturnValue);
+#endif
 
 
     protected:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlShutdownCompletedOnThreadEventArgs.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlShutdownCompletedOnThreadEventArgs.g.cpp
index 1d0e2f2956..d1f2dbdf26 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlShutdownCompletedOnThreadEventArgs.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlShutdownCompletedOnThreadEventArgs.g.cpp
@@ -53,6 +53,7 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlShutdownCompletedOnThread
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlShutdownCompletedOnThreadEventArgs_GetDispatcherQueueDeferral", 0);
     }
     ARG_VALIDRETURNPOINTER(ppResult);
+    *ppResult={};
     IFC(CheckThread());
     IFC(static_cast<XamlShutdownCompletedOnThreadEventArgs*>(this)->GetDispatcherQueueDeferralImpl(ppResult));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlSourceFocusNavigationRequest.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlSourceFocusNavigationRequest.g.cpp
index 093456a9e7..ebef9f7104 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlSourceFocusNavigationRequest.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlSourceFocusNavigationRequest.g.cpp
@@ -45,6 +45,7 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlSourceFocusNavigationRequ
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     
     IFC(static_cast<XamlSourceFocusNavigationRequest*>(this)->get_CorrelationIdImpl(pValue));
 Cleanup:
@@ -54,6 +55,7 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlSourceFocusNavigationRequ
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     
     IFC(static_cast<XamlSourceFocusNavigationRequest*>(this)->get_HintRectImpl(pValue));
 Cleanup:
@@ -63,6 +65,7 @@ _Check_return_ HRESULT STDMETHODCALLTYPE DirectUI::XamlSourceFocusNavigationRequ
 {
     HRESULT hr = S_OK;
     ARG_VALIDRETURNPOINTER(pValue);
+    *pValue={};
     
     IFC(static_cast<XamlSourceFocusNavigationRequest*>(this)->get_ReasonImpl(pValue));
 Cleanup:
diff --git a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlUICommand.g.cpp b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlUICommand.g.cpp
index 5e58e84b78..3281ac211f 100644
--- a/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlUICommand.g.cpp
+++ b/src/dxaml/xcp/dxaml/lib/winrtgeneratedclasses/XamlUICommand.g.cpp
@@ -272,6 +272,7 @@ IFACEMETHODIMP DirectUI::XamlUICommandGenerated::CanExecute(_In_opt_ IInspectabl
         XamlTelemetry::PublicApiCall(true, reinterpret_cast<uint64_t>(this), "XamlUICommand_CanExecute", 0);
     }
     ARG_VALIDRETURNPOINTER(pReturnValue);
+    *pReturnValue={};
     IFC(CheckThread());
     IFC(DefaultStrictApiCheck(this));
     IFC(static_cast<XamlUICommand*>(this)->CanExecuteImpl(pParameter, pReturnValue));
diff --git a/src/dxaml/xcp/dxaml/themes/generic.xaml b/src/dxaml/xcp/dxaml/themes/generic.xaml
index 6b3a696ec0..def26a6152 100644
--- a/src/dxaml/xcp/dxaml/themes/generic.xaml
+++ b/src/dxaml/xcp/dxaml/themes/generic.xaml
@@ -13,8 +13,8 @@
             -->
             <FontFamily x:Key="ContentControlThemeFontFamily">XamlAutoFontFamily</FontFamily>
             <FontFamily x:Key="MTCMediaFontFamily">XamlAutoFontFamily</FontFamily>
-            <FontFamily x:Key="PhoneFontFamilyNormal">Segoe WP</FontFamily>
-            <FontFamily x:Key="PhoneFontFamilySemiLight">Segoe WP SemiLight</FontFamily>
+            <FontFamily x:Key="PhoneFontFamilyNormal">Segoe UI</FontFamily>
+            <FontFamily x:Key="PhoneFontFamilySemiLight">Segoe UI</FontFamily>
             <FontFamily x:Key="PivotHeaderItemFontFamily">XamlAutoFontFamily</FontFamily>
             <FontFamily x:Key="PivotTitleFontFamily">XamlAutoFontFamily</FontFamily>
             <FontFamily x:Key="SymbolThemeFontFamily">Segoe Fluent Icons,Segoe MDL2 Assets</FontFamily>
@@ -2795,8 +2795,8 @@
             -->
             <FontFamily x:Key="ContentControlThemeFontFamily">XamlAutoFontFamily</FontFamily>
             <FontFamily x:Key="MTCMediaFontFamily">XamlAutoFontFamily</FontFamily>
-            <FontFamily x:Key="PhoneFontFamilyNormal">Segoe WP</FontFamily>
-            <FontFamily x:Key="PhoneFontFamilySemiLight">Segoe WP SemiLight</FontFamily>
+            <FontFamily x:Key="PhoneFontFamilyNormal">Segoe UI</FontFamily>
+            <FontFamily x:Key="PhoneFontFamilySemiLight">Segoe UI</FontFamily>
             <FontFamily x:Key="PivotHeaderItemFontFamily">XamlAutoFontFamily</FontFamily>
             <FontFamily x:Key="PivotTitleFontFamily">XamlAutoFontFamily</FontFamily>
             <FontFamily x:Key="SymbolThemeFontFamily">Segoe Fluent Icons,Segoe MDL2 Assets</FontFamily>
@@ -3938,8 +3938,8 @@
             -->
             <FontFamily x:Key="ContentControlThemeFontFamily">XamlAutoFontFamily</FontFamily>
             <FontFamily x:Key="MTCMediaFontFamily">XamlAutoFontFamily</FontFamily>
-            <FontFamily x:Key="PhoneFontFamilyNormal">Segoe WP</FontFamily>
-            <FontFamily x:Key="PhoneFontFamilySemiLight">Segoe WP SemiLight</FontFamily>
+            <FontFamily x:Key="PhoneFontFamilyNormal">Segoe UI</FontFamily>
+            <FontFamily x:Key="PhoneFontFamilySemiLight">Segoe UI</FontFamily>
             <FontFamily x:Key="PivotHeaderItemFontFamily">XamlAutoFontFamily</FontFamily>
             <FontFamily x:Key="PivotTitleFontFamily">XamlAutoFontFamily</FontFamily>
             <FontFamily x:Key="SymbolThemeFontFamily">Segoe Fluent Icons,Segoe MDL2 Assets</FontFamily>
diff --git a/src/dxaml/xcp/dxaml/tools/xamldiagnostics/tap/XamlDiagnosticsTap.cpp b/src/dxaml/xcp/dxaml/tools/xamldiagnostics/tap/XamlDiagnosticsTap.cpp
index 803e9b7ffb..75b60cd6c6 100644
--- a/src/dxaml/xcp/dxaml/tools/xamldiagnostics/tap/XamlDiagnosticsTap.cpp
+++ b/src/dxaml/xcp/dxaml/tools/xamldiagnostics/tap/XamlDiagnosticsTap.cpp
@@ -873,7 +873,7 @@ XamlDiagnosticsTap::BaseValueSourceToString(
 }
 
 template<typename TDelegateInterface, typename TCallback>
-wrl::ComPtr<TDelegateInterface> MakeAgileCallback(TCallback callback) throw()
+wrl::ComPtr<TDelegateInterface> MakeAgileCallback(TCallback callback) noexcept
 {
     return wrl::Callback<wrl::Implements<wrl::RuntimeClassFlags<::Microsoft::WRL::ClassicCom>, TDelegateInterface, wrl::FtmBase>>(callback);
 }
diff --git a/src/dxaml/xcp/dxaml/tools/xamldiagnostics/tap/XamlDiagnosticsTap.vcxproj b/src/dxaml/xcp/dxaml/tools/xamldiagnostics/tap/XamlDiagnosticsTap.vcxproj
index 00d7b1d19a..47078178c1 100644
--- a/src/dxaml/xcp/dxaml/tools/xamldiagnostics/tap/XamlDiagnosticsTap.vcxproj
+++ b/src/dxaml/xcp/dxaml/tools/xamldiagnostics/tap/XamlDiagnosticsTap.vcxproj
@@ -11,7 +11,7 @@
     <Import Project="$([MSBuild]::GetPathOfFileAbove(Xaml.Cpp.props))"/>
     <Import Project="$(XamlSourcePath)\xcp\project-lift.props"/>
     <Import Project="$(XamlSourcePath)\test\external-dependencies-lift.props"/>
-    
+
     <!-- TAEF.targets always sets INLINE_TEST_METHOD_MARKUP.  We don't want that defined so capture the value before the import and override it
          back to the starting value afterwards. -->
     <ItemDefinitionGroup>
@@ -79,7 +79,7 @@
             <AdditionalDependencies>
                 %(AdditionalDependencies);
                 onecoreuap.lib;
-                $(VCToolsInstallDir)lib\$(WindowsSDKArch)\comsupp.lib;
+                $(VisualStudioLibPath)comsupp.lib;
             </AdditionalDependencies>
         </Link>
     </ItemDefinitionGroup>
diff --git a/src/dxaml/xcp/dxaml/tools/xamldiagnostics/tap/dllentry.cpp b/src/dxaml/xcp/dxaml/tools/xamldiagnostics/tap/dllentry.cpp
index 2a61346db7..b44d0506d1 100644
--- a/src/dxaml/xcp/dxaml/tools/xamldiagnostics/tap/dllentry.cpp
+++ b/src/dxaml/xcp/dxaml/tools/xamldiagnostics/tap/dllentry.cpp
@@ -29,6 +29,7 @@ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, _COM_Outptr_ void** ppv)
     return wrl::Module<wrl::InProc>::GetModule().GetClassObject(rclsid, riid, ppv);
 }
 
+__control_entrypoint(DllExport)
 STDAPI
 DllCanUnloadNow()
 {
diff --git a/src/dxaml/xcp/host/win/browserdesktop/PlatWinBrowserHost.cpp b/src/dxaml/xcp/host/win/browserdesktop/PlatWinBrowserHost.cpp
index 2d8a54bf4b..f447bbd762 100644
--- a/src/dxaml/xcp/host/win/browserdesktop/PlatWinBrowserHost.cpp
+++ b/src/dxaml/xcp/host/win/browserdesktop/PlatWinBrowserHost.cpp
@@ -98,6 +98,7 @@ CXcpBrowserHost::HandlePointerMessage(_In_ XUINT32 uMsg, _In_ MsgPacket *pMsgPac
 
         pMsg->m_pPointerPointNoRef = pMsgPack->m_pPointerPointNoRef;
         pMsg->m_pPointerEventArgsNoRef = pMsgPack->m_pPointerEventArgsNoRef;
+        pMsg->m_isNonClientPointerMessage = pMsgPack->m_isNonClientPointerMessage;
 
         // Set the core window handle to register InputPane handler
         pMsg->m_pointerInfo.m_pCoreWindow = pMsgPack->m_pCoreWindow;
diff --git a/src/dxaml/xcp/host/win/browserdesktop/windwnreq.cpp b/src/dxaml/xcp/host/win/browserdesktop/windwnreq.cpp
index 93d8030f3c..818bf0ede9 100644
--- a/src/dxaml/xcp/host/win/browserdesktop/windwnreq.cpp
+++ b/src/dxaml/xcp/host/win/browserdesktop/windwnreq.cpp
@@ -913,6 +913,8 @@ CWindowsDownloadRequest::OnResponse( DWORD dwResponseCode,
         return E_POINTER;
     }
 
+    *pszAdditionalRequestHeaders = NULL;
+
     m_ulHttpStatusCode = dwResponseCode;
 
     IFC(gps->GetPlatformUtilities(&pUtilities));
@@ -922,8 +924,6 @@ CWindowsDownloadRequest::OnResponse( DWORD dwResponseCode,
         xstrlen(szResponseHeaders),
         &m_strHeaders));
 
-    *pszAdditionalRequestHeaders = NULL;
-
 Cleanup:
     return S_OK;
 }
@@ -1113,11 +1113,13 @@ CWindowsDownloadRequest::InitiateRequest (
 
     if (m_cHeaders)
     {
+#pragma prefast( suppress: 26451 "We shouldn't need to worry about casting here, if the following add operation generates an arithmetic overflow, m_cHeaders is likely already bad. Abstain from adding casting to complicate the code only to make PREfast happy.")
         m_pHeaders = new WCHAR[m_cHeaders + 1];
         if (bAddAcceptLanguageHeader)
         {
             //we need to add the accept-language header
-            memcpy(m_pHeaders+offset, ACCEPT_LANGUAGE_HEADER_PREFIX, ACCEPT_LANGUAGE_HEADER_PREFIX_LENGTH * sizeof(WCHAR));
+#pragma prefast( suppress: 6386 "PREfast does not know that whenever bAddAcceptLanguageHeader is set to TRUE above, m_cHeaders is big enough.")
+            memcpy(m_pHeaders, ACCEPT_LANGUAGE_HEADER_PREFIX, ACCEPT_LANGUAGE_HEADER_PREFIX_LENGTH * sizeof(WCHAR));
             offset += ACCEPT_LANGUAGE_HEADER_PREFIX_LENGTH;
             memcpy(m_pHeaders+offset, strAcceptLanguageHeader.GetBuffer(), strAcceptLanguageHeader.GetCount() * sizeof(WCHAR));
             offset += strAcceptLanguageHeader.GetCount();
diff --git a/src/dxaml/xcp/hostpalplatmisc.vcxproj b/src/dxaml/xcp/hostpalplatmisc.vcxproj
index b1dac78a96..33f0c4fb70 100644
--- a/src/dxaml/xcp/hostpalplatmisc.vcxproj
+++ b/src/dxaml/xcp/hostpalplatmisc.vcxproj
@@ -78,8 +78,6 @@
     <ClCompile Include="pal\win\DWriteFontCollection.cpp"/>
     <ClCompile Include="pal\win\DWriteFontFamily.cpp"/>
     <ClCompile Include="pal\win\DWriteFontFace.cpp"/>
-    <ClCompile Include="pal\win\DXamlFontFileEnumerator.cpp"/>
-    <ClCompile Include="pal\win\DXamlFontCollectionLoader.cpp"/>
 
     <ClCompile Include="plat\win\common\math.cpp"/>
     <ClCompile Include="plat\win\common\memory.cpp"/>
diff --git a/src/dxaml/xcp/inc/AutomationCValue.h b/src/dxaml/xcp/inc/AutomationCValue.h
index 28d77ddce1..3abd8664bb 100644
--- a/src/dxaml/xcp/inc/AutomationCValue.h
+++ b/src/dxaml/xcp/inc/AutomationCValue.h
@@ -48,7 +48,7 @@ namespace Automation
             (*this) = other;
         }
 
-        CValue(CValue&& other)
+        CValue(CValue&& other) noexcept
         {
             CountTypeAndFlags = other.EncodeCountTypeAndFlags();
             other.ResetCountTypeAndFlags();
@@ -60,7 +60,7 @@ namespace Automation
         ~CValue();
 
         // move assignment operator
-        CValue& operator=(CValue&& other)
+        CValue& operator=(CValue&& other) noexcept
         {
             if (this != &other)
             {
@@ -578,7 +578,7 @@ namespace Automation
 
         wf::TimeSpan AsTimeSpan() const
         {
-            wf::TimeSpan result;
+            wf::TimeSpan result = {};
 
             if (m_type == valueTimeSpan)
             {
diff --git a/src/dxaml/xcp/inc/FeatureFlags.h b/src/dxaml/xcp/inc/FeatureFlags.h
index a1347406ce..05a1997dc2 100644
--- a/src/dxaml/xcp/inc/FeatureFlags.h
+++ b/src/dxaml/xcp/inc/FeatureFlags.h
@@ -15,20 +15,17 @@ namespace features
     feature_name Feature_Xaml2018 = { AlwaysDisabled, FALSE };
     feature_name Feature_CommandingImprovements = { AlwaysDisabled, FALSE };
     feature_name Feature_WUXCPreviewTypes = { AlwaysDisabled, FALSE };
+    feature_name Feature_UwpSupportApi = { AlwaysDisabled, FALSE };
 
 #ifdef MUX_PRERELEASE
     // In prerelease, the API is "experimental"
-    feature_name Feature_XamlDirect = { DisabledByDefault, FALSE };
     feature_name Feature_InputValidation = { DisabledByDefault, FALSE };
-    feature_name Feature_UwpSupportApi = { DisabledByDefault, FALSE };
     feature_name Feature_UiaEndpointsForContentIslands = { DisabledByDefault, FALSE };
     feature_name Feature_ExperimentalApi = { DisabledByDefault, FALSE };
 #else
     // In release, the experimental feature is disabled, removing it from the final WinMD,
     // but preserving it in the private WinMD.
-    feature_name Feature_XamlDirect = { AlwaysDisabled, FALSE };
     feature_name Feature_InputValidation = { AlwaysDisabled, FALSE };
-    feature_name Feature_UwpSupportApi = { AlwaysDisabled, FALSE };
     feature_name Feature_UiaEndpointsForContentIslands = { AlwaysDisabled, FALSE };
     feature_name Feature_ExperimentalApi = { AlwaysDisabled, FALSE };
 #endif
@@ -105,15 +102,6 @@ namespace Feature_RunawayTextureList
 // Below apis are not release ready, hence we have marked them as experimental in winmd in preview build and removed from winmd in final release of WinUI. 
 // This feature is always enabled, so that we can use these features in preview builds.
 
-namespace Feature_XamlDirect
-{
-    #define __INTERNAL_FEATURE_PRESENT_Feature_XamlDirect 1
-    inline bool __cdecl IsEnabled()
-    {
-        return true;
-    }
-}
-
 namespace Feature_InputValidation
 {
     #define __INTERNAL_FEATURE_PRESENT_Feature_InputValidation 1
diff --git a/src/dxaml/xcp/inc/IXamlTestHooks-win.h b/src/dxaml/xcp/inc/IXamlTestHooks-win.h
index dd6630bb69..4ff0567805 100644
--- a/src/dxaml/xcp/inc/IXamlTestHooks-win.h
+++ b/src/dxaml/xcp/inc/IXamlTestHooks-win.h
@@ -76,7 +76,7 @@ DECLARE_INTERFACE_IID_(IXamlTestHooks, IXamlLoggerTestHooks, "43d4bcbd-4f02-4651
         ) const = 0;
 
     IFACEMETHOD(MarkDeviceInstanceLost)() const = 0;
-    IFACEMETHOD(GetD3D11GraphicsDeviceAddress)(_Outptr_ INT64* ppCD3D11Device) const = 0;
+    IFACEMETHOD(GetD3D11GraphicsDeviceAddress)(_Out_ INT64* ppCD3D11Device) const = 0;
 
     IFACEMETHOD(SetWindowSizeOverride)(
         _In_ const wf::Size& size,
@@ -133,6 +133,7 @@ DECLARE_INTERFACE_IID_(IXamlTestHooks, IXamlLoggerTestHooks, "43d4bcbd-4f02-4651
 
     // Clear the system font collection cached by core text services so that it retrieves the recent one after fonts have changed.
     IFACEMETHOD(SetSystemFontCollectionOverride)(_In_ IDWriteFontCollection* pFontCollection) = 0;
+    IFACEMETHOD(ShouldUseTypographicFontModel)(_Out_ bool* useDWriteTypographicModel) = 0;
 
     IFACEMETHOD(GetGripperData)(_In_ IInspectable* textControl, _Inout_ JupiterGripperData* returnValue);
 
@@ -279,11 +280,9 @@ DECLARE_INTERFACE_IID_(IXamlTestHooks, IXamlLoggerTestHooks, "43d4bcbd-4f02-4651
     IFACEMETHOD_(void, GetAnimatedCenterPoint)(_In_ xaml::IUIElement* element, _Out_ wfn::Vector3* centerPoint) = 0;
     IFACEMETHOD_(void, ScheduleWaitForAnimatedFacadePropertyChanges)(int count) = 0;
 
-    IFACEMETHOD(SimulateRegionsForContentDialog)(_In_ xaml_controls::IContentDialog* dialog) = 0;
-
     IFACEMETHOD_(bool, IsStoryboardActive)(_In_ xaml_animation::IStoryboard* storyboard) = 0;
 
-    IFACEMETHOD(GetElementInputWindow)(_In_ xaml::IUIElement* element, _Out_ HWND* hwnd) = 0;
+    IFACEMETHOD(GetElementInputWindow)(_In_ xaml::IUIElement* element, _Out_ HWND* inputHwnd) = 0;
 
     IFACEMETHOD_(void, SetSuspendOffThreadDecoding)(bool isOffThreadDecodingSuspended) = 0;
 
diff --git a/src/dxaml/xcp/inc/WindowsAppSDK-ProductInfo.h b/src/dxaml/xcp/inc/WindowsAppSDK-ProductInfo.h
index c327e5352c..ae14c1f4fb 100644
--- a/src/dxaml/xcp/inc/WindowsAppSDK-ProductInfo.h
+++ b/src/dxaml/xcp/inc/WindowsAppSDK-ProductInfo.h
@@ -15,7 +15,7 @@
 #endif
 
 #define WINDOWSAPPSDK_RELEASE_MAJOR                         1
-#define WINDOWSAPPSDK_RELEASE_MINOR                         5
+#define WINDOWSAPPSDK_RELEASE_MINOR                         6
 
 #define WINDOWSAPPSDK_PRODUCT_VERSION    WINDOWSAPPSDK_RELEASE_MAJOR, WINDOWSAPPSDK_RELEASE_MINOR
 #define WINDOWSAPPSDK_PRODUCT_VERSION_STRING   STR2(WINDOWSAPPSDK_RELEASE_MAJOR, WINDOWSAPPSDK_RELEASE_MINOR)
diff --git a/src/dxaml/xcp/inc/core.h b/src/dxaml/xcp/inc/core.h
index b9779a3de5..f11fff143d 100644
--- a/src/dxaml/xcp/inc/core.h
+++ b/src/dxaml/xcp/inc/core.h
@@ -19,7 +19,7 @@ enum DisplayRotation : uint8_t;
 class DCompTreeHost;
 class CEventArgs;
 struct IPALDownloadRequest;
-struct IPALTickableClock;
+class RefreshAlignedClock;
 struct IPALSurface;
 struct IPALGraphicsDeviceChangeListener;
 struct IErrorService;
@@ -192,7 +192,7 @@ struct ITickableFrameScheduler : IFrameScheduler
     virtual _Check_return_ HRESULT EndTick() = 0;
     virtual bool IsInTick() = 0;
     virtual bool IsHighPriority() = 0;
-    virtual IPALTickableClock* GetClock() = 0;  // TODO: HWPC: Can we factor TimeManager's clock dependency into the UIThreadFrameScheduler completely?
+    virtual RefreshAlignedClock* GetClock() = 0;  // TODO: HWPC: Can we factor TimeManager's clock dependency into the UIThreadFrameScheduler completely?
 };
 
 //------------------------------------------------------------------------------
diff --git a/src/dxaml/xcp/inc/cvalue.h b/src/dxaml/xcp/inc/cvalue.h
index 5664cbe694..d4822ad607 100644
--- a/src/dxaml/xcp/inc/cvalue.h
+++ b/src/dxaml/xcp/inc/cvalue.h
@@ -32,6 +32,7 @@ namespace CValueDetails
     static constexpr uint16_t CValueStateBits = TypeBits + 1;
 
     // Mask used to extract CValueCustomData bits from Flags union.
+#pragma warning (suppress : 26450) // Arithmetic overflow: '<<' operation causes overflow at compile time. Use a wider type to store the operands (io.1).
     static constexpr uint32_t CustomDataMask = (0xffffffff) << CValueStateBits;
 }
 
@@ -290,7 +291,7 @@ class CValue
     // Move assignment operator transfers value and ownership.
     // Difference from old CValue: leaves other in default constructed state (valueAny) as opposed to valueNull.
     CValue& operator=(
-        _Inout_ CValue&& source);
+        _Inout_ CValue&& source) noexcept;
 
     // Equality comparison has the following rules:
     //   If value types are the same:
diff --git a/src/dxaml/xcp/inc/minxcptypes.h b/src/dxaml/xcp/inc/minxcptypes.h
index ee8b67f6b5..e684fada4f 100644
--- a/src/dxaml/xcp/inc/minxcptypes.h
+++ b/src/dxaml/xcp/inc/minxcptypes.h
@@ -383,7 +383,7 @@ struct XGRIDLENGTH
 {
     DirectUI::GridUnitType type;
     char padding[3] { };    // XBF writer will stamp this struct onto disk and compare to the XBF master which has zeros in these 3 bytes
-    XFLOAT value;
+    XFLOAT value{};
 
     static XFLOAT Default()
     {
diff --git a/src/dxaml/xcp/inc/xcp_error.h b/src/dxaml/xcp/inc/xcp_error.h
index 0de744e324..18652e8428 100644
--- a/src/dxaml/xcp/inc/xcp_error.h
+++ b/src/dxaml/xcp/inc/xcp_error.h
@@ -122,8 +122,3 @@ struct HResultToECodePair
    XUINT32   m_iErrorCode;
 };
 
-struct ECodePair
-{
-    XUINT32  m_iKey;
-    XUINT32  m_iEquivalent;
-};
\ No newline at end of file
diff --git a/src/dxaml/xcp/inc/xcperrorresource.h b/src/dxaml/xcp/inc/xcperrorresource.h
index e536a8e358..b1c60ebd30 100644
--- a/src/dxaml/xcp/inc/xcperrorresource.h
+++ b/src/dxaml/xcp/inc/xcperrorresource.h
@@ -177,11 +177,6 @@
 #define   AG_E_STYLE_BASEDON_TARGETTYPE_NULL            4019
 #define   AG_E_PROPERTY_INVALID                         4020
 
-#define   AG_E_CAPTURE_DEVICE_IN_USE                    4024
-#define   AG_E_CAPTURE_DEVICE_REMOVED                   4025
-#define   AG_E_CAPTURE_DEVICE_ACCESS_DENIED             4026
-#define   AG_E_CAPTURE_SOURCE_NOT_STOPPED               4027
-#define   AG_E_CAPTURE_DEVICE_NOT_AVAILABLE             4028
 #define   AG_E_TEMPLATEBINDING_TEMPLATEDPARENT_NULL     4031
 #define   AG_E_NO_VECTOR_PRINT                          4032
 
diff --git a/src/dxaml/xcp/pal/common/CommonPlatformUtilities.cpp b/src/dxaml/xcp/pal/common/CommonPlatformUtilities.cpp
index 9caf329f1f..52c9f8a28c 100644
--- a/src/dxaml/xcp/pal/common/CommonPlatformUtilities.cpp
+++ b/src/dxaml/xcp/pal/common/CommonPlatformUtilities.cpp
@@ -27,6 +27,7 @@ _Check_return_ __ecount_opt(sourceStringLen + 1) WCHAR* CommonPlatformUtilities:
     if (XUINT32_MAX / sizeof(WCHAR) - 1 < sourceStringLen)
         return NULL;
     
+#pragma prefast( suppress: 26451 "PREfast does not know we already checked the size of sourceStringLen above. Abstain from adding casting to complicate the code only to make PREfast happy.")
     theNewString = new WCHAR[sourceStringLen + 1];
     if (theNewString != NULL)
     {
diff --git a/src/dxaml/xcp/pal/inc/CommonPlatformUtilities.h b/src/dxaml/xcp/pal/inc/CommonPlatformUtilities.h
index ba3f090827..5b057c6fc9 100644
--- a/src/dxaml/xcp/pal/inc/CommonPlatformUtilities.h
+++ b/src/dxaml/xcp/pal/inc/CommonPlatformUtilities.h
@@ -13,7 +13,7 @@ class CommonPlatformUtilities: public IPlatformUtilities
     CommonPlatformUtilities() {}
 public:
     
-    _Check_return_ __ecount_opt((sourceStringLen + 1)) WCHAR* Xstralloc(
+    _Check_return_ __ecount_opt(sourceStringLen + 1) WCHAR* Xstralloc(
         const _In_reads_opt_(sourceStringLen) WCHAR* sourceString,
         const _In_ XUINT32  sourceStringLen) override;
 
diff --git a/src/dxaml/xcp/pal/inc/matrix.h b/src/dxaml/xcp/pal/inc/matrix.h
index f09777fbc2..666ec46765 100644
--- a/src/dxaml/xcp/pal/inc/matrix.h
+++ b/src/dxaml/xcp/pal/inc/matrix.h
@@ -19,11 +19,9 @@ class CValue;
 class CMILMatrix
 {
 public:
-    CMILMatrix()
-    {
-    }
-
-    CMILMatrix(bool fInitialize)
+    CMILMatrix() = default;
+    
+    explicit CMILMatrix(bool fInitialize)
     {
         if (fInitialize)
         {
@@ -233,9 +231,7 @@ class CMILMatrix
 class CMILMatrix4x4
 {
 public:
-    CMILMatrix4x4()
-    {
-    }
+    CMILMatrix4x4() = default;
 
     explicit CMILMatrix4x4(bool fInitialize)
     {
diff --git a/src/dxaml/xcp/pal/inc/palcore.h b/src/dxaml/xcp/pal/inc/palcore.h
index ec9f3c19f1..2c9b31aed0 100644
--- a/src/dxaml/xcp/pal/inc/palcore.h
+++ b/src/dxaml/xcp/pal/inc/palcore.h
@@ -79,31 +79,6 @@ struct IPALClock : public IObject
     virtual XDOUBLE GetAbsoluteTimeInSeconds() = 0;
 };
 
-//------------------------------------------------------------------------
-//
-//  Interface:  IPALTickableClock
-//
-//  Synopsis:
-//      A stateful PAL clock object that supports ticking at a fixed frequency.
-//      Useful to keep time-based operations in sync between threads.
-//
-//------------------------------------------------------------------------
-struct IPALTickableClock : public IObject
-{
-protected:
-    ~IPALTickableClock(){}  // 'delete' not allowed, use 'Release' instead.
-
-public:
-    // Move the clock state forward by one tick.
-    virtual XDOUBLE Tick() = 0;
-
-    // Returns the last time Tick()-ed to.
-    virtual XDOUBLE GetLastTickTimeInSeconds() const = 0;
-
-    // Estimates the next time Tick() will return, but does not change state.
-    virtual XDOUBLE GetNextTickTimeInSeconds() const = 0;
-};
-
 //------------------------------------------------------------------------
 //
 //  Interface:  IPALRegion
@@ -298,17 +273,17 @@ struct IPALCoreServices
 
 // In checked builds, memory allocation is done through the memory allocator
 // in the PAL debugging service.
-__declspec(allocator) void * __cdecl operator new(size_t cSize);
-__bcount(cSize) __declspec(allocator) void * __cdecl operator new[](size_t cSize);
+_Ret_notnull_ _Post_writable_byte_size_(cSize) __declspec(allocator) void * __cdecl operator new(size_t cSize);
+_Ret_notnull_ _Post_writable_byte_size_(cSize) __declspec(allocator) void * __cdecl operator new[](size_t cSize);
 
 enum NoFailFastAllocationPolicy;
 enum ZeroMemAllocationPolicy;
 
-__declspec(allocator) void * __cdecl operator new(size_t cSize, NoFailFastAllocationPolicy);
-__bcount(cSize) XCP_FORCEINLINE __declspec(allocator) void * __cdecl operator new[](size_t cSize, NoFailFastAllocationPolicy);
+_Ret_notnull_ _Post_writable_byte_size_(cSize) __declspec(allocator) void * __cdecl operator new(size_t cSize, NoFailFastAllocationPolicy);
+_Ret_notnull_ _Post_writable_byte_size_(cSize) XCP_FORCEINLINE __declspec(allocator) void * __cdecl operator new[](size_t cSize, NoFailFastAllocationPolicy);
 
-__declspec(allocator) void * __cdecl operator new(size_t cSize, ZeroMemAllocationPolicy);
-__bcount(cSize) XCP_FORCEINLINE __declspec(allocator) void * __cdecl operator new[](size_t cSize, ZeroMemAllocationPolicy);
+_Ret_notnull_ _Post_writable_byte_size_(cSize) __declspec(allocator) void * __cdecl operator new(size_t cSize, ZeroMemAllocationPolicy);
+_Ret_notnull_ _Post_writable_byte_size_(cSize) XCP_FORCEINLINE __declspec(allocator) void * __cdecl operator new[](size_t cSize, ZeroMemAllocationPolicy);
 
 #pragma warning(push)
 // Some header files have their own definition of this function and don't
diff --git a/src/dxaml/xcp/pal/inc/palgfx.h b/src/dxaml/xcp/pal/inc/palgfx.h
index 02bb48c0ca..450082bb09 100644
--- a/src/dxaml/xcp/pal/inc/palgfx.h
+++ b/src/dxaml/xcp/pal/inc/palgfx.h
@@ -104,19 +104,6 @@ struct IPALGraphicsDeviceChangeListener
 // Assume a refresh rate of 60Hz before we can query the system for the actual refresh rate.
 const XFLOAT DefaultRefreshIntervalInMilliseconds = 1000.0f / 60.0f;
 
-//------------------------------------------------------------------------------
-//
-//  Synopsis:
-//      Refresh rate abstraction
-//
-//------------------------------------------------------------------------------
-struct IPALRefreshRateInfo : public IObject
-{
-    virtual XFLOAT GetRefreshIntervalInMilliseconds() = 0;
-    virtual _Check_return_ HRESULT WaitForRefreshInterval() = 0;
-    virtual bool IsValid() = 0;
-};
-
 enum class InterpolationMode
 {
     Gamma_2_2,
diff --git a/src/dxaml/xcp/pal/inc/paltext.h b/src/dxaml/xcp/pal/inc/paltext.h
index 80492bf517..19b218cf13 100644
--- a/src/dxaml/xcp/pal/inc/paltext.h
+++ b/src/dxaml/xcp/pal/inc/paltext.h
@@ -388,9 +388,6 @@ namespace PALText
         // Returns whether or not the font supports pair-kerning.
         virtual bool HasKerningPairs() = 0;
 
-        // Returns whether we can bypass full shaping.
-        virtual bool CanOptimizeShaping() = 0;
-
         // Returns true if the font has a COLR table
         virtual bool IsColorFont() = 0;
 
@@ -651,6 +648,7 @@ namespace PALText
             XUINT32 baseWeight,
             XUINT32 baseStyle,
             XUINT32 baseStretch,
+            FLOAT opticalSize,
             _Deref_out_range_(0, textLength) XUINT32* pMappedLength,
             _COM_Outptr_ IFontFace** ppMappedFont,
             _Out_ XFLOAT* pScale
diff --git a/src/dxaml/xcp/pal/inc/palthread.h b/src/dxaml/xcp/pal/inc/palthread.h
index 862a894a63..21df746e66 100644
--- a/src/dxaml/xcp/pal/inc/palthread.h
+++ b/src/dxaml/xcp/pal/inc/palthread.h
@@ -188,6 +188,6 @@ class xinit_cross_thread
     }
 
 private:
-    T m_value;
+    T m_value{};
     bool m_initialized;
 };
diff --git a/src/dxaml/xcp/pal/inc/paltypes.h b/src/dxaml/xcp/pal/inc/paltypes.h
index 3de755c8a3..e986fa4a12 100644
--- a/src/dxaml/xcp/pal/inc/paltypes.h
+++ b/src/dxaml/xcp/pal/inc/paltypes.h
@@ -632,9 +632,9 @@ enum XEDITKEY
 
 #if defined(__cplusplus) && !defined(NO_XCP_NEW_AND_DELETE) // for example, xcpmon and drtapp set this.
 
-XCP_FORCEINLINE __declspec(allocator) void * __cdecl operator new(size_t cSize);
+_Ret_notnull_ _Post_writable_byte_size_(cSize) XCP_FORCEINLINE __declspec(allocator) void * __cdecl operator new(size_t cSize);
 
-__bcount(cSize) XCP_FORCEINLINE __declspec(allocator) void * __cdecl operator new[](size_t cSize);
+_Ret_notnull_ _Post_writable_byte_size_(cSize) XCP_FORCEINLINE __declspec(allocator) void * __cdecl operator new[](size_t cSize);
 
 #pragma warning(push)
 #pragma warning(disable:26021 28301)
@@ -679,6 +679,8 @@ struct InputMessage
 
     ixp::IPointerEventArgs* m_pPointerEventArgsNoRef {nullptr};
 
+    bool m_isNonClientPointerMessage{ false };
+
     bool IsReplayedMessage() const { return m_isReplayedMessage; }
 
     // For re-entrancy scenarios, this flag is set when XAML has processed a message later than this one.
diff --git a/src/dxaml/xcp/pal/inc/xcperror.h b/src/dxaml/xcp/pal/inc/xcperror.h
index 6ad4f1763f..3865b2876b 100644
--- a/src/dxaml/xcp/pal/inc/xcperror.h
+++ b/src/dxaml/xcp/pal/inc/xcperror.h
@@ -24,6 +24,11 @@
 #define E_NOT_SUPPORTED                  _HRESULT_TYPEDEF_(0x80131515L)
 #endif
 
+// different than above, used widely in OS for general error reporting
+#ifndef E_NOTSUPPORTED
+#define E_NOTSUPPORTED HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED)
+#endif
+
 //
 // Webcam/Microphone error codes.
 //
diff --git a/src/dxaml/xcp/pal/win/DWriteFontAndScriptServices.cpp b/src/dxaml/xcp/pal/win/DWriteFontAndScriptServices.cpp
index 383f2feea9..56f369ae58 100644
--- a/src/dxaml/xcp/pal/win/DWriteFontAndScriptServices.cpp
+++ b/src/dxaml/xcp/pal/win/DWriteFontAndScriptServices.cpp
@@ -6,21 +6,11 @@
 #include "DWriteTextAnalyzer.h"
 #include "DWriteFontCollection.h"
 #include "DWriteFontFace.h"
-#include "DXamlFontCollectionLoader.h"
 #include "corep.h"
+#include "RuntimeEnabledFeatures.h"
 
 wrl::ComPtr<IUnknown> DWriteFontAndScriptServices::s_customSystemFontCollection;
 
-//---------------------------------------------------------------------------
-//
-//  Initializes a new instance of the DWriteFontAndScriptServices class.
-//
-//---------------------------------------------------------------------------
-DWriteFontAndScriptServices::DWriteFontAndScriptServices() :
-    m_pDXamlFontCollectionLoader(NULL)
-{
-}
-
 //---------------------------------------------------------------------------
 //
 //  Release resources associated with the DWriteFontAndScriptServices.
@@ -28,15 +18,6 @@ DWriteFontAndScriptServices::DWriteFontAndScriptServices() :
 //---------------------------------------------------------------------------
 DWriteFontAndScriptServices::~DWriteFontAndScriptServices()
 {
-    // Need to call IDWriteFactory::UnregisterFontCollectionLoader to release the ref
-    // added by IDWriteFactory::RegisterFontCollectionLoader.
-    if (m_dwriteFactory && m_pDXamlFontCollectionLoader)
-    {
-        VERIFYHR(m_dwriteFactory->UnregisterFontCollectionLoader(m_pDXamlFontCollectionLoader));
-    }
-
-    ReleaseInterface(m_pDXamlFontCollectionLoader);
-    
     ClearNumberSubstitutionList();
     m_fontNameList.clear();
 }
@@ -74,22 +55,14 @@ HRESULT DWriteFontAndScriptServices::Create(
 HRESULT DWriteFontAndScriptServices::Initialize()
 {
     HRESULT hr = S_OK;
-    DXamlFontCollectionLoader *pDXamlFontCollectionLoader = NULL;
 
     if (m_dwriteFactory == nullptr)
     {
-        IFC(DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, __uuidof(IDWriteFactory), &m_dwriteFactory));
-
-        pDXamlFontCollectionLoader = new DXamlFontCollectionLoader();
-        IFC(m_dwriteFactory->RegisterFontCollectionLoader(pDXamlFontCollectionLoader));
-        m_pDXamlFontCollectionLoader = pDXamlFontCollectionLoader;
-        pDXamlFontCollectionLoader = NULL;
-        
+        IFC(DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, __uuidof(IDWriteFactory6), &m_dwriteFactory));
         IFC(m_dwriteFactory->CreateTextAnalyzer(&m_dwriteTextAnalyzer));
     }
 
 Cleanup:
-    ReleaseInterface(pDXamlFontCollectionLoader);
     RRETURN(hr);
 }
 
@@ -117,24 +90,43 @@ _Check_return_ HRESULT DWriteFontAndScriptServices::GetDWriteFactory(_COM_Outptr
     return S_OK;
 }
 
+_Check_return_ HRESULT DWriteFontAndScriptServices::GetDWriteFactory(_COM_Outptr_ IDWriteFactory6** ppIDWriteFactory6) const
+{
+    IFC_RETURN(m_dwriteFactory.CopyTo(ppIDWriteFactory6));
+    return S_OK;
+}
+
 HRESULT DWriteFontAndScriptServices::EnsureSystemFontCollection()
 {
     if (m_systemFontCollection == nullptr)
     {
-        Microsoft::WRL::ComPtr<IDWriteFontCollection1> dWriteFontCollection;
+        Microsoft::WRL::ComPtr<IDWriteFontCollection2> dWriteFontCollection;
         if (s_customSystemFontCollection != nullptr)
         {
             IFC_RETURN(s_customSystemFontCollection.As(&dWriteFontCollection));
         }
         else
         {
-            IFC_RETURN(m_dwriteFactory->GetSystemFontCollection(/*includeDownloadableFonts*/ true, dWriteFontCollection.GetAddressOf()));
+            DWRITE_FONT_FAMILY_MODEL fontFamilyModel = ShouldUseTypographicFontModel() ? DWRITE_FONT_FAMILY_MODEL_TYPOGRAPHIC : DWRITE_FONT_FAMILY_MODEL_WEIGHT_STRETCH_STYLE;
+            IFC_RETURN(m_dwriteFactory->GetSystemFontCollection(/*includeDownloadableFonts*/ true, fontFamilyModel, dWriteFontCollection.GetAddressOf()));
         }
         IFC_RETURN(DWriteFontCollection::Create(dWriteFontCollection.Get(), m_systemFontCollection.ReleaseAndGetAddressOf()));
     }
     return S_OK;
 }
 
+bool DWriteFontAndScriptServices::ShouldUseTypographicFontModel()
+{
+    if (!RuntimeFeatureBehavior::GetRuntimeEnabledFeatureDetector()->IsFeatureEnabled(RuntimeFeatureBehavior::RuntimeEnabledFeature::ForceDWriteTypographicModel))
+    {
+        // The typographic model was not explicitly requested, so see if it is disabled
+        if (RuntimeFeatureBehavior::GetRuntimeEnabledFeatureDetector()->IsFeatureEnabled(RuntimeFeatureBehavior::RuntimeEnabledFeature::DisableDWriteTypographicModel))
+        {
+            return false;
+        }
+    }
+    return true;
+}
 
 //---------------------------------------------------------------------------
 //
@@ -158,12 +150,28 @@ HRESULT DWriteFontAndScriptServices::GetSystemFontCollection(
     return S_OK;
 }
 
-_Check_return_ HRESULT DWriteFontAndScriptServices::GetDefaultDWriteTextFormat(_COM_Outptr_ IDWriteTextFormat** ppIDWriteTextFormat)
+_Check_return_ HRESULT DWriteFontAndScriptServices::GetDefaultDWriteTextFormat(_COM_Outptr_ IDWriteTextFormat** ppIDWriteTextFormat, bool isTypographicCollection)
 {
     if (m_defaultTextFormat == nullptr)
     {
+        if (isTypographicCollection)
+        {
+            Microsoft::WRL::ComPtr<IDWriteTextFormat3> defaultTextFormat;
+            IFC_RETURN(m_dwriteFactory->CreateTextFormat(
+                L"Segoe UI", // This value is always overridden in the text layout so it is arbitrary.
+                nullptr, // use default collection
+                nullptr, // use default axis values
+                0,       // value count
+                15.0,    // font size
+                L"en-US",
+                &defaultTextFormat
+            ));
+            IFC_RETURN(defaultTextFormat.As(&m_defaultTextFormat));
+        }
+        else
+        {
         IFC_RETURN(m_dwriteFactory->CreateTextFormat(
-            L"Segoe UI",
+            L"Segoe UI", // This value is always overridden in the text layout so it is arbitrary
             nullptr,
             DWRITE_FONT_WEIGHT_NORMAL,
             DWRITE_FONT_STYLE_NORMAL,
@@ -172,6 +180,7 @@ _Check_return_ HRESULT DWriteFontAndScriptServices::GetDefaultDWriteTextFormat(_
             L"en-US",
             &m_defaultTextFormat
             ));
+        }
     }
     IFC_RETURN(m_defaultTextFormat.CopyTo(ppIDWriteTextFormat));
     return S_OK;
@@ -248,9 +257,7 @@ HRESULT DWriteFontAndScriptServices::CreateCustomFontCollection(
     _Outptr_ PALText::IFontCollection **ppFontCollection
     )
 {
-    HRESULT hr = S_OK;
     xstring_ptr strFilePath;
-    IDWriteFontCollection *pDWriteFontCollection = NULL;
 
     //
     // NOTE: Currently we only support resources that have a file path. 
@@ -258,23 +265,23 @@ HRESULT DWriteFontAndScriptServices::CreateCustomFontCollection(
     //
     // See the explanation below, in DWriteFontAndScriptServices::CreateCustomFontFace().
     //
-    IFC(pResource->TryGetFilePath(&strFilePath));
-    if (strFilePath.IsNullOrEmpty())
-    {
-        IFC(E_FAIL);
-    }
+    IFC_RETURN(pResource->TryGetFilePath(&strFilePath));
+    IFCCHECK_RETURN(!strFilePath.IsNullOrEmpty());
+
+    Microsoft::WRL::ComPtr<IDWriteFontSetBuilder2> fontSetBuilder;
+    IFC_RETURN(m_dwriteFactory->CreateFontSetBuilder(&fontSetBuilder));
+
+    IFC_RETURN(fontSetBuilder->AddFontFile(strFilePath.GetBuffer()));
     
-    IFC(m_dwriteFactory->CreateCustomFontCollection(
-        m_pDXamlFontCollectionLoader,
-        reinterpret_cast<void const*>(strFilePath.GetBuffer()),
-        (strFilePath.GetCount() + 1) * sizeof(XCHAR),
-        &pDWriteFontCollection));
+    Microsoft::WRL::ComPtr<IDWriteFontSet> fontSet;
+    IFC_RETURN(fontSetBuilder->CreateFontSet(&fontSet));
+    wrl::ComPtr<IDWriteFontCollection2> dwriteFontCollection;
+    DWRITE_FONT_FAMILY_MODEL dwriteFontFamilyModel = DWriteFontCollection::GetInternalCollection(m_systemFontCollection)->GetFontFamilyModel();
+    IFC_RETURN(m_dwriteFactory->CreateFontCollectionFromFontSet(fontSet.Get(), dwriteFontFamilyModel, dwriteFontCollection.ReleaseAndGetAddressOf()));
 
-    IFC(DWriteFontCollection::Create(pDWriteFontCollection, ppFontCollection));
+    IFC_RETURN(DWriteFontCollection::Create(dwriteFontCollection.Get(), ppFontCollection));
 
-Cleanup:
-    ReleaseInterface(pDWriteFontCollection);
-    RRETURN(hr);
+    return S_OK;
 }
 
 //---------------------------------------------------------------------------
@@ -497,7 +504,7 @@ _Check_return_ HRESULT DWriteFontAndScriptServices::IsFontNameValid(_In_ const x
         {
             UINT32 index = 0;
             IFC_RETURN(EnsureSystemFontCollection());
-            IDWriteFontCollection* pDWriteFontCollection = reinterpret_cast<DWriteFontCollection*>(m_systemFontCollection.get())->m_pDWriteFontCollection;
+            IDWriteFontCollection2* pDWriteFontCollection = DWriteFontCollection::GetInternalCollection(m_systemFontCollection.get());
             IFC_RETURN(pDWriteFontCollection->FindFamilyName(strFontName.GetBuffer(), &index, pIsValid));
             VERIFY_COND(m_fontNameList.insert({ strFontName, *pIsValid }), .second);
         }
diff --git a/src/dxaml/xcp/pal/win/DWriteFontCollection.cpp b/src/dxaml/xcp/pal/win/DWriteFontCollection.cpp
index 2bf9eb2a9d..f6bc7da4e8 100644
--- a/src/dxaml/xcp/pal/win/DWriteFontCollection.cpp
+++ b/src/dxaml/xcp/pal/win/DWriteFontCollection.cpp
@@ -11,12 +11,9 @@
 //
 //---------------------------------------------------------------------------
 DWriteFontCollection::DWriteFontCollection(
-    _In_ IDWriteFontCollection *pDWriteFontCollection
-    ) : m_pDWriteFontCollection(pDWriteFontCollection),
-        m_segoeUIFamilyIndex(0),
-        m_containsSegoeUIFamily(FALSE)
+    _In_ IDWriteFontCollection2 *pDWriteFontCollection
+    ) : m_dwriteFontCollection(pDWriteFontCollection)
 {
-    AddRefInterface(pDWriteFontCollection);
 }
 
 //---------------------------------------------------------------------------
@@ -25,37 +22,14 @@ DWriteFontCollection::DWriteFontCollection(
 //
 //---------------------------------------------------------------------------
 _Check_return_ HRESULT DWriteFontCollection::Create(
-    _In_  IDWriteFontCollection *pDWriteFontCollection,
+    _In_  IDWriteFontCollection2 *pDWriteFontCollection,
     _Outptr_ PALText::IFontCollection **ppFontCollection)
 {
-    HRESULT hr = S_OK;
-    static const WCHAR* pSegoeUI = L"Segoe UI";
-    DWriteFontCollection *pFontCollection = NULL;
-    BOOL exists = FALSE;
-    XUINT32 segoeUIFamilyIndex = 0;
-    
-    IFC(pDWriteFontCollection->FindFamilyName(pSegoeUI, &segoeUIFamilyIndex, &exists));
-    
-    pFontCollection = new DWriteFontCollection(pDWriteFontCollection);
-    pFontCollection->m_containsSegoeUIFamily = !!exists;
-    pFontCollection->m_segoeUIFamilyIndex = segoeUIFamilyIndex;
-    
-    *ppFontCollection = pFontCollection;
-    pFontCollection = NULL;
-
-Cleanup:
-    ReleaseInterface(pFontCollection);
-    RRETURN(hr);
-}
+    Microsoft::WRL::ComPtr<DWriteFontCollection> fontCollection;
+    fontCollection.Attach(new DWriteFontCollection(pDWriteFontCollection));
 
-//---------------------------------------------------------------------------
-//
-//  Release resources associated with the DWriteFontCollection.
-//
-//---------------------------------------------------------------------------
-DWriteFontCollection::~DWriteFontCollection()
-{
-    ReleaseInterface(m_pDWriteFontCollection);
+    *ppFontCollection = fontCollection.Detach();
+    return S_OK;
 }
 
 //---------------------------------------------------------------------------
@@ -74,14 +48,14 @@ HRESULT DWriteFontCollection::LookupPhysicalFontFamily(
     IDWriteFontFamily *pFontFamily = NULL;
     DWriteFontFamily *pDWriteFontFamily = NULL;
 
-    IFC(m_pDWriteFontCollection->FindFamilyName(pFamilyName, &index, &exists));
+    IFC(m_dwriteFontCollection->FindFamilyName(pFamilyName, &index, &exists));
 
     if (exists)
     {      
-        IFC(m_pDWriteFontCollection->GetFontFamily(index, &pFontFamily));
+        IFC(m_dwriteFontCollection->GetFontFamily(index, &pFontFamily));
         pDWriteFontFamily = new DWriteFontFamily(
             pFontFamily,
-            (m_containsSegoeUIFamily && (index == m_segoeUIFamilyIndex)));
+            m_dwriteFontCollection->GetFontFamilyModel() == DWRITE_FONT_FAMILY_MODEL_TYPOGRAPHIC);
     }
 
     *ppPhysicalFontFamily = pDWriteFontFamily;
diff --git a/src/dxaml/xcp/pal/win/DWriteFontFace.cpp b/src/dxaml/xcp/pal/win/DWriteFontFace.cpp
index 7ab86e4a59..46203700d2 100644
--- a/src/dxaml/xcp/pal/win/DWriteFontFace.cpp
+++ b/src/dxaml/xcp/pal/win/DWriteFontFace.cpp
@@ -18,10 +18,6 @@ DWriteFontFace::DWriteFontFace(
 {
     VERIFYHR(pDWriteFontFace->QueryInterface(__uuidof(IDWriteFontFace4), reinterpret_cast<void **>(&m_pDWriteFontFace)));
     AddRefInterface(m_pDWriteFontFamily);
-    if (m_pDWriteFontFamily)
-    {
-        m_canOptimizeShaping = !!m_pDWriteFontFamily->CanOptimizeShaping();
-    }
 }
 
 
@@ -264,7 +260,7 @@ HRESULT DWriteFontFace::GetKerningPairAdjustments(
     IFC(m_pDWriteFontFace->GetKerningPairAdjustments(glyphCount, pGlyphIndices, pGlyphAdvanceAdjustments));
 
 Cleanup:
-    return hr;    
+    return hr;
 }
 
 //---------------------------------------------------------------------------
@@ -277,17 +273,6 @@ bool DWriteFontFace::HasKerningPairs()
     return !!m_pDWriteFontFace->HasKerningPairs();
 }
 
-//---------------------------------------------------------------------------
-//
-//  Returns whether we can bypass full shaping.
-//
-//---------------------------------------------------------------------------
-bool DWriteFontFace::CanOptimizeShaping()
-{
-    return m_canOptimizeShaping;
-}
-
-
 //---------------------------------------------------------------------------
 //
 //  Returns whether or not the font has a COLR table.
diff --git a/src/dxaml/xcp/pal/win/DWriteFontFamily.cpp b/src/dxaml/xcp/pal/win/DWriteFontFamily.cpp
index f7acd8d954..0ec537f349 100644
--- a/src/dxaml/xcp/pal/win/DWriteFontFamily.cpp
+++ b/src/dxaml/xcp/pal/win/DWriteFontFamily.cpp
@@ -4,6 +4,7 @@
 #include "precomp.h"
 #include "DWriteFontFamily.h"
 #include "DWriteFontFace.h"
+#include "DWriteFontAndScriptServices.h"
 
 //---------------------------------------------------------------------------
 //
@@ -12,9 +13,9 @@
 //---------------------------------------------------------------------------
 DWriteFontFamily::DWriteFontFamily(
     _In_ IDWriteFontFamily *pDWriteFontFamily,
-    _In_ bool canOptimizeShaping
+    _In_ bool useTypographicModel
     ) : m_pDWriteFontFamily(pDWriteFontFamily),
-        m_canOptimizeShaping(canOptimizeShaping)
+        m_useTypographicModel(useTypographicModel)
 {
     AddRefInterface(pDWriteFontFamily);
 }
@@ -43,31 +44,52 @@ HRESULT DWriteFontFamily::LookupNominalFontFace(
     )
 {
     HRESULT hr = S_OK;
-    IDWriteFont     *pFont     = NULL;
-    IDWriteFontFace *pFontFace = NULL;
+    Microsoft::WRL::ComPtr<IDWriteFontFace> fontFace;
+    Microsoft::WRL::ComPtr<IDWriteFont> font;
 
-    hr = m_pDWriteFontFamily->GetFirstMatchingFont(static_cast<DWRITE_FONT_WEIGHT>(weight),
-            static_cast<DWRITE_FONT_STRETCH>(stretch),
-            static_cast<DWRITE_FONT_STYLE>(style),
-            &pFont);
+    if (m_useTypographicModel)
+    {
+        Microsoft::WRL::ComPtr<IDWriteFontFamily2> fontFamily2;
+        IFC_RETURN(m_pDWriteFontFamily->QueryInterface(IID_PPV_ARGS(&fontFamily2)));
+        DWRITE_FONT_AXIS_VALUE axisValues[] = {
+            { DWRITE_FONT_AXIS_TAG_WEIGHT, DWriteFontAndScriptServices::DWriteWeightToFontAxisWeight(static_cast<DWRITE_FONT_WEIGHT>(weight)) },
+            { DWRITE_FONT_AXIS_TAG_ITALIC, DWriteFontAndScriptServices::DWriteStyleToFontAxisItalic(static_cast<DWRITE_FONT_STYLE>(style)) },
+            { DWRITE_FONT_AXIS_TAG_SLANT, DWriteFontAndScriptServices::DWriteStyleToFontAxisSlant(static_cast<DWRITE_FONT_STYLE>(style)) },
+            { DWRITE_FONT_AXIS_TAG_WIDTH, DWriteFontAndScriptServices::DWriteStretchToFontAxisWidth(static_cast<DWRITE_FONT_STRETCH>(stretch)) }
+        };
+        Microsoft::WRL::ComPtr<IDWriteFontList2> matchingFonts;
+        hr = fontFamily2->GetMatchingFonts(axisValues, ARRAYSIZE(axisValues), matchingFonts.ReleaseAndGetAddressOf());
 
-    // Explicitly handle this particular error because it can happen for downloadable fonts,
-    // and we do not want to trigger the unexpected error handling callback of IFC.
-    if (hr == DWRITE_E_REMOTEFONT)
-        goto Cleanup;
+        // We don't error on DWRITE_E_REMOTEFONT since it can happen for downloadable fonts and
+        // we do not want to trigger the unexpected error handling in IFC.
+        if (hr == DWRITE_E_REMOTEFONT) return hr;
+        IFC_RETURN(hr);
+        if (matchingFonts->GetFontCount() == 0) return S_OK;
 
-    IFC(hr);
+        Microsoft::WRL::ComPtr<IDWriteFont> font3;
+        hr = matchingFonts->GetFont(0, font3.ReleaseAndGetAddressOf());
+        if (hr == DWRITE_E_REMOTEFONT) return hr;
+        IFC_RETURN(hr);
+        IFC_RETURN(font3.As(&font));
+    }
+    else
+    {
+        hr = m_pDWriteFontFamily->GetFirstMatchingFont(static_cast<DWRITE_FONT_WEIGHT>(weight),
+                static_cast<DWRITE_FONT_STRETCH>(stretch),
+                static_cast<DWRITE_FONT_STYLE>(style),
+                font.ReleaseAndGetAddressOf());
 
-    hr = pFont->CreateFontFace(&pFontFace);
-    if (hr == DWRITE_E_REMOTEFONT)
-        goto Cleanup;
+        // Explicitly handle this particular error because it can happen for downloadable fonts,
+        // and we do not want to trigger the unexpected error handling callback of IFC.
+        if (hr == DWRITE_E_REMOTEFONT) return hr;
+        IFC_RETURN(hr);
+    }
 
-    IFC(hr);
+    hr = font->CreateFontFace(fontFace.ReleaseAndGetAddressOf());
+    if (hr == DWRITE_E_REMOTEFONT) return hr;
+    IFC_RETURN(hr);
 
-    *ppFontFace = new DWriteFontFace(pFontFace, this);
+    *ppFontFace = new DWriteFontFace(fontFace.Get(), this);
 
-Cleanup:
-    ReleaseInterface(pFontFace);
-    ReleaseInterface(pFont);
-    RRETURN(hr);
+    return S_OK;
 }
diff --git a/src/dxaml/xcp/pal/win/DWriteTextAnalyzer.cpp b/src/dxaml/xcp/pal/win/DWriteTextAnalyzer.cpp
index 18ae9ea3b4..940bf2e590 100644
--- a/src/dxaml/xcp/pal/win/DWriteTextAnalyzer.cpp
+++ b/src/dxaml/xcp/pal/win/DWriteTextAnalyzer.cpp
@@ -932,7 +932,7 @@ class FontFallbackBuilderWrapper : public CXcpObjectBase<PALText::IFontFallbackB
             rangesCount,
             targetFamilyNames,
             targetFamilyNamesCount,
-            fontCollection ? reinterpret_cast<DWriteFontCollection*>(fontCollection)->m_pDWriteFontCollection : NULL,
+            fontCollection ? DWriteFontCollection::GetInternalCollection(fontCollection) : NULL,
             localeName,
             baseFamilyName,
             scale
@@ -944,7 +944,7 @@ class FontFallbackBuilderWrapper : public CXcpObjectBase<PALText::IFontFallbackB
         ) override
     {
         return m_pFontFallbackBuilder->AddMappings(
-            reinterpret_cast<FontFallbackWrapper*>(pFontFallback)->m_pFontFallback);
+            reinterpret_cast<FontFallbackWrapper*>(pFontFallback)->m_fontFallback.Get());
     }
 
     HRESULT CreateFontFallback(
@@ -956,7 +956,7 @@ class FontFallbackBuilderWrapper : public CXcpObjectBase<PALText::IFontFallbackB
 
         IFC(m_pFontFallbackBuilder->CreateFontFallback(&pFontFallback));
 
-        *ppFontFallback = new FontFallbackWrapper(pFontFallback);
+        IFC(FontFallbackWrapper::Create(pFontFallback, ppFontFallback));
 
     Cleanup:
         ReleaseInterface(pFontFallback);
@@ -977,42 +977,72 @@ HRESULT FontFallbackWrapper::MapCharacters(
     XUINT32 baseWeight,
     XUINT32 baseStyle,
     XUINT32 baseStretch,
+    FLOAT opticalSize,
     _Deref_out_range_(0, textLength) UINT32* pMappedLength,
     _COM_Outptr_ PALText::IFontFace** ppMappedFont,
     _Out_ FLOAT* pScale
     )
 {
-    HRESULT hr = S_OK;
-
     TextAnalysisSourceProxy textAnalysisSourceProxy(pAnalysisSource);
-    IDWriteFont *pDWriteMappedFont {};
 
     IDWriteTextAnalysisSource* proxy;
-    IFC(TextAnalysis_CreateDWritePrivateTextAnalysisSourceProxy(&textAnalysisSourceProxy, &proxy));
+    IFC_RETURN(TextAnalysis_CreateDWritePrivateTextAnalysisSourceProxy(&textAnalysisSourceProxy, &proxy));
 
     *ppMappedFont = NULL;
 
-    IFC(m_pFontFallback->MapCharacters(
-        proxy, //&textAnalysisSourceProxy,
-        textPosition,
-        textLength,
-        pBaseFontCollection ? reinterpret_cast<DWriteFontCollection*>(pBaseFontCollection)->m_pDWriteFontCollection : NULL,
-        pBaseFamilyName,
-        static_cast<DWRITE_FONT_WEIGHT>(baseWeight),
-        static_cast<DWRITE_FONT_STYLE>(baseStyle),
-        static_cast<DWRITE_FONT_STRETCH>(baseStretch),
-        pMappedLength,
-        &pDWriteMappedFont,
-        pScale));
-
-    if (pDWriteMappedFont != NULL)
+    // This method is used by both rich edit and rich text block, but we don't currently have any way to plumb
+    // through the font size from richedit since TextServicesHost::GetRunFontFaceId does not give use a desired
+    // size.  So for now (until RichEdit is passes us this data), we will fall back to the legacy MapCharacters
+    // implementation when we don't have an optical size.
+    if (pBaseFontCollection && DWriteFontCollection::IsTypographicCollection(pBaseFontCollection) && opticalSize > 0.0f)
+    {
+        Microsoft::WRL::ComPtr<IDWriteFontFace5> fontFace;
+        auto axisValues = DWriteFontAndScriptServices::CreateFontAxisValueArray(
+            opticalSize,
+            static_cast<DWRITE_FONT_WEIGHT>(baseWeight),
+            static_cast<DWRITE_FONT_STYLE>(baseStyle),
+            static_cast<DWRITE_FONT_STRETCH>(baseStretch));
+
+        IFC_RETURN(m_fontFallback->MapCharacters(
+            &textAnalysisSourceProxy,
+            textPosition,
+            textLength,
+            DWriteFontCollection::GetInternalCollection(pBaseFontCollection),
+            pBaseFamilyName,
+            axisValues.data(),
+            static_cast<UINT32>(axisValues.size()),
+            pMappedLength,
+            pScale,
+            fontFace.ReleaseAndGetAddressOf()));
+
+        if (fontFace)
+        {
+            *ppMappedFont = new DWriteFontFace(fontFace.Get(), nullptr);
+        }
+    }
+    else
     {
-        *ppMappedFont = new DWriteFontFace(pDWriteMappedFont);
+        Microsoft::WRL::ComPtr<IDWriteFont> mappedFont;
+        IFC_RETURN(m_fontFallback->MapCharacters(
+            proxy, //&textAnalysisSourceProxy,
+            textPosition,
+            textLength,
+            pBaseFontCollection ? DWriteFontCollection::GetInternalCollection(pBaseFontCollection) : NULL,
+            pBaseFamilyName,
+            static_cast<DWRITE_FONT_WEIGHT>(baseWeight),
+            static_cast<DWRITE_FONT_STYLE>(baseStyle),
+            static_cast<DWRITE_FONT_STRETCH>(baseStretch),
+            pMappedLength,
+            mappedFont.ReleaseAndGetAddressOf(),
+            pScale));
+
+        if (mappedFont)
+        {
+                *ppMappedFont = new DWriteFontFace(mappedFont.Get());
+        }
     }
 
-Cleanup:
-    ReleaseInterface(pDWriteMappedFont);
-    RRETURN(hr);
+    return S_OK;
 }
 
 
@@ -1031,7 +1061,7 @@ HRESULT DWriteFontAndScriptServices::GetSystemFontFallback(
 
     IFC(m_dwriteFactory->GetSystemFontFallback(&pFontFallback));
 
-    *ppFontFallback = new FontFallbackWrapper(pFontFallback);
+    IFC(FontFallbackWrapper::Create(pFontFallback, ppFontFallback));
 
 Cleanup:
     ReleaseInterface(pFontFallback);
diff --git a/src/dxaml/xcp/pal/win/DXamlFontCollectionLoader.cpp b/src/dxaml/xcp/pal/win/DXamlFontCollectionLoader.cpp
deleted file mode 100644
index bea39e74f4..0000000000
--- a/src/dxaml/xcp/pal/win/DXamlFontCollectionLoader.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-#include "precomp.h"
-#include "DXamlFontCollectionLoader.h"
-#include "DXamlFontFileEnumerator.h"
-
-const GUID DXamlFontCollectionLoader::IID_IDWriteFontCollectionLoader = {
-    0xcca920e4,
-    0x52f0,
-    0x492b,
-    { 0xbf, 0xa8, 0x29, 0xc7, 0x2e, 0xe0, 0xa4, 0x68 } };
-
-const GUID DXamlFontCollectionLoader::IID_IUnknown = {
-    0x00000000,
-    0x0000,
-    0x0000,
-    { 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 } };
-
-//---------------------------------------------------------------------------
-//
-//  Member:
-//      DXamlFontCollectionLoader::DXamlFontCollectionLoader
-//
-//  Synopsis:
-//      Initializes a new instance of the DXamlFontCollectionLoader class.
-//
-//---------------------------------------------------------------------------
-DXamlFontCollectionLoader::DXamlFontCollectionLoader() :
-    m_referenceCount(1)
-{
-}
-
-//---------------------------------------------------------------------------
-//
-//  Member:
-//      DXamlFontCollectionLoader::~DXamlFontCollectionLoader
-//
-//  Synopsis:
-//      Release resources associated with the DXamlFontCollectionLoader.
-//
-//---------------------------------------------------------------------------
-DXamlFontCollectionLoader::~DXamlFontCollectionLoader()
-{
-}
-
-//---------------------------------------------------------------------------
-//
-//  Member:
-//      DXamlFontFileEnumerator::CreateEnumeratorFromKey
-//
-//  Synopsis:
-//      Creates a font file enumerator object that encapsulates a collection 
-//      of font files. The font system calls back to this interface to create 
-//      a font collection.
-//
-//---------------------------------------------------------------------------
-HRESULT DXamlFontCollectionLoader::CreateEnumeratorFromKey(
-        _In_ IDWriteFactory *pFactory,
-        _In_reads_bytes_(collectionKeySize) void const *pCollectionKey,
-        _In_ XUINT32 collectionKeySize,
-        _Out_ IDWriteFontFileEnumerator ** ppFontFileEnumerator
-        )
-{
-    HRESULT hr = S_OK;
-    DXamlFontFileEnumerator* pDXamlFontFileEnumerator = NULL;
-    pDXamlFontFileEnumerator = new DXamlFontFileEnumerator(pFactory, reinterpret_cast<WCHAR const*>(pCollectionKey));
-    *ppFontFileEnumerator = pDXamlFontFileEnumerator;
-
-    RRETURN(hr);//RRETURN_REMOVAL
-}
-
-//---------------------------------------------------------------------------
-//
-//  Member:
-//      DXamlFontCollectionLoader::AddRef
-//
-//  Synopsis:
-//      Increments the count of references to this object.
-//
-//---------------------------------------------------------------------------
-ULONG DXamlFontCollectionLoader::AddRef()
-{
-    return ++m_referenceCount;
-}
-
-//---------------------------------------------------------------------------
-//
-//  Member:
-//      DXamlFontCollectionLoader::Release
-//
-//  Synopsis:
-//      Decrements the count of references to this object.
-//
-//---------------------------------------------------------------------------
-ULONG DXamlFontCollectionLoader::Release()
-{
-    ASSERT(m_referenceCount > 0);
-
-    ULONG referenceCount = --m_referenceCount;
-
-    if (0 == m_referenceCount)
-    {
-        delete this;
-    }
-
-    return referenceCount;
-}
-
-//---------------------------------------------------------------------------
-//
-//  Member:
-//      DXamlFontCollectionLoader::QueryInterface
-//
-//  Synopsis:
-//      Retrieves pointers to the supported interfaces on an object.
-//
-//---------------------------------------------------------------------------
-HRESULT DXamlFontCollectionLoader::QueryInterface(
-    _In_ REFIID riid,
-    _Outptr_ void** ppObject
-    )
-{
-    if (riid == DXamlFontCollectionLoader::IID_IDWriteFontCollectionLoader)
-    {
-        *ppObject = static_cast<IDWriteFontCollectionLoader*>(this);
-        AddRef();
-        return S_OK;
-    }
-    else if (riid == DXamlFontCollectionLoader::IID_IUnknown)
-    {
-        *ppObject = static_cast<IUnknown*>(static_cast<IDWriteFontCollectionLoader*>(this));
-        AddRef();
-        return S_OK;
-    }
-    return E_NOINTERFACE;
-}
diff --git a/src/dxaml/xcp/pal/win/DXamlFontFileEnumerator.cpp b/src/dxaml/xcp/pal/win/DXamlFontFileEnumerator.cpp
deleted file mode 100644
index b3c4fdf188..0000000000
--- a/src/dxaml/xcp/pal/win/DXamlFontFileEnumerator.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-#include "precomp.h"
-#include "DXamlFontFileEnumerator.h"
-
-const GUID DXamlFontFileEnumerator::IID_IDWriteFontFileEnumerator = {
-    0x72755049,
-    0x5ff7,
-    0x435d,
-    { 0x83, 0x48, 0x4b, 0xe9, 0x7c, 0xfa, 0x6c, 0x7c } };
-
-const GUID DXamlFontFileEnumerator::IID_IUnknown = {
-    0x00000000,
-    0x0000,
-    0x0000,
-    { 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 } };
-
-//---------------------------------------------------------------------------
-//
-//  Member:
-//      DXamlFontFileEnumerator::DXamlFontFileEnumerator
-//
-//  Synopsis:
-//      Initializes a new instance of the DXamlFontFileEnumerator class.
-//
-//---------------------------------------------------------------------------
-DXamlFontFileEnumerator::DXamlFontFileEnumerator(
-     _In_   IDWriteFactory *pDWriteFactory,
-     _In_z_ WCHAR const    *pUri
-    ) :
-    m_referenceCount(1),
-    m_index(0),
-    m_count(1),
-    m_pUri(pUri),
-    m_pDWriteFactory(pDWriteFactory)
-{
-    AddRefInterface(m_pDWriteFactory);
-}
-
-//---------------------------------------------------------------------------
-//
-//  Member:
-//      DXamlFontFileEnumerator::~DXamlFontFileEnumerator
-//
-//  Synopsis:
-//      Release resources associated with the DXamlFontFileEnumerator.
-//
-//---------------------------------------------------------------------------
-DXamlFontFileEnumerator::~DXamlFontFileEnumerator()
-{
-    ReleaseInterface(m_pDWriteFactory);
-}
-
-//---------------------------------------------------------------------------
-//
-//  Member:
-//      DXamlFontFileEnumerator::MoveNext
-//
-//  Synopsis:
-//      Advances to the next font file in the collection. When it is first created, the enumerator is positioned
-//      before the first element of the collection and the first call to MoveNext advances to the first file.
-//
-//---------------------------------------------------------------------------
-HRESULT DXamlFontFileEnumerator::MoveNext(_Out_ BOOL* pHasCurrentFile)
-{
-    if (m_index < m_count)
-    {
-        m_index++;
-        *pHasCurrentFile = TRUE;
-    }
-    else
-    {
-        *pHasCurrentFile = FALSE;
-    }
-
-    return S_OK;
-}
-
-//---------------------------------------------------------------------------
-//
-//  Member:
-//      DXamlFontFileEnumerator::GetCurrentFontFile
-//
-//  Synopsis:
-//      Gets a reference to the current font file.
-//
-//---------------------------------------------------------------------------
-HRESULT DXamlFontFileEnumerator::GetCurrentFontFile(_Out_ IDWriteFontFile** ppFontFile)
-{
-    HRESULT hr = S_OK;   
-    IFC(m_pDWriteFactory->CreateFontFileReference(m_pUri,
-                                                  NULL,          //_In_opt_ FILETIME const* lastWriteTime
-                                                  ppFontFile));
-
-Cleanup:
-    RRETURN(hr);
-}
-
-//---------------------------------------------------------------------------
-//
-//  Member:
-//      DXamlFontFileEnumerator::AddRef
-//
-//  Synopsis:
-//      Increments the count of references to this object.
-//
-//---------------------------------------------------------------------------
-ULONG DXamlFontFileEnumerator::AddRef()
-{
-    return ++m_referenceCount;
-}
-
-//---------------------------------------------------------------------------
-//
-//  Member:
-//      DXamlFontFileEnumerator::Release
-//
-//  Synopsis:
-//      Decrements the count of references to this object.
-//
-//---------------------------------------------------------------------------
-ULONG DXamlFontFileEnumerator::Release()
-{
-    ASSERT(m_referenceCount > 0);
-
-    ULONG referenceCount = --m_referenceCount;
-
-    if (0 == m_referenceCount)
-    {
-        delete this;
-    }
-
-    return referenceCount;
-}
-
-//---------------------------------------------------------------------------
-//
-//  Member:
-//      DXamlFontFileEnumerator::QueryInterface
-//
-//  Synopsis:
-//      Retrieves pointers to the supported interfaces on an object.
-//
-//---------------------------------------------------------------------------
-HRESULT DXamlFontFileEnumerator::QueryInterface(
-    _In_ REFIID riid,
-    _Outptr_ void** ppObject
-    )
-{
-    if (riid == DXamlFontFileEnumerator::IID_IDWriteFontFileEnumerator)
-    {
-        *ppObject = static_cast<IDWriteFontFileEnumerator*>(this);
-        AddRef();
-        return S_OK;
-    }
-    else if (riid == DXamlFontFileEnumerator::IID_IUnknown)
-    {
-        *ppObject = static_cast<IUnknown*>(static_cast<IDWriteFontFileEnumerator*>(this));
-        AddRef();
-        return S_OK;
-    }
-    return E_NOINTERFACE;
-}
diff --git a/src/dxaml/xcp/pal/win/inc/DWriteFontAndScriptServices.h b/src/dxaml/xcp/pal/win/inc/DWriteFontAndScriptServices.h
index dc6976640c..4f91c12b29 100644
--- a/src/dxaml/xcp/pal/win/inc/DWriteFontAndScriptServices.h
+++ b/src/dxaml/xcp/pal/win/inc/DWriteFontAndScriptServices.h
@@ -8,7 +8,8 @@
 #include "values.h"
 
 #pragma once
-class DXamlFontCollectionLoader;
+enum DWRITE_FONT_FAMILY_MODEL;
+
 //---------------------------------------------------------------------------
 //
 //  DWriteFontAndScriptServices
@@ -37,6 +38,56 @@ class DWriteFontAndScriptServices : public CXcpObjectBase<IPALFontAndScriptServi
         _Outptr_ DWriteFontAndScriptServices** ppDWriteFontAndScriptServices
         );
 
+    static FLOAT DWriteStretchToFontAxisWidth(DWRITE_FONT_STRETCH stretch) {
+        switch (stretch)
+        {
+        case DWRITE_FONT_STRETCH_ULTRA_CONDENSED: return 50.0f;
+        case DWRITE_FONT_STRETCH_EXTRA_CONDENSED: return 62.5f;
+        case DWRITE_FONT_STRETCH_CONDENSED: return 75.0f;
+        case DWRITE_FONT_STRETCH_SEMI_CONDENSED: return 87.5f;
+        case DWRITE_FONT_STRETCH_SEMI_EXPANDED: return 112.5f;
+        case DWRITE_FONT_STRETCH_EXPANDED: return 125.0f;
+        case DWRITE_FONT_STRETCH_EXTRA_EXPANDED: return 150.0f;
+        case DWRITE_FONT_STRETCH_ULTRA_EXPANDED: return 200.0f;
+        }
+        return 100.0f;
+    }
+    static FLOAT DWriteWeightToFontAxisWeight(DWRITE_FONT_WEIGHT weight)
+    {
+        return static_cast<FLOAT>(weight);
+    }
+    static FLOAT DWriteStyleToFontAxisSlant(DWRITE_FONT_STYLE style)
+    {
+        switch (style)
+        {
+        case DWRITE_FONT_STYLE_ITALIC: return -12.0f;
+        case DWRITE_FONT_STYLE_OBLIQUE: return -20.0f;
+        }
+        return 0.0f;
+    }
+    static FLOAT DWriteStyleToFontAxisItalic(DWRITE_FONT_STYLE style)
+    {
+        return style == DWRITE_FONT_STYLE_ITALIC ? 1.0f : 0.0f;
+    }
+
+    static FLOAT DWriteSizeToFontAxisOpticalSize(FLOAT size)
+    {
+        return size * (72.0f / 96.0f); // Dips to points
+    }
+
+    // Utility function to construct an array of FONT AXIS VALUES
+    static std::array<DWRITE_FONT_AXIS_VALUE, 5> CreateFontAxisValueArray(float fontSize, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style, DWRITE_FONT_STRETCH stretch)
+    {
+        std::array<DWRITE_FONT_AXIS_VALUE, 5> axisValues = {
+                DWRITE_FONT_AXIS_VALUE { DWRITE_FONT_AXIS_TAG_OPTICAL_SIZE, DWriteSizeToFontAxisOpticalSize(fontSize) },
+                DWRITE_FONT_AXIS_VALUE { DWRITE_FONT_AXIS_TAG_WEIGHT, DWriteWeightToFontAxisWeight(weight) },
+                DWRITE_FONT_AXIS_VALUE { DWRITE_FONT_AXIS_TAG_ITALIC, DWriteStyleToFontAxisItalic(style) },
+                DWRITE_FONT_AXIS_VALUE { DWRITE_FONT_AXIS_TAG_SLANT, DWriteStyleToFontAxisSlant(style) },
+                DWRITE_FONT_AXIS_VALUE { DWRITE_FONT_AXIS_TAG_WIDTH, DWriteStretchToFontAxisWidth(stretch) }
+        };
+        return axisValues;
+    }
+
     // Gets a font collection representing the set of installed fonts.
     HRESULT GetSystemFontCollection(
         _Outptr_ PALText::IFontCollection **ppFontCollection
@@ -80,6 +131,7 @@ class DWriteFontAndScriptServices : public CXcpObjectBase<IPALFontAndScriptServi
         ) override;
 
     _Check_return_ HRESULT SetSystemFontCollectionOverride(_In_opt_ IDWriteFontCollection* pFontCollection);
+    bool ShouldUseTypographicFontModel();
 
     // Clear the cached IDWriteNumberSubstitution objects when system settings
     // changed. This is triggered only when locale is changed in
@@ -96,13 +148,14 @@ class DWriteFontAndScriptServices : public CXcpObjectBase<IPALFontAndScriptServi
     _Check_return_ HRESULT GetDWriteFactory(_COM_Outptr_ IDWriteFactory2** ppIDWriteFactory2) const;
     _Check_return_ HRESULT GetDWriteFactory(_COM_Outptr_ IDWriteFactory3** ppIDWriteFactory3) const;
     _Check_return_ HRESULT GetDWriteFactory(_COM_Outptr_ IDWriteFactory4** ppIDWriteFactory4) const;
+    _Check_return_ HRESULT GetDWriteFactory(_COM_Outptr_ IDWriteFactory6** ppIDWriteFactory6) const;
 
     // For fast path TextBlock, we need to determine whether the current font collection is the static one,
     // if so, we need to create a IDWriteTextFormat object with the static font collection, so that the static font will be picked up.
     // if not, we need to keep passing nullptr when we create IDWriteTextFormat for perf reasons.
     bool IsSystemFontCollectionOverride() const {return s_customSystemFontCollection != nullptr;}
 
-    _Check_return_ HRESULT GetDefaultDWriteTextFormat(_COM_Outptr_ IDWriteTextFormat** ppIDWriteTextFormat);
+    _Check_return_ HRESULT GetDefaultDWriteTextFormat(_COM_Outptr_ IDWriteTextFormat** ppIDWriteTextFormat, bool isTypographicCollection);
     _Check_return_ HRESULT GetDWriteTextAnalyzer(_COM_Outptr_ IDWriteTextAnalyzer** ppIDWriteTextAnalyzer) const;
 
 private:
@@ -118,10 +171,7 @@ class DWriteFontAndScriptServices : public CXcpObjectBase<IPALFontAndScriptServi
     containers::vector_map<xstring_ptr, BOOL> m_fontNameList;
 
     // The root factory interface for all DWrite objects.
-    Microsoft::WRL::ComPtr<IDWriteFactory4> m_dwriteFactory;
-
-    // DXaml custom font collection loader.
-    DXamlFontCollectionLoader *m_pDXamlFontCollectionLoader;
+    Microsoft::WRL::ComPtr<IDWriteFactory6> m_dwriteFactory;
 
     // Caches the System FssFontCollection to avoid creating multiple DWriteFontCollection.
     xref_ptr<PALText::IFontCollection> m_systemFontCollection;
@@ -135,12 +185,10 @@ class DWriteFontAndScriptServices : public CXcpObjectBase<IPALFontAndScriptServi
 
     HRESULT EnsureSystemFontCollection();
 
-    // Initializes a new instance of the DWriteFontAndScriptServices class.
-    DWriteFontAndScriptServices();
-
     // Release resources associated with the DWriteFontAndScriptServices.
     ~DWriteFontAndScriptServices() override;
 
     // Initialize DWrite wrapper.
     HRESULT Initialize();
+
 };
diff --git a/src/dxaml/xcp/pal/win/inc/DWriteFontCollection.h b/src/dxaml/xcp/pal/win/inc/DWriteFontCollection.h
index 43f4c5296c..19fbab4138 100644
--- a/src/dxaml/xcp/pal/win/inc/DWriteFontCollection.h
+++ b/src/dxaml/xcp/pal/win/inc/DWriteFontCollection.h
@@ -18,7 +18,7 @@ class DWriteFontCollection : public CXcpObjectBase<PALText::IFontCollection, CXc
 public:
 
      static _Check_return_ HRESULT Create(
-         _In_  IDWriteFontCollection *pDWriteFontCollection,
+         _In_  IDWriteFontCollection2 *pDWriteFontCollection,
          _Outptr_ PALText::IFontCollection **ppFontCollection);
 
     // Looks for a physical font in the font collection.
@@ -27,15 +27,21 @@ class DWriteFontCollection : public CXcpObjectBase<PALText::IFontCollection, CXc
         _Outptr_result_maybenull_ PALText::IFontFamily **ppPhysicalFontFamily
         ) override;
 
+    static IDWriteFontCollection2* GetInternalCollection(_In_ PALText::IFontCollection* palCollection) {
+        return static_cast<DWriteFontCollection*>(palCollection)->m_dwriteFontCollection.Get();
+    }
+    static bool IsTypographicCollection(_In_ PALText::IFontCollection* palCollection)
+    {
+        return GetInternalCollection(palCollection)->GetFontFamilyModel() == DWRITE_FONT_FAMILY_MODEL_TYPOGRAPHIC;
+    }
+
 private:
-    // TODO: Consider exposing m_pDWriteFontCollection via a public getter.
-    friend class FontFallbackBuilderWrapper;
-    friend class FontFallbackWrapper;
+    // TODO: Consider exposing m_dwriteFontCollection via a public getter.
     friend class DWriteFontAndScriptServices;
     friend class CTextBlock;
 
     // DWrite's peer associated with this object.
-    IDWriteFontCollection *m_pDWriteFontCollection;
+    Microsoft::WRL::ComPtr<IDWriteFontCollection2> m_dwriteFontCollection;
 
     // Index of the Segoe UI font family in the current font collection.
     XUINT32 m_segoeUIFamilyIndex;
@@ -43,13 +49,10 @@ class DWriteFontCollection : public CXcpObjectBase<PALText::IFontCollection, CXc
     // This checks whether Segoe UI is available in this font collection.
     // It might not be found if this is a custom font collection
     // (or somebody removed it from the system which is unlikely)
-    bool m_containsSegoeUIFamily;
+    bool m_containsSegoeUIFamily{};
 
     // Initializes a new instance of the DWriteFontCollection class.
     DWriteFontCollection(
-        _In_ IDWriteFontCollection *pDWriteFontCollection
+        _In_ IDWriteFontCollection2 *pDWriteFontCollection
         );
-
-    // Release resources associated with the DWriteFontCollection.
-    ~DWriteFontCollection() override;
 };
diff --git a/src/dxaml/xcp/pal/win/inc/DWriteFontFace.h b/src/dxaml/xcp/pal/win/inc/DWriteFontFace.h
index b6b1425a68..a6de79b0b4 100644
--- a/src/dxaml/xcp/pal/win/inc/DWriteFontFace.h
+++ b/src/dxaml/xcp/pal/win/inc/DWriteFontFace.h
@@ -116,10 +116,6 @@ class DWriteFontFace : public CXcpObjectBase<PALText::IFontFace, CXcpObjectAddRe
     // Returns whether or not the font supports pair-kerning.
     bool HasKerningPairs() override;
 
-    // Returns whether we can bypass full shaping.
-    // This currently only applies to Segoe UI.
-    bool CanOptimizeShaping() override;
-
     // Returns true if the font has a COLR table
     bool IsColorFont() override;
 
@@ -139,7 +135,6 @@ class DWriteFontFace : public CXcpObjectBase<PALText::IFontFace, CXcpObjectAddRe
 
     // The font family that contains this DWriteFontFace.
     DWriteFontFamily *m_pDWriteFontFamily = nullptr;
-    bool m_canOptimizeShaping = false;
 
     // Release resources associated with the DWriteFontFace.
     ~DWriteFontFace() override;
diff --git a/src/dxaml/xcp/pal/win/inc/DWriteFontFamily.h b/src/dxaml/xcp/pal/win/inc/DWriteFontFamily.h
index 9b8df4d68a..fbbaee335f 100644
--- a/src/dxaml/xcp/pal/win/inc/DWriteFontFamily.h
+++ b/src/dxaml/xcp/pal/win/inc/DWriteFontFamily.h
@@ -25,7 +25,7 @@ class DWriteFontFamily : public CXcpObjectBase<PALText::IFontFamily, CXcpObjectA
     // Initializes a new instance of the DWriteFontFamily class.
     DWriteFontFamily(
         _In_ IDWriteFontFamily *pDWriteFontFamily,
-        _In_ bool isShapingOptimizable
+        _In_ bool useTypographicModel
         );
 
     // For a given physical font typeface determines which glyph typeface to
@@ -40,18 +40,14 @@ class DWriteFontFamily : public CXcpObjectBase<PALText::IFontFamily, CXcpObjectA
     // Gets DWrite's peer associated with this object.
     IDWriteFontFamily* GetFontFamily() const;
 
-    // Returns whether we can bypass full shaping.
-    // This currently only applies to Segoe UI.
-    bool CanOptimizeShaping() const;
-
 private:
 
     // DWrite's peer associated with this object.
     IDWriteFontFamily *m_pDWriteFontFamily;
 
-    // A flag to indicate whether we can bypass full shaping.
-    // This currently only applies to Segoe UI.
-    bool m_canOptimizeShaping;
+    // Indicates whether we are using DWrite's typographic model instead of the
+    // legacy weight/strech/style model.
+    bool m_useTypographicModel;
 
     // Release resources associated with the DWriteFontFamily.
     ~DWriteFontFamily() override;
@@ -61,9 +57,4 @@ class DWriteFontFamily : public CXcpObjectBase<PALText::IFontFamily, CXcpObjectA
 inline IDWriteFontFamily* DWriteFontFamily::GetFontFamily() const
 {
     return m_pDWriteFontFamily;
-}
-
-inline bool DWriteFontFamily::CanOptimizeShaping() const
-{
-    return m_canOptimizeShaping;
-}
+}
\ No newline at end of file
diff --git a/src/dxaml/xcp/pal/win/inc/DWriteTextAnalyzer.h b/src/dxaml/xcp/pal/win/inc/DWriteTextAnalyzer.h
index 24df337f30..bbe9a97ef7 100644
--- a/src/dxaml/xcp/pal/win/inc/DWriteTextAnalyzer.h
+++ b/src/dxaml/xcp/pal/win/inc/DWriteTextAnalyzer.h
@@ -194,15 +194,18 @@ class DWriteTextAnalyzer final : public PALText::ITextAnalyzer, public PALText::
 class FontFallbackWrapper : public CXcpObjectBase<PALText::IFontFallback, CXcpObjectAddRefPolicy>
 {
 public:
-    FontFallbackWrapper(IDWriteFontFallback *pFontFallback)
+    FontFallbackWrapper(IDWriteFontFallback1 *pFontFallback)
     {
-        m_pFontFallback = pFontFallback;
-        AddRefInterface(m_pFontFallback);
+        Microsoft::WRL::ComPtr<IDWriteFontFallback1> fontFallback(pFontFallback);
+        fontFallback.Swap(m_fontFallback);
     }
 
-    ~FontFallbackWrapper() override
+    static HRESULT Create(IDWriteFontFallback* pFontFallback, IFontFallback** ppFontFallbackWrapper)
     {
-        ReleaseInterface(m_pFontFallback);
+        Microsoft::WRL::ComPtr<IDWriteFontFallback1> fontFallback;
+        IFC_RETURN(pFontFallback->QueryInterface(IID_PPV_ARGS(fontFallback.ReleaseAndGetAddressOf())));
+        *ppFontFallbackWrapper = new FontFallbackWrapper(fontFallback.Get());
+        return S_OK;
     }
 
     HRESULT MapCharacters(
@@ -214,6 +217,7 @@ class FontFallbackWrapper : public CXcpObjectBase<PALText::IFontFallback, CXcpOb
         XUINT32 baseWeight,
         XUINT32 baseStyle,
         XUINT32 baseStretch,
+        FLOAT opticalSize,
         _Deref_out_range_(0, textLength) UINT32* pMappedLength,
         _COM_Outptr_ PALText::IFontFace** ppMappedFont,
         _Out_ FLOAT* pScale
@@ -222,6 +226,6 @@ class FontFallbackWrapper : public CXcpObjectBase<PALText::IFontFallback, CXcpOb
 private:
     friend class FontFallbackBuilderWrapper;
     friend class CTextBlock;
-    IDWriteFontFallback *m_pFontFallback;
+    Microsoft::WRL::ComPtr<IDWriteFontFallback1> m_fontFallback;
 };
 
diff --git a/src/dxaml/xcp/pal/win/inc/DXamlFontCollectionLoader.h b/src/dxaml/xcp/pal/win/inc/DXamlFontCollectionLoader.h
deleted file mode 100644
index 120e9ed932..0000000000
--- a/src/dxaml/xcp/pal/win/inc/DXamlFontCollectionLoader.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-//  Abstract:
-//      Implementation of DXamlFontCollectionLoader.
-
-#pragma once
-
-//---------------------------------------------------------------------------
-//
-//  DXamlFontCollectionLoader
-//
-//  DXAML implementation of the DWrite interface DXamlFontCollectionLoader
-//
-//---------------------------------------------------------------------------
-class DXamlFontCollectionLoader final : public IDWriteFontCollectionLoader
-{
-public:
-
-    // Initializes a new instance of the DXamlFontCollectionLoader class.
-    DXamlFontCollectionLoader();
-
-    // Increments the count of references to this object.
-    ULONG __stdcall AddRef() override;
-
-    // Decrements the count of references to this object.
-    ULONG __stdcall Release() override;
-
-    // Retrieves pointers to the supported interfaces on an object.
-    HRESULT __stdcall QueryInterface(
-        _In_ REFIID riid,
-        _Outptr_ void** ppvObject
-        ) override;
-
-    // Creates a font file enumerator object that encapsulates a collection of font files.
-    // The font system calls back to this interface to create a font collection.
-     HRESULT __stdcall CreateEnumeratorFromKey(
-        _In_ IDWriteFactory *pFactory,
-        _In_reads_bytes_(collectionKeySize) void const *pCollectionKey,
-        _In_ XUINT32 collectionKeySize,
-        _Out_ IDWriteFontFileEnumerator ** ppFontFileEnumerator
-        ) override;
-
-private:
-
-    ULONG m_referenceCount;
-
-    // Release resources associated with the DXamlFontFileEnumerator.
-    ~DXamlFontCollectionLoader();
-
-    static const GUID IID_IDWriteFontCollectionLoader;
-
-    static const GUID IID_IUnknown;
-};
diff --git a/src/dxaml/xcp/pal/win/inc/DXamlFontFileEnumerator.h b/src/dxaml/xcp/pal/win/inc/DXamlFontFileEnumerator.h
deleted file mode 100644
index 34e7718987..0000000000
--- a/src/dxaml/xcp/pal/win/inc/DXamlFontFileEnumerator.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-//  Abstract:
-//      Implementation of IDWriteFontFileEnumerator.
-
-#pragma once
-
-//---------------------------------------------------------------------------
-//
-//  DXamlFontFileEnumerator
-//
-//  DXAML implementation of the DWrite interface IDWriteFontFileEnumerator
-//
-//---------------------------------------------------------------------------
-class DXamlFontFileEnumerator final : public IDWriteFontFileEnumerator
-{
-public:
-
-    // Initializes a new instance of the DXamlFontFileEnumerator class.
-    DXamlFontFileEnumerator(
-        _In_   IDWriteFactory *pDWriteFactory,
-        _In_z_ WCHAR const    *pUri
-        );
-
-    // Increments the count of references to this object.
-    ULONG __stdcall AddRef() override;
-
-    // Decrements the count of references to this object.
-    ULONG __stdcall Release() override;
-
-    // Retrieves pointers to the supported interfaces on an object.
-    HRESULT __stdcall QueryInterface(
-        _In_ REFIID riid,
-        _Outptr_ void** ppvObject
-        ) override;
-
-    // Advances to the next font file in the collection. When it is first created, the enumerator is positioned
-    // before the first element of the collection and the first call to MoveNext advances to the first file.
-     HRESULT __stdcall MoveNext(_Out_ BOOL* pHasCurrentFile) override;
-
-    // Gets a reference to the current font file.
-     HRESULT __stdcall GetCurrentFontFile(_Out_ IDWriteFontFile** ppFontFile) override;
-
-private:
-
-    ULONG m_referenceCount;
-
-    XUINT32 m_index;
-
-    XUINT32 m_count;
-
-    // A Null terminated URI.
-    WCHAR const *m_pUri;
-
-    IDWriteFactory *m_pDWriteFactory;
-
-
-    // Release resources associated with the DXamlFontFileEnumerator.
-    ~DXamlFontFileEnumerator();
-
-    static const GUID IID_IDWriteFontFileEnumerator;
-
-    static const GUID IID_IUnknown;
-};
diff --git a/src/dxaml/xcp/plat/win/browserdesktop/DirectManipulationService.h b/src/dxaml/xcp/plat/win/browserdesktop/DirectManipulationService.h
index cddc3df597..5912a8ee0e 100644
--- a/src/dxaml/xcp/plat/win/browserdesktop/DirectManipulationService.h
+++ b/src/dxaml/xcp/plat/win/browserdesktop/DirectManipulationService.h
@@ -14,6 +14,9 @@
 #include "XcpDirectManipulationViewportEventHandler.h"
 #include "XcpAutoLock.h"
 
+// Uncomment for DManip debug outputs.
+//#define DM_DEBUG
+
 class WrappingHelper;
 class DirectManipulationServiceSharedState;
 
@@ -292,7 +295,7 @@ class CDirectManipulationService final :
         : m_sharedState(std::move(sharedState))
         , m_fManagerActive(FALSE)
         , m_islandInputSite(nullptr)
-        , m_activeHwnd(nullptr)
+        , m_activeInputHwnd(nullptr)
         , m_pViewportEventHandler(NULL)
         , m_pDMManager(NULL)
         , m_pDMUpdateManager(NULL)
@@ -560,6 +563,11 @@ class CDirectManipulationService final :
 
     wrl::ComPtr<ixp::IPointerPoint> GetPointerPointFromPointerId(_In_ XUINT32 pointerId);
 
+#ifdef DM_DEBUG
+    bool DMS_TraceDbg() const;
+    bool DMSv_TraceDbg() const;
+#endif // DM_DEBUG
+
 // Private Data
 private:
     std::shared_ptr<DirectManipulationServiceSharedState> m_sharedState;
@@ -573,7 +581,9 @@ class CDirectManipulationService final :
     // Cached for teardown scenarios where the m_islandInputSite's hwnd has already been cleared out
     // Potentially removable after this IXP bug is resolved:
     // https://task.ms/47915632 - Should the InputSiteHwnd cache its internal hwnd on Destroy so that it can return something to callers of get_UnderlyingInputHwnd instead of failing
-    HWND m_activeHwnd;
+    // Note that this refers to the IslandInputSite's hidden hwnd, which will always exist even in a world when islands
+    // are no longer backed by hwnds.
+    HWND m_activeInputHwnd;
 
     // Listener used to provide DM feedback to an input manager
     IXcpDirectManipulationViewportEventHandler* m_pViewportEventHandler;
diff --git a/src/dxaml/xcp/plat/win/browserdesktop/DirectManipulationViewportEventHandler.cpp b/src/dxaml/xcp/plat/win/browserdesktop/DirectManipulationViewportEventHandler.cpp
index 7ac10342b4..377eadc2bf 100644
--- a/src/dxaml/xcp/plat/win/browserdesktop/DirectManipulationViewportEventHandler.cpp
+++ b/src/dxaml/xcp/plat/win/browserdesktop/DirectManipulationViewportEventHandler.cpp
@@ -6,6 +6,19 @@
 // Define as 1 (i.e. XCP_TRACE_OUTPUT_MSG) to get debug outputs, and 0 otherwise
 #define DMVEH_DBG 0
 
+#ifdef DM_DEBUG
+bool CDirectManipulationViewportEventHandler::DMVEH_TraceDbg() const
+{
+    bool result = gps->IsDebugTraceTypeActive(XCP_TRACE_DM_PAL_SERVICE_VIEWPORT_EVENTHANDLER);
+
+    if constexpr (DMVEH_DBG)
+    {
+        result = true;
+    }
+
+    return result;
+}
+#endif // DM_DEBUG
 
 //------------------------------------------------------------------------
 //
@@ -18,7 +31,7 @@
 CDirectManipulationViewportEventHandler::CDirectManipulationViewportEventHandler()
 {
 #ifdef DM_DEBUG
-    if (DMVEH_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_PAL_SERVICE_VIEWPORT_EVENTHANDLER))
+    if (DMVEH_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_PAL_SERVICE_VIEWPORT_EVENTHANDLER | XCP_TRACE_APPEND_OUTPUT_WITH_THREAD_ID | DMVEH_DBG) /*traceType*/,
             L"DMVEH[0x%p]: CDirectManipulationViewportEventHandler constructor.", this));
@@ -39,7 +52,7 @@ CDirectManipulationViewportEventHandler::CDirectManipulationViewportEventHandler
 CDirectManipulationViewportEventHandler::~CDirectManipulationViewportEventHandler()
 {
 #ifdef DM_DEBUG
-    if (DMVEH_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_PAL_SERVICE_VIEWPORT_EVENTHANDLER))
+    if (DMVEH_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_PAL_SERVICE_VIEWPORT_EVENTHANDLER | XCP_TRACE_APPEND_OUTPUT_WITH_THREAD_ID | DMVEH_DBG) /*traceType*/,
             L"DMVEH[0x%p]: ~CDirectManipulationViewportEventHandler destructor.", this));
@@ -86,7 +99,7 @@ CDirectManipulationViewportEventHandler::OnViewportStatusChanged(
     HRESULT hr = S_OK;
 
 #ifdef DM_DEBUG
-    if (DMVEH_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_PAL_SERVICE_VIEWPORT_EVENTHANDLER))
+    if (DMVEH_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_PAL_SERVICE_VIEWPORT_EVENTHANDLER | XCP_TRACE_APPEND_OUTPUT_WITH_THREAD_ID | DMVEH_DBG) /*traceType*/,
             L"DMVEH[0x%p]: OnViewportStatusChanged entry for UI thread consumption. pDMViewport=0x%p, previous=%d, current=%d.", this, pDMViewport, previous, current));
@@ -155,7 +168,7 @@ CDirectManipulationViewportEventHandler::OnInteraction(
     HRESULT hr = S_OK;
 
 #ifdef DM_DEBUG
-    if (DMVEH_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_PAL_SERVICE_VIEWPORT_EVENTHANDLER))
+    if (DMVEH_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_PAL_SERVICE_VIEWPORT_EVENTHANDLER | XCP_TRACE_APPEND_OUTPUT_WITH_THREAD_ID | DMVEH_DBG) /*traceType*/,
             L"DMVEH[0x%p]: OnInteraction entry for UI thread consumption. pDMViewport=0x%p, newInteractionType=%d.", this, pDMViewport, newInteractionType));
@@ -190,7 +203,7 @@ CDirectManipulationViewportEventHandler::OnDragDropStatusChange(
     )
 {
 #ifdef DM_DEBUG
-    if (DMVEH_DBG || gps->IsDebugTraceTypeActive(XCP_TRACE_DM_PAL_SERVICE_VIEWPORT_EVENTHANDLER))
+    if (DMVEH_TraceDbg())
     {
         IGNOREHR(gps->DebugTrace(static_cast<XDebugTraceType>(XCP_TRACE_DM_PAL_SERVICE_VIEWPORT_EVENTHANDLER | XCP_TRACE_APPEND_OUTPUT_WITH_THREAD_ID | DMVEH_DBG) /*traceType*/,
             L"DMVEH[0x%p]: OnDragDropStatusChange entry for UI thread consumption. pDMViewport=0x%p, current=%d, previous=%d.", this, pDMViewport, current, previous));
diff --git a/src/dxaml/xcp/plat/win/browserdesktop/DirectManipulationViewportEventHandler.h b/src/dxaml/xcp/plat/win/browserdesktop/DirectManipulationViewportEventHandler.h
index d432996fba..b3e60bcd61 100644
--- a/src/dxaml/xcp/plat/win/browserdesktop/DirectManipulationViewportEventHandler.h
+++ b/src/dxaml/xcp/plat/win/browserdesktop/DirectManipulationViewportEventHandler.h
@@ -9,6 +9,9 @@
 
 #include <Microsoft.DirectManipulation.h>
 
+// Uncomment for DManip debug outputs.
+//#define DM_DEBUG
+
 class CDirectManipulationService;
 
 class CDirectManipulationViewportEventHandler : public ATL::CComObjectRootEx<ATL::CComMultiThreadModel>,
@@ -20,6 +23,10 @@ class CDirectManipulationViewportEventHandler : public ATL::CComObjectRootEx<ATL
     // CDirectManipulationService implementation that handles the notifications.
     CDirectManipulationService* m_pDMService;
 
+#ifdef DM_DEBUG
+    bool DMVEH_TraceDbg() const;
+#endif // DM_DEBUG
+
 protected:
     CDirectManipulationViewportEventHandler();
     ~CDirectManipulationViewportEventHandler();
diff --git a/src/dxaml/xcp/plat/win/browserdesktop/FrameworkInputPaneHandler.h b/src/dxaml/xcp/plat/win/browserdesktop/FrameworkInputPaneHandler.h
index cf7a2f7b84..736c614f66 100644
--- a/src/dxaml/xcp/plat/win/browserdesktop/FrameworkInputPaneHandler.h
+++ b/src/dxaml/xcp/plat/win/browserdesktop/FrameworkInputPaneHandler.h
@@ -41,5 +41,5 @@ class CFrameworkInputPaneHandler : public ATL::CComObjectRootEx<ATL::CComSingleT
         _In_ IXcpInputPaneHandler* pInputPaneHandler);
 
 private:
-    IXcpInputPaneHandler* m_pInputPaneHandler;
+    IXcpInputPaneHandler* m_pInputPaneHandler{};
 };
diff --git a/src/dxaml/xcp/plat/win/browserdesktop/InputPaneInteractionHelper.h b/src/dxaml/xcp/plat/win/browserdesktop/InputPaneInteractionHelper.h
index 7a3b811611..604bb88de0 100644
--- a/src/dxaml/xcp/plat/win/browserdesktop/InputPaneInteractionHelper.h
+++ b/src/dxaml/xcp/plat/win/browserdesktop/InputPaneInteractionHelper.h
@@ -26,7 +26,7 @@ class CInputPaneInteractionHelper : CXcpObjectBase<IPALInputPaneInteraction>
     ~CInputPaneInteractionHelper();
 
 private:
-    IXcpInputPaneHandler* m_pInputPaneHandler;
+    IXcpInputPaneHandler* m_pInputPaneHandler{};
     Microsoft::WRL::ComPtr<IFrameworkInputPane> m_pInputPane;
     IFrameworkInputPaneHandler* m_pFrameworkInputPaneHandler;
     DWORD m_dwCookie;
diff --git a/src/dxaml/xcp/plat/win/browserdesktop/PlatformServices.cpp b/src/dxaml/xcp/plat/win/browserdesktop/PlatformServices.cpp
index 2c00d32457..8f85092adc 100644
--- a/src/dxaml/xcp/plat/win/browserdesktop/PlatformServices.cpp
+++ b/src/dxaml/xcp/plat/win/browserdesktop/PlatformServices.cpp
@@ -7,8 +7,7 @@
 // Enable graphics device manager creation
 #include "windowsgraphicsdevicemanager.h"
 
-#include <DWrite.h>
-#include <DWrite_2.h>
+#include <DWrite_3.h>
 #include "DWriteTypes.h"
 #include "DWriteFontAndScriptServices.h"
 
diff --git a/src/dxaml/xcp/plat/win/browserdesktop/WinThreadPool.h b/src/dxaml/xcp/plat/win/browserdesktop/WinThreadPool.h
index 93870b89a0..0d1dd075eb 100644
--- a/src/dxaml/xcp/plat/win/browserdesktop/WinThreadPool.h
+++ b/src/dxaml/xcp/plat/win/browserdesktop/WinThreadPool.h
@@ -31,7 +31,7 @@ class CWinWorkItemFactory :  public CXcpObjectBase<IPALWorkItemFactory>
 
 private:  
     // Internals all Windows threadpool specific.  See threadpool docs.
-    TP_CALLBACK_ENVIRON m_threadPoolEnvironment;
+    TP_CALLBACK_ENVIRON m_threadPoolEnvironment{};
     PTP_CLEANUP_GROUP m_pCleanupGroup;
 
 public:
diff --git a/src/dxaml/xcp/plat/win/common/winstream.h b/src/dxaml/xcp/plat/win/common/winstream.h
index eed6c5f0bd..6109ffdda5 100644
--- a/src/dxaml/xcp/plat/win/common/winstream.h
+++ b/src/dxaml/xcp/plat/win/common/winstream.h
@@ -35,7 +35,7 @@ class CWinDataStreamBuffer : public IPALDataStreamBuffer
     virtual void SetFinalDownloadSize( _In_ XUINT32 cbFinalSize ) = 0 ;
 
 protected:
-    bool m_bSupportsFastSeek;
+    bool m_bSupportsFastSeek{};
 };
 
 class CWinMemoryStreamBuffer final : public CWinDataStreamBuffer
diff --git a/src/dxaml/xcp/plat/win/desktop/D2DAccelerated.cpp b/src/dxaml/xcp/plat/win/desktop/D2DAccelerated.cpp
index 89cbac1c43..b9335177fc 100644
--- a/src/dxaml/xcp/plat/win/desktop/D2DAccelerated.cpp
+++ b/src/dxaml/xcp/plat/win/desktop/D2DAccelerated.cpp
@@ -382,7 +382,7 @@ CD2DFactory::CreateGeometryGroup(
     {
         ReleaseInterface(ppD2DGeometries[i]);
     }
-
+    ReleaseInterface(pD2DGeometry);
     delete[] ppD2DGeometries;
 
     RRETURN(hr);
diff --git a/src/dxaml/xcp/plat/win/desktop/D2DAccelerated.h b/src/dxaml/xcp/plat/win/desktop/D2DAccelerated.h
index 473a3e23ef..898dee1cf4 100644
--- a/src/dxaml/xcp/plat/win/desktop/D2DAccelerated.h
+++ b/src/dxaml/xcp/plat/win/desktop/D2DAccelerated.h
@@ -99,7 +99,7 @@ class CD2DFactory final : public CXcpObjectBase<IPALAcceleratedGraphicsFactory>
 
     _Check_return_ HRESULT Initialize();
 
-    ID2D1Factory1 *m_pFactory;
+    ID2D1Factory1 *m_pFactory{};
 
-    HMODULE m_D2DModule;
+    HMODULE m_D2DModule{};
 };
diff --git a/src/dxaml/xcp/plat/win/desktop/D2DAcceleratedPrimitives.h b/src/dxaml/xcp/plat/win/desktop/D2DAcceleratedPrimitives.h
index 8a9f56e1ac..b7fff4073e 100644
--- a/src/dxaml/xcp/plat/win/desktop/D2DAcceleratedPrimitives.h
+++ b/src/dxaml/xcp/plat/win/desktop/D2DAcceleratedPrimitives.h
@@ -186,7 +186,7 @@ class CD2DRoundedRectangleGeometry : public CD2DGeometry<IPALAcceleratedGeometry
 
     XRECTF_RB m_rect;
     XFLOAT m_rRadiusX;
-    XFLOAT m_rRadiusY;
+    XFLOAT m_rRadiusY{};
 };
 
 
diff --git a/src/dxaml/xcp/plat/win/desktop/D2DAcceleratedRT.cpp b/src/dxaml/xcp/plat/win/desktop/D2DAcceleratedRT.cpp
index bace045c88..9fff4ecaca 100644
--- a/src/dxaml/xcp/plat/win/desktop/D2DAcceleratedRT.cpp
+++ b/src/dxaml/xcp/plat/win/desktop/D2DAcceleratedRT.cpp
@@ -226,7 +226,7 @@ CD2DRenderTarget<T>::CreateBitmap(
 Cleanup:
     if (bitmapIsLocked)
     {
-        pBitmapSurface->Unlock();
+        VERIFYHR(pBitmapSurface->Unlock());
     }
 
     ReleaseInterface(pD2DBitmap);
diff --git a/src/dxaml/xcp/plat/win/desktop/D2DPrintTarget.cpp b/src/dxaml/xcp/plat/win/desktop/D2DPrintTarget.cpp
index ccd927c944..f303a029d8 100644
--- a/src/dxaml/xcp/plat/win/desktop/D2DPrintTarget.cpp
+++ b/src/dxaml/xcp/plat/win/desktop/D2DPrintTarget.cpp
@@ -78,7 +78,7 @@ _Check_return_ HRESULT CD2DPrintTarget::Initialize(
 //      Print thread function. Listens for print messages on thread-safe queue.
 //
 //------------------------------------------------------------------------
-XINT32 CD2DPrintTarget::PrintThreadFn(_In_reads_bytes_(sizeof(IPALQueue*)) XUINT8* pData)
+XINT32 CD2DPrintTarget::PrintThreadFn(_In_ XUINT8* pData)
 {
     HRESULT hr = S_OK;
     IPALQueue* pPrintQueue = reinterpret_cast<IPALQueue*>(pData);
diff --git a/src/dxaml/xcp/plat/win/desktop/D2DPrintTarget.h b/src/dxaml/xcp/plat/win/desktop/D2DPrintTarget.h
index a3cfbd243f..04cf77ae01 100644
--- a/src/dxaml/xcp/plat/win/desktop/D2DPrintTarget.h
+++ b/src/dxaml/xcp/plat/win/desktop/D2DPrintTarget.h
@@ -74,7 +74,7 @@ class CD2DPrintTarget : public CD2DRenderTarget<IPALPrintTarget>
         _In_ LPARAM lParam);
 
     static XINT32 PrintThreadFn(
-        _In_reads_bytes_(sizeof(PrintThreadData)) XUINT8* pData);
+        _In_ XUINT8* pData);
 
     static void ProcessPrintMessage(
         _In_ UINT   msg,
@@ -136,7 +136,7 @@ class CD2DPrintTarget : public CD2DRenderTarget<IPALPrintTarget>
     ID3D11Device* m_pD3DDevice;
     ID2D1CommandList* m_pCommandList;
     ID2D1PrintControl* m_pPrintControl;
-    D2D_SIZE_F m_pageSize;
+    D2D_SIZE_F m_pageSize{};
     IPALD2DPrintingData* m_pPreviewData;
 
     bool m_fPreviewStage;
diff --git a/src/dxaml/xcp/plat/win/desktop/D3D11DeviceInstance.cpp b/src/dxaml/xcp/plat/win/desktop/D3D11DeviceInstance.cpp
index 6b5d9fd5e5..48b1059f54 100644
--- a/src/dxaml/xcp/plat/win/desktop/D3D11DeviceInstance.cpp
+++ b/src/dxaml/xcp/plat/win/desktop/D3D11DeviceInstance.cpp
@@ -148,81 +148,6 @@ CD3D11DeviceInstance::~CD3D11DeviceInstance()
     ReleaseInterface(m_pD2DDevice);
 }
 
-//------------------------------------------------------------------------------
-//
-//  Synopsis:
-//      Returns an object that deals with the refresh rate.
-//
-//------------------------------------------------------------------------------
-_Check_return_ HRESULT
-    CD3D11DeviceInstance::GetRefreshRateInfo(
-    _Outptr_ IPALRefreshRateInfo **ppRefreshRateInfo
-    )
-{
-    HRESULT hr = S_OK;
-
-    wil::cs_leave_scope_exit guard = m_lock.lock();
-
-    ComPtr<IDXGIOutput> primaryOutput;
-    xref_ptr<RefreshRateInfo> refreshRateInfo;
-
-    // Ensure the primary adapter is up-to-date.
-    IFC(EnsureDXGIAdapters());
-
-    // If we are no longer the current shared device, then return a device lost status.  This
-    // duplicates a check that is in CheckForStaleD3DDevice (which is called by EnsureDXGIAdapters),
-    // but if another thread refreshes the DXGI factory before us, then we won't go through
-    // that code.  However, if another thread has changed out the device (due to it being stale)
-    // we want to start using that new device.
-    if (m_isSharedDevice && GetSharedDeviceInstance().get() != this)
-    {
-        TraceCheckForStaleDxgiDeviceInfo(DXGI_ERROR_DEVICE_RESET, true);
-        IFC(DXGI_ERROR_DEVICE_RESET);
-    }
-
-    if (m_hardwareAdapter)
-    {
-        // The DWM composes using the primary display's vBlank, so our composition should keep
-        // the same beat.
-        hr = m_hardwareAdapter->EnumOutputs(
-            0 /*primary display*/,
-            &primaryOutput
-            );
-    }
-    else if (m_warpAdapter)
-    {
-        // If we don't have a hardware adapter, try to use the warp adapter
-        hr = m_warpAdapter->EnumOutputs(
-            0 /*primary display*/,
-            &primaryOutput
-            );
-    }
-
-    // If all displays are turned off or disconnected, it's possible for no outputs to be
-    // found. The RefreshRateInfo wrapper will simulate a vBlank in this case. When a display
-    // is reconnected or powered back on, the DXGIFactory->IsCurrent will return false and
-    // this method will be need to be called again to re-enumerate outputs.
-    if (hr == DXGI_ERROR_NOT_FOUND)
-    {
-        hr = S_OK;
-    }
-    else
-    {
-        IFC(hr);
-    }
-
-    IFC(RefreshRateInfo::Create(
-        primaryOutput.Get(),
-        m_dxgiFactory.Get(),
-        refreshRateInfo.ReleaseAndGetAddressOf()
-        ));
-
-    *ppRefreshRateInfo = refreshRateInfo.detach();
-
-Cleanup:
-    return hr;
-}
-
 //------------------------------------------------------------------------------
 //
 //  Synopsis:
diff --git a/src/dxaml/xcp/plat/win/desktop/D3D11DeviceInstance.h b/src/dxaml/xcp/plat/win/desktop/D3D11DeviceInstance.h
index 2d81fc5a5c..c4f835e129 100644
--- a/src/dxaml/xcp/plat/win/desktop/D3D11DeviceInstance.h
+++ b/src/dxaml/xcp/plat/win/desktop/D3D11DeviceInstance.h
@@ -16,7 +16,6 @@ struct ID2D1Multithread;
 struct ID2D1DeviceContext;
 struct ID2D1SolidColorBrush;
 struct ID3D10Multithread;
-struct IPALRefreshRateInfo;
 struct IDXGIDevice2;
 class SystemMemoryBits;
 class CD2DFactory;
@@ -115,10 +114,6 @@ class CD3D11DeviceInstance
         _Out_ UINT32 *puTextureMemoryUsageNPOT
         );
 
-    _Check_return_ HRESULT GetRefreshRateInfo(
-        _Outptr_ IPALRefreshRateInfo **ppRefreshRateInfo
-        );
-
     //
     // CD3D11DeviceInstance methods
     //
diff --git a/src/dxaml/xcp/plat/win/desktop/DCompSurface.h b/src/dxaml/xcp/plat/win/desktop/DCompSurface.h
index c64501df18..7729dd64fe 100644
--- a/src/dxaml/xcp/plat/win/desktop/DCompSurface.h
+++ b/src/dxaml/xcp/plat/win/desktop/DCompSurface.h
@@ -57,7 +57,7 @@ class DCompSurface : public CXcpObjectBase<>
     struct DCompSurfaceUpdate
     {
         xref_ptr<SystemMemoryBits> spSysMemBits; // for SysMemLock & ReturnSysMemBitsToPool only
-        XRECT region;
+        XRECT region{};
     };
 
 public:
diff --git a/src/dxaml/xcp/plat/win/desktop/DCompSurfaceFactoryManager.cpp b/src/dxaml/xcp/plat/win/desktop/DCompSurfaceFactoryManager.cpp
index 907bb34b42..d7ef7dc3b3 100644
--- a/src/dxaml/xcp/plat/win/desktop/DCompSurfaceFactoryManager.cpp
+++ b/src/dxaml/xcp/plat/win/desktop/DCompSurfaceFactoryManager.cpp
@@ -127,7 +127,7 @@ DCompSurfaceFactoryManager::SurfaceFactoryMap* DCompSurfaceFactoryManager::GetSu
 //      is called in DCompTreeHost to acquire all secondary SFs
 //-------------------------------------------------------------------------
 void DCompSurfaceFactoryManager::GetSurfaceFactoriesForCurrentThread(
-    _Outptr_ std::vector<IDCompositionSurfaceFactoryPartner3*>* surfaceFactoryVector
+    _Inout_ std::vector<IDCompositionSurfaceFactoryPartner3*>* surfaceFactoryVector
 )
 {
     auto guard = m_Lock.lock();
diff --git a/src/dxaml/xcp/plat/win/desktop/DCompSurfaceFactoryManager.h b/src/dxaml/xcp/plat/win/desktop/DCompSurfaceFactoryManager.h
index 644bce4bd9..1dc10e10b2 100644
--- a/src/dxaml/xcp/plat/win/desktop/DCompSurfaceFactoryManager.h
+++ b/src/dxaml/xcp/plat/win/desktop/DCompSurfaceFactoryManager.h
@@ -32,7 +32,7 @@ class DCompSurfaceFactoryManager
     static void Deinitialize();
 
     void GetSurfaceFactoriesForCurrentThread(
-        _Outptr_ std::vector<IDCompositionSurfaceFactoryPartner3*>* surfaceFactoryVector
+        _Inout_ std::vector<IDCompositionSurfaceFactoryPartner3*>* surfaceFactoryVector
     );
 
     _Check_return_ HRESULT ObtainSurfaceFactory(
diff --git a/src/dxaml/xcp/plat/win/desktop/ImageSharingEngineHost.cpp b/src/dxaml/xcp/plat/win/desktop/ImageSharingEngineHost.cpp
index d50f8f49fa..ecb774bdae 100644
--- a/src/dxaml/xcp/plat/win/desktop/ImageSharingEngineHost.cpp
+++ b/src/dxaml/xcp/plat/win/desktop/ImageSharingEngineHost.cpp
@@ -383,7 +383,7 @@ ImageSharingEngineHost::Shutdown( )
     }
 
     // Disconnect any casting sessions that are currently running
-    Disconnect();
+    IFCFAILFAST(Disconnect());
 
 }
 
diff --git a/src/dxaml/xcp/plat/win/desktop/LockableGraphicsPointer.h b/src/dxaml/xcp/plat/win/desktop/LockableGraphicsPointer.h
index 52675cdfcd..ab44779c0e 100644
--- a/src/dxaml/xcp/plat/win/desktop/LockableGraphicsPointer.h
+++ b/src/dxaml/xcp/plat/win/desktop/LockableGraphicsPointer.h
@@ -118,7 +118,7 @@ struct CLockedGraphicsPointer
     }
 
     // Move constructor and assignment for efficient return from a method
-    CLockedGraphicsPointer(CLockedGraphicsPointer&& other)
+    CLockedGraphicsPointer(CLockedGraphicsPointer&& other) noexcept
     {
         this->m_pointer = other.m_pointer;
         this->m_d2dMultithread = other.m_d2dMultithread;
diff --git a/src/dxaml/xcp/plat/win/desktop/RefreshRateInfo.h b/src/dxaml/xcp/plat/win/desktop/RefreshRateInfo.h
deleted file mode 100644
index 1e67acc71a..0000000000
--- a/src/dxaml/xcp/plat/win/desktop/RefreshRateInfo.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-
-#pragma once
-
-#include <powrprof.h>
-
-//  Synopsis:
-//      A class that returns the refresh rate and waits for a vblank.
-
-using unique_powerhpowernotify = wil::unique_any<
-    HPOWERNOTIFY,
-    decltype(&::PowerSettingUnregisterNotification),
-    ::PowerSettingUnregisterNotification>;
-
-class RefreshRateInfo
-    : public CXcpObjectBase<IPALRefreshRateInfo, CXcpObjectAddRefPolicy>
-{
-public:
-    static _Check_return_ HRESULT Create(
-        _In_opt_ IDXGIOutput *pOutput,
-        _In_ IDXGIFactory1 *pFactory,
-        _Outptr_ RefreshRateInfo **ppRefreshRateInfo
-        );
-
-    virtual XFLOAT GetRefreshIntervalInMilliseconds();
-
-    virtual _Check_return_ HRESULT WaitForRefreshInterval();
-
-    virtual bool IsValid();
-
-    void SetIsDisplayOn(bool isDisplayOn);
-
-private:
-    RefreshRateInfo(
-        _In_opt_ IDXGIOutput *pOutput,
-        _In_ IDXGIFactory1 *pFactory,
-        _In_ IPALClock *pIClock
-        );
-    ~RefreshRateInfo();
-
-    auto GetWaitForCompositorClockFn();
-    _Check_return_ HRESULT TryWaitForCompositorClock(_Out_ bool* waitForCompositorClockFound);
-
-    void RegisterForPowerNotification();
-
-private:
-    IDXGIOutput *m_pIOutput;
-    IDXGIFactory1 *m_pIFactory;
-
-    XFLOAT m_refreshIntervalInMilliseconds;
-
-    IPALClock *m_pIClock;
-
-    bool m_isDisplayOn {true};
-    unique_powerhpowernotify m_hOcclusion;
-
-    HMODULE m_dcompModule = 0;
-};
diff --git a/src/dxaml/xcp/plat/win/desktop/SystemMemoryBits.h b/src/dxaml/xcp/plat/win/desktop/SystemMemoryBits.h
index eae8138db7..38a03239e5 100644
--- a/src/dxaml/xcp/plat/win/desktop/SystemMemoryBits.h
+++ b/src/dxaml/xcp/plat/win/desktop/SystemMemoryBits.h
@@ -187,6 +187,6 @@ class SystemMemoryBitsDriver : public SystemMemoryBits
     {
         void *pData;
         UINT pitch;
-    } m_mappedSubresource;
+    } m_mappedSubresource{};
 };
 
diff --git a/src/dxaml/xcp/plat/win/desktop/d3d11device.cpp b/src/dxaml/xcp/plat/win/desktop/d3d11device.cpp
index 5da43eb9c5..b6c454362b 100644
--- a/src/dxaml/xcp/plat/win/desktop/d3d11device.cpp
+++ b/src/dxaml/xcp/plat/win/desktop/d3d11device.cpp
@@ -86,20 +86,6 @@ CD3D11Device::~CD3D11Device()
     ReleaseInterface(m_UploadIntermediate.pTexture);
 }
 
-//------------------------------------------------------------------------------
-//
-//  Synopsis:
-//      Returns an object that deals with the refresh rate.
-//
-//------------------------------------------------------------------------------
-_Check_return_ HRESULT
-CD3D11Device::GetRefreshRateInfo(
-_Outptr_ IPALRefreshRateInfo **ppRefreshRateInfo
-)
-{
-    return m_deviceInstance->GetRefreshRateInfo(ppRefreshRateInfo);
-}
-
 //------------------------------------------------------------------------------
 //
 //  Synopsis:
diff --git a/src/dxaml/xcp/plat/win/desktop/d3d11device.h b/src/dxaml/xcp/plat/win/desktop/d3d11device.h
index cfaebe66bd..d2bd039849 100644
--- a/src/dxaml/xcp/plat/win/desktop/d3d11device.h
+++ b/src/dxaml/xcp/plat/win/desktop/d3d11device.h
@@ -71,9 +71,6 @@ class CD3D11Device final : public CXcpWeakObjectBase
         _Out_ UINT32 *puTextureMemoryUsageNPOT
         );
 
-    _Check_return_ HRESULT GetRefreshRateInfo(
-        _Outptr_ IPALRefreshRateInfo **ppRefreshRateInfo
-        );
     //
     // CD3D11Device methods
     //
diff --git a/src/dxaml/xcp/plat/win/desktop/platwindesktop.vcxproj b/src/dxaml/xcp/plat/win/desktop/platwindesktop.vcxproj
index 1ae1a4e4cf..9dbc5563fa 100644
--- a/src/dxaml/xcp/plat/win/desktop/platwindesktop.vcxproj
+++ b/src/dxaml/xcp/plat/win/desktop/platwindesktop.vcxproj
@@ -41,7 +41,6 @@
         <ClInclude Include="ImageUtils.h"/>
         <ClInclude Include="LockableGraphicsPointer.h"/>
         <ClInclude Include="precomp.h"/>
-        <ClInclude Include="RefreshRateInfo.h"/>
         <ClInclude Include="SystemMemoryBits.h"/>
         <ClInclude Include="windowsgraphicsdevicemanager.h"/>
         <ClInclude Include="windowspresenttarget.h"/>
@@ -65,7 +64,6 @@
         <ClCompile Include="D2DAcceleratedBrushes.cpp"/>
         <ClCompile Include="D2DAcceleratedPrimitives.cpp"/>
         <ClCompile Include="D2DAcceleratedRT.cpp"/>
-        <ClCompile Include="RefreshRateInfo.cpp"/>
         <ClCompile Include="DCompSurfaceFactoryManager.cpp"/>
         <ClCompile Include="ProcessCharacteristics.cpp"/>
         <ClCompile Include="ImageUtils.cpp"/>
diff --git a/src/dxaml/xcp/plat/win/desktop/windowsgraphicsdevicemanager.cpp b/src/dxaml/xcp/plat/win/desktop/windowsgraphicsdevicemanager.cpp
index fa844658b3..6ac5ab69aa 100644
--- a/src/dxaml/xcp/plat/win/desktop/windowsgraphicsdevicemanager.cpp
+++ b/src/dxaml/xcp/plat/win/desktop/windowsgraphicsdevicemanager.cpp
@@ -8,6 +8,7 @@
 #include <GraphicsUtility.h>
 #include <DCompTreeHost.h>
 #include <RuntimeEnabledFeatures.h>
+#include "RefreshRateInfo.h"
 
 //------------------------------------------------------------------------------
 //
@@ -63,21 +64,11 @@ WindowsGraphicsDeviceManager::~WindowsGraphicsDeviceManager()
     RRETURN(hr);
 }
 
-//------------------------------------------------------------------------------
-//
-//  Synopsis:
-//      Basic initialization
-//
-//------------------------------------------------------------------------------
-_Check_return_ HRESULT
-WindowsGraphicsDeviceManager::Initialize()
+_Check_return_ HRESULT WindowsGraphicsDeviceManager::Initialize()
 {
-    HRESULT hr = S_OK;
-
-    IFC(DCompTreeHost::Create(this, &m_pDCompTreeHost));
-
-Cleanup:
-    RRETURN(hr);
+    IFC_RETURN(RefreshRateInfo::Create(m_refreshRateInfo.ReleaseAndGetAddressOf()));
+    IFC_RETURN(DCompTreeHost::Create(this, &m_pDCompTreeHost));
+    return S_OK;
 }
 
 //------------------------------------------------------------------------------
@@ -304,7 +295,7 @@ WindowsGraphicsDeviceManager::DrawDummyText()
 
     Microsoft::WRL::ComPtr<IDWriteTextFormat> textFormat1;
     IFC_RETURN(dwriteFactory->CreateTextFormat(
-        L"Segoe UI",
+        L"Segoe UI",  // This font is arbitrary just to render something.
         nullptr,
         DWRITE_FONT_WEIGHT_NORMAL,
         DWRITE_FONT_STYLE_NORMAL,
diff --git a/src/dxaml/xcp/plat/win/desktop/windowsgraphicsdevicemanager.h b/src/dxaml/xcp/plat/win/desktop/windowsgraphicsdevicemanager.h
index 0e8e9d45fb..8943ec9952 100644
--- a/src/dxaml/xcp/plat/win/desktop/windowsgraphicsdevicemanager.h
+++ b/src/dxaml/xcp/plat/win/desktop/windowsgraphicsdevicemanager.h
@@ -13,6 +13,7 @@ class CD2DFactory;
 class WindowsPresentTarget;
 class DCompTreeHost;
 class CompositorScheduler;
+class RefreshRateInfo;
 
 struct ID3D11Device;
 struct ID2D1Device;
@@ -64,6 +65,11 @@ class WindowsGraphicsDeviceManager final : public CXcpObjectBase<IObject>
         return m_pDCompTreeHost;
     }
 
+    RefreshRateInfo* GetRefreshRateInfo() const
+    {
+        return m_refreshRateInfo.get();
+    }
+
    _Check_return_ bool CanContinueOnInternalDriverError();
 #if DBG
     _Check_return_ HRESULT CreateFinalReleaseAsserter(
@@ -101,9 +107,10 @@ class WindowsGraphicsDeviceManager final : public CXcpObjectBase<IObject>
     wil::critical_section m_InitializeWorkItemLock;
 
     xref_ptr<CD3D11Device> m_cachedD3DDevice;
+    xref_ptr<CD3D11Device> m_videoGraphicsDevice;
 
+    xref_ptr<RefreshRateInfo> m_refreshRateInfo;
     DCompTreeHost *m_pDCompTreeHost;
-    xref_ptr<CD3D11Device> m_videoGraphicsDevice;
 
     CWindowRenderTarget* m_pRenderTargetNoRef;
     CompositorScheduler *m_pCompositorSchedulerNoRef;
diff --git a/src/dxaml/xcp/tools/GenXbfDLL/CFocusManagerStub.cpp b/src/dxaml/xcp/tools/GenXbfDLL/CFocusManagerStub.cpp
index 6042473f6e..f9fedc7a39 100644
--- a/src/dxaml/xcp/tools/GenXbfDLL/CFocusManagerStub.cpp
+++ b/src/dxaml/xcp/tools/GenXbfDLL/CFocusManagerStub.cpp
@@ -5,7 +5,7 @@
 #include "focusmgr.h"
 #include "contentroot.h"
 
-CFocusManager::CFocusManager(CCoreServices* pCoreService, CContentRoot& contentRoot)
+CFocusManager::CFocusManager(_In_ CCoreServices* pCoreService, _In_ CContentRoot& contentRoot)
     : m_contentRoot(contentRoot)
 {
 }
diff --git a/src/dxaml/xcp/tools/GenXbfDLL/DumpAdapterMetadataProvider.h b/src/dxaml/xcp/tools/GenXbfDLL/DumpAdapterMetadataProvider.h
index dbf2c3ecd1..336debd8c4 100644
--- a/src/dxaml/xcp/tools/GenXbfDLL/DumpAdapterMetadataProvider.h
+++ b/src/dxaml/xcp/tools/GenXbfDLL/DumpAdapterMetadataProvider.h
@@ -12,7 +12,7 @@ class DumpAdapterMember: public xaml_markup::IXamlMember, public ctl::ComBase
     END_INTERFACE_MAP(DumpAdapterMember, ctl::ComBase)
 
 private:
-    HSTRING m_strName;
+    HSTRING m_strName{};
 
 protected:
     HRESULT QueryInterfaceImpl(_In_ REFIID riid, _Outptr_ void **ppObject);
diff --git a/src/dxaml/xcp/tools/GenXbfDLL/InputManagerStub.cpp b/src/dxaml/xcp/tools/GenXbfDLL/InputManagerStub.cpp
index 953316225f..63c1fc69e2 100644
--- a/src/dxaml/xcp/tools/GenXbfDLL/InputManagerStub.cpp
+++ b/src/dxaml/xcp/tools/GenXbfDLL/InputManagerStub.cpp
@@ -48,7 +48,7 @@ KeyTip::~KeyTip(void)
 {
 }
 
-long KeyTipManager::Execute(void)
+_Check_return_ long KeyTipManager::Execute(void)
 {
     return 0;
 }
diff --git a/src/dxaml/xcp/tools/GenXbfDLL/XamlMetadataProviderStub.h b/src/dxaml/xcp/tools/GenXbfDLL/XamlMetadataProviderStub.h
index 22c3c6df14..ef8a54d516 100644
--- a/src/dxaml/xcp/tools/GenXbfDLL/XamlMetadataProviderStub.h
+++ b/src/dxaml/xcp/tools/GenXbfDLL/XamlMetadataProviderStub.h
@@ -65,7 +65,7 @@ class XamlTypeAdapter: public xaml_markup::IXamlType, public ctl::ComBase
     END_INTERFACE_MAP(XamlTypeAdapter, ctl::ComBase)
 
 private:
-    IXbfType *m_pXamlType;
+    IXbfType *m_pXamlType{};
 
 protected:
     virtual ~XamlTypeAdapter()
diff --git a/src/dxaml/xcp/tools/GenXbfDLL/XbfParserErrorService.h b/src/dxaml/xcp/tools/GenXbfDLL/XbfParserErrorService.h
index 18007bc189..7f5c0e24c2 100644
--- a/src/dxaml/xcp/tools/GenXbfDLL/XbfParserErrorService.h
+++ b/src/dxaml/xcp/tools/GenXbfDLL/XbfParserErrorService.h
@@ -24,10 +24,10 @@ class XbfParserErrorService final : public ParserErrorReporter
             _In_ const xstring_ptr& spMessage);
 
 private:
-    CCoreServices* m_pCore;
+    CCoreServices* m_pCore{};
     xstring_ptr m_spMessage;
-    XUINT32 m_uiErrorCode;
-    XUINT32 m_uiLine;
-    XUINT32 m_uiColumn;
+    XUINT32 m_uiErrorCode{};
+    XUINT32 m_uiLine{};
+    XUINT32 m_uiColumn{};
 };
 
diff --git a/src/dxaml/xcp/tools/XCPTypesAutoGen/OM/ContractDefinition.cs b/src/dxaml/xcp/tools/XCPTypesAutoGen/OM/ContractDefinition.cs
index e93d0698fd..6f1b87c0e7 100644
--- a/src/dxaml/xcp/tools/XCPTypesAutoGen/OM/ContractDefinition.cs
+++ b/src/dxaml/xcp/tools/XCPTypesAutoGen/OM/ContractDefinition.cs
@@ -24,16 +24,14 @@ public ContractDefinition()
             IsWebHostHidden = false;
         }
 
-        public void AddVersion(int version, int xamlDirectVersion)
+        public void AddVersion(int version)
         {
-            if (version <= 0 || xamlDirectVersion < 0) throw new InvalidOperationException("Invalid version or xamlDirectVersion for contract");
+            if (version <= 0) throw new InvalidOperationException("Invalid version for contract");
             while (versions.Count <= version)
             {
                 versions.Add(-1);
             }
-            versions[version] = xamlDirectVersion;
-
-
+            versions[version] = 1; // this can be anything >= 0 (see ContainsVersion)
         }
 
         public int MaxVersion
@@ -49,11 +47,6 @@ public bool ContainsVersion(int version)
             return version < versions.Count && versions[version] >= 0;
         }
 
-        public int GetXamlDirectVersion(int version)
-        {
-            return version < versions.Count ? versions[version] : 0;
-        }
-
         public override Idl.IdlTypeInfo IdlTypeInfo
         {
             get
diff --git a/src/dxaml/xcp/tools/XCPTypesAutoGen/OM/ContractReference.cs b/src/dxaml/xcp/tools/XCPTypesAutoGen/OM/ContractReference.cs
index 66173ddeba..17c898e5ab 100644
--- a/src/dxaml/xcp/tools/XCPTypesAutoGen/OM/ContractReference.cs
+++ b/src/dxaml/xcp/tools/XCPTypesAutoGen/OM/ContractReference.cs
@@ -24,14 +24,6 @@ public int Version
             private set;
         }
 
-        public int XamlDirectVersion
-        {
-            get
-            {
-                return Definition.GetXamlDirectVersion(Version);
-            }
-        }
-
         public string FullName
         {
             get
diff --git a/src/dxaml/xcp/tools/XCPTypesAutoGen/OM/Guids.cs b/src/dxaml/xcp/tools/XCPTypesAutoGen/OM/Guids.cs
index 3afe1a4c78..27bab4c2d1 100644
--- a/src/dxaml/xcp/tools/XCPTypesAutoGen/OM/Guids.cs
+++ b/src/dxaml/xcp/tools/XCPTypesAutoGen/OM/Guids.cs
@@ -156,7 +156,6 @@ public static class NonIdlGuids
     // See https://docs.microsoft.com/en-us/uwp/midl-3/advanced#empty-interfaces for more info
     public static class EmptyInterfaceGuids
     {
-        public static Guids IXamlDirectObject => new InterfaceGuids("f94d4ea9-e795-4425-a8c8-498990fce9c7");
     }
 
     // These GUIDS are needed for compat with the projection layers that hardcode our interfaces.
diff --git a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/StableXbfIndexGenerator.cs b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/StableXbfIndexGenerator.cs
index 079819ac5d..dcdd05c936 100644
--- a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/StableXbfIndexGenerator.cs
+++ b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/StableXbfIndexGenerator.cs
@@ -14,7 +14,6 @@ public class StableIndexEntry
         public int stableIndex;
         public string knownIndexName;
         public bool mappedToKnownType;
-        public ContractReference xamlDirectContractReference;
 
         public StableIndexEntry(string[] row)
         {
@@ -63,12 +62,6 @@ public class StableXbfIndexGenerator
         private string outputDirectory;
         private bool partialXbfGeneration;
 
-        // This list will cross reference UniversalApiVersions (beginning with 7) with XamlDirect contract
-        // references.  We use the list of references so that that rather than rewalking all our stable 
-        // indexes we just popouplate the list after the fact.
-        private List<ContractReference> xamlDirectContractReferences;
-        private ContractDefinition xamlDirectContractDefinition;
-
         private List<StableIndexEntry> typeEntriesByIndex;
         private List<StableIndexEntry> propertyEntriesByIndex;
         private List<StableIndexEntry> methodEntriesByIndex;
@@ -93,30 +86,6 @@ public StableXbfIndexGenerator(OMContextView contextArg, string inputDirectoryAr
             UnknownPropertyName = PropertyDefinition.UnknownProperty.IndexNameWithoutPrefix;
             UnknownMethodName = MethodDefinition.UnknownMethod.IndexNameWithoutPrefix;
             UnknownEventName = EventDefinition.UnknownEvent.IndexNameWithoutPrefix;
-
-            // Locate the XamlDirect contract version by finding the corresponding enteries where we will popuplate
-            // the stable index enums.
-            foreach (var stableEnum in context.GetTypeTableNamespaces().SelectMany(ns => ns.Enums)
-                .Where(t => t.XamlEnumFlags.IsStableEventIndex || t.XamlEnumFlags.IsStablePropertyIndex || t.XamlEnumFlags.IsStableTypeIndex))
-            {
-                if (stableEnum.DeclaringNamespace.Contracts.Count != 1) throw new InvalidOperationException("Expected one and only one contract on a stable index enum.");
-                if (xamlDirectContractDefinition == null)
-                {
-                    xamlDirectContractDefinition = stableEnum.DeclaringNamespace.Contracts[0];
-
-                    // Create the list of contract references for the XamlDirect contracts.  Note: We skip zero
-                    xamlDirectContractReferences = new List<ContractReference>();
-                    xamlDirectContractReferences.Add(null);
-                    for (var i = 1; i <= xamlDirectContractDefinition.MaxVersion; i++)
-                    {
-                        xamlDirectContractReferences.Add(xamlDirectContractDefinition.ContainsVersion(i) ? new ContractReference(xamlDirectContractDefinition, i) : null);
-                    }
-                }
-                else if (xamlDirectContractDefinition != stableEnum.DeclaringNamespace.Contracts[0])
-                {
-                    throw new InvalidOperationException("Expected all stable index enums to use the same contract");
-                }
-            }
         }
 
         public void Run()
@@ -127,7 +96,7 @@ public void Run()
                 out typeEntriesByIndex,
                 out typeEntriesByName,
                 context.GetAllTypeTableTypes().Where(t => !(t is ClassDefinition) || classSelector(t as ClassDefinition) && t.GenerateStableIndex)
-                    .Select(c => new Tuple<string, bool, List<ContractReference>>(c.IndexNameWithoutPrefix, ExposeToPublicStableIndexes(c), c.SupportedContracts)),
+                    .Select(c => c.IndexNameWithoutPrefix),
                 UnknownTypeName
                 );
 
@@ -136,8 +105,7 @@ public void Run()
                 out propertyEntriesByIndex,
                 out propertyEntriesByName,
                 context.GetAllTypeTableProperties().Where(p => classSelector(p.DeclaringClass) && p.GenerateStableIndex).
-                    Select(p => new Tuple<string, bool, List<ContractReference>>(p.IndexNameWithoutPrefix, ExposeToPublicStableIndexes(p), 
-                        p.SupportedContracts.Count != 0 ? p.SupportedContracts : p.DeclaringType.SupportedContracts)),
+                    Select(p => p.IndexNameWithoutPrefix),
                 UnknownPropertyName
                 );
 
@@ -145,7 +113,7 @@ public void Run()
                 MethodCsvFilename,
                 out methodEntriesByIndex,
                 out methodEntriesByName,
-                context.GetAllMethodIndexNamesNoPrefix().Select(m => new Tuple<string, bool, List<ContractReference>>(m, false, null)),
+                context.GetAllMethodIndexNamesNoPrefix(),
                 UnknownMethodName
                 );
 
@@ -154,8 +122,7 @@ public void Run()
                 out eventEntriesByIndex,
                 out eventEntriesByName,
                 context.GetAllEvents().Where(e => e.GenerateStableIndex).
-                    Select(e => new Tuple<string, bool, List<ContractReference>>(e.IndexNameWithoutPrefix, ExposeToPublicStableIndexes(e),
-                        e.SupportedContracts.Count != 0 ? e.SupportedContracts : e.DeclaringType.SupportedContracts)),
+                    Select(e => e.IndexNameWithoutPrefix),
                 UnknownEventName
                 );
         }
@@ -213,7 +180,7 @@ private void RunGroup(
             string csvFilename,
             out List<StableIndexEntry> entriesByIndex,
             out Dictionary<string, StableIndexEntry> entriesByName,
-            IEnumerable<Tuple<string, bool, List<ContractReference>>> knownSourceEntries,
+            IEnumerable<string> knownSourceEntries,
             string unknownName)
         {
             // In order to guarantee a stable ordering, even when types are removed from the table,
@@ -251,24 +218,18 @@ private void RunGroup(
             }
 
             // Now that we've read in the stored CSV, try to match all the known types
-            foreach (Tuple<string, bool, List<ContractReference>> knownSourceEntry in knownSourceEntries)
+            foreach (string knownName in knownSourceEntries)
             {
-                string knownName = knownSourceEntry.Item1;
-                ContractReference contractReference = knownSourceEntry.Item2 ? GetStableIndexContractReference(knownSourceEntry.Item3) : null;
- 
                 if (entriesByName.ContainsKey(knownName))
                 {
                     entriesByName[knownName].mappedToKnownType = true;
-                    entriesByName[knownName].xamlDirectContractReference = contractReference;
                     int stableIndex = entriesByName[knownName].stableIndex;
                     entriesByIndex[stableIndex].mappedToKnownType = true;
-                    entriesByIndex[stableIndex].xamlDirectContractReference = contractReference;
                 }
                 else if (!partialXbfGeneration)
                 {
                     int newIndex = GetNextAvailableIndex(entriesByIndex);
                     StableIndexEntry newEntry = new StableIndexEntry(knownName, newIndex);
-                    newEntry.xamlDirectContractReference = contractReference;
                     entriesByName.Add(knownName, newEntry);
                     entriesByIndex.Add(newEntry);
                 }
@@ -300,22 +261,6 @@ private void RunGroup(
             }
         }
 
-        private ContractReference GetStableIndexContractReference(List<ContractReference> contractReferences)
-        {
-            if (contractReferences == null || contractReferences.Count == 0) throw new InvalidOperationException("Expected contract references");
-            ContractReference contractReference = contractReferences.GetConcreteContractReference();
-
-            int xamlDirectVersion = contractReference.XamlDirectVersion;
-
-            if (xamlDirectVersion <= 0) throw new InvalidOperationException("Unable to determine Xaml Direct version for " + contractReference.FullName + "(ver:" + contractReference + ")");
-            
-            if (contractReference.FullName != "Microsoft.UI.Xaml.WinUIContract") throw new InvalidOperationException("Only support public stable indicies from the WinUI contract");
-
-            if (xamlDirectVersion < xamlDirectContractReferences.Count && xamlDirectContractReferences[xamlDirectVersion] != null) return xamlDirectContractReferences[xamlDirectVersion];
-
-            throw new InvalidOperationException("XamlDirect Version " + xamlDirectVersion + " used on " + contractReference.FullName + "(ver:" + contractReference + ") not defined");
-        }
-
         private string GetDeletedName(string stableIndexName, Dictionary<string, StableIndexEntry> entriesByName)
         {
             string root = stableIndexName + "_Deleted";
diff --git a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/Templates/Code/Core/Headers/Activators.cs b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/Templates/Code/Core/Headers/Activators.cs
index c53dd9999f..d0ada77c8d 100644
--- a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/Templates/Code/Core/Headers/Activators.cs
+++ b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/Templates/Code/Core/Headers/Activators.cs
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version: 16.0.0.0
+//     Runtime Version: 17.0.0.0
 //  
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -18,7 +18,7 @@ namespace XamlGen.Templates.Code.Core.Headers
     /// <summary>
     /// Class to produce the template output
     /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
     public partial class Activators : CppCodeGenerator<OMContextView>
     {
         /// <summary>
@@ -43,7 +43,7 @@ public override string TransformText()
             this.Write(this.ToStringHelper.ToStringWithCulture(OMContext.DefaultImplementationNamespace));
             this.Write("\r\n{\r\n");
  foreach (var type in Model.GetAllClasses().Where(c => c.IsAEventArgs && c.IsActivatable)) { 
-            this.Write("    HRESULT ");
+            this.Write("    _Check_return_ HRESULT ");
             this.Write(this.ToStringHelper.ToStringWithCulture(type.EventArgsFrameworkDefaultConstructor));
             this.Write("(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);\r\n");
  } 
diff --git a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/Templates/Code/Core/Headers/Activators.tt b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/Templates/Code/Core/Headers/Activators.tt
index a2a4d79861..348b0b2cbe 100644
--- a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/Templates/Code/Core/Headers/Activators.tt
+++ b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/Templates/Code/Core/Headers/Activators.tt
@@ -22,6 +22,6 @@ HRESULT <#= type.CoreDefaultConstructor #>(_Outptr_ CDependencyObject **ppObject
 namespace <#= OMContext.DefaultImplementationNamespace #>
 {
 <# foreach (var type in Model.GetAllClasses().Where(c => c.IsAEventArgs && c.IsActivatable)) { #>
-    HRESULT <#= type.EventArgsFrameworkDefaultConstructor #>(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
+    _Check_return_ HRESULT <#= type.EventArgsFrameworkDefaultConstructor #>(_In_ CEventArgs* pCoreArgs, _Out_ IInspectable** ppNewInstance);
 <# } #>
 }
diff --git a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/Templates/Code/Framework/Bodies/Class.cs b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/Templates/Code/Framework/Bodies/Class.cs
index 291dc9d67a..a1b27ede6a 100644
--- a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/Templates/Code/Framework/Bodies/Class.cs
+++ b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/Templates/Code/Framework/Bodies/Class.cs
@@ -172,9 +172,9 @@ public override string TransformText()
             this.Write(this.ToStringHelper.ToStringWithCulture(ev.IndexName));
             this.Write(":\r\n        {\r\n            ctl::ComPtr<");
             this.Write(this.ToStringHelper.ToStringWithCulture(AsCppType(ev.EventHandlerType.AbiFullName)));
-            this.Write("> spEventHandler;\r\n            IValueBoxer::UnboxValue(pHandler, spEventHandler.R" +
-                    "eleaseAndGetAddressOf());\r\n\r\n            if (nullptr != spEventHandler)\r\n       " +
-                    "     {\r\n                ");
+            this.Write("> spEventHandler;\r\n            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEve" +
+                    "ntHandler.ReleaseAndGetAddressOf()));\r\n\r\n            if (nullptr != spEventHandl" +
+                    "er)\r\n            {\r\n                ");
             this.Write(this.ToStringHelper.ToStringWithCulture(ev.EventSourceTypeName));
             this.Write("* pEventSource = nullptr;\r\n                IFC_RETURN(");
             this.Write(this.ToStringHelper.ToStringWithCulture(ev.GetEventSourceName));
diff --git a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/Templates/Code/Framework/Bodies/Class.tt b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/Templates/Code/Framework/Bodies/Class.tt
index 05ab94c7ea..00a09a1cf3 100644
--- a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/Templates/Code/Framework/Bodies/Class.tt
+++ b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/Templates/Code/Framework/Bodies/Class.tt
@@ -132,7 +132,7 @@ _Check_return_ HRESULT <#= AsCppType(Model.GeneratedClassFullName) #>::EventAddH
     case <#= ev.IndexName #>:
         {
             ctl::ComPtr<<#= AsCppType(ev.EventHandlerType.AbiFullName) #>> spEventHandler;
-            IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf());
+            IFC_RETURN(IValueBoxer::UnboxValue(pHandler, spEventHandler.ReleaseAndGetAddressOf()));
 
             if (nullptr != spEventHandler)
             {
diff --git a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/Templates/Code/Framework/Bodies/ParameterValidation.cs b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/Templates/Code/Framework/Bodies/ParameterValidation.cs
index d2f2c1153e..fcadd0a9a7 100644
--- a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/Templates/Code/Framework/Bodies/ParameterValidation.cs
+++ b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/Templates/Code/Framework/Bodies/ParameterValidation.cs
@@ -1,9 +1,7 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-// ------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version: 15.0.0.0
+//     Runtime Version: 17.0.0.0
 //  
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -20,7 +18,7 @@ namespace XamlGen.Templates.Code.Framework.Bodies
     /// <summary>
     /// Class to produce the template output
     /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
     public partial class ParameterValidation : CppCodeGenerator<ParameterValidationModel>
     {
         /// <summary>
@@ -38,7 +36,9 @@ public override string TransformText()
  if (Model.HasReturnType) { 
             this.Write("ARG_VALIDRETURNPOINTER(");
             this.Write(this.ToStringHelper.ToStringWithCulture(Model.ReturnType.AbiReturnParameterName));
-            this.Write(");\r\n");
+            this.Write(");\r\n*");
+            this.Write(this.ToStringHelper.ToStringWithCulture(Model.ReturnType.AbiReturnParameterName));
+            this.Write("={};\r\n");
  } 
             return this.GenerationEnvironment.ToString();
         }
diff --git a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/Templates/Code/Framework/Bodies/ParameterValidation.tt b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/Templates/Code/Framework/Bodies/ParameterValidation.tt
index 8dfa13a488..9aadd51ec1 100644
--- a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/Templates/Code/Framework/Bodies/ParameterValidation.tt
+++ b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/Templates/Code/Framework/Bodies/ParameterValidation.tt
@@ -9,4 +9,5 @@ ARG_NOTNULL(<#= parameter.ParameterType.AbiArgumentName #>, "<#= parameter.Param
 <# } #>
 <# if (Model.HasReturnType) { #>
 ARG_VALIDRETURNPOINTER(<#= Model.ReturnType.AbiReturnParameterName #>);
+*<#= Model.ReturnType.AbiReturnParameterName #>={};
 <# } #>
\ No newline at end of file
diff --git a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/Templates/ModernIDL/ModernIDLCodeGenerator.cs b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/Templates/ModernIDL/ModernIDLCodeGenerator.cs
index 0be3959654..6582b01aa6 100644
--- a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/Templates/ModernIDL/ModernIDLCodeGenerator.cs
+++ b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlGen/Templates/ModernIDL/ModernIDLCodeGenerator.cs
@@ -709,83 +709,6 @@ protected void WriteContractVersion(MemberDefinition model)
 
         protected void EnsureEnumValues(EnumDefinition enumDef)
         {
-            if (enumDef.Values.Count > 0)
-            {
-                return;
-            }
-
-            if (enumDef.XamlEnumFlags.IsStableTypeIndex && null != StableIndexes)
-            {
-                int previousIndex = -1; // Start at -1 because 0 is default for first enum
-                foreach (StableIndexEntry stableTypeIndex in StableIndexes.GetStableTypeIndexes())
-                {
-                    if (stableTypeIndex.mappedToKnownType && stableTypeIndex.xamlDirectContractReference != null)
-                    {
-                        EnumValueDefinition evd = new EnumValueDefinition()
-                        {
-                            Name = stableTypeIndex.stableIndexName,
-                            Value = stableTypeIndex.stableIndex,
-                            IsInOrder = stableTypeIndex.stableIndex == (previousIndex + 1),
-                            DeclaringType = enumDef,
-                        };
-                        if (stableTypeIndex.xamlDirectContractReference != null)
-                        {
-                            evd.SupportedContracts.Add(stableTypeIndex.xamlDirectContractReference);
-                            evd.Version = stableTypeIndex.xamlDirectContractReference.Version;
-                        }
-                        enumDef.Values.Add(evd);
-                        previousIndex = stableTypeIndex.stableIndex;
-                    }
-                }
-            }
-            else if (enumDef.XamlEnumFlags.IsStablePropertyIndex && null != StableIndexes)
-            {
-                int previousIndex = -1; // Start at -1 because 0 is default for first enum
-                foreach (StableIndexEntry stablePropertyIndex in StableIndexes.GetStablePropertyIndexes())
-                {
-                    if (stablePropertyIndex.mappedToKnownType && stablePropertyIndex.xamlDirectContractReference != null)
-                    {
-                        EnumValueDefinition evd = new EnumValueDefinition()
-                        {
-                            Name = stablePropertyIndex.stableIndexName,
-                            Value = stablePropertyIndex.stableIndex,
-                            IsInOrder = stablePropertyIndex.stableIndex == (previousIndex + 1),
-                            DeclaringType = enumDef,
-                        };
-                        if (stablePropertyIndex.xamlDirectContractReference != null)
-                        {
-                            evd.SupportedContracts.Add(stablePropertyIndex.xamlDirectContractReference);
-                            evd.Version = stablePropertyIndex.xamlDirectContractReference.Version;
-                        }
-                        enumDef.Values.Add(evd);
-                        previousIndex = stablePropertyIndex.stableIndex;
-                    }
-                }
-            }
-            else if (enumDef.XamlEnumFlags.IsStableEventIndex && null != StableIndexes)
-            {
-                int previousIndex = -1; // Start at -1 because 0 is default for first enum
-                foreach (StableIndexEntry stableEventIndex in StableIndexes.GetStableEventIndexes())
-                {
-                    if (stableEventIndex.mappedToKnownType && stableEventIndex.xamlDirectContractReference != null)
-                    {
-                        EnumValueDefinition evd = new EnumValueDefinition()
-                        {
-                            Name = stableEventIndex.stableIndexName,
-                            Value = stableEventIndex.stableIndex,
-                            IsInOrder = stableEventIndex.stableIndex == (previousIndex + 1),
-                            DeclaringType = enumDef,
-                        };
-                        if (stableEventIndex.xamlDirectContractReference != null)
-                        {
-                            evd.SupportedContracts.Add(stableEventIndex.xamlDirectContractReference);
-                            evd.Version = stableEventIndex.xamlDirectContractReference.Version;
-                        }
-                        enumDef.Values.Add(evd);
-                        previousIndex = stableEventIndex.stableIndex;
-                    }
-                }
-            }
         }
 
         private bool VersionNeedsNewGroup(ClassDefinition model)
diff --git a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Contracts.cs b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Contracts.cs
index f99812a89f..6860f1b376 100644
--- a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Contracts.cs
+++ b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Contracts.cs
@@ -5,14 +5,14 @@
 namespace Windows.Foundation
 {
     [ExternalIdl]
-    [ContractVersion(1, xamlDirectVersion: 1)]
-    [ContractVersion(2, xamlDirectVersion: 1)]
-    [ContractVersion(3, xamlDirectVersion: 1)]
-    [ContractVersion(4, xamlDirectVersion: 1)]
-    [ContractVersion(5, xamlDirectVersion: 1)]
-    [ContractVersion(6, xamlDirectVersion: 1)]
-    [ContractVersion(7, xamlDirectVersion: 1)]
-    [ContractVersion(8, xamlDirectVersion: 1)]
+    [ContractVersion(1)]
+    [ContractVersion(2)]
+    [ContractVersion(3)]
+    [ContractVersion(4)]
+    [ContractVersion(5)]
+    [ContractVersion(6)]
+    [ContractVersion(7)]
+    [ContractVersion(8)]
     public class UniversalApiContract : Contract { };
 }
 
@@ -22,15 +22,16 @@ namespace Microsoft.UI.Xaml
     [ContractVersion(1)]
     public class PrivateApiContract : Contract { };
 
-    [ContractVersion(1, xamlDirectVersion: 1)] // WinAppSDK 1.0
-    [ContractVersion(2, xamlDirectVersion: 1)] // WinAppSDK 1.1
-    [ContractVersion(3, xamlDirectVersion: 1)] // WinAppSDK 1.2
-    [ContractVersion(4, xamlDirectVersion: 1)] // WinAppSDK 1.3
-    [ContractVersion(5, xamlDirectVersion: 1)] // WinAppSDK 1.4
-    [ContractVersion(6, xamlDirectVersion: 1)] // WinAppSDK 1.5
+    [ContractVersion(1)] // WinAppSDK 1.0
+    [ContractVersion(2)] // WinAppSDK 1.1
+    [ContractVersion(3)] // WinAppSDK 1.2
+    [ContractVersion(4)] // WinAppSDK 1.3
+    [ContractVersion(5)] // WinAppSDK 1.4
+    [ContractVersion(6)] // WinAppSDK 1.5
+    [ContractVersion(7)] // WinAppSDK 1.6
     public class WinUIContract : Contract
     {
-        public const int LatestVersion = 6;
+        public const int LatestVersion = 7;
     };
 
     [ContractVersion(1)]
@@ -39,5 +40,6 @@ public class WinUIContract : Contract
     [ContractVersion(4)]
     [ContractVersion(5)]
     [ContractVersion(6)]
+    [ContractVersion(7)]
     public class XamlContract : Contract { };
 }
diff --git a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Content.cs b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Content.cs
index d0234a5bc1..fed32f0e21 100644
--- a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Content.cs
+++ b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Content.cs
@@ -30,4 +30,11 @@ public sealed class ContentIslandEnvironment
     public sealed class ContentIsland
     {
     }
+
+    [Imported("microsoft.ui.content.idl")]
+    [DefaultInterfaceName("IContentCoordinateConverter")]
+    [WindowsTypePattern]
+    public sealed class ContentCoordinateConverter
+    {
+    }
 }
diff --git a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Xaml.Controls.cs b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Xaml.Controls.cs
index 24dbff1942..ad1199a7ff 100644
--- a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Xaml.Controls.cs
+++ b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Xaml.Controls.cs
@@ -5280,7 +5280,7 @@ public bool AreStickyGroupHeadersEnabledBase
     [ControlPattern]
     [Implements(typeof(Microsoft.UI.Xaml.Controls.IOrientedPanel))]
     [Guids(ClassGuid = "81b3c2e9-dba8-4612-92f8-a3e96e437b0b")]
-    public sealed class ItemsWrapGrid
+    public class ItemsWrapGrid
         : Microsoft.UI.Xaml.Controls.ModernCollectionBasePanel
     {
         [TypeTable(IsExcludedFromCore = true)]
@@ -7687,6 +7687,7 @@ public enum CharacterCasing
         Upper = 2
     }
 
+    [Platform(typeof(PrivateApiContract), 1)]
     [VelocityFeature("Feature_InputValidation")]
     public enum InputValidationKind
     {
@@ -7695,6 +7696,7 @@ public enum InputValidationKind
         Inline,
     }
 
+    [Platform(typeof(PrivateApiContract), 1)]
     [VelocityFeature("Feature_InputValidation")]
     public enum InputValidationMode
     {
@@ -7704,6 +7706,7 @@ public enum InputValidationMode
     }
 
     [Guids(ClassGuid = "95d4d3ce-d079-4901-830a-6994cf15e371")]
+    [Platform(typeof(PrivateApiContract), 1)]
     [VelocityFeature("Feature_InputValidation")]
     public sealed class InputValidationErrorEventArgs : EventArgs
     {
@@ -7764,7 +7767,7 @@ public InputValidationKind InputValidationKind
         public virtual void Validate(IInputValidationControl validationControl) { }
     }
 
-    [DXamlIdlGroup("Main")]
+    [Platform(typeof(PrivateApiContract), 1)]
     [VelocityFeature("Feature_InputValidation")]
     public enum InputValidationErrorEventAction
     {
@@ -7775,6 +7778,7 @@ public enum InputValidationErrorEventAction
     [Guids(ClassGuid = "2d40157d-ce2d-453a-ad35-afa5ea1997b8")]
     [TypeTable(IsExcludedFromNewTypeTable = true)]
     [TypeFlags(IsCreateableFromXAML = false)]
+    [Platform(typeof(PrivateApiContract), 1)]
     [VelocityFeature("Feature_InputValidation")]
     public class InputValidationError
     {
@@ -7790,6 +7794,7 @@ public InputValidationError(Windows.Foundation.String errorMessage) { }
     }
 
     [Guids(ClassGuid = "9ec15c00-97d1-4125-b0d8-7ac11ae0791e")]
+    [Platform(typeof(PrivateApiContract), 1)]
     [VelocityFeature("Feature_InputValidation")]
     public class InputValidationContext
     {
@@ -7810,6 +7815,7 @@ public string MemberName
         }
     }
 
+    [Platform(typeof(PrivateApiContract), 1)]
     [VelocityFeature("Feature_InputValidation")]
     public interface IInputValidationControl
     {
diff --git a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Xaml.Core.Direct.cs b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Xaml.Core.Direct.cs
deleted file mode 100644
index a9573284a4..0000000000
--- a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Xaml.Core.Direct.cs
+++ /dev/null
@@ -1,355 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See LICENSE in the project root for license information.
-using OM;
-using XamlOM;
-
-namespace Microsoft.UI.Xaml.Core.Direct
-{
-    [DXamlIdlGroup("coretypes2")]
-    [ContractVersion(1)]
-    public sealed class XamlDirectContract : Contract { }
-
-    [NativeName("XamlTypeIndex")]
-    [EnumFlags(HasTypeConverter = true, IsExcludedFromNative = true, IsStableTypeIndex = true)]
-    [TypeTable(IsExcludedFromDXaml = true, IsExcludedFromNewTypeTable = true)]
-    [DXamlIdlGroup("coretypes2")]
-    [Platform(typeof(XamlDirectContract), 1)]
-    [VelocityFeature("Feature_XamlDirect")]
-    public enum XamlTypeIndex
-    {
-    }
-
-    [NativeName("XamlPropertyIndex")]
-    [EnumFlags(HasTypeConverter = true, IsExcludedFromNative = true, IsStablePropertyIndex = true)]
-    [TypeTable(IsExcludedFromDXaml = true, IsExcludedFromNewTypeTable = true)]
-    [DXamlIdlGroup("coretypes2")]
-    [Platform(typeof(XamlDirectContract), 1)]
-    [VelocityFeature("Feature_XamlDirect")]
-    public enum XamlPropertyIndex
-    {
-    }
-
-    [NativeName("XamlEventIndex")]
-    [EnumFlags(HasTypeConverter = true, IsExcludedFromNative = true, IsStableEventIndex = true)]
-    [TypeTable(IsExcludedFromDXaml = true, IsExcludedFromNewTypeTable = true)]
-    [DXamlIdlGroup("coretypes2")]
-    [Platform(typeof(XamlDirectContract), 1)]
-    [VelocityFeature("Feature_XamlDirect")]
-    public enum XamlEventIndex
-    {
-    }
-
-    [DXamlIdlGroup("coretypes2")]
-    [Platform(typeof(XamlDirectContract), 1)]
-    [VelocityFeature("Feature_XamlDirect")]
-    public interface IXamlDirectObject
-    {
-    }
-
-    [CodeGen(partial: true)]
-    [TypeTable(IsExcludedFromDXaml = true, IsExcludedFromCore = true)]
-    [DXamlIdlGroup("coretypes2")]
-    [Platform(typeof(XamlDirectContract), 1)]
-    [Guids(ClassGuid = "6a38cf51-578f-4551-b5ef-6b3cf208b35f")]
-    [VelocityFeature("Feature_XamlDirect")]
-    public sealed class XamlDirect
-    {
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public static XamlDirect GetDefault()
-        {
-            return default(XamlDirect);
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public Windows.Foundation.Object GetObject(IXamlDirectObject xamlDirectObject)
-        {
-            return default(Windows.Foundation.Object);
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public IXamlDirectObject GetXamlDirectObject(Windows.Foundation.Object @object)
-        {
-            return default(IXamlDirectObject);
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public IXamlDirectObject CreateInstance(XamlTypeIndex typeIndex)
-        {
-            return default(IXamlDirectObject);
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public void SetObjectProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex, [Optional] Windows.Foundation.Object value)
-        {
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public void SetXamlDirectObjectProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex, [Optional] IXamlDirectObject value)
-        {
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public void SetBooleanProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex, bool value)
-        {
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public void SetDoubleProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex, double value)
-        {
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public void SetInt32Property(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex, int value)
-        {
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public void SetStringProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex, [Optional] string value)
-        {
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public void SetDateTimeProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex, Windows.Foundation.DateTime value)
-        {
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public void SetPointProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex, Windows.Foundation.Point value)
-        {
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public void SetRectProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex, Windows.Foundation.Rect value)
-        {
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public void SetSizeProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex, Windows.Foundation.Size value)
-        {
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public void SetTimeSpanProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex, Windows.Foundation.TimeSpan value)
-        {
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public void SetColorProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex, Windows.UI.Color value)
-        {
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public void SetCornerRadiusProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex, Microsoft.UI.Xaml.CornerRadius value)
-        {
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public void SetDurationProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex, Microsoft.UI.Xaml.Duration value)
-        {
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public void SetGridLengthProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex, Microsoft.UI.Xaml.GridLength value)
-        {
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public void SetThicknessProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex, Microsoft.UI.Xaml.Thickness value)
-        {
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public void SetMatrixProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex, Microsoft.UI.Xaml.Media.Matrix value)
-        {
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public void SetMatrix3DProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex, Microsoft.UI.Xaml.Media.Media3D.Matrix3D value)
-        {
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public void SetEnumProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex, uint value)
-        {
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public Windows.Foundation.Object GetObjectProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex)
-        {
-            return default(Windows.Foundation.Object);
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public IXamlDirectObject GetXamlDirectObjectProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex)
-        {
-            return default(IXamlDirectObject);
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public bool GetBooleanProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex)
-        {
-            return default(bool);
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public double GetDoubleProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex)
-        {
-            return default(double);
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public int GetInt32Property(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex)
-        {
-            return default(int);
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public string GetStringProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex)
-        {
-            return default(string);
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public Windows.Foundation.DateTime GetDateTimeProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex)
-        {
-            return default(Windows.Foundation.DateTime);
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public Windows.Foundation.Point GetPointProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex)
-        {
-            return default(Windows.Foundation.Point);
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public Windows.Foundation.Rect GetRectProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex)
-        {
-            return default(Windows.Foundation.Rect);
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public Windows.Foundation.Size GetSizeProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex)
-        {
-            return default(Windows.Foundation.Size);
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public Windows.Foundation.TimeSpan GetTimeSpanProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex)
-        {
-            return default(Windows.Foundation.TimeSpan);
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public Windows.UI.Color GetColorProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex)
-        {
-            return default(Windows.UI.Color);
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public Microsoft.UI.Xaml.CornerRadius GetCornerRadiusProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex)
-        {
-            return default(Microsoft.UI.Xaml.CornerRadius);
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public Microsoft.UI.Xaml.Duration GetDurationProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex)
-        {
-            return default(Microsoft.UI.Xaml.Duration);
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public Microsoft.UI.Xaml.GridLength GetGridLengthProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex)
-        {
-            return default(Microsoft.UI.Xaml.GridLength);
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public Microsoft.UI.Xaml.Thickness GetThicknessProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex)
-        {
-            return default(Microsoft.UI.Xaml.Thickness);
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public Microsoft.UI.Xaml.Media.Matrix GetMatrixProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex)
-        {
-            return default(Microsoft.UI.Xaml.Media.Matrix);
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public Microsoft.UI.Xaml.Media.Media3D.Matrix3D GetMatrix3DProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex)
-        {
-            return default(Microsoft.UI.Xaml.Media.Media3D.Matrix3D);
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public uint GetEnumProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex)
-        {
-            return default(uint);
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public void ClearProperty(IXamlDirectObject xamlDirectObject, XamlPropertyIndex propertyIndex)
-        {
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public uint GetCollectionCount(IXamlDirectObject xamlDirectObject)
-        {
-            return default(uint);
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public IXamlDirectObject GetXamlDirectObjectFromCollectionAt(IXamlDirectObject xamlDirectObject, uint index)
-        {
-            return default(IXamlDirectObject);
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public void AddToCollection(IXamlDirectObject xamlDirectObject, IXamlDirectObject value)
-        {
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public void InsertIntoCollectionAt(IXamlDirectObject xamlDirectObject, uint index, IXamlDirectObject value)
-        {
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public bool RemoveFromCollection(IXamlDirectObject xamlDirectObject, IXamlDirectObject value)
-        {
-            return false;
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public void RemoveFromCollectionAt(IXamlDirectObject xamlDirectObject, uint index)
-        {
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public void ClearCollection(IXamlDirectObject xamlDirectObject)
-        {
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        [DXamlOverloadName("AddEventHandler")]
-        [DXamlName("AddEventHandler")]
-        [DefaultOverload]
-        public void AddEventHandler(IXamlDirectObject xamlDirectObject, XamlEventIndex eventIndex, Windows.Foundation.Object handler)
-        {
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        [DXamlOverloadName("AddEventHandler")]
-        [DXamlName("AddEventHandler_HandledEventsToo")]
-        public void AddEventHandler(IXamlDirectObject xamlDirectObject, XamlEventIndex eventIndex, Windows.Foundation.Object handler, bool handledEventsToo)
-        {
-        }
-
-        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
-        public void RemoveEventHandler(IXamlDirectObject xamlDirectObject, XamlEventIndex eventIndex, Windows.Foundation.Object handler)
-        {
-        }
-
-        internal XamlDirect() { }
-    }
-}
diff --git a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Xaml.Hosting.cs b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Xaml.Hosting.cs
index e73359a2f7..f6e98675ac 100644
--- a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Xaml.Hosting.cs
+++ b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Xaml.Hosting.cs
@@ -363,6 +363,7 @@ public static WindowsXamlManager InitializeForCurrentThread()
         [Version(2)]
         [CodeGen(CodeGenLevel.IdlAndPartialStub)]
         [TypeTable(IsExcludedFromDXaml = true)]
+        [OptionalReturnValue]
 	    public static WindowsXamlManager GetForCurrentThread()
         {
             return default(WindowsXamlManager);
diff --git a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Xaml.Input.cs b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Xaml.Input.cs
index f524e51677..bab272e8bf 100644
--- a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Xaml.Input.cs
+++ b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Xaml.Input.cs
@@ -140,6 +140,7 @@ public static Windows.Foundation.Object GetFocusedElement()
 
         [DXamlName("GetFocusedElementWithRoot")]
         [DXamlOverloadName("GetFocusedElement")]
+        [OptionalReturnValue]
         public static Windows.Foundation.Object GetFocusedElementWithRoot(Microsoft.UI.Xaml.XamlRoot xamlRoot)
         {
             return default(Windows.Foundation.Object);
diff --git a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Xaml.cs b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Xaml.cs
index 691faea3df..efad237737 100644
--- a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Xaml.cs
+++ b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/Model/Microsoft.UI.Xaml.cs
@@ -5878,6 +5878,7 @@ internal XamlRootChangedEventArgs() { }
     [CodeGen(partial: true)]
     [Guids(ClassGuid = "eaad7a20-751b-4a85-b6c9-50231742b28f")]
     [Platform(2, typeof(Microsoft.UI.Xaml.WinUIContract), 5)]
+    [Platform("Feature_ExperimentalApi", typeof(Microsoft.UI.Xaml.WinUIContract), Microsoft.UI.Xaml.WinUIContract.LatestVersion)]
     public sealed class XamlRoot
     {
         private XamlRoot() { }
@@ -5910,6 +5911,13 @@ private XamlRoot() { }
         [Version(2)]
         [CodeGen(CodeGenLevel.IdlAndPartialStub)]
         public Microsoft.UI.Content.ContentIslandEnvironment ContentIslandEnvironment { get; }
+
+        [VelocityFeature("Feature_ExperimentalApi")]
+        [CodeGen(CodeGenLevel.IdlAndPartialStub)]
+        public Microsoft.UI.Content.ContentCoordinateConverter CoordinateConverter { get; }
+
+        [VelocityFeature("Feature_ExperimentalApi")]
+        public Microsoft.UI.Content.ContentIsland TryGetContentIsland() { return null; }
     }
 
     [TypeTable(ForceInclude = true)]
diff --git a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/NewBuilders/Contracts.cs b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/NewBuilders/Contracts.cs
index 3f23d1223b..19e2ca6f23 100644
--- a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/NewBuilders/Contracts.cs
+++ b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/NewBuilders/Contracts.cs
@@ -8,10 +8,9 @@ namespace XamlOM
     [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = true)]
     public sealed class ContractVersionAttribute : Attribute, IContractBuilder
     {
-        public ContractVersionAttribute(int version, int xamlDirectVersion = 0)
+        public ContractVersionAttribute(int version)
         {
             Version = version;
-            XamlDirectVersion = xamlDirectVersion;
         }
 
         public int Version
@@ -20,15 +19,9 @@ public int Version
             private set;
         }
 
-        public int XamlDirectVersion
-        {
-            get;
-            private set;
-        }
-
         void IContractBuilder.BuildContract(OM.ContractDefinition definition, Type source)
         {
-            definition.AddVersion(Version, XamlDirectVersion);
+            definition.AddVersion(Version);
         }
     }
 
diff --git a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/XamlOM.Sources.targets b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/XamlOM.Sources.targets
index 2e5cb260a2..85f7a39eff 100644
--- a/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/XamlOM.Sources.targets
+++ b/src/dxaml/xcp/tools/XCPTypesAutoGen/XamlOM/XamlOM.Sources.targets
@@ -127,7 +127,6 @@
     <CompileFiles Include="Model\Microsoft.UI.Xaml.Controls.cs" />
     <CompileFiles Include="Model\Microsoft.UI.Xaml.Controls.Primitives.cs" />
     <CompileFiles Include="Model\Microsoft.UI.Xaml.cs" />
-    <CompileFiles Include="Model\Microsoft.UI.Xaml.Core.Direct.cs" />
     <CompileFiles Include="Model\Microsoft.UI.Xaml.Data.cs" />
     <CompileFiles Include="Model\Microsoft.UI.Xaml.Documents.cs" />
     <CompileFiles Include="Model\Microsoft.UI.Xaml.Hosting.cs" />
diff --git a/src/dxaml/xcp/win/agcore.debug/CommonErrors.rc b/src/dxaml/xcp/win/agcore.debug/CommonErrors.rc
index 559f8eb3a2..1131834614 100644
--- a/src/dxaml/xcp/win/agcore.debug/CommonErrors.rc
+++ b/src/dxaml/xcp/win/agcore.debug/CommonErrors.rc
@@ -244,12 +244,6 @@ XMLLITE_XML_E_INVALID_HEXIDECIMAL     "invalid hexidecimal"
 XMLLITE_XML_E_INVALID_UNICODE         "invalid unicode"
 XMLLITE_XML_E_INVALIDENCODING         "invalid encoding"
 
-AG_E_CAPTURE_DEVICE_IN_USE          "The capture device you are attempting to use is already being used"
-AG_E_CAPTURE_DEVICE_REMOVED         "The capture device was removed"
-AG_E_CAPTURE_DEVICE_ACCESS_DENIED   "Access denied to capture devices"
-AG_E_CAPTURE_SOURCE_NOT_STOPPED     "Capture source is not stopped"
-AG_E_CAPTURE_DEVICE_NOT_AVAILABLE   "Capture device is not available"
-
 AG_E_SWAPCHAINBACKGROUNDPANEL_UNSUPPORTED_ALPHAMODE "SwapChainBackgroundPanel does not support setting a swap chain with premultiplied alpha mode."
 AG_E_SWAPCHAINBACKGROUNDPANEL_UNSUPPORTED_SWAPCHAINTYPE "SwapChainBackgroundPanel only supports setting a swap chain created with CreateSwapChainForComposition()."
 AG_E_SWAPCHAINBACKGROUNDPANEL_ERROR_SETUNSUPPORTEDPROPERTY "Setting '%0' property is not supported on SwapChainBackgroundPanel."
diff --git a/src/dxaml/xcp/win/inc/winpal.h b/src/dxaml/xcp/win/inc/winpal.h
index 7c36c52adb..abcfa7329b 100644
--- a/src/dxaml/xcp/win/inc/winpal.h
+++ b/src/dxaml/xcp/win/inc/winpal.h
@@ -34,6 +34,7 @@ struct MsgPacket
 
     ixp::IPointerPoint* m_pPointerPointNoRef;
     ixp::IPointerEventArgs* m_pPointerEventArgsNoRef;
+    bool m_isNonClientPointerMessage{ false };
 
     //Ctor
     MsgPacket()
@@ -549,7 +550,7 @@ class CWinQueue final : public IPALQueue
     HANDLE   m_handle;          // An event (only used when queue is empty)
     _Guarded_by_(m_cs) QPACKET *m_pHead;           // First item in the queue
     _Guarded_by_(m_cs) QPACKET *m_pTail;           // Final item in the queue
-    CRITICAL_SECTION m_cs;      // Synchronization object
+    CRITICAL_SECTION m_cs{};      // Synchronization object
 };
 
 #if XCP_MONITOR
@@ -984,7 +985,7 @@ friend class TestWindowsServices;
 
     IXcpRenderCounters *m_pRenderCounters;
 
-    IValueStore*    pHostProps;
+    IValueStore*    pHostProps{};
 
     bool m_isDirectManipulationSupported;
     bool m_hasCheckedForDirectManipulationSupport;
diff --git a/src/eng/Version.Details.xml b/src/eng/Version.Details.xml
index c1335168bf..3133eaa4ca 100644
--- a/src/eng/Version.Details.xml
+++ b/src/eng/Version.Details.xml
@@ -2,33 +2,33 @@
 <!-- Copyright (c) Microsoft Corporation. Licensed under the MIT License. See LICENSE in the project root for license information. -->
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.WindowsAppSDK.Foundation.TransportPackage" Version="1.5.0-20240625.0.release">
+    <Dependency Name="Microsoft.WindowsAppSDK.Foundation.TransportPackage" Version="1.6.0-20240529.1">
       <Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDK</Uri>
-      <Sha>ad621f84e7cc1b2c4e2409f82582cda4570f22d9</Sha>
+      <Sha>49438aac0b7ab08a86bab8ea2cce63022b91f1b2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage" Version="1.5.4-CI-26105.1002.240617-0923.0">
+    <Dependency Name="Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage" Version="1.6.4-CI-26107.1002.240525-1925.5">
       <Uri>https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP</Uri>
-      <Sha>8ae48bdfe2603ad520a56f5bcd40e136c2026c0e</Sha>
+      <Sha>78ebff492706089b8b0590e7d3c4c1653061103f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Internal.InteractiveExperiences" Version="1.5.4-CI-26105.1002.240617-0923.0">
+    <Dependency Name="Microsoft.Internal.InteractiveExperiences" Version="1.6.4-CI-26107.1002.240525-1925.5">
       <Uri>https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP</Uri>
-      <Sha>8ae48bdfe2603ad520a56f5bcd40e136c2026c0e</Sha>
+      <Sha>78ebff492706089b8b0590e7d3c4c1653061103f</Sha>
     </Dependency>
     <!-- Microsoft-WinUI-SDK repo (MSBuild and Visual Studio extensions for building, deploying, and debugging packaged applications.)  -->
-    <Dependency Name="Microsoft.Build.Msix" Version="1.5.0-zmain.240510.2">
+    <Dependency Name="Microsoft.Build.Msix" Version="1.6.0-zmain.240416.1">
       <Uri>https://dev.azure.com/microsoft/WinUI/_git/Microsoft-WinUI-Sdk</Uri>
-      <Sha>991614b101e9987684a5550327b0aac4c97347ff</Sha>
+      <Sha>a89584866b65fc63692020a47ad24b9e5b619229</Sha>
     </Dependency>
     <!-- Closed source binary (ex PTLS and WinUIEdit) -->
-    <Dependency Name="Microsoft.Internal.WinUIDetails" Version="1.500.0">
-      <Uri>https://dev.azure.com/microsoft/WinUI/_git/WinUIDetails</Uri>
-      <Sha>5b3913ef8513e7bebd8fb07a98de88155e1df66d</Sha>
+    <Dependency Name="Microsoft.Internal.WinUIDetails" Version="1.610.0-exp1.20240528.1">
+      <Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKClosed</Uri>
+      <Sha>3afddea64a90fbad1f1a429d0cefeec886003dfc</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.WinAppSDK.EngCommon" Version="1.4.230710">
+    <Dependency Name="Microsoft.WinAppSDK.EngCommon" Version="1.6.240416">
       <Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKAggregator</Uri>
-      <Sha>2862d221dd2c73bb7dc150b4e9f87b114ae62d5f</Sha>
+      <Sha>6f65fd54d50a6dd51707562807d9329f1f736dec</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/src/eng/adhocappreg.targets b/src/eng/adhocappreg.targets
index c234c62e11..7aac96b468 100644
--- a/src/eng/adhocappreg.targets
+++ b/src/eng/adhocappreg.targets
@@ -1,85 +1,41 @@
 <!-- Copyright (c) Microsoft Corporation. Licensed under the MIT License. See LICENSE in the project root for license information. -->
 <Project>
-  
-    <Target Name="GetPathToXAMLWinRTImplementations"
-          BeforeTargets="ReplaceMUXWinRTRegistrations"
-          Returns="$(PathToXAMLWinRTImplementations)"
-          Condition="'$(PathToXAMLWinRTImplementations)'=='' and ('$(MSBuildProjectExtension)'=='.wapproj' or '$(UsingMicrosoftNetSdk)' == 'true')">
-      <PropertyGroup>
-        <_MuxDll>microsoft.ui.xaml.dll</_MuxDll>
-        <_MuxDllRidLocation>runtimes\$(_WinUIRuntimeIdentifier)\native\microsoft.ui.xaml.dll</_MuxDllRidLocation>
-        <_EntryPointProjectName>$([System.IO.Path]::GetFileNameWithoutExtension('$(EntryPointProjectFullPath)'))</_EntryPointProjectName>
-      </PropertyGroup>
-      <ItemGroup>
-        <_WinUINativeItemsFiltered Remove="@(_WinUINativeItemsFiltered)"/>
 
-        <_WinUINativeItemsFiltered Include="@(AppxPackagePayload)" Condition="$([System.String]::new('%(Identity)').EndsWith('Microsoft.UI.Xaml.dll', StringComparison.OrdinalIgnoreCase))"/>
-        <_WinUINativeItemsFiltered Remove="@(_WinUINativeItemsFiltered)"
-                                   Condition="'%(_WinUINativeItemsFiltered.OutputType)'!='Exe' and '%(_WinUINativeItemsFiltered.OutputType)'!='WinExe' and '%(_WinUINativeItemsFiltered.OutputGroup)'!='PublishItemsOutputGroupOutput'"/>
-
-        <_MuxItemFiltered Include="@(_WinUINativeItemsFiltered)"
-            Condition="$(_MuxDll.Equals('%(TargetPath)', StringComparison.OrdinalIgnoreCase)) or $(_MuxDllRidLocation.Equals('%(TargetPath)', StringComparison.OrdinalIgnoreCase))"/>
-      </ItemGroup>
-
-      <!-- Fallback to DestinationSubDirectory if TargetPath check doesn't work for the packaging project -->
-      <ItemGroup Condition="'$(MSBuildProjectExtension)'=='.wapproj' and '@(_MuxItemFiltered->Count())' &lt; 1">
-        <_EntryPointItems Include="@(_WinUINativeItemsFiltered->WithMetadataValue('SourceProject','$(_EntryPointProjectName)'))"/>
-        <_MuxItemFiltered Include="@(_EntryPointItems)" Condition="'%(_EntryPointItems.DestinationSubDirectory)'==''"/>
-        <_MuxItemFiltered Include="@(_EntryPointItems)" Condition="'@(_MuxItemFiltered->Count())' &lt; 1 and '%(_EntryPointItems.DestinationSubDirectory)'=='runtimes\$(_WinUIRuntimeIdentifier)\native\'"/>
-      </ItemGroup>
-
-      <!-- This will only happen if there are multiple .exe's which reference WinUI, which will create duplicate entries in the appxmanifest -->
-      <Error Text="App packages with multiple exes are not supported. To override this, set the PathToXAMLWinRTImplementations property."
-             Condition="'@(_MuxItemFiltered->Count())' &gt; 1" />
-
-      <PropertyGroup>
-        <_XamlItemTargetPath>@(_MuxItemFiltered->'%(TargetPath)')</_XamlItemTargetPath>
-        <!-- Make the path lowerscase so the comparison will succeed -->
-        <_XamlItemTargetPath>$(_XamlItemTargetPath.ToLower())</_XamlItemTargetPath>
-        <PathToXAMLWinRTImplementations>$(_XamlItemTargetPath.Substring(0, $(_XamlItemTargetPath.IndexOf('microsoft.ui.xaml.dll'))))</PathToXAMLWinRTImplementations>
-      </PropertyGroup>
-    </Target>
-
-    <!-- Replace UWP AppxManifest WinRT registrations for Microsoft.UI.Xaml.dll, post-GenerateAppxManifest. -->
+    <!-- Transform fusion manifest activatable class entries and insert into appx manifest, 
+          for WindowsAppSdkSelfContained sample/test execution requiring UWP and/or < RS5. -->
     <!-- Target runs before manifest validation occurs. Requires output file to support incremental builds. -->
-    <Target Name="ReplaceMUXWinRTRegistrations"
+    <Target Name="WinAppSdkInsertActivatableClassEntries"
         BeforeTargets="_GenerateAppxPackageRecipeFile;_WireUpCoreRuntime"
         AfterTargets="_CalculateInputsForGenerateAppxPackageRecipe"
         Inputs="$(MSBuildAllProjects);@(_GenerateCurrentProjectAppxManifestInput);@(_GenerateAppxPackageRecipeInput)"
         Outputs="$(FinalAppxManifestName).incremental" >
-        <PropertyGroup>
-          <WinUIClassRegistrationsDir Condition="'$(WinUIClassRegistrationsDir)' == ''">$(MicrosoftWindowsAppSDKPackageDir)build\native\</WinUIClassRegistrationsDir>
-        </PropertyGroup>
-        <ItemGroup>
-          <_WinUIAssemblies Include="$(MicrosoftWindowsAppSDKPackageDir)runtimes\$(_WinUIRuntimeIdentifier)\native\*.dll"/>
-        </ItemGroup>
-        <PropertyGroup>
-          <_WinUIAssembliesAsString>@(_WinUIAssemblies->'%(Filename)%(Extension)',';')</_WinUIAssembliesAsString>
-          <_WinUIAssembliesAsString>$(_WinUIAssembliesAsString.ToLower())</_WinUIAssembliesAsString>
-        </PropertyGroup>
-        <ReplaceMUXWinRTRegistrations
+        
+        <MSBuild
+            Condition="'$(MSBuildProjectExtension)' == '.wapproj'"
+            Projects="$(EntryPointProjectFullPath)"
+            Targets="WinAppSdkGetActivatableClassEntriesManifest" >
+            <Output TaskParameter="TargetOutputs" PropertyName="ApplicationManifest" />
+        </MSBuild>
+
+        <XslTransformation XslInputPath="$(ProjectRoot)\build\TransformFusionManifest.xslt"
+            XmlInputPaths="$(ApplicationManifest)"
+            OutputPaths="$(FinalAppxManifestName).fragment" />
+
+        <WinAppSdkInsertActivatableClassEntries
             FullPathToAppxManifest="$(FinalAppxManifestName)"
-            FullPathToLiftedXAMLWinRTRegistrations="$(WinUIClassRegistrationsDir)LiftedWinRTClassRegistrations.xml"
-            WinUIAssemblies="$(_WinUIAssembliesAsString)"
-            PathToXAMLWinRTImplementations="$(PathToXAMLWinRTImplementations)"
-         />
+            FullPathToAppxFragment="$(FinalAppxManifestName).fragment" />
 
          <Touch
             Files="$(FinalAppxManifestName).incremental"
-            AlwaysCreate="true"
-         />
-
-        <ItemGroup>
-          <_WinUIAssemblies Remove="@(_WinUIAssemblies)"/>
-        </ItemGroup>
+            AlwaysCreate="true" />
     </Target>
 
-    <UsingTask TaskName="ReplaceMUXWinRTRegistrations" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
+    <Target Name="WinAppSdkGetActivatableClassEntriesManifest" DependsOnTargets="CreateWinRTRegistration" Outputs="$(ApplicationManifest)" />
+
+    <UsingTask TaskName="WinAppSdkInsertActivatableClassEntries" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
         <ParameterGroup>
             <FullPathToAppxManifest ParameterType="System.String" Required="true" />
-            <FullPathToLiftedXAMLWinRTRegistrations ParameterType="System.String" Required="true" />
-            <WinUIAssemblies ParameterType="System.String"  Required="true" />
-            <PathToXAMLWinRTImplementations ParameterType="System.String" />
+            <FullPathToAppxFragment ParameterType="System.String" Required="true" />
         </ParameterGroup>
         <Task>
             <Using Namespace="System" />
@@ -88,70 +44,41 @@
             <Using Namespace="System.Collections.Generic" />
             <Using Namespace="System.IO" />
             <Code Type="Fragment" Language="cs"><![CDATA[
-                if (File.Exists(FullPathToLiftedXAMLWinRTRegistrations) && File.Exists(FullPathToAppxManifest))
+                if (File.Exists(FullPathToAppxManifest) && File.Exists(FullPathToAppxFragment))
                 {
-                    // Load AppxManifest.xml
                     XmlDocument appxManifest = new XmlDocument();
                     appxManifest.Load(FullPathToAppxManifest);
 
                     XmlNamespaceManager namespaceManager = new XmlNamespaceManager(appxManifest.NameTable);
                     namespaceManager.AddNamespace("w", "http://schemas.microsoft.com/appx/manifest/foundation/windows10");
 
-                    // If there exists an existing Extensions node, we'll remove any Microsoft.UI.Xaml.dll, Microsoft.Web.WebView2.Core.dll entry in it
-                    // and add the correct DLL mapping. Otherwise, if there doesn't, we'll create one and add it.
+                    // If Extensions node already exists, merge with it.  Otherwise, create a new one.
                     XmlNode extensionsNode = null;
-
                     foreach (XmlNode node in appxManifest.DocumentElement.SelectNodes("//w:Package/w:Extensions", namespaceManager))
                     {
                         extensionsNode = node;
                         break;
                     }
-
-                    if (extensionsNode != null)
-                    {
-                        XmlNodeList xmlNodeList = appxManifest.DocumentElement.SelectNodes("//w:Package/w:Extensions/w:Extension", namespaceManager);
-
-                        // Remove WinUI registrations from the AppxManifest file as we will be inserting the entries ourselves
-                        foreach (XmlNode node in xmlNodeList)
-                        {
-                            XmlNode pathNode = node.SelectSingleNode("w:InProcessServer/w:Path", namespaceManager);
-                            string path = Path.GetFileName(pathNode.InnerText).ToLower();
-                            if (WinUIAssemblies.Contains(path))
-                            {
-                                extensionsNode.RemoveChild(node);
-                            }
-                        }
-                    }
-                    else
+                    if (extensionsNode == null)
                     {
                         extensionsNode = appxManifest.CreateElement("Extensions", "http://schemas.microsoft.com/appx/manifest/foundation/windows10");
                         appxManifest.DocumentElement.AppendChild(extensionsNode);
                     }
 
-                    // Load correct WinRT registration file created during build.  These entries have the correct implemetation DLLs.
-                    XmlDocument newRegistrations = new XmlDocument();
-                    newRegistrations.Load(FullPathToLiftedXAMLWinRTRegistrations);
-                    XmlNamespaceManager namespaceManager2 = new XmlNamespaceManager(newRegistrations.NameTable);
+                    XmlDocument registrations = new XmlDocument();
+                    registrations.Load(FullPathToAppxFragment);
+                    XmlNamespaceManager namespaceManager2 = new XmlNamespaceManager(registrations.NameTable);
                     namespaceManager2.AddNamespace("w", "http://schemas.microsoft.com/appx/manifest/foundation/windows10");
-                    XmlNodeList newRegistrationNodes = newRegistrations.DocumentElement.SelectNodes("/w:Data/w:Extension", namespaceManager2);
+                    XmlNodeList registrationNodes = registrations.DocumentElement.SelectNodes("//w:Extensions/w:Extension", namespaceManager2);
 
-                    // Add entries for all Microsoft.UI.Xaml types in the AppxManifest
-                    foreach (XmlNode node in newRegistrationNodes)
+                    foreach (XmlNode registrationNode in registrationNodes)
                     {
-                        // If we have a path to our implementation DLLs, we'll add that here.
-                        if (!string.IsNullOrWhiteSpace(PathToXAMLWinRTImplementations))
-                        {
-                            XmlNode pathNode = node.SelectSingleNode("w:InProcessServer/w:Path", namespaceManager);
-                            pathNode.InnerText = PathToXAMLWinRTImplementations + pathNode.InnerText;
-                        }
-                        XmlNode importNode = extensionsNode.OwnerDocument.ImportNode(node, true);
+                        XmlNode importNode = extensionsNode.OwnerDocument.ImportNode(registrationNode, true);
                         extensionsNode.AppendChild(importNode);
                     }
 
-                    // Save the updated AppxManifest.xml file
                     appxManifest.Save(FullPathToAppxManifest);
                 }
-
             ]]></Code>
         </Task>
     </UsingTask>
diff --git a/src/eng/consumebinaries.targets b/src/eng/consumebinaries.targets
index 387672cd65..a7a7a089fa 100644
--- a/src/eng/consumebinaries.targets
+++ b/src/eng/consumebinaries.targets
@@ -8,17 +8,6 @@
         <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="$(MicrosoftNETCoreUniversalWindowsPlatformVersion)" />
     </ItemGroup>
 
-    <Target Name="InjectManagedProjectWinmdMetadata" DependsOnTargets="GetCppWinRTProjectWinMDReferences" BeforeTargets="CppWinRTSetMidlReferences">
-        <ItemGroup>
-            <_CppWinRTMissedDynamicProjectReferences Include="@(_ResolvedProjectReferencePaths)"
-                Condition= "'%(_ResolvedProjectReferencePaths.ProjectType)'==''  AND '%(_ResolvedProjectReferencePaths.WinMDFile)' == '' AND '%(_ResolvedProjectReferencePaths.Extension)' == '.winmd'">
-            </_CppWinRTMissedDynamicProjectReferences>
-            <CppWinRTDynamicProjectWinMDReferences Include="@(_CppWinRTMissedDynamicProjectReferences)">
-                <WinMDPath>%(FullPath)</WinMDPath>
-            </CppWinRTDynamicProjectWinMDReferences>
-        </ItemGroup>
-    </Target>
-
     <!-- Normally our dependent dlls are included by the NuGet, but for consuming directly from the build we need to copy them ourselves -->
     <Target Name="_UpdateMUXFilesToCopyForApp" BeforeTargets="_CopyFilesMarkedCopyLocal" Condition="'$(IncludeXamlDlls)' == 'true'">
         <ItemGroup>
diff --git a/src/eng/crtstl.targets b/src/eng/crtstl.targets
index 0416cf9001..b2bf294021 100644
--- a/src/eng/crtstl.targets
+++ b/src/eng/crtstl.targets
@@ -2,10 +2,10 @@
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <!-- Build product binaries with Hybrid CRT linkage (Universal CRT + Static VS CRT) to simplify 
-  app install requirements. By default, test code is also built with Hybrid CRT, since it often 
-  links in product code libs and mixing CRT models is not supported.  Projects that are independent 
-  of product code can opt out of Hybrid CRT to keep binaries smaller and build times shorter. 
+  <!-- Build product binaries with Hybrid CRT linkage (Universal CRT + Static VS CRT) to simplify
+  app install requirements. By default, test code is also built with Hybrid CRT, since it often
+  links in product code libs and mixing CRT models is not supported.  Projects that are independent
+  of product code can opt out of Hybrid CRT to keep binaries smaller and build times shorter.
   https://github.com/microsoft/WindowsAppSDK/blob/main/docs/Coding-Guidelines/HybridCRT.md -->
   <PropertyGroup>
     <CxCompilation Condition="'$(CxCompilation)'=='' and ('$(AppContainerApplication)'=='true' or '$(XamlConsumesWinRT)'=='true')">true</CxCompilation>
@@ -15,6 +15,14 @@
     <!-- We'll not use debug libraries when using the Hybrid CRT because doing so causes linker issues.
          See the comment below about _ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH. -->
     <UseDebugLibraries Condition="'$(UseHybridCrt)'=='true'">false</UseDebugLibraries>
+    <PlatformTarget Condition="'$(PlatformTarget)' == '' and '$(Platform)' == 'Win32'">x86</PlatformTarget>
+    <PlatformTarget Condition="'$(PlatformTarget)' == ''">$(Platform)</PlatformTarget>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <VisualStudioLibPath Condition="'$(PlatformTarget)' == 'x86'">$(_VC_LibraryPath_VC_x86_Desktop)\</VisualStudioLibPath>
+    <VisualStudioLibPath Condition="'$(PlatformTarget)' == 'x64'">$(_VC_LibraryPath_VC_x64_Desktop)\</VisualStudioLibPath>
+    <VisualStudioLibPath Condition="'$(PlatformTarget)' == 'arm64'">$(_VC_LibraryPath_VC_arm64_Desktop)\</VisualStudioLibPath>
   </PropertyGroup>
 
   <!-- However, we do need to explicitly disable optimization when we've set UseDebugLibraries to false.
@@ -29,7 +37,6 @@
   <PropertyGroup>
     <CrtLibSuffix/>
     <CrtLibSuffix Condition="'$(UseDebugLibraries)'=='true'">d</CrtLibSuffix>
-    <VisualStudioLibPath>$(VCToolsInstallDir)lib\$(WindowsSDKArch)\</VisualStudioLibPath>
     <CrtDefinitions>
       _UCRT;
       _CRT_SECURE_NO_WARNINGS;
@@ -64,7 +71,7 @@
   <PropertyGroup>
       <!-- CX compilation (/ZW) requires dynamic CRT (/MD).  This collides with hybrid (static) CRT linkage,
       producing error D8016, via a RuntimeLibrary pragma detect mismatch.  We disable this warning for CX test code
-      to allow it to link with C++ product code.  Normally, the mismatch would be a concern in that a binary should 
+      to allow it to link with C++ product code.  Normally, the mismatch would be a concern in that a binary should
       have one CRT instance for efficiency, consistency, to prevent heap confusion, etc.  In this case, we're not
       introducing two CRT instances, since the dynamic CRT imports from CX code actually resolve to the static CRT
       library externals (producing a warning about importing local functions). -->
@@ -79,9 +86,9 @@
       <RuntimeLibrary>$(RuntimeLibrary)</RuntimeLibrary>
       <PreprocessorDefinitions>$(CrtDefinitions) $(StlDefinitions) $(ClMidlDefinitions) $(AllowRuntimeLibraryMismatch) %(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <Midl>    
+    <Midl>
       <PreprocessorDefinitions>$(ClMidlDefinitions) %(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </Midl>    
+    </Midl>
     <Link>
       <IgnoreSpecificDefaultLibraries>
         libucrt.lib;
@@ -110,7 +117,7 @@
     <CrtLib Include="$(VisualStudioLibPath)msvcprt$(CrtLibSuffix).lib"/>
     <CrtLib Include="$(VisualStudioLibPath)vcruntime$(CrtLibSuffix).lib"/>
   </ItemGroup>
-  
+
   <!-- If hybrid CRT, link dynamically to ucrtbase.dll, statically to VC startup/runtime and STL.
   Note that we can't link with libcpmtd.lib (etc), or we'll end up with an iterator debug level mismatch,
   which will break the build.  Using _ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH is not a good workaround, as it can
@@ -131,7 +138,7 @@
     <CrtLib Condition="'$(UseHybridCrt)'=='true'" Include="$(VisualStudioLibPath)vccorlib.lib"/>
   </ItemGroup>
 
-  <!-- To ensure that XAML's new/delete function overrides take precedence, 
+  <!-- To ensure that XAML's new/delete function overrides take precedence,
     CRT libs are explicitly added last to the link inputs. -->
   <Target Name="AddCrtLibs" BeforeTargets="Link">
     <ItemGroup>
diff --git a/src/eng/folderpaths.props b/src/eng/folderpaths.props
index b0866b7951..6172b00ec7 100644
--- a/src/eng/folderpaths.props
+++ b/src/eng/folderpaths.props
@@ -54,10 +54,17 @@
       See https://github.com/microsoft/msbuild/issues/1603 for more discussion about this.
 
       If the BaseIntermediateOutputPath property is supplied, just use that. Our CsWinRT generation creates projects that are already located
-      in the buildoutput, so we don't use the project relative path for that
+      in the buildoutput, so we don't use the project relative path for that.
     -->
+    <BaseOutputPath Condition="'$(BaseOutputPath)'==''">$(XamlBuildOutputRoot)$(ProjectRelativePath)\</BaseOutputPath>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'==''">$(XamlBuildOutputRoot)$(ProjectRelativePath)\</BaseIntermediateOutputPath>
     <BaseIntermediateOutputPath Condition="'$(GenerateProjectSpecificOutputFolder)' == 'true'">$(BaseIntermediateOutputPath)$(MSBuildProjectName)\</BaseIntermediateOutputPath>
+    <!--
+      Most of our projects don't need to differentiate between intermediates directories and output directories, and just put both directories' files in the same place.
+      However, unpackaged apps need to differentiate between the two in order not to unnecessarily put intermediates files in the unpackaged directory used for testing,
+      so IntermediateOutputPathSubdirectory allows apps to opt-in to placing intermediates in a subdirectory that can be excluded from copy operations.
+    -->
+    <BaseIntermediateOutputPath Condition="'$(IntermediateOutputPathSubdirectory)'!=''">$(BaseIntermediateOutputPath)$(IntermediateOutputPathSubdirectory)\</BaseIntermediateOutputPath>
     <!--Trimming down path length to prevent MAX_PATH -->
     <BaseIntermediateOutputPath>$(BaseIntermediateOutputPath.Replace("src\XamlCompiler\Tests\RegressionProjects\Features\CompiledBinding", "CompilerTests"))</BaseIntermediateOutputPath>
     <GenerateProjectSpecificOutputFolder>false</GenerateProjectSpecificOutputFolder>
@@ -74,7 +81,7 @@
   <PropertyGroup>
     <BaseIntermediateOutputPath Condition="'$(TargetFramework)' != '' and '$(IgnoreTargetFramework)' != 'true'">$(BaseIntermediateOutputPath)$(TargetFramework)\</BaseIntermediateOutputPath>
     <IntermediateOutputPath>$(BaseIntermediateOutputPath)</IntermediateOutputPath>
-    <OutputPath>$(IntermediateOutputPath)</OutputPath>
+    <OutputPath>$(BaseOutputPath)</OutputPath>
     <OutDir>$(OutputPath)</OutDir>
     <OutDirWasSpecified>true</OutDirWasSpecified>
 
diff --git a/src/eng/projectcaching.props b/src/eng/projectcaching.props
index 4b96e790de..df0afa323d 100644
--- a/src/eng/projectcaching.props
+++ b/src/eng/projectcaching.props
@@ -1,27 +1,39 @@
 <Project>
   <PropertyGroup>
-    <MemoBuildPackageRoot>$(NugetPackageDirectory)\MemoBuild.$(MemoBuildPackageVersion)</MemoBuildPackageRoot>
-
-    <!-- Off by default -->
-    <MemoBuildEnabled Condition="'$(MemoBuildEnabled)' == ''">false</MemoBuildEnabled>
-
     <!-- For local testing, use a local cache -->
-    <MemoBuildCacheType Condition="'$(TF_BUILD)' == ''">LocalOnly</MemoBuildCacheType>
+    <MSBuildCachePackageName Condition="'$(TF_BUILD)' == ''">Microsoft.MSBuildCache.Local</MSBuildCachePackageName>
 
     <!-- In Azure pipelines, use Pipeline Caching as the cache storage backend -->
-    <MemoBuildCacheType Condition="'$(TF_BUILD)' != ''">AzurePipelines</MemoBuildCacheType>
-    <MemoBuildLocalCacheRootPath Condition="'$(TF_BUILD)' != ''">$(ProjectRoot)\MemoBuildCache</MemoBuildLocalCacheRootPath>
+    <MSBuildCachePackageName Condition="'$(TF_BUILD)' != ''">Microsoft.MSBuildCache.AzurePipelines</MSBuildCachePackageName>
+
+    <MSBuildCachePackageRoot>$(NugetPackageDirectory)\$(MSBuildCachePackageName).$(MSBuildCachePackageVersion)</MSBuildCachePackageRoot>
+
+    <!-- Off by default -->
+    <MSBuildCacheEnabled Condition="'$(MSBuildCacheEnabled)' == ''">false</MSBuildCacheEnabled>
 
-    <!-- vctip.exe is a detached process which outlives the project it's reporting telemetry on. Just ignore these accesses. -->
-    <MemoBuildAllowFileAccessAfterProjectFinish>true</MemoBuildAllowFileAccessAfterProjectFinish>
+    <MSBuildCacheLocalCacheRootPath Condition="'$(TF_BUILD)' != ''">$(ProjectRoot)\MSBuildCache</MSBuildCacheLocalCacheRootPath>
 
     <!-- Change this to bust the cache -->
-    <MemoBuildCacheUniverse>1</MemoBuildCacheUniverse>
+    <MSBuildCacheCacheUniverse>1</MSBuildCacheCacheUniverse>
   </PropertyGroup>
 
-  <Import Project="$(MemoBuildPackageRoot)\build\MemoBuild.props" />
+  <Import Project="$(MSBuildCachePackageRoot)\build\$(MSBuildCachePackageName).props" />
 
   <PropertyGroup>
+    <!--
+      Visual Studio telemetry reads various ApplicationInsights.config files and other files after the project is finished, likely in a detached process.
+      This is acceptable and should not impact cache correctness.
+    -->
+    <MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns>
+      $(MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns);
+      \**\ApplicationInsights.config;
+      $(LocalAppData)\Microsoft\VSApplicationInsights\**;
+      $(LocalAppData)\Microsoft\Windows\INetCache\**;
+      A:\;
+      E:\;
+      $(WinDir)\**;
+    </MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns>
+
     <!--
       Double-writes across projects are not good for build performance but allow specific ones to unblock.
 
@@ -30,25 +42,28 @@
         controls\idl\Microsoft.UI.Xaml.Controls.idl.vcxproj copies the file via controls\dev\Materials\Acrylic\AcrylicBrush.vcxitems via a PackageContent item.
         controls\dev\dll\Microsoft.UI.Xaml.Controls.vcxproj copies the file via a BinplaceItem in controls\dev\dll\Microsoft.UI.Xaml.Common.targets.
       Attempting to remove either of these leads to various downstream issues.
+
+      Note: Not using $(NativeAssemblyPackageLocation) since that value is based on the Platform, and there is some cross-platform eferencing happening.
+      The value is intended to effectively be $(NativeAssemblyPackageLocation)\Microsoft.UI.Xaml\Assets\NoiseAsset_256x256_PNG.png
     -->
-    <MemoBuildIdenticalDuplicateOutputPatterns>$(MemoBuildIdenticalDuplicateOutputPatterns);$(NativeAssemblyPackageLocation)\Microsoft.UI.Xaml\Assets\NoiseAsset_256x256_PNG.png</MemoBuildIdenticalDuplicateOutputPatterns>
+    <MSBuildCacheIdenticalDuplicateOutputPatterns>$(MSBuildCacheIdenticalDuplicateOutputPatterns);$(PackageOutputLocation)\runtimes\win10-*\native\Microsoft.UI.Xaml\Assets\NoiseAsset_256x256_PNG.png</MSBuildCacheIdenticalDuplicateOutputPatterns>
 
     <!--
       Ignore controls\dev\Generated\** even though these files are possibly changed during the build (see controls\dev\dll\Microsoft.UI.Xaml.Common.targets::RunDependencyPropertyCodeGen).
       These files are part of source control and any changes should be committed, so we don't want to consider them cached outputs.
     -->
-    <MemoBuildIgnoredOutputPatterns>$(MemoBuildIgnoredOutputPatterns);controls\dev\Generated\**</MemoBuildIgnoredOutputPatterns>
+    <MSBuildCacheIgnoredOutputPatterns>$(MSBuildCacheIgnoredOutputPatterns);controls\dev\Generated\**</MSBuildCacheIgnoredOutputPatterns>
 
     <!--
       MUXControls.sln does not get the MUXFinalRelease global property, so ignore it to enable cache hits.
       TODO: Consider providing it to MUXControls.sln instead as a more correct solution.
     -->
-    <MemoBuildGlobalPropertiesToIgnore>$(MemoBuildGlobalPropertiesToIgnore);MUXFinalRelease</MemoBuildGlobalPropertiesToIgnore>
+    <MSBuildCacheGlobalPropertiesToIgnore>$(MSBuildCacheGlobalPropertiesToIgnore);MUXFinalRelease</MSBuildCacheGlobalPropertiesToIgnore>
 
     <!--
       The version is passed as a global property and is based on the date, which would bust the cache once a day.
       For actual shipping bits this probably shouldn't be ignored, but is fine for prototyping / CI.
     -->
-    <MemoBuildGlobalPropertiesToIgnore>$(MemoBuildGlobalPropertiesToIgnore);WinUIVersion</MemoBuildGlobalPropertiesToIgnore>
+    <MSBuildCacheGlobalPropertiesToIgnore>$(MSBuildCacheGlobalPropertiesToIgnore);WinUIVersion</MSBuildCacheGlobalPropertiesToIgnore>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/eng/projectcaching.targets b/src/eng/projectcaching.targets
index c41fcc4ae3..24efd364a7 100644
--- a/src/eng/projectcaching.targets
+++ b/src/eng/projectcaching.targets
@@ -1,3 +1,3 @@
 <Project>
-  <Import Project="$(MemoBuildPackageRoot)\build\MemoBuild.targets" />
+  <Import Project="$(MSBuildCachePackageRoot)\build\$(MSBuildCachePackageName).targets" />
 </Project>
\ No newline at end of file
diff --git a/src/eng/sdkconfig.targets b/src/eng/sdkconfig.targets
index 65b7c7f028..1be267b701 100644
--- a/src/eng/sdkconfig.targets
+++ b/src/eng/sdkconfig.targets
@@ -7,7 +7,7 @@
    -->
   <ItemGroup Condition="'$(UsingMicrosoftNETSdk)'=='true' and '$(MicrosoftWindowsSDKNetRefPackVersionSuffixOverride)'!=''">
     <FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="$(TargetPlatformVersion.TrimEnd('0'))$(MicrosoftWindowsSDKNetRefPackVersionSuffixOverride)" />
-    <FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="$(TargetPlatformVersion.TrimEnd('0'))$(MicrosoftWindowsSDKNetRefPackVersionSuffixOverride)" />  
+    <FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="$(TargetPlatformVersion.TrimEnd('0'))$(MicrosoftWindowsSDKNetRefPackVersionSuffixOverride)" />
   </ItemGroup>
   
   <!-- TODO: Remove this when https://github.com/microsoft/CsWinRT/issues/530 is fixed and we've picked up a new version. -->
diff --git a/src/eng/testprojects.targets b/src/eng/testprojects.targets
index 284409905c..4c80c15540 100644
--- a/src/eng/testprojects.targets
+++ b/src/eng/testprojects.targets
@@ -11,4 +11,15 @@
         AddBinplaceItems
       </PrepareForRunDependsOn>
     </PropertyGroup>
+
+    <!-- By default, build (but don't restore) all Release 64-bit .NET7+ managed tests and samples with PublishAot (which does not support x86 or WPF). -->
+    <PropertyGroup Condition="'$(PublishAot)' == '' and 
+        '$(Configuration)' == 'Release' and '$(ExcludeRestorePackageImports)' != 'true' and
+        ('$(Platform)' == 'x64' or '$(Platform)' == 'arm64') and '$(UseWpf)' != 'true' and 
+        $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">
+        <PublishAot>true</PublishAot>
+        <IsAotCompatible>true</IsAotCompatible>
+        <IsTrimmable>true</IsTrimmable>
+    </PropertyGroup>
+      
 </Project>
\ No newline at end of file
diff --git a/src/eng/versions.props b/src/eng/versions.props
index a3e119d653..68a9118e1b 100644
--- a/src/eng/versions.props
+++ b/src/eng/versions.props
@@ -32,7 +32,8 @@
     <MicrosoftWindowsSDKBuildToolsNugetPackageVersion>$([System.Text.RegularExpressions.Regex]::Match($(PackagesConfigContents), 'Microsoft.Windows.SDK.BuildTools.*?version="(.*?)"').Groups[1].Value)</MicrosoftWindowsSDKBuildToolsNugetPackageVersion>
     <CurrentPrivateDependencyPackageVersion>$([System.Text.RegularExpressions.Regex]::Match($(PackagesConfigContents), 'Microsoft.UI.DCPP.Dependencies.Minimal.*?version="(.*?)"').Groups[1].Value)</CurrentPrivateDependencyPackageVersion>
     <TestInProductionPackageVersion>$([System.Text.RegularExpressions.Regex]::Match($(PackagesConfigContents), 'Microsoft.Windows.TestInProduction.*?version="(.*?)"').Groups[1].Value)</TestInProductionPackageVersion>
-    <MemoBuildPackageVersion>$([System.Text.RegularExpressions.Regex]::Match($(PackagesConfigContents), 'MemoBuild.*?version="(.*?)"').Groups[1].Value)</MemoBuildPackageVersion>
+    <MSBuildCachePackageVersion>$([System.Text.RegularExpressions.Regex]::Match($(PackagesConfigContents), 'Microsoft.MSBuildCache.*?version="(.*?)"').Groups[1].Value)</MSBuildCachePackageVersion>
+    <MicrosoftCsWinRTVersion>$([System.Text.RegularExpressions.Regex]::Match($(PackagesConfigContents), 'Microsoft.Windows.CsWinRT.*?version="(.*?)"').Groups[1].Value)</MicrosoftCsWinRTVersion>
     <!-- Determine the configured versions based upon the Vesion.Details.xml file. -->
     <VersionDetailsFile>$(MSBuildThisFileDirectory)Version.Details.xml</VersionDetailsFile>
     <VersionDetailsFileContents>$([System.IO.File]::ReadAllText("$(VersionDetailsFile)"))</VersionDetailsFileContents>
@@ -64,21 +65,17 @@
     <!-- For compat reasons, this should always be .NET 6, as it controls the .NET version the Microsoft.WinUI.dll CSWinRT projection assembly targets. -->
     <WindowsAppSdkTargetFrameworkMoniker>net6.0-windows$(WindowsAppSdkTargetPlatformVersion)</WindowsAppSdkTargetFrameworkMoniker>
     <SamplesTargetFrameworkMoniker>$(WindowsAppSdkTargetFrameworkMoniker)</SamplesTargetFrameworkMoniker>
-    <!--
-         Keep this CsWinRT version in sync with both \Samples\WinUIGallery\WinUIGallery\standalone.props as well
-         as what is included in the .NET version specified below
-    -->
-    <MicrosoftCsWinRTPackageVersion>2.0.3</MicrosoftCsWinRTPackageVersion>
-    <MicrosoftWindowsSDKNetRefPackVersionSuffixOverride>29</MicrosoftWindowsSDKNetRefPackVersionSuffixOverride>
-    <dotNetSdkChannel>7.0.1xx</dotNetSdkChannel>
-    <dotNetSdkVNextChannel>8.0.1xx</dotNetSdkVNextChannel>
+    <MicrosoftCsWinRTPackageVersion>2.1.0-prerelease.240517.1</MicrosoftCsWinRTPackageVersion>
+    <MicrosoftWindowsSDKNetRefPackVersionSuffixOverride>35-preview</MicrosoftWindowsSDKNetRefPackVersionSuffixOverride>
+    <dotNetSdkChannel>8.0.1xx</dotNetSdkChannel>
+    <dotNetSdkVNextChannel>9.0.xx</dotNetSdkVNextChannel>
     <CppWinRTVersion>2.0.230706.1</CppWinRTVersion>
     <WebView2Version>1.0.2210.55</WebView2Version>
     <Win2DWinUIVersion>0.1.0.3</Win2DWinUIVersion>
     <Win2DUWPVersion>1.25.0</Win2DUWPVersion>
     <ColorCodeVersion>2.0.13</ColorCodeVersion>
     <CommunityToolkitWinUIVersion>8.0.230907</CommunityToolkitWinUIVersion>
-    <GraphicsWin2DVersion>1.0.4</GraphicsWin2DVersion>
+    <GraphicsWin2DVersion>1.1.1-1.1.1-local6</GraphicsWin2DVersion>
     <NewtonsoftJsonVersion>13.0.2</NewtonsoftJsonVersion>
     <MicrosoftTestNetSdkVersion>17.4.0</MicrosoftTestNetSdkVersion>
     <AbiWinRtVersion>2.0.210330.2</AbiWinRtVersion>
@@ -118,5 +115,6 @@
     <Error Condition="'$(MicrosoftWindowsSDKCppVersion)' != '$(MicrosoftWindowsSDKUWPManagedVersion)'" Text="Version mismatch between Microsoft.Windows.SDK and Microsoft.Windows.SDK.UWP.Managed" />
     <!-- Temporarily requiring BuildTools 22621.756 for transitive reference support -->
     <!-- <Error Condition="'$(MicrosoftWindowsSDKCppVersion)' != '$(MicrosoftWindowsSDKBuildToolsNugetPackageVersion)'" Text="Version mismatch between Microsoft.Windows.SDK and Microsoft.Windows.SDK.BuildTools" /> -->
+    <Error Condition="'$(MicrosoftCsWinRTVersion)' != '$(MicrosoftCsWinRTPackageVersion)'" Text="Version mismatch for Microsoft.Windows.CsWinRT between packages.config and versions.props" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/src/global.json b/src/global.json
index d9990edd18..010ec208c9 100644
--- a/src/global.json
+++ b/src/global.json
@@ -15,6 +15,6 @@
   },
   "msbuild-sdks": {
     "Microsoft.Build.NoTargets": "3.3.0",
-    "Microsoft.WinAppSDK.EngCommon": "1.4.230710"
+    "Microsoft.WinAppSDK.EngCommon": "1.6.240418"
   }
 }
diff --git a/src/packages.config b/src/packages.config
index f1d92425d1..1029693c40 100644
--- a/src/packages.config
+++ b/src/packages.config
@@ -24,15 +24,15 @@
   <package id="MUXCustomBuildTasks" version="1.0.125-winui3" targetFramework="native" />
   <!-- WIL -->
   <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.230202.1" targetFramework="native" />
-  <!-- Runtime for c#/winrt -->
-  <package id="Microsoft.Windows.CsWinRT" version="2.0.3" />
+  <!-- Runtime for c#/winrt.  Keep this in sync with \Samples\WinUIGallery\WinUIGallery\standalone.props -->
+  <package id="Microsoft.Windows.CsWinRT" version="2.1.0-prerelease.240517.1" />
   <!-- For MUXControlsTestApp? -->
   <package id="Microsoft.SourceLink.AzureRepos.Git" version="1.1.0" />
   <!-- We don't compile against the CRT version that requires these forwarders, but TAEF does,
        so we need to pull down this package so we can deploy it to Helix machines. -->
   <package id="Microsoft.VCRTForwarders.140" version="1.0.6" />
   <!-- Localized MUI and resw files -->
-  <package id="Microsoft.Internal.WinUILocalizationResources" version="3.0.0-zmain.231201.1" />
+  <package id="Microsoft.Internal.WinUILocalizationResources" version="3.0.0-exp1.240516.2" />
   <!-- Windows SDK build tools (e.g. makeappx.exe) -->
   <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.756" />
   <!-- AbiWinRt to convert winmd files to ABI headers -->
@@ -40,6 +40,7 @@
   <!-- TestInProduction library -->
   <!-- TIP is currently not OSS friendly. See task.ms/38973430 and task.ms/42919421 -->
   <package id="Microsoft.Windows.TestInProduction" version="2.0.2" targetFramework="native" />
-  <!-- Project Caching implementation. -->
-  <package id="MemoBuild" version="0.1.162" />
+  <!-- Project Caching implementations. -->
+  <package id="Microsoft.MSBuildCache.Local" version="0.1.268-preview" />
+  <package id="Microsoft.MSBuildCache.AzurePipelines" version="0.1.268-preview" />
 </packages>
\ No newline at end of file
diff --git a/src/packages.x86.config b/src/packages.x86.config
index 90a753d61f..fee03ce48c 100644
--- a/src/packages.x86.config
+++ b/src/packages.x86.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.SDK.cpp.x86" version="10.0.22621.755" />
 </packages>
diff --git a/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CSharpPagePass2.cs b/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CSharpPagePass2.cs
index 10cd4f1524..1adbde53a4 100644
--- a/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CSharpPagePass2.cs
+++ b/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CSharpPagePass2.cs
@@ -663,7 +663,7 @@ private void Output_BindingsClasses()
 
 this.Write(this.ToStringHelper.ToStringWithCulture(DebuggerNonUserCodeAttribute));
 
-this.Write("\r\n        private class ");
+this.Write("\r\n        private partial class ");
 
 this.Write(this.ToStringHelper.ToStringWithCulture(bindUniverse.BindingsClassName));
 
diff --git a/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CSharpPagePass2.tt b/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CSharpPagePass2.tt
index f49177d569..ccf8299502 100644
--- a/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CSharpPagePass2.tt
+++ b/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CSharpPagePass2.tt
@@ -366,7 +366,7 @@ namespace <#=Model.CodeInfo.ClassName.Namespace#>
 
         <#=GeneratedCodeAttribute#>
         <#=DebuggerNonUserCodeAttribute#>
-        private class <#=bindUniverse.BindingsClassName#> :
+        private partial class <#=bindUniverse.BindingsClassName#> :
 <#+             if (bindUniverse.NeedsIDataTemplateExtension) #>
 <#+             {#>
             <#=Globalize(KnownTypes.IDataTemplateExtension)#>,
diff --git a/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CSharpTypeInfoPass2.cs b/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CSharpTypeInfoPass2.cs
index 9a1eb4d606..2e7a362738 100644
--- a/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CSharpTypeInfoPass2.cs
+++ b/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CSharpTypeInfoPass2.cs
@@ -31,6 +31,8 @@ public override string TransformText()
 // </auto-generated>
 //------------------------------------------------------------------------------
 
+using System.Diagnostics.CodeAnalysis;
+
 ");
   if(!Model.GenerateTypeInfo)  
   {                                       
@@ -270,14 +272,20 @@ public override string TransformText()
             this.Write(this.ToStringHelper.ToStringWithCulture(GeneratedCodeAttribute));
             this.Write("\r\n    ");
             this.Write(this.ToStringHelper.ToStringWithCulture(DebuggerNonUserCodeAttribute));
-            this.Write("\r\n    internal class XamlSystemBaseType : ");
+            this.Write("\r\n    internal partial class XamlSystemBaseType : ");
             this.Write(this.ToStringHelper.ToStringWithCulture(Globalize(KnownTypes.IXamlType)));
-            this.Write(@"
-    {
-        string _fullName;
-        global::System.Type _underlyingType;
-
-        public XamlSystemBaseType(string fullName, global::System.Type underlyingType)
+            this.Write("\r\n    {\r\n        string _fullName;\r\n");
+  if (ProjectInfo.UsingCSWinRT) { 
+            this.Write("        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstruc" +
+                    "tors)]\r\n");
+  }
+            this.Write("        global::System.Type _underlyingType;\r\n\r\n        public XamlSystemBaseType" +
+                    "(string fullName, \r\n");
+  if (ProjectInfo.UsingCSWinRT) { 
+            this.Write("            [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicCons" +
+                    "tructors)]\r\n");
+  }
+            this.Write(@"            global::System.Type underlyingType)
         {
             _fullName = fullName;
             _underlyingType = underlyingType;
@@ -336,7 +344,7 @@ public XamlSystemBaseType(string fullName, global::System.Type underlyingType)
             this.Write(this.ToStringHelper.ToStringWithCulture(GeneratedCodeAttribute));
             this.Write("\r\n    ");
             this.Write(this.ToStringHelper.ToStringWithCulture(DebuggerNonUserCodeAttribute));
-            this.Write("\r\n    internal class XamlUserType : ");
+            this.Write("\r\n    internal partial class XamlUserType : ");
             this.Write(this.ToStringHelper.ToStringWithCulture(Globalize(ProjectInfo.XamlTypeInfoNamespace)));
             this.Write(".XamlSystemBaseType\r\n        , ");
             this.Write(this.ToStringHelper.ToStringWithCulture(Globalize(KnownTypes.IXamlType)));
@@ -361,7 +369,12 @@ public XamlSystemBaseType(string fullName, global::System.Type underlyingType)
 
         public XamlUserType(");
             this.Write(this.ToStringHelper.ToStringWithCulture(Globalize(ProjectInfo.XamlTypeInfoNamespace)));
-            this.Write(".XamlTypeInfoProvider provider, string fullName, global::System.Type fullType, ");
+            this.Write(".XamlTypeInfoProvider provider, string fullName, \r\n");
+  if (ProjectInfo.UsingCSWinRT) { 
+            this.Write("            [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicCons" +
+                    "tructors)]\r\n");
+  }
+            this.Write("            global::System.Type fullType, ");
             this.Write(this.ToStringHelper.ToStringWithCulture(Globalize(KnownTypes.IXamlType)));
             this.Write(" baseType)\r\n            :base(fullName, fullType)\r\n        {\r\n            _provid" +
                     "er = provider;\r\n            _baseType = baseType;\r\n        }\r\n\r\n        // --- I" +
@@ -389,66 +402,94 @@ public XamlSystemBaseType(string fullName, global::System.Type underlyingType)
             this.Write(" KeyType\r\n        {\r\n            get { return _provider.GetXamlTypeByName(_keyTyp" +
                     "eName); }\r\n        }\r\n\r\n        override public ");
             this.Write(this.ToStringHelper.ToStringWithCulture(Globalize(KnownTypes.IXamlMember)));
-            this.Write(" GetMember(string name)\r\n        {\r\n            if (_memberNames == null)\r\n      " +
-                    "      {\r\n                return null;\r\n            }\r\n            string longNam" +
-                    "e;\r\n            if (_memberNames.TryGetValue(name, out longName))\r\n            {" +
-                    "\r\n                return _provider.GetMemberByLongName(longName);\r\n            }" +
-                    "\r\n            return null;\r\n        }\r\n\r\n        override public object Activate" +
-                    "Instance()\r\n        {\r\n            return Activator(); \r\n        }\r\n\r\n        ov" +
-                    "erride public void AddToMap(object instance, object key, object item) \r\n        " +
-                    "{\r\n            DictionaryAdd(instance, key, item);\r\n        }\r\n\r\n        overrid" +
-                    "e public void AddToVector(object instance, object item)\r\n        {\r\n            " +
-                    "CollectionAdd(instance, item);\r\n        }\r\n\r\n        override public void RunIni" +
-                    "tializer() \r\n        {\r\n            global::System.Runtime.CompilerServices.Runt" +
-                    "imeHelpers.RunClassConstructor(UnderlyingType.TypeHandle);\r\n        }\r\n\r\n       " +
-                    " override public object CreateFromString(string input)\r\n        {\r\n            i" +
-                    "f (BoxedType != null)\r\n            {\r\n                return BoxInstance(BoxedTy" +
-                    "pe.CreateFromString(input));\r\n            }\r\n\r\n            if (CreateFromStringM" +
-                    "ethod != null)\r\n            {\r\n                return this.CreateFromStringMetho" +
-                    "d(input);\r\n            }\r\n            else if (_enumValues != null)\r\n           " +
-                    " {\r\n                long value = 0;\r\n\r\n                string[] valueParts = inp" +
-                    "ut.Split(\',\');\r\n\r\n                foreach (string valuePart in valueParts) \r\n   " +
-                    "             {\r\n                    object partValue;\r\n                    long " +
-                    "enumFieldValue = 0;\r\n                    try\r\n                    {\r\n           " +
-                    "             if (_enumValues.TryGetValue(valuePart.Trim(), out partValue))\r\n    " +
-                    "                    {\r\n                            enumFieldValue = global::Syst" +
-                    "em.Convert.ToInt64(partValue);\r\n                        }\r\n                     " +
-                    "   else\r\n                        {\r\n                            try\r\n           " +
-                    "                 {\r\n                                enumFieldValue = global::Sys" +
-                    "tem.Convert.ToInt64(valuePart.Trim());\r\n                            }\r\n         " +
-                    "                   catch( global::System.FormatException )\r\n                    " +
-                    "        {\r\n                                foreach( string key in _enumValues.Ke" +
-                    "ys )\r\n                                {\r\n                                    if(" +
-                    " string.Compare(valuePart.Trim(), key, global::System.StringComparison.OrdinalIg" +
-                    "noreCase) == 0 )\r\n                                    {\r\n                       " +
-                    "                 if( _enumValues.TryGetValue(key.Trim(), out partValue) )\r\n     " +
-                    "                                   {\r\n                                          " +
-                    "  enumFieldValue = global::System.Convert.ToInt64(partValue);\r\n                 " +
-                    "                           break;\r\n                                        }\r\n  " +
-                    "                                  }\r\n                                }\r\n        " +
-                    "                    }\r\n                        }\r\n                        value " +
-                    "|= enumFieldValue; \r\n                    }\r\n                    catch( global::S" +
-                    "ystem.FormatException )\r\n                    {\r\n                        throw ne" +
-                    "w global::System.ArgumentException(input, FullName);\r\n                    }\r\n   " +
-                    "             }\r\n\r\n                return System.Convert.ChangeType(value, System" +
-                    ".Enum.GetUnderlyingType(this.UnderlyingType));\r\n            }\r\n            throw" +
-                    " new global::System.ArgumentException(input, FullName);\r\n        }\r\n\r\n        //" +
-                    " --- End of Interface methods\r\n\r\n        public Activator Activator { get; set; " +
-                    "}\r\n        public AddToCollection CollectionAdd { get; set; }\r\n        public Ad" +
-                    "dToDictionary DictionaryAdd { get; set; }\r\n        public CreateFromStringMethod" +
-                    " CreateFromStringMethod {get; set; }\r\n        public BoxInstanceMethod BoxInstan" +
-                    "ce {get; set; }\r\n\r\n        public void SetContentPropertyName(string contentProp" +
-                    "ertyName)\r\n        {\r\n            _contentPropertyName = contentPropertyName;\r\n " +
-                    "       }\r\n\r\n        public void SetIsArray()\r\n        {\r\n            _isArray = " +
-                    "true; \r\n        }\r\n\r\n        public void SetIsMarkupExtension()\r\n        {\r\n    " +
-                    "        _isMarkupExtension = true;\r\n        }\r\n\r\n        public void SetIsBindab" +
-                    "le()\r\n        {\r\n            _isBindable = true;\r\n        }\r\n\r\n        public vo" +
-                    "id SetIsReturnTypeStub()\r\n        {\r\n            _isReturnTypeStub = true;\r\n    " +
-                    "    }\r\n\r\n        public void SetIsLocalType()\r\n        {\r\n            _isLocalTy" +
-                    "pe = true;\r\n        }\r\n\r\n        public void SetItemTypeName(string itemTypeName" +
-                    ")\r\n        {\r\n            _itemTypeName = itemTypeName;\r\n        }\r\n\r\n        pu" +
-                    "blic void SetKeyTypeName(string keyTypeName)\r\n        {\r\n            _keyTypeNam" +
-                    "e = keyTypeName;\r\n        }\r\n\r\n        public void SetBoxedType(");
+            this.Write(@" GetMember(string name)
+        {
+            if (_memberNames == null)
+            {
+                return null;
+            }
+            string longName;
+            if (_memberNames.TryGetValue(name, out longName))
+            {
+                return _provider.GetMemberByLongName(longName);
+            }
+            return null;
+        }
+
+        override public object ActivateInstance()
+        {
+            return Activator(); 
+        }
+
+        override public void AddToMap(object instance, object key, object item) 
+        {
+            DictionaryAdd(instance, key, item);
+        }
+
+        override public void AddToVector(object instance, object item)
+        {
+            CollectionAdd(instance, item);
+        }
+
+        override public void RunInitializer() => RunInitializerImplementation();
+
+");
+  if (ProjectInfo.UsingCSWinRT) { 
+            this.Write("        [UnconditionalSuppressMessage(\"ReflectionAnalysis\", \"IL2059\",\r\n          " +
+                    "  Justification = \"UnderlyingType (and TypeHandle property) protected at assignm" +
+                    "ent\")]\r\n");
+  }
+            this.Write("        private void RunInitializerImplementation()\r\n        {\r\n            globa" +
+                    "l::System.Runtime.CompilerServices.RuntimeHelpers.RunClassConstructor(Underlying" +
+                    "Type.TypeHandle);\r\n        }\r\n\r\n        override public object CreateFromString(" +
+                    "string input)\r\n        {\r\n            if (BoxedType != null)\r\n            {\r\n   " +
+                    "             return BoxInstance(BoxedType.CreateFromString(input));\r\n           " +
+                    " }\r\n\r\n            if (CreateFromStringMethod != null)\r\n            {\r\n          " +
+                    "      return this.CreateFromStringMethod(input);\r\n            }\r\n            els" +
+                    "e if (_enumValues != null)\r\n            {\r\n                long value = 0;\r\n\r\n  " +
+                    "              string[] valueParts = input.Split(\',\');\r\n\r\n                foreach" +
+                    " (string valuePart in valueParts) \r\n                {\r\n                    objec" +
+                    "t partValue;\r\n                    long enumFieldValue = 0;\r\n                    " +
+                    "try\r\n                    {\r\n                        if (_enumValues.TryGetValue(" +
+                    "valuePart.Trim(), out partValue))\r\n                        {\r\n                  " +
+                    "          enumFieldValue = global::System.Convert.ToInt64(partValue);\r\n         " +
+                    "               }\r\n                        else\r\n                        {\r\n     " +
+                    "                       try\r\n                            {\r\n                     " +
+                    "           enumFieldValue = global::System.Convert.ToInt64(valuePart.Trim());\r\n " +
+                    "                           }\r\n                            catch( global::System." +
+                    "FormatException )\r\n                            {\r\n                              " +
+                    "  foreach( string key in _enumValues.Keys )\r\n                                {\r\n" +
+                    "                                    if( string.Compare(valuePart.Trim(), key, gl" +
+                    "obal::System.StringComparison.OrdinalIgnoreCase) == 0 )\r\n                       " +
+                    "             {\r\n                                        if( _enumValues.TryGetVa" +
+                    "lue(key.Trim(), out partValue) )\r\n                                        {\r\n   " +
+                    "                                         enumFieldValue = global::System.Convert" +
+                    ".ToInt64(partValue);\r\n                                            break;\r\n      " +
+                    "                                  }\r\n                                    }\r\n    " +
+                    "                            }\r\n                            }\r\n                  " +
+                    "      }\r\n                        value |= enumFieldValue; \r\n                    " +
+                    "}\r\n                    catch( global::System.FormatException )\r\n                " +
+                    "    {\r\n                        throw new global::System.ArgumentException(input," +
+                    " FullName);\r\n                    }\r\n                }\r\n\r\n                return " +
+                    "global::System.Convert.ChangeType(value, global::System.Enum.GetUnderlyingType(t" +
+                    "his.UnderlyingType));\r\n            }\r\n            throw new global::System.Argum" +
+                    "entException(input, FullName);\r\n        }\r\n\r\n        // --- End of Interface met" +
+                    "hods\r\n\r\n        public Activator Activator { get; set; }\r\n        public AddToCo" +
+                    "llection CollectionAdd { get; set; }\r\n        public AddToDictionary DictionaryA" +
+                    "dd { get; set; }\r\n        public CreateFromStringMethod CreateFromStringMethod {" +
+                    "get; set; }\r\n        public BoxInstanceMethod BoxInstance {get; set; }\r\n\r\n      " +
+                    "  public void SetContentPropertyName(string contentPropertyName)\r\n        {\r\n   " +
+                    "         _contentPropertyName = contentPropertyName;\r\n        }\r\n\r\n        publi" +
+                    "c void SetIsArray()\r\n        {\r\n            _isArray = true; \r\n        }\r\n\r\n    " +
+                    "    public void SetIsMarkupExtension()\r\n        {\r\n            _isMarkupExtensio" +
+                    "n = true;\r\n        }\r\n\r\n        public void SetIsBindable()\r\n        {\r\n        " +
+                    "    _isBindable = true;\r\n        }\r\n\r\n        public void SetIsReturnTypeStub()\r" +
+                    "\n        {\r\n            _isReturnTypeStub = true;\r\n        }\r\n\r\n        public v" +
+                    "oid SetIsLocalType()\r\n        {\r\n            _isLocalType = true;\r\n        }\r\n\r\n" +
+                    "        public void SetItemTypeName(string itemTypeName)\r\n        {\r\n           " +
+                    " _itemTypeName = itemTypeName;\r\n        }\r\n\r\n        public void SetKeyTypeName(" +
+                    "string keyTypeName)\r\n        {\r\n            _keyTypeName = keyTypeName;\r\n       " +
+                    " }\r\n\r\n        public void SetBoxedType(");
             this.Write(this.ToStringHelper.ToStringWithCulture(Globalize(KnownTypes.IXamlType)));
             this.Write(@" boxedType)
         {
@@ -487,7 +528,7 @@ public void AddEnumValue(string name, object value)
             this.Write(this.ToStringHelper.ToStringWithCulture(GeneratedCodeAttribute));
             this.Write("\r\n    ");
             this.Write(this.ToStringHelper.ToStringWithCulture(DebuggerNonUserCodeAttribute));
-            this.Write("\r\n    internal class XamlMember : ");
+            this.Write("\r\n    internal partial class XamlMember : ");
             this.Write(this.ToStringHelper.ToStringWithCulture(Globalize(KnownTypes.IXamlMember)));
             this.Write("\r\n    {\r\n        ");
             this.Write(this.ToStringHelper.ToStringWithCulture(Globalize(ProjectInfo.XamlTypeInfoNamespace)));
@@ -671,9 +712,43 @@ private void Output_CheckOtherMetadataProviders()
          }                               
          private void Output_TypeTables()     
          {                                       
-this.Write("        string[] _typeNameTable = null;\r\n        global::System.Type[] _typeTable" +
-        " = null;\r\n\r\n        private void InitTypeTables()\r\n        {\r\n            _typeN" +
-        "ameTable = new string[");
+this.Write(@"        string[] _typeNameTable = null;
+
+        class TypeTable
+        {
+            global::System.Type[] _types;
+
+            public TypeTable(int typeCount)
+            {
+                _types = new global::System.Type[typeCount];
+            }
+
+");
+
+  if (ProjectInfo.UsingCSWinRT) { 
+this.Write("            [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicCons" +
+        "tructors)]\r\n");
+
+  }
+this.Write("            public global::System.Type this[int i]\r\n            {\r\n");
+
+  if (ProjectInfo.UsingCSWinRT) { 
+this.Write("                [UnconditionalSuppressMessage(\"ReflectionAnalysis\", \"IL2063\",\r\n  " +
+        "                  Justification = \"TypeTable assignments are protected through s" +
+        "etter\")]\r\n");
+
+  }
+this.Write(@"                get { return _types[i]; }
+                set { _types[i] = value; }
+            }
+
+            public int Length { get => _types.Length; }
+        }
+        TypeTable _typeTable;
+
+        private void InitTypeTables()
+        {
+            _typeNameTable = new string[");
 
 this.Write(this.ToStringHelper.ToStringWithCulture(SchemaInfo.TypeTableFromAllAssemblies.Count));
 
@@ -693,11 +768,11 @@ private void Output_TypeTables()
 this.Write("\";\r\n");
 
          }                                                           
-this.Write("\r\n            _typeTable = new global::System.Type[");
+this.Write("\r\n            _typeTable = new TypeTable(");
 
 this.Write(this.ToStringHelper.ToStringWithCulture(SchemaInfo.TypeTableFromAllAssemblies.Count));
 
-this.Write("];\r\n");
+this.Write(");\r\n");
 
          for(int i=0; i<SchemaInfo.TypeTable.Count; i++)             
          {                                                           
diff --git a/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CSharpTypeInfoPass2.tt b/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CSharpTypeInfoPass2.tt
index bb62b6b377..a442a6b288 100644
--- a/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CSharpTypeInfoPass2.tt
+++ b/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/CodeGenerators/CSharpTypeInfoPass2.tt
@@ -9,6 +9,8 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
+using System.Diagnostics.CodeAnalysis;
+
 <#  if(!Model.GenerateTypeInfo)  #>
 <#  {                                       #>
 // No local types.
@@ -252,12 +254,19 @@ namespace <#=ProjectInfo.XamlTypeInfoNamespace#>
 
     <#=GeneratedCodeAttribute#>
     <#=DebuggerNonUserCodeAttribute#>
-    internal class XamlSystemBaseType : <#=Globalize(KnownTypes.IXamlType)#>
+    internal partial class XamlSystemBaseType : <#=Globalize(KnownTypes.IXamlType)#>
     {
         string _fullName;
+<#  if (ProjectInfo.UsingCSWinRT) { #>
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)]
+<#  }#>
         global::System.Type _underlyingType;
 
-        public XamlSystemBaseType(string fullName, global::System.Type underlyingType)
+        public XamlSystemBaseType(string fullName, 
+<#  if (ProjectInfo.UsingCSWinRT) { #>
+            [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)]
+<#  }#>
+            global::System.Type underlyingType)
         {
             _fullName = fullName;
             _underlyingType = underlyingType;
@@ -302,7 +311,7 @@ namespace <#=ProjectInfo.XamlTypeInfoNamespace#>
 
     <#=GeneratedCodeAttribute#>
     <#=DebuggerNonUserCodeAttribute#>
-    internal class XamlUserType : <#=Globalize(ProjectInfo.XamlTypeInfoNamespace)#>.XamlSystemBaseType
+    internal partial class XamlUserType : <#=Globalize(ProjectInfo.XamlTypeInfoNamespace)#>.XamlSystemBaseType
         , <#=Globalize(KnownTypes.IXamlType)#>
     {
         <#=Globalize(ProjectInfo.XamlTypeInfoNamespace)#>.XamlTypeInfoProvider _provider;
@@ -320,7 +329,11 @@ namespace <#=ProjectInfo.XamlTypeInfoNamespace#>
         global::System.Collections.Generic.Dictionary<string, string> _memberNames;
         global::System.Collections.Generic.Dictionary<string, object> _enumValues;
 
-        public XamlUserType(<#=Globalize(ProjectInfo.XamlTypeInfoNamespace)#>.XamlTypeInfoProvider provider, string fullName, global::System.Type fullType, <#=Globalize(KnownTypes.IXamlType)#> baseType)
+        public XamlUserType(<#=Globalize(ProjectInfo.XamlTypeInfoNamespace)#>.XamlTypeInfoProvider provider, string fullName, 
+<#  if (ProjectInfo.UsingCSWinRT) { #>
+            [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)]
+<#  }#>
+            global::System.Type fullType, <#=Globalize(KnownTypes.IXamlType)#> baseType)
             :base(fullName, fullType)
         {
             _provider = provider;
@@ -384,7 +397,13 @@ namespace <#=ProjectInfo.XamlTypeInfoNamespace#>
             CollectionAdd(instance, item);
         }
 
-        override public void RunInitializer() 
+        override public void RunInitializer() => RunInitializerImplementation();
+
+<#  if (ProjectInfo.UsingCSWinRT) { #>
+        [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2059",
+            Justification = "UnderlyingType (and TypeHandle property) protected at assignment")]
+<#  }#>
+        private void RunInitializerImplementation()
         {
             global::System.Runtime.CompilerServices.RuntimeHelpers.RunClassConstructor(UnderlyingType.TypeHandle);
         }
@@ -445,7 +464,7 @@ namespace <#=ProjectInfo.XamlTypeInfoNamespace#>
                     }
                 }
 
-                return System.Convert.ChangeType(value, System.Enum.GetUnderlyingType(this.UnderlyingType));
+                return global::System.Convert.ChangeType(value, global::System.Enum.GetUnderlyingType(this.UnderlyingType));
             }
             throw new global::System.ArgumentException(input, FullName);
         }
@@ -533,7 +552,7 @@ namespace <#=ProjectInfo.XamlTypeInfoNamespace#>
 
     <#=GeneratedCodeAttribute#>
     <#=DebuggerNonUserCodeAttribute#>
-    internal class XamlMember : <#=Globalize(KnownTypes.IXamlMember)#>
+    internal partial class XamlMember : <#=Globalize(KnownTypes.IXamlMember)#>
     {
         <#=Globalize(ProjectInfo.XamlTypeInfoNamespace)#>.XamlTypeInfoProvider _provider;
         string _name;
@@ -683,7 +702,32 @@ namespace <#=ProjectInfo.XamlTypeInfoNamespace#>
 <#+         private void Output_TypeTables()     #>
 <#+         {                                       #>
         string[] _typeNameTable = null;
-        global::System.Type[] _typeTable = null;
+
+        class TypeTable
+        {
+            global::System.Type[] _types;
+
+            public TypeTable(int typeCount)
+            {
+                _types = new global::System.Type[typeCount];
+            }
+
+<#+  if (ProjectInfo.UsingCSWinRT) { #>
+            [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)]
+<#+  }#>
+            public global::System.Type this[int i]
+            {
+<#+  if (ProjectInfo.UsingCSWinRT) { #>
+                [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2063",
+                    Justification = "TypeTable assignments are protected through setter")]
+<#+  }#>
+                get { return _types[i]; }
+                set { _types[i] = value; }
+            }
+
+            public int Length { get => _types.Length; }
+        }
+        TypeTable _typeTable;
 
         private void InitTypeTables()
         {
@@ -694,7 +738,7 @@ namespace <#=ProjectInfo.XamlTypeInfoNamespace#>
             _typeNameTable[<#=entry.TypeIndex#>] = "<#=entry.StandardName#>";
 <#+         }                                                           #>
 
-            _typeTable = new global::System.Type[<#=SchemaInfo.TypeTableFromAllAssemblies.Count#>];
+            _typeTable = new TypeTable(<#=SchemaInfo.TypeTableFromAllAssemblies.Count#>);
 <#+         for(int i=0; i<SchemaInfo.TypeTable.Count; i++)             #>
 <#+         {                                                           #>
 <#+             InternalTypeEntry entry = SchemaInfo.TypeTable[i];      #>
diff --git a/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/TypeInfoCollector.cs b/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/TypeInfoCollector.cs
index 8493136fb0..3c96b2ac2f 100644
--- a/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/TypeInfoCollector.cs
+++ b/src/src/XamlCompiler/BuildTasks/Microsoft/Xaml/XamlCompiler/TypeInfoCollector.cs
@@ -177,6 +177,19 @@ public void AddMetadataAndBindableTypes(List<Assembly> loadedAssemblies, Assembl
             List<Type> bindableTypes;
             FindAllMetadataAndBindableTypes(loadedAssemblies, localAssembly, out otherProviders, out bindableTypes);
 
+            // We want to ensure that the MUXC IXMP comes first in the list.
+            // We previously ran into an issue where apps that were compiled against a newer version of WinAppSDK and
+            // referenced libraries compiled against an older version of WinAppSDK would run into issues due to the older 
+            // library providing out of date metadata for types in MUXC. We work around this issue by making sure that we
+            // always check the MUXC IXMP first.
+            var indexOfControlsIXMP = otherProviders.FindIndex(p => p.FullName == KnownTypes.XamlControlsXamlMetaDataProvider);
+            if (indexOfControlsIXMP != -1)
+            {
+                var controlsIXMP = otherProviders[indexOfControlsIXMP];
+                otherProviders.RemoveAt(indexOfControlsIXMP);
+                otherProviders.Insert(0, controlsIXMP);
+            }
+
             // This selects all types we found that implement IXMP, 
             // and excludes"local types", which are types that we may have 
             // received in a reference to a static libray (which is treated as local).
diff --git a/src/src/XamlCompiler/Microsoft.UI.Xaml.Markup.Compiler.Core/KnownStrings.cs b/src/src/XamlCompiler/Microsoft.UI.Xaml.Markup.Compiler.Core/KnownStrings.cs
index ced5ad4d0e..103716f898 100644
--- a/src/src/XamlCompiler/Microsoft.UI.Xaml.Markup.Compiler.Core/KnownStrings.cs
+++ b/src/src/XamlCompiler/Microsoft.UI.Xaml.Markup.Compiler.Core/KnownStrings.cs
@@ -114,6 +114,7 @@ internal static class KnownTypes
         public const string InputValidationContext = KnownNamespaces.XamlControls + ".InputValidationContext";
         public const string InputValidationCommand = KnownNamespaces.XamlControls + ".InputValidationCommand";
         public const string InputValidationError = KnownNamespaces.XamlControls + ".InputValidationError";
+        public const string XamlControlsXamlMetaDataProvider = KnownNamespaces.XamlXamlTypeInfo + ".XamlControlsXamlMetaDataProvider";
 
         // Xaml.Controls.Primitives
         public const string ComponentResourceLocation = KnownNamespaces.XamlControlsPrimitives + ".ComponentResourceLocation";
diff --git a/src/src/XamlCompiler/Targets/Microsoft.UI.Xaml.Markup.Compiler.interop.targets b/src/src/XamlCompiler/Targets/Microsoft.UI.Xaml.Markup.Compiler.interop.targets
index ce0a0eab3e..d8fafb1675 100644
--- a/src/src/XamlCompiler/Targets/Microsoft.UI.Xaml.Markup.Compiler.interop.targets
+++ b/src/src/XamlCompiler/Targets/Microsoft.UI.Xaml.Markup.Compiler.interop.targets
@@ -185,9 +185,9 @@ Licensed under the MIT License. See LICENSE in the project root for license info
         <XamlCompilerExePath>$(_MuxPackageToolsFolder)..\net472\XamlCompiler.exe</XamlCompilerExePath>
     </PropertyGroup>
 
-    <UsingTask TaskName="Microsoft.UI.Xaml.Markup.Compiler.Tasks.CompileXaml"                  AssemblyFile="$(XamlCompilerTaskPath)" />
-    <UsingTask TaskName="Microsoft.UI.Xaml.Markup.Compiler.Tasks.AddDefaultXamlLinkMetadata"   AssemblyFile="$(XamlCompilerTaskPath)" />
-    <UsingTask TaskName="Microsoft.UI.Xaml.Markup.Compiler.Tasks.GetXamlCppIncludeDirectories" AssemblyFile="$(XamlCompilerTaskPath)" />
+    <UsingTask TaskName="Microsoft.UI.Xaml.Markup.Compiler.Tasks.CompileXaml"                  AssemblyFile="$(XamlCompilerTaskPath)" Override="true" />
+    <UsingTask TaskName="Microsoft.UI.Xaml.Markup.Compiler.Tasks.AddDefaultXamlLinkMetadata"   AssemblyFile="$(XamlCompilerTaskPath)" Override="true" />
+    <UsingTask TaskName="Microsoft.UI.Xaml.Markup.Compiler.Tasks.GetXamlCppIncludeDirectories" AssemblyFile="$(XamlCompilerTaskPath)" Override="true" />
 
     <UsingTask TaskName="Microsoft.UI.Xaml.Markup.Compiler.IO.InputSerializer"       AssemblyFile="$(XamlCompilerJsonTaskPath)" />
     <UsingTask TaskName="Microsoft.UI.Xaml.Markup.Compiler.IO.OutputDeserializer"       AssemblyFile="$(XamlCompilerJsonTaskPath)" />
diff --git a/src/src/projection/Directory.Build.props b/src/src/projection/Directory.Build.props
index 633a32ff8a..6c2f6a7d96 100644
--- a/src/src/projection/Directory.Build.props
+++ b/src/src/projection/Directory.Build.props
@@ -8,6 +8,11 @@
     <NoWarn>0108,0618,0628,8305</NoWarn>
     <LangVersion>preview</LangVersion>
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+
+    <!-- Both the IID optimizer and the CsWinRT lookup table aren't needed with the new CsWinRT version,
+         so disabling them here until they are disabled automatically by CsWinRT. -->
+    <CsWinRTIIDOptimizerOptOut>true</CsWinRTIIDOptimizerOptOut>
+    <CsWinRTCcwLookupTableGeneratorEnabled>false</CsWinRTCcwLookupTableGeneratorEnabled>
   </PropertyGroup>
 
   <ItemGroup>