Merge "Fix for broken tests in Accessibility Settings" into main