am b25cb21f: am 8426319c: am f20e9a88: Merge change Idf40f3b0 into eclair

Merge commit 'b25cb21f59da53f138bc516a6047f55a2c412764'

* commit 'b25cb21f59da53f138bc516a6047f55a2c412764':
  Prevent crash in Home when using widgets whose ids collide with Home's