As for the Celebration surprise(s), someone mentioned earlier the possibility of it being a Lucas appearance. That would be fitting, and I don’t think anyone said the surprise would be any kind of announcement. If anything, the big surprise being merchandise of any kind, including a new home media release, would probably get an underwhelming “making the fans buy the same movies again” response, OOT or not. That doesn’t sound like a fitting enough surprise for such a huge panel.
Just gonna quote myself here, before everyone gets all disappointed that an unrealistic announcement wasn’t announced.