Merge "Correct NshNpCodec serializer key"