Merge "Fix dialog accessibility issues." into sc-v2-dev