Merge "Use generated font_fallback XML" into main