Merge "Fix crash in UndoManager after parceling TextView"