Merge "Move/refactor filmstrip related files around." into gb-ub-photos-denali