Merge "Change factoryReset to succeed for Settings"