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

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