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

Change-Id: I9f7b82cfd7cd13eaf480110dcfb90822aee0d28f