Merge "Revert "Request re-layout after setText if layout width is 0"" into nyc-dev am: c18009e6dd
am: 938055b122

* commit '938055b12209028be0ff36d0eb81892c443f0b60':

Change-Id: I236a44a16b2876bceb0a6a00768053fc1e7a4b73