Merge "Wire file creation to go through MediaProvider"