Merge "Fixed behavior for back key when viewing download." into gb-ub-photos-arches