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

* commit '0499f90a2d2774f28ca3d430dfe563391669c515':
  Bug 5428541: Check that span is still in text before deleting