Merge "Fixed an issue where heads-upped notifications would stay" into nyc-mr2-dev am: e89a950b8b
am: ac0d22f4ce  -s ours

Change-Id: Iee2e3512eb816ec9865038ffc918b698d38c30fc