am 20f7a6f0: Merge "Modify EGL to disconnect the window when the surface gets destroyed."

* commit '20f7a6f004511486a2130030a4694ec2d2983c96':
  Modify EGL to disconnect the window when the surface gets destroyed.