Merge "Remove KQS touch handling outside its bounds" into main