Merge "Add flag for TaskViewTaskController clean up" into main