Merge "fix(non linear font scaling): fix flaky test timing out" into main