Merge "Fix race condition in NotificationListener"