Merge "Bug 5428541: Check that span is still in text before deleting" into ics-mr0