Change to remove progress bar from "unplug/replug" dialog, and fix a crash