Merge "Ensure non-resizeable tasks not in multi-window mode"