Merge "Take hinting into account when caching fonts Bug #9464403"