Merge "Add getUri() for streaming"