Merge "ContextHubManager: Rename Callback class." into nyc-dev