Merge "Support non-system Font Providers"