Merge "InputReader: Cleanup after PointerChoreographer refactor" into main