Merge "Revert "Ringtone uri should add type query""