Merge "Fix video snapshot aspect ratio" into gb-ub-photos-carlsbad