Merge "Add discharge power estimates to BatteryUsageStats" into sc-dev