Merge changes from topic 'battery_string_main_screen'

* changes:
  Add lower case charging string.
  Add showChargingMethod in BatteryInfo