Yes, the handing off of the lightsaber is supposed to mirror Maz Kanata handing off Luke’s lightsaber to Leia in the trailer before it was changed. Let the fun begin!