Merge "Fix in-place audio format conversion issues" into pi-dev