Merge "Ensure client side starting window get removed when remove all windows" into main