Merge "Use shell executor for TaskView"