am 1e444092: Merge "Ellipsize long text and use the framework switch" into gb-ub-photos-bryce

* commit '1e44409206f164fdd2b3cb1bec5bda8ef17806f6':
  Ellipsize long text and use the framework switch