Merge "Listen to capability discovery settings in the registry" into rvc-dev