Merge "audio policy: fix global effect attachment" into oc-dev