The concept art of the cantina showed at D23 is really just rejected concept art for FORCE AWAKENS that was thrown into the announcement presentation last minute.
Well, considering it seems that Star Wars, Avatar, and Toy Story open within 12 months of one of their respective sequels. Since an Incredibles sequel is on the way in 2019, could THAT be the 2020 Phase 3?
If Star Tours (with all its prequels/originals timeline jumble) is in the specific new trilogy land its gonna be pretty jarring. Perhaps they keep the locations but not specific characters? (Yoda, Ackbar, etc.)