Merge "Fixed an issue where heads-upped notifications would stay"