Merge "Standardize MasterSwitchPreference attr order."