Merge "Avoid unlinking app image file"