Merge "Fix overdraw in FilterShow activity" into gb-ub-photos-arches