Merge "Clarifies usage of ContextHubClientCallback APIs"