Merge "Fixes for a11y selection" into tm-dev