Merge "Change display of 360 panorama button" into gb-ub-photos-arches