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

Change-Id: Ia0483891047bb38b1fc1184d3547cb27b2286b80