Merge "Remove non-split touch from input code" into main