Merge "Display pipe underrun counters in dumpsys" into jb-dev