Merge "Make sure scrims will fade from black" into qt-r1-dev