Maybe you're right... I do remember that Future Trunks mention that Goku will have a heart attack, whether that was before or after the activation of Android 17 and Android 18, I don't remember. I doubt it's Trunks... I'm convinced it's Gohan carrying the Z Sword on his back before he gave it to Trunks. Is it just me or am I the only one seeing orange?