Merge "Fixed a bug where a notification could be stuck in the overlay" into...
Merge "Fixed a bug where a notification could be stuck in the overlay" into nyc-dev am: 2fba2291 am: 48eb3702
am: 05671232
* commit '05671232':
Fixed a bug where a notification could be stuck in the overlay
Change-Id: I89cebb051980d729a2eb9f4e49a93055959bfd07