Fixed an issue where heads-upped notifications would stay am: 23301afb8e
am: 2bc30ead52  -s ours

Change-Id: I42f565b8fb4019c7cb27faae3d7d3757bd7b2d92