Merge "Add more methods to dumpstate listener"