Merge "Changed the way the ellipsizing of text is measured" into pi-dev