Not sure which trailer, but in BbS's there's a moment right after the Cinderella scene where Aqua is approaching something in the foreground that looks a LOT like Riku's hair. That dissolves into the Mirror, though, so maybe that's more metaphorical than anything else; but we already know Xion's...