How long do you swaddle?

Monica • Baby boy born 8/7/18. Baby girl born 3/9/16. Learning so much about life and love being their mama.
I'm wanting to break the swaddle habit for my 13 week old daughter. She used the Velcro ones and she's growing out of them and it's getting too hot for her to be all wrapped up. Plus changing her diaper is such a pain when I have to undo and redo everything in the middle of the night. She sleeps in her rock n play. I've tried one arm out and she startles herself awake. I just keep swaddling her just to try to get longer stretches of sleep. Usually the first stretch is 3-4 hours then 2 hours after that.