Merge "Improve swipe gesture in filmstrip." into gb-ub-photos-carlsbad