Merge "Fixed a bug where the scrim could flash black when snoozing huns" into nyc-dev am: 7fc88ac214 am: 8a87d24e96
am: 779b41bd64
* commit '779b41bd64dd748039a818fdfcc714ff181bd0a6':
Change-Id: Ie07d195f29e50f226b3d79e1c26bee1a894f97f5
This commit is contained in: