Merge "LazyServiceRegistrar: Add flag to prevent shutdown"