Fix (and redesign) Device::merge
Connection.cpp: Fix nonce sizes