Merge "Touch: Cleanup after PointerChoreographer refactor" into main