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