Merge "Wire opendir to go through MediaProvider"