Merge "Remove TouchState::split variable"