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

Change-Id: If35ea6e4c2864f83f22a50f02b14cc62747157d1