Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev