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