Transit in Guangzhou - Eligible for Visa-free?

So, my flight plan is probably going to be:

Bali-Guangzhou-Nagoya

and usually this would qualify for the free transit 24 hours in Guangzhou. However, though it seems the Guangzhou to Nagoya leg actually has a short layover in Shanghai. Does this make a difference? The route could end up being:

Bali-Guangzhou-Shanghai-Nagoya

So it's not a case of inbound and outbound being different from China this way, instead being A Country-B Country-B Country-C Country. So I'm a little confused!

Thanks for your help!