Merge "Widget preview improvements" into ics-mr1