NR-580 : Fix the layout of the Flickr results

Fixed.
Merge remote-tracking branch 'origin/devel' into devel