Merge "[SurfaceFlinger] Add hwc information to winscope:" into rvc-dev