Revert of Support modal windows

athena/main/athena_launcher.cc

Index: athena/main/athena_launcher.cc
diff --git a/athena/main/athena_launcher.cc b/athena/main/athena_launcher.cc
index 28059df2cd959bcbc084f68c675b1cb64b0ce58d..2634489e99b74374b55af2ac24e94d18dca1d2c4 100644
--- a/athena/main/athena_launcher.cc
+++ b/athena/main/athena_launcher.cc
@@ -115,8 +115,8 @@
 
   athena::InputManager::Create()->OnRootWindowCreated(root_window);
   athena::ScreenManager::Create(root_window);
+  athena::SystemUI::Create(blocking_task_runner);
   athena::WindowManager::Create();
-  athena::SystemUI::Create(blocking_task_runner);
   athena::AppRegistry::Create();
   SetupBackgroundImage();
 
@@ -166,8 +166,8 @@
     session_started = false;
   }
   athena::AppRegistry::ShutDown();
+  athena::WindowManager::Shutdown();
   athena::SystemUI::Shutdown();
-  athena::WindowManager::Shutdown();
   athena::ScreenManager::Shutdown();
   athena::InputManager::Shutdown();
   athena::AthenaEnv::Shutdown();