fix #3550: dialog don't show up the second time
Merge branch 'release' into upstream
refactoring: clean progress dialog handling