The Canadian Grand Prix in Montreal will remain on the F1 calendar until 2035 after a four-year extension.