Merge "Remove race from wait_for_interface_detach waiter"