Merge "Allow for streaming of media files (without recompression)" into jb-mr2-dev