Merge "fix a surface leak in SurfaceFlinger"