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

* commit 'a68351bb867e6b65bd92a7ba7a0d26880b3898e9':

Change-Id: Ifca7ff639a3b10898f512931d9cb206c7adaf0e9