Merge change Idf40f3b0 into eclair

* changes:
  Prevent crash in Home when using widgets whose ids collide with Home's resources.