Thailand passport holder transiting via Guangzhou (CAN)

Flying BKK -> CAN -> YVR with only a 2 hour layover, do you need a Transit Visa (G)? I was told Xiamen Airpot started requiring it for Thai passport holders for even short international transfers so I am a bit concerned the rules changed.