Merge "Fix large font display issues." into main