Mason Greenwood has signed a new Manchester United contract until June 2025 with the option for a further year.