am ee1a3f16: Merge "Fix for setting Toolbar content descriptions" into lmp-preview-dev

* commit 'ee1a3f1612cb69fe5567bf7cde2496a4774ab8ed':
  Fix for setting Toolbar content descriptions