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

Change-Id: Ia3bf3dc5d7c8bdcf6246321195a4f47628a37dcf