Merge "Erase modem config on factoryReset" into qt-qpr1-dev