Merge commit 'e6bb8325b55cc1087d84004166a97d2b9bef98bb' * commit 'e6bb8325b55cc1087d84004166a97d2b9bef98bb': Patch from HTC related to use of camcorder with wired headset plugged in: