Merge pull request #9454 from JosJuice/android-ingame-settings-save Android: Fix in-game settings changes not getting saved