Merge "Do more stuff w/o ImfLock in onFinishPackageChangesInternal()" into main