Merge "Fix NPE due to progress bar not existing." into gb-ub-photos-arches