Merge "Add UI for insertion in FilmStripView." into gb-ub-photos-carlsbad