Merge "Fix several issues with the "EasyEditSpan"."