Merge "Fix saved video timestamps." into gb-ub-photos-bryce