H1b-h4-h1b visa interview or IWP?


I have a previous h1b from employer A which I had stamped in my home country. I then took a break for 6 months and moved to h4. My previous h1b a stamp that says “cancelled without prejuduice”. My current employer B, restarted my H1b and i have approved i797 valid till 2021. I am planning to go to my home country. would i have to go for in person interview or will i be eligible for Waiver program?

Ds-160 in step 7 asked the question “if i have a previous h1b?”. I said yes because i had one stamped back in 2015. Should I be saying “No” since i moved to H4?

Thanks in advance!