Merge "Accessibility fix for ShellRoot" into sc-dev