Merge "[NotificationManagerService]: Fixes the thread-safe issue."