Merge "Fixed a bug where the scrim could flash black when snoozing huns" into nyc-dev am: 7fc88ac214
am: 8a87d24e96

* commit '8a87d24e968e367c3f3878371f744ebc0a33b257':

Change-Id: Ieecb7d00d3f26ec371687ccaa855ec5e0b9358be