Merge "fix(high contrast text): fix test tolerances" into main