Merge "fix(non linear font scaling): restore font scale to default instead of original" into udc-dev