Merge "[sf] fix dumpsys SurfaceFlinger --hwclayers" into main