Merge "NativeInputManager: Cleanup after PointerChoreographer refactor" into main