Merge "Remove unused fields from the NotificationEntry" into main