Merge "Avoid duplicate map lookups in RemoteConnectionManager." into main