Merge "Preserve windows when resizing tasks" into rvc-dev