Merge "Changed the way the ellipsizing of text is measured" into pi-dev
am: 497fa8b8ab

Change-Id: I65cf2e2ca592616f68811f80dee92e786a93329c