Merge "Fix the default battery drain monitor window size in AppBatteryTracker" into tm-dev