Merge "InputManager: Cleanup after PointerChoreographer refactor" into main