Merge "Fix z order of tasks in overview." into main