Merge "Fix app image memory leak"
am: b9adbf63f8

* commit 'b9adbf63f880f246d83b3af4ca03aca07711f857':
  Fix app image memory leak