Merge "Fix lock contention in ResourcesManager"