Merge "Add new preference class MasterSwitchPreference."