Merge "Add better a11y support in QS" into tm-dev