Will Black Spire hot chocolate return?

[MsVanderquack]

I enjoyed the orange spice flavored hot chocolate on my first visit to Batuu, but I don’t see it listed on any menus in Galaxy’s Edge anymore. Does anyone know if it’s available or coming back? Can you get regular hot chocolate anywhere in that land?