Merge "Inline & privatize methods in NotificationEntryManager"