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

Change-Id: I993be517e322fc22c9f44da66d917825eba98c2d