Merge "fix(high contrast text): fix grey text sometimes getting lighter when it should get darker and vice-versa" into main