Merge "Remove color extraction from scrims" into qt-dev