Merge "ImageWallpaper: Only draw on valid surfaces" into nyc-dev