Merge "Use empty BatteryDiffData instead of null to avoid NullPointerException" into main