uhd: squashed per-channel stream support
Merge branch 'master' into next