Merge "Refactors client callback methods in ContextHubClientBroker"