Merge "Stop making copies when updating input channels" into tm-qpr-dev