Merge "Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED" into sc-dev