Swc-770:  retry combine chunks step of upload (and small view fix in annotations widget)