Merge "SoundTrigger owner cleanup"