Merge "Show progress indicator dialog when saving edited image" into gb-ub-photos-arches