Moving context.WithoutCancel
outside defer.
#17260
+30
−19
Merged