Hello - I was just wondering if we would qualify for The Visa Free Transit through Shanghai?

Our flight plan is as follows:

Chicago > SH (Arrive Saturday, Leave Thursday - 6 day stay)
SH > Bangkok
Bangkok > SH (4 hour layover) > Chicago

I know that we would qualify for it from a technicality standpoint on the way out there since we have a ticket showing that we're flying to a different country than our original, but my question lies in the fact that we have the layover on the way home. Will that effect our ability to qualify for this?

Thank you in advance!