Merge "Consistent animations & up button behavior in Gallery" into gb-ub-photos-arches