Merge "Touchpad: Cleanup after PointerChoreographer refactor" into main