Merge "Revert "Fixes for a11y selection". Reverts hiding some selection UI" into tm-dev