Merge "Fix fonts following 455f1bfc05" into oc-dev