helpers: fix move_contents_to() not moving air

fixes #5232

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
(cherry picked from commit 38c5b380172cf362fb6e55185c177b688442326a)
Merge remote-tracking branch 'origin/base' into develop