Merge "Update targetRect when font axes change" into main