Merge "When adding dialog window but not creating update the configuration."...
Merge "When adding dialog window but not creating update the configuration." into nyc-mr1-dev am: 93becf51
am: 25cbfe8a
Change-Id: If977968046903069959e4f849547c7aff7d6f597