Merge "surfaceflinger: minor dumpsys improvements" into pi-dev