Using delegated handlers for dynamically generated items.

Change-Id: I11395b1e0dd75b538fa5120d420b2913f189dc84
Merge "Using delegated handlers for dynamically generated items."