Merge "fix(high contrast text): fix background rect overlaps other characters with multiple spans" into main