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

Change-Id: Ic671da92251b3058e8f13395bebf7a44f3dc0cc3