Another part of AMD's 2020-2022 roadmap has leaked, detailing several codenames and specifications. Navi2-based APUs will arrive in 2021, but it won't be until 2022 when we see laptop APUs with Navi graphics. Zen 3 will debut with Cezanne and Warhol too.
https://www.notebookcheck.net/AMD-Ryzen-2020-2022-roadmap-leaks-Cezanne-Dragon-Crest-Raphael-Rembrandt-and-Van-Gogh-all-detailed.489369.0.html