Merge "Fix NPE in BatteryStats.dump" into main