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

Change-Id: I7da1a69f7f51d472e5402a2b75dd080e1e4af83d