In the second trailer to the Force Awakens, there's a short scene showing Maz handing Luke's lightsaber over to Leia. (In the finished film, it doesn't seem to leave Finn's possession until he drops it in the fight). Apparently Maz was going to accompany the group back to the resistance base, instead of presumably staying to repair her bar/castle or whatever she was doing in "The Last Jedi") and would give Leia the weapon for some reason in scene that was ultimately dropped.
Wonder if this is some of the footage that will be somehow reworked into Episode 9's plot? Maybe Maz somehow fixes the saber (She was, after all, in possession of the weapon for many years and might have some technical know-how). Lupita has been confirmed I think to return as Maz....