Merge "Dump offscreen layers in SurfaceFlinger dump" into main