Merge "Add AppBatteryPreference for Spa"