Merge "Fix 5509346: Resize the thumbnails if it's too large." into ics-mr1