Merge "runtime: Properly unload partially loaded image spaces" into oc-dev