If a new country isn't coming until 2022, it better have a substantial attraction to go with it. If it's just going to be restaurants and shops, there's no way in hell it should take five years.
And mind you, I'll take a pavilion that's just restaurants and shops. Happily. I just won't accept a Pandora-like span from announcement to completion if that's all we're getting. As such, if 2022 is accurate, I don't see any way Disney announces it at D23 unless they're prepared to confirm that a major attraction is coming with it.