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