Merge "Disable font test temporarily" into oc-dev