Merge changes from topic "siyamed_maxlines" into oc-mr1-dev

* changes:
  StaticLayout capped height should be 0 when maxLines=0
  Reset StaticLayout.mEllipsized during generate()