[Backport 11.0] Image upload select doesn't pick up the right imageset

I have to manage multiple imageset.

If I upload the images directly from the document, the chooser(picker) select the right imageset, but if I upload an image from /content/gallery/folder/subfolder, it takes the first imageset defined in the property hippostd:gallerytype of the folder "subfolder"

subfolder
hippostd:gallerytype
-new-image-folder

hippostd:gallerytype
-project:customimageset1
-project:customimageset2
-project:customimageset3
-project:customimageset4
-project:customimageset5

Each image in this folder has the type project:customimageset1