Merge "Do not accept NaN as scrim values" into rvc-dev am: 919e1f7776

Change-Id: I161a85d13529db6faf0d2a839bb69d2050a0b523