Formula One's iconic Monaco Grand Prix will remain on the calendar until at least 2031 after a six-year extension was announced on Thursday with a date change to June that also avoids future clashes with the Indianapolis 500.