Merge "fix(non linear font scaling): increase timeout to fix flaky test" into main