Merge "Toolbar factoring and ActionBar functionality integration" into lmp-preview-dev