Merge "Fixed a bug where the scrim could flash black when snoozing huns" into nyc-dev