[automerger skipped] Merge "Do not accept NaN as scrim values" into...

[automerger skipped] Merge "Do not accept NaN as scrim values" into qt-qpr1-dev am: e8788abc -s ours am: 1342da18 -s ours am: beeec9ce -s ours
am skip reason: Change-Id I8217a0fa9a08f94b98121d6584fafab1bca88b4d with SHA-1 bc384690 is in history

Change-Id: I64fa4d60612edb501c0c87f1ecbd324b8ba8246f