Merge branch 'sfc-siena-fix-some-efx_separate_tx_channels-errors'