Merge changes from topic "update_battery_icon" into qt-qpr1-dev

* changes:
  Sync dimen from SystemUI
  Battery icon is too large