Merge "Reorganize font enumeration API." into oc-dev