Merge "Fixed a bug where notifications could reappear" into nyc-dev