Merge "Add icon to current screen saver preference" into rvc-dev am: beb92c325a am: 1e27d08127 am: 9c550e6fae am: a42b76d93a am: a63c46f736
Change-Id: Ibf60933af4016736102186fedf7193d29bf5017f
This commit is contained in: