Merge "Fix NPE in NotificationMgr"