FLUID-4323: Restore the default settings for the extra panels.
Merge remote-tracking branch 'acheetham/FLUID-4323-demo' into demo

* acheetham/FLUID-4323-demo:
  FLUID-4323: Restore the default settings for the extra panels.