Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content"