Merge "bootctl: fix reconnect logic" into main