Merge "Bring back Share to filmstrip" into gb-ub-photos-carlsbad