Include nested content when swapping or moving FOLDED sections

Related feature requests: