Merge "Fixed bug with black background when exiting a wallpaper window."