You will still have non-qualifying use in that latter scenario because you moved into the home that was formerly used as a rental.
Your suspended passive losses should be released on the taxable sale to a third party.
There is a good site (link below) that posits a few hypotheticals.
https://www.merriman.com/wealth-preservation/planning-on-moving-back-into-your-rental-in-the-future-...
