Merge "Fix toString() for empty DeviceIdSet" into main