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

Change-Id: I2f31b0a2e9d2426b6a22924b2f19ccf7590f86d0