Merge "vignette fix & enhance to remove center focus" into gb-ub-photos-carlsbad