Merge "LazyServiceRegistrar: Add flag to prevent shutdown" into rvc-dev