Merge "Nearly remove NotificationSectionsFeatureManager" into main