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

* commit 'aa1e57286d5435fff0ad1de894cf9d3d730b5e59':
  Small fix to deal with ugly widget dropping situations