Merge "Add null check to a11y call." into oc-dev