am 87467d3a: Fix 2246713 - Bad offset when picking up a widget for the first time.

Merge commit '87467d3a2168180e8d6437d07d22b4dd0ef59845' into eclair-mr2

* commit '87467d3a2168180e8d6437d07d22b4dd0ef59845':
  Fix 2246713 - Bad offset when picking up a widget for the first time.