Merge "Remove defaultEnabled arg from isNetworkStackFeatureEnabled" into main