Merge "Fixing window dump timing out on wallpaper service"