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

Change-Id: I5d46625235cbf58090b42594af3b49b290f7e878