Merge "Fix tinting of battery percentage" into qt-dev