am f20e9a88: Merge change Idf40f3b0 into eclair

Merge commit 'f20e9a88a36ced533e96b8873a3321b4d51585ca' into eclair-plus-aosp

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