pick thumbnail size depending on imageview usage
Merge branch 'thumbnail-size-fix'