Merge "Fix crash in developer settings when backup is not available" into oc-mr1-dev