Merge "Fix compaction unsafe DescribeWait"