Merge "Fade to black without showing system wallpaper" into pi-dev