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

Change-Id: I7aeb34e75245f5bc9974110d9847efd03445acbd