China-Canada tensions simmer ahead of G20 in Indonesia