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