Merge "Remove disallowed network types in the network_type_bitmask" into main