Merge "Fixed a bug where the scrim could flash black when snoozing huns" into nyc-dev am: 7fc88ac214
am: c91da73326

* commit 'c91da7332696afc6fc3594cb9e090c2897109f49':
  Fixed a bug where the scrim could flash black when snoozing huns

Change-Id: I513c76ed5bf5e0a72aa7db1cdcf15043172d66de