Update feature specs and E2E specs

While &17783 (closed) is a WIP we will stub the feature flag as false in feature specs. Before we enable the feature flag we need to make sure feature specs and E2E specs are passing with the feature flag enabled. In feature specs we should have a version for enabled and a version for disabled. When we remove the feature flag we can remove the disabled version.