Merge "Fix AppBatteryPreferenceControllerTest test fail" into sc-dev