Merge "Remove automatic addition of AC3, IEC61937 to HDMI outputs"