Merge "Convert UserPowerCalculator to work with BatteryUsageStats" into sc-dev