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: c91da733
* commit 'c91da733':
Fixed a bug where the scrim could flash black when snoozing huns
Change-Id: I513c76ed5bf5e0a72aa7db1cdcf15043172d66de