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

Change-Id: I3596b2d9182a967896b122c653b5a42c713838aa