I listened to MSW's most recent podcast and they were discussing the cut footage of Leia in TFA. Evidently there was a fair amount of footage shot of Leia where Maz returned the lightsaber to Leia. We saw that in the trailer, and it was also intended to be in the movie. Maz returns the lightsaber to Leia, and Leia came to the conclusion that maybe Finn is the person who should take the lightsaber and passed it along to him. However, when Harrison Ford got injured on set there was some significant retooling of the second act, including that scene. The MSW guys also mentioned that there might be some unused footage from TLJ that could get incorporated, too.