Merge "Fix undo of text pasted into TextView with TextWatcher"