Merge "Polish and humanize the strings for the confirm dialog of "Display size and text"." into tm-dev