Use feature flag system for lock file mechanism

Merge Request Checklist

• Link to an issue
• Include the proposed fix or feature
• Include and update tests for the modified code
• Include a documentation change
• Add a CHANGELOG.md entry in the Unreleased section for any user-facing changes
• Mention or assign a maintainer

Related Issues

• Closes #3484 (closed)
• Closes #3500 (closed)