Merge "IndexDiff: support state [removed, untracked]"