Merge "Add icon to current screen saver preference" into rvc-dev am: beb92c325a
am: 9921ee8713
am: ab6dd73faf
am: 6aa00a1f54
am: 2cf8fe9ede
Change-Id: Id9bec72567cb96fb2d0f076eaa8de18d49a0b9c7
This commit is contained in: