Merge "Fix handling of disable_secure_windows setting deletion" into main