Merge "Do not accept NaN as scrim values" into qt-qpr1-dev