Merge "Use fonts_fallback XML only when flag is ON." into main