Merge "Let MasterSwitchPreference be restrictable"