Merge "Fix CTS regression in running tasks"