Merge "Fixed an issue where notifications weren't dismissed properly"