Merge "Move wait_for_interface_status into _check_interface"