Merge "Fix battery color tint issue." into qt-dev