Merge "Check that alpha is zero instead of transparent color to decide scrim" into qt-dev