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