Merge "Add back button handling" into gb-ub-photos-arches