Merge "Allow setting a filter in IndexDiff"