PIM-3151: Refactor NotificationEvent into Notification