Merge changes from topic 'battery3'

* changes:
  Fix regression in battery size.
  Clean up BatteryMeterDrawable internal api.