Merge "Introduce ActiveNotificationModel data model" into main