Merge "Add null check in a11y callback" into oc-mr1-dev