Merge "Synchronize listeners in ConfigurationControllerImpl" into main