Merge "Canonicalize ringtones before returning." into qt-dev