Merge "audio: fix AEC/NS effect control"