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