Merge "Add a feature flag for Settings conditionals removal."