core: make sure to restore the control command id, too
Fixes: #15356
(cherry picked from commit e9da62b18af647bfa73807e1c7fc3bfa4bb4b2ac)
Resolves: #1829867
patch_name: 0434-core-make-sure-to-restore-the-control-command-id-too.patch
present_in_specfile: true
location_in_specfile: 434
squash_commits: true