Merge "A few updates to task views to enable shell transitions on auto." into main