Merge "Ringtone uri should add type query"