Merge "Update save button in photo editor" into gb-ub-photos-arches