Merge "Add test for Ctrl-Z undo in editable TextViews"