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

Merge commit '511ab64d25ee45518b816afa9110b3160edf3f7b' into eclair-mr2

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