Merge "Reland: Improvements to TextView Ctrl-Z undo support"