Merge "Stop supporting broken font fallback"