Merge "Revert "Return the registry in registerNetworkAgent."" into main