Merge "Use QueuedNotificationManager to dispatch tasks"