Merge "CallControl & CallEventCallback should use CallEndpoint routing"