Merge "Fix lock order issue with large-object space lock"