Merge "Make StopRecur test hardened against move-exception"