Merge "Fix crash when using list of enabled a11y services" into oc-dev