Merge "Revert "Add a functional test for no-desktop-task-limit"" into main