Merge "Fixed a bug where the scrim could flash black when snoozing huns" into...
Merge "Fixed a bug where the scrim could flash black when snoozing huns" into nyc-dev am: 7fc88ac2 am: 8a87d24e
am: 779b41bd
* commit '779b41bd':
Change-Id: Ie07d195f29e50f226b3d79e1c26bee1a894f97f5