Merge "Add screensaver settings to backup list" into oc-dr1-dev