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: I2c0b8b910f5cd5de82f3b6831b9dd9166a280dc1