Merge "Add setupDialog method to ZenDurationDialog"