Merge "Add wait_for_interface_detach method"