Merge "Add more info to dumpsys output"