Merge "Surface: Add a death notification to SurfaceListener" into main