am c3b7ca91: Merge "Menu callbacks for ToolbarActionBars, part 2" into lmp-dev

* commit 'c3b7ca9161efcc9a7646989b6b10f505cf5056e1':
  Menu callbacks for ToolbarActionBars, part 2