Merge "Fix concurrency issue with BatteryUsageStats"