Merge pull request #8288 from allanxp4/master Fix for Android version crashing when changing rotation on settings screen
