Hello I have a one year non-O extension based on Thai Child. It expires on the 5th of this month and don't have enough time to renew it. So I was thinking to do a border run to get a new 45 day stamp. When I get to the border is the Non-O extension automatically cancelled or do I need to cancel it before I go?