am bbd4f232: Merge "Revert "Revert "Modify EGL to disconnect the window when the surface gets destroyed.""" into mnc-dev

* commit 'bbd4f23247b3599bdda0149fcb68f311900ecf4f':
  Revert "Revert "Modify EGL to disconnect the window when the surface gets destroyed.""