Merge "Revert "Add rotate support in Film Strip"" into gb-ub-photos-carlsbad