Apply MediaProvider external storage fixes