Merge "Font API clean up" into oc-dev