Harmy, based on that video, I think it is the same prop.
1) Look at the way the activation button slides open in the "deleted scene" and the footage you linked me to
2) There's a distinct possibility that the full scene wasn't shown at Celebration V
3) It's also possible that, in editing the scene before it was excised completely, the "tinkering" footage was cut down to the point where most of the "disassembling"/"reassembling" wasn't included.
Seriously though, as soon as the guy in the video you linked slid open the button, my immediate thought was, "That's clearly the same prop in the deleted scene."