Merge "Add tests for some split touch cases" into tm-dev