Merge "recovery: Add screensaver mode." am: 389a29193c am: 2684259c34
am: 79ce31073a

Change-Id: I7f8d0553853ed01acd9973a80c710b3eab1f370b