Merge pull request #9356 from JosJuice/android-save-ingame-change Android: Correctly save in-game settings changes to disk