RAZ-3278: Change "choose thumbnail" to be able to choose from rendition thumbnails
- Fix for merge issues
- Code tweaks