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

* commit 'c18009e6dd32f04fdad7f1b27a0a6b52ee5c875c':
  Revert "Request re-layout after setText if layout width is 0"

Change-Id: I701dbebcde81f535db42da7292db8c7a26121f81