Merge "Do not save TextView text when freezesText is false" into nyc-dev