Merge "Consistently close BatteryUsageStats objects" into main