Merge "Uncanonicalize URIs when searching for audio-coupled haptics." into qt-dev am: eeffe0c9dd
am: df23df8420

Change-Id: Iebbed11b507995081d69262c7cb9b7d75ed87166