Fixed a bug where notifications could reappear am: f3b64692a3 am: e90d6d682e
am: ed596e6836

Change-Id: I430e38bcba8b741fe2b43c5dba6f1d2a3f38d5a0