Merge "XML Support for non system font providers"