Fix preservation of foreign elements on paragraph merge

This behaviour was working prior to the merge paragraph operation being introduced. A new edge case was introduced related to cleaning up empty spans that caused this to regress.
Not quite sure I follow? Merge shouldn't have created any empty spans (in theory) as a merge shouldn't be removing any ODF content on it's own. Only merging two paragraphs into one.