Merge "Mark non-running task as minimized." into main