Merge "Fixed a bug where a notification could get removed"