Spat with Trudeau upsets Xi’s choreographed return to limelight