Merge "MainSwitchPreference minor fix"