Merge "Revert "Restrict moveToSplit calls to freeform tasks."" into main