Merge "Revert "Improvements to TextView Ctrl-Z undo support""