Merge "AudioFormat: Uncomment conversion for EAC3-JOC" into pi-dev