Merge "Fix settings crash due to enrolling error" into oc-dev