Merge "Add screensaver settings to backup list" into oc-dr1-dev am: 2c3c58d917
am: 4c30304a8c

Change-Id: Icac69838617de8c58a0d9090dc4d78b14ad1a976