Merge "AudioFlinger: fix regression on device effect introduced locking order" into main