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

Change-Id: Ib517c495cd53a5ea0f14bb443b74d69d2efe8429