Merge "Avoid default SkFont in tests" into main