Request closing the app on android in better place, so that it handles both - quit button and escape pressed.

src/states_screens/main_menu_screen.cpp

@@ -407,11 +407,7 @@ void MainMenuScreen::eventCallback(Widget* widget, const std::string& name,
     }
     else if (selection == "quit")
     {
-        #ifdef ANDROID
-        ANativeActivity_finish(global_android_app->activity);
-        #else
         StateManager::get()->popMenu();
-        #endif
         return;
     }
     else if (selection == "about")

src/states_screens/state_manager.cpp

@@ -240,9 +240,13 @@ void StateManager::onTopMostScreenChanged()
 
 void StateManager::onStackEmptied()
 {
+    #ifdef ANDROID
+    ANativeActivity_finish(global_android_app->activity);
+    #else
     GUIEngine::cleanUp();
     GUIEngine::deallocate();
     main_loop->abort();
+    #endif
 }   // onStackEmptied
 
 // ============================================================================