Merge "Fix app image memory leak"