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

* commit '967482f6a70d49b6a8ff58474d203f31e6d6295f':
  Modify EGL to disconnect the window when the surface gets destroyed.