Merge "Remove duplicate Toolbar method for setting content description" into lmp-dev