Merge pull request #9009 from JosJuice/android-settings-recreation Android: Fix SettingsActivity lifecycle management
