Merge "Fixed a bug where notifications could reappear" into nyc-dev am: 4226dcef1e am: 96b67bcd1c
am: 0d68c55d17

Change-Id: Ibcd0f4507e98bc6af8cd3252c78b197b698dd2b0