Merge "Add battery history to BatteryStatsUsage" into sc-dev