Merge "fix(non linear font scaling): fix test timeout flakiness" into udc-dev