Merge "Consolidate tracking of touch state in Editor (editable TextView)"