Merge "Fixed an issue where the scrim could be lost" into nyc-dev