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: 0d33e087
am: 4ded23e0
* commit '4ded23e0':
Change-Id: Id396d3e91b90ae563103223ecfd13a18ed0f48b4