Merge "Untangle BatteryStats lock"