Merge "Refactors IContextHubWrapper to use ContextHubInfo"