Resolve #3533905 "Restore layout"

christian.wiedemannrequested to merge
issue/ui_patterns-3533905:3533905-restore-layout into 2.0.x

Closes #3533905

Merge request reports