Merge "Updated Gallery to avoid breaking the build - API change" into gb-ub-photos-carlsbad