Merge "libsnapshot: Call EnsureImageManager before RemoveAllImages"