I would really switch out of a swaddle at this age. Also I'm not pro cosleeping but I am pretty sure the cosleepers don't swaddle
We have used Woolino 2-24mo sleep sacks for all four of our babies and love them. This is with cosleeping as I don’t like sharing a blanket with baby that they can pull over their face.
We ended up breaking down and buying the halo sleep sacks. We had the Velcro 0-3 month one, but she was starting to show signs of rolling so we stopped swaddling her arms and had them free but she isn’t or at least a few weeks ago wasn’t over the startle reflex yet so we bought the transitional swaddle from halo and that has been fabulous no more problems of her startling herself awake but also her arms are free and if she rolls over has full control of her arms!
I think the recommendation is to stop swaddling at 8 weeks or when they show signs of rolling. At 17 weeks I think they could literally start rolling any second so I would be too scared to still swaddle :/ you could try a transition swaddle, like the zipadeezip. They aren’t as tight and they have arms so if they do roll, they can still move their arms, but still have that compression feel. Thats what we did with my son and then moved to the halo sleep sacks. It definitely eased the transition.
My 5 month just started to use the sleep sack (not yet rolling over). She started fighting the swaddle so I think we're just going to stick to sack now.. From what I have seen, the velcro swaddles are made to 6 months.