am 68e4ae64: Merge "Fix overdraw in FilterShow activity" into gb-ub-photos-arches

* commit '68e4ae64380e2c9843faaec63b98ba51479c0f11':
  Fix overdraw in FilterShow activity