Merge "Fix windowing mode for non-resizable tasks"