Merge "Fix a missing synchronization to Notification"