Merge "Set correct alpha for views in filmstrip." into gb-ub-photos-carlsbad