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

Change-Id: I981327b35f341600f908d479d4a4d36356b18b1d