Merge "Add flag for ongoing notif features" into main