Merge "Make /data/media case insensitive"