Merge "Always split touches" into main