Merge "Change FilterShow theme and extra remove gray line" into gb-ub-photos-arches