Merge "Avoid transcoding for MediaProvider itself"