Merge "Fix black wallpaper when docking a non-resizeable task"