Merge "Add color overlays to build." into qt-dev