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

Change-Id: I7c3c46bf360899387a0d2d33d4beb83a3b096aa0