Merge "fix(high contrast text): fix solid rectangle background obscuring other text in the same layout pass" into main