Merge "Revert "Request re-layout after setText if layout width is 0"" into...
Merge "Revert "Request re-layout after setText if layout width is 0"" into nyc-dev am: c18009e6 am: 553aae25
am: 66850473
* commit '66850473':
Revert "Request re-layout after setText if layout width is 0"
Change-Id: I9511aced9abc8d8c250959069bfe8a862eb29689