am 7af7156a: Merge "Make sure canceling a filter does not undo previous filter." into gb-ub-photos-bryce

* commit '7af7156a809934951877b1f9b9ad1ceeb9c9a5ce':
  Make sure canceling a filter does not undo previous filter.