Merge "Fix getVolumeName with secondary volume issue in MediaStore"