Toolbar onDestroy fix
Merge remote-tracking branch 'remotes/origin/dev' into Biomes

* remotes/origin/dev:
  Toolbar onDestroy fix