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