Merge "Audio V4: Add V2 XML in V4 effect" into pi-dev