Merge "When doing the special case migration where cells shift up, only modify workspace items" into main