Merge "Re-Re-enable SettingsBackupTest" into oc-dev