Merge "Introduce FilterShowHelper for versioning visibility" into gb-ub-photos-carlsbad