Merge "Fix NPE in SettingsMainSwitchPreference." into sc-dev