Merge "Change factoryReset to succeed for Settings" into qt-dev