Merge "Refactor TaskViewTouchController to separately handle dismiss and launch." into main