Merge "Revert "TextView setText/append methods set movement method"" into nyc-dev