Merge "Fix wrapping when zoom or large font is used" into main