CMS-1398 Image picker - add animation while waiting for images to appear

- also fixed scenario when existing image is selected from combo