Merge "Fixing issue where widget previews were being scaled up." into ics-mr1