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
* commit '8a87d24e':
Change-Id: Ieecb7d00d3f26ec371687ccaa855ec5e0b9358be