Merge "Update design for grid/filmstrip switcher" into gb-ub-photos-arches