Merge "Wait a little longer to hide wallpaper" into pi-dev