Merge "ServiceManager: Check guaranteeClient before unregistering services" into rvc-dev