Merge "Revert "Update fonts.xml with user customization fonts.""