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

Change-Id: I8c796189cb90219ba21195e6d1a1e227a3d88051