Merge "fix(high contrast text): fix text cursor, spellcheck, etc not visible" into main