Merge "Fix CDM dialog for accessibility" into tm-dev