Merge "Fix tinting of battery percentage" into qt-dev
am: c34f078f61

Change-Id: I1e1778605b7415e2360d80d51c09f3d7faa8a664