Merge "Fix VDEX header when no quickening info"