hack around contents refresh issue by inlining code that seems to work (i dont have a lot of confidence that something isn't AFU in the grid as the result of not calling updateRowCount, however)
Merge branch 'master' into feature.contents-sse-hacked
Fix clearData in favor of not resetting the scroll position on redraw
Merge branch 'master' into feature.contents-sse-hacked
Merge branch 'master' into feature.contents-sse-hacked