Merge "Dumpstate: Add tombstone filtering"