Merge "Small fix to deal with ugly widget dropping situations" into ics-mr1