Merge pull request #9089 from JosJuice/android-orientation-setting Android: Move orientation setting to main settings screen
