Merge "Fix issue where scrim color event would be skipped" into qt-dev am: a288fae7cb
am: 7c8536cea3

Change-Id: Ib9a6076a0ffce214bd438ace9bbae1ab9ec7f690