Merge pull request #7292 from mahdihijazi/settings_refactor Android: Settings refactor & Fix custom game settings
