Merge "Make sensor direct channel creation more robust" into main