Merge "Fix a11y navigation in Chooser" into tm-dev