Merge "[CDM a11y] Fix a11y issues" into udc-dev