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