Merge "Fixed memory leak in ExtractEditLayout finish()"