Merge "Fix flashing of the scrim" into nyc-dev