weed out assumption that widgets are direct children of Dialogs

Change-Id: Ib2cf0c8862bd5e82b13380634ed82ca7fcc746b8