Merge "NotificationManagerService: add right lock for some methods." into main