Fix Random Restarts and Black Wallpaper Issue