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