Merge "When adding dialog window but not creating update the configuration." into nyc-mr1-dev am: 93becf5148 am: 25cbfe8af8
am: 0f53f5a413

Change-Id: Iff62169c5f302913475109ccfdf1a4c516b4a7f7