Merge "Fix deadlock between APS and sound trigger middleware" into rvc-dev