Merge "x86_64: Fix 079-Phantom hang with QCG enabled"