Merge "Fix SurfaceFlinger crash caused by layerleak" into main