Merge "Ensure single-step always causes global deopt"