Merge "resourceloader: Release saveFileDependencies() lock on rollback"