Merge "Fixed a bug where a notification could be stuck in the overlay" into nyc-dev