am 0ef64908: Merge "Fix options list menu when Toolbar doesn\'t have items" into lmp-mr1-ub-dev

* commit '0ef64908166d67a58e073d36e783c775f6512b35':
  Fix options list menu when Toolbar doesn't have items