am 49a4961e: Merge "Toolbar factoring and ActionBar functionality integration" into lmp-preview-dev

* commit '49a4961efde042f4921393f59cff86c2b7889c71':
  Toolbar factoring and ActionBar functionality integration