Merge "Fix toolbar announce wrong text." into tm-qpr-dev