Merge changes from topic "update_battery_icon" into qt-qpr1-dev am: c08f70b7dd

Change-Id: I73ebb69f6bfcff8c3c09b8768dd48c9124d67594