Merge "Fix broken test NotificatonSectionsFeatureManagerTest" into rvc-dev