Merge "Pointer Icon Refactor: Fix CursorInputMapperUnitTests with flag enabled" into main