Merge "Fix thumbnail generation" into gb-ub-photos-bryce