Merge "Add showChargingMethod in BatteryInfo" into oc-dev