Merge "Protect against mConfigs changes in writeXml" into qt-dev am: 5779ed51c2
am: df5f186c25

Change-Id: Ib44904977163c0fc238c7dbe462c03365b1b8d46