Merge "Add xml attributes to Toolbar for navigation icon" into lmp-dev