Merge changes from topics 'roozbeh-b31537595-thirdtry', 'roozbeh-b64372088'

* changes:
  Make ellipsize retry if text doesn't fit
  Reset StaticLayout.mEllipsized during generate()