Merge "audioflinger: fix effect disconnect deadlock"