Merge "Remove FUSE special case when starting MediaProvider"