[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: 802c4dd9 -s ours am: aba42c7f -s ours
am skip reason: Change-Id I8217a0fa9a08f94b98121d6584fafab1bca88b4d with SHA-1 7a66c7b3 is in history

Change-Id: I321b51ac91efb807ea7bac7383ddb84e6262325a