Merge "fix(high contrast text): fix highlight/selection is obscured by high contrast text background rectangle" into main