Mexico GP to remain at least to 2022