Merge "Fixed an issue where a notification may not be updated"