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

* commit 'c8036cdc602a35a415fd66370c7621bb957f657e':
  Prevent leaking surfaces from exiting windows