Merge "Always suppress font error during resource loading"