Merge "Make Network & internet v2 feature flag be persistent"