Merge "[A11y] Fix text clipped for back botton in helper dialog." into main