Merge "Fixing a couple crashes in the SoundTriggerTestApp" into pi-dev