[automerger] Merge "Fade to black without showing system wallpaper" into pi-dev am: 0e52664b am: 2e575f41 Change-Id: I28b6f791597056c07b504d070ab704d74a37d1df