Merge "Fade to black without showing system wallpaper" into pi-dev
am: 0e52664b0c

Change-Id: I68c83452ffcff8424aa58a0527a14f90497990d1