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