Merge "Revert "Revert "Don't allow Desktop tasks to go outside Overview..."" into main