Merge "Fix race condition in PointerControllerTest" into main