Merge "Fix race condition between VDM and ProxyManager when registering a proxy" into main