Formula 1 has confirmed that Bahrain will stay on the calendar until 2036 inclusive following agreement with the promoter, the Bahrain International Circuit, to extend its contract.