Merge remote-tracking branch 'origin/DF-4558_Control_child_controls_contents_missing_after_redo' into development (reverse-merged from commit a1ba53e9bf8b969c399ef6835b52dfb3f60b8421)

Additional review needed due to fix for task DF-4978.