Merge "Use MasterSwitchPref vs subclass"