Fix VS Code Git Authentication Failed Keychain Error - Restore Windows Search Indexing After Upgrade-Resolving Git Merge Conflicts After Cherry-Pick

Result check
- Keep one change per test run so you know which step helped.
- Undo temporary changes after the issue is confirmed.