Lando Norris has committed his Formula 1 future to McLaren by extending his contract until the end of 2025.