Merge "Fix BatteryStats Screen On timer reset" into sc-dev