Merge "wpa: Terminate on callback client death"