Merge "SoundTriggerHelper: fix state after audioserver death" into qt-qpr1-dev