Merge "Stay in the current task when a new desk is created" into main