am 2a005f6f: Merge "Prevent leaking surfaces from exiting windows"

* commit '2a005f6fe91eac2ac2646be17815756637ed610f':
  Prevent leaking surfaces from exiting windows