Merge "Fix of memory issues with bitmaps in filmstrip." into gb-ub-photos-carlsbad