Merge "libsnapshot: Only EnsureImageManager when it is needed."