Helpers: resetActivePageHeight now accounts for external toolbars

Fixes gh-7134