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