Merge "Use separate Uris for MTP to the media provider files table"