Merge "Move contents of FeatureFlags into FeatureFlagManager." into sc-v2-dev