Can Modi's G7 Canada Visit Smooth Over Ripples from Trudeau Era?