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

* commit '5d8f249104a1798b6c55ae1de4e5ea36a4babd53':
  Prevent leaking surfaces from exiting windows