Merge scsi2sd-util GUI changes