Merge "Move shouldSplitTouch into anonymous namespace" into main