Another point: I just found this on Tematic.
'Nationals of USA holding confirmed onward tickets for a max. transit time of 48 hours, provided arriving at and departing from Shanghai Hongqiao (SHA) or Pu Dong (PVG) airports.
Holders of confirmed onward tickets for a max. transit time of 24 hours.
All transiting passengers are subject to passport control.
Leaving the airport transit area is allowed.'
Does this mean it's actually possible to leave the airport as long as there's an onward ticket and the stay is less than 24 hours?
Also, I'm a dual-American/Israeli citizen. I have a long-term Thai visa on my American, but can I just use the Israeli passport to exit and enter the airport once in CAN?