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

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