Merge "Refactor the filmstrip backing data." into ub-camera-haleakala