Merge "Fix two panel accessibility issues" into sc-v2-dev