Merge "PointerController: Cleanup after PointerChoreographer refactor" into main