Merge "improve dumpsys SurfaceFlinger output"