Merge "Add feature flag for settings slice injection"