Merge "Making "Battery Saver" use MasterSwitchPreference."