Merge "Do not slip touch into window with same input channel" into udc-dev