Merge "LazyServiceRegistrar: race w/ register & onClients"