Merge "Revert "Always suppress font error during resource loading""