Merge "Font provider cleaning ups." into oc-dev