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