If Iyara na possible, then exit Qatar and come back with the new visa, you mentioned they've give you an NOC. Simple as that!