Merge "Destroy eglSurface before recreating." into lmp-dev