Use new options format for toolbar in mw init

Wasn't updated after change 63095 and so wasn't setting options.

Bug: 48509
Change-Id: Icda3305e422bedaf0d490b8fbe51f55b8c8e79e8
Merge "Use new options format for toolbar in mw init"