Merge "chore(non linear font scaling): add FontScaleConverter tests to presubmit"