Merge "Add render moved paragraphs marker in diff view"