Merge "LazyServiceRegistrar: race w/ register & onClients" into sc-dev