Merge "NotificationEntryListener: pre & post onEntryUpdated"