Merge "Accumulate battery usage stats incrementally" into main