HAL-529 / BZ 1167362: Fix hanging "download in progress" dialog