Merge "Change the metric category of "Display size and text" in SuW." into tm-dev