Upgrade image-upload module from upstream and fix issue with selecting the same image again