Fixed an issue where heads-upped notifications would stay
am: 23301afb8e

Change-Id: I04e8cf3ba5a0f44390c53867a43dacd22812da4e