[automerger] Merge "Fade to black without showing system wallpaper" into pi-dev am: 0e52664b0c am: 2e575f413c

Change-Id: I28b6f791597056c07b504d070ab704d74a37d1df