Merge "Editor uses a SpanWatcher to track EasyEditSpans"