Merge "Remove heuristic that determines whether to shift cells down or not" into main