Merge "BatteryUsageStats - use bus end time" into sc-dev