Merge pull request #12076 from JosJuice/android-when-or Android: Fix SettingsActivity.onActivityResult
