H-1 to H-4 to H-1: Eligibility for Interview Waiver Program (Dropbox)

[Buckeye_OH]

Hello all, 

1. I was originally on an H-1B visa, which started in October 2016 and was valid until August 2019. I have this visa stamped in my passport. 
2. I switched from H-1B to H-4 last year along with H-4 EAD. 
3. I'm planning to do a COS from H-4 to H-1B next month (June 2019) and then travel to India in July 2019. 

Based on the above, here are my questions: 
1. Is my previous H-1B visa stamp (expiring in August 2019) still valid for me to enter the US with a new H-1B I-797 in July 2019? 
2. If I do decide to get the latest visa (new H-1B which will be a COS from H-4) stamped in my passport, would I be eligible for the Interview Waiver Program (Dropbox) since the previous visa stamped in my passport is an H-1B visa?

[adshah84]

Yes and Yes

[Buckeye_OH]

Thanks for your response adshah84!