Merge "BatteryMonitor: Ensure batteryHealthData has value when needed" into main