Merge "fix(high contrast text): draw a solid rectangle background behind text instead of a stroke border" into main