Merge "Synchronize access to mNotificationsByKey"