Merge "Use PostScript name as a key of updated font map" into sc-dev