Merge "Fixed a bug where a notification could be stuck in the overlay" into nyc-dev am: 2fba229166
am: 0d33e08779
* commit '0d33e0877903a6791a6c2e2e3ab9c89695e0555a':
Change-Id: Ifcaec781b920725759c30ea7f4607638acfbd727
This commit is contained in: