Merge "Clarify text shown in a11y service warning dialog"