Merge "Fix audio effect framework issues"