am 3605a98f: Merge "Allow fallback to Toolbar\'s default Navigation Icon" into lmp-dev

* commit '3605a98fe8d95201c4598ad08a51ee3feb2c9a6d':
  Allow fallback to Toolbar's default Navigation Icon