Merge "IServiceManager: Improve getService responsiveness in absence of service"