split UpdateToolbarAndScrollbarState in two
one fewer include