Merge "Restore recent task to freeform space when resizing"