Merge "Fix bug in setText" into nyc-dev