Merge "Add BatterySaver as SettingSlice"