Fix issue that stopped view from scrolling to the top when a spanned item was the first in view
Move span check under child null break
merge conflict