Merge "Create new NotificationClassificationUiFlag class" into main