am cf8da6b6: am 511ab64d: Fix 2215274 - Duplicate widgets appearing on top of each other

Merge commit 'cf8da6b624492bc1ccb9b33da37bb783c8bba486' into eclair-mr2-plus-aosp

* commit 'cf8da6b624492bc1ccb9b33da37bb783c8bba486':
  Fix 2215274 - Duplicate widgets appearing on top of each other