PIM-3151: Refactor Notification into UserNotification