Merge "A11y fix for all widgets tray (Part 1 / n)" into sc-dev