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

Change-Id: I852f59db3a02df586098d5faa2f96ee59ee56c74