Merge "BatteryService: Typo fix ("Charing" -> "Charging")" into main