Merge "Cleanup ContexthubService implementation"