Merge pull request #9230 from JosJuice/android-savesettings-onstop Android: Call saveSettings in EmulationActivity.onStop