Merge "Add proper locks in the AppBatteryTracker"