remove FeaturesAutoContainerSwitch by keeping the 'On' variant
Merge pull request #4696 from guardian/remove-FeaturesAutoContainerSwitch

remove FeaturesAutoContainerSwitch by keeping the 'On' variant