Merge "Improve dumpsys user readability"