Merge "Allow fallback to Toolbar's default Navigation Icon" into lmp-dev