Merge "Annotate fonts.xml with intended scripts" into nyc-dev