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

Change-Id: Iac49fa43c932e66f1f437c06cab9f32cb16dcab1