Merge "ContextHubService: Simplify hubId logic, ensure type correctness"