Merge "Snap to task from other grid row if dismissing non-snapped focused task...

Merge "Snap to task from other grid row if dismissing non-snapped focused task and not enough tasks remain in current grid row to snap to." into sc-v2-dev