I don't want to jinx anything, but I think she's finally sleeping through the night. It's been happening for about a month. Sometimes, she will wake up and leave her bed for a cuddle, but after 1 min I tell her to go back to bed and that I'm right here. She does go back, covers herself up and goes to sleep.
I am hoping this bodes well for when we change the dressing room back into her bedroom. The next moving challenge will be fitting the dressers and a crib into our bedroom.