Merge "Fix hyphenation in dialog_with_icon.xml" into main