Merge pull request #16938 from crdlc/bug-978011

Bug 978011 - Unload properly Image Loader when syncing/importing