Revert "Merge branch 'user/jessecol/calc-app-compactoverlay' of https…

…://github.com/microsoft/WindowsAppSDK-Samples into user/jessecol/calc-app-compactoverlay"

This reverts commit 5d3b8c0, reversing
changes made to 41c6b9c.

Samples/Islands/DrawingIsland/DrawingCppTestApp/WinMain.cpp

@@ -21,30 +21,25 @@ int __stdcall wWinMain(HINSTANCE, HINSTANCE, PWSTR, int)
     auto controller{ winrt::DispatcherQueueController::CreateOnCurrentThread() };
     auto queue = controller.DispatcherQueue();
 
-    auto compositor = winrt::Compositor();
-    auto island = winrt::DrawingIsland(compositor).Island();
-
-    // Associating the AppWindow with the DispatcherQueue on which the ContentIsland is created
-    // will ensure that the ContentIsland is Closed when the AppWindow closes.
     auto window = winrt::AppWindow::Create();
     window.AssociateWithDispatcherQueue(queue);
-    window.Closing(
-        [queue](auto&&, auto&&)
+    window.Closing([&](auto&&, auto&&)
         {
-            // Ensure the DispatcherQueue exits the event loop on close.
             queue.EnqueueEventLoopExit();
         });
 
     window.Title(L"Drawing C++ TestApp");
     window.Show();
 
-    // Create a ContentSiteBridge and connect the ContentIsland to it.
+    auto compositor = winrt::Compositor();
+    auto drawing = winrt::DrawingIsland(compositor);
+
     auto siteBridge = winrt::DesktopChildSiteBridge::Create(compositor, window.Id());
     siteBridge.ResizePolicy(winrt::ContentSizePolicy::ResizeContentToParentWindow);
     siteBridge.Show();
-    siteBridge.Connect(island);
+    siteBridge.Connect(drawing.Island());
 
-    // Move initial focus to the ContentIsland.
+    // Move initial focus to the island.
     auto focusNavigationHost = winrt::InputFocusNavigationHost::GetForSiteBridge(siteBridge);
     focusNavigationHost.NavigateFocus(winrt::FocusNavigationRequest::Create(
         winrt::FocusNavigationReason::Programmatic));

Samples/Islands/DrawingIsland/DrawingCsTestApp/Program.cs

@@ -37,16 +37,10 @@
     var lottie = LottieIslandScenario.CreateLottieIsland(compositor);
     siteBridge.Connect(lottie.Island);
 }
-else if (args.Contains("Duck"))
+else if (args.Contains("SceneNode"))
 {
     // SceneNodeIsland
-    var island = DuckScenario.CreateIsland(compositor);
-    siteBridge.Connect(island);
-}
-else if (args.Contains("Helmet"))
-{
-    // SceneNodeIsland
-    var island = HelmetScenario.CreateIsland(compositor);
+    var island = SceneNodeScenario.CreateIsland(compositor);
     siteBridge.Connect(island);
 }
 else