Merge "Ensure channel receives a consistent touch stream" into udc-dev