British driver Norris extends contract with McLaren until 2025