Merge "Add multithread support to call imgdiff with block-limit"