Merge "Synchronize access to BatteryStatsHistory" into main