Account for divider height when switching pinned headers

-Account for divider height when switching pinned headers
-Fix NullPointerException when data set changes