Merge "Remove subclasses of NotificationEntryManager"