am da1bc605: am 7a3c8c70: Merge "Fixed memory leak in ExtractEditLayout finish()"

* commit 'da1bc6057417e0ee6faa1cdd08a0be346a27659a':
  Fixed memory leak in ExtractEditLayout finish()