Merge pull request #3692 from Snuffleupagus/issue-3690

Prevent trying to set the 'maxHeight' property of the secondaryToolbar before the viewer is completely loaded

web/secondary_toolbar.js

@@ -96,6 +96,9 @@ var SecondaryToolbar = {
 
   // Misc. functions for interacting with the toolbar.
   setMaxHeight: function secondaryToolbarSetMaxHeight(container) {
+    if (!container) {
+      return;
+    }
     this.newContainerHeight = container.clientHeight;
     if (this.previousContainerHeight === this.newContainerHeight) {
       return;