Resolving Git Merge Conflicts After Cherry-Pick - Fix BSOD After Memory Diagnostic on Windows 11-Fixing Python pip Dependency Conflicts

Final checklist
- Confirm that the same symptom is gone after a restart or refresh.
- Keep the smallest working change and undo temporary diagnostic settings.