Merge "handle supplicant stop after child states exit"