Merge "Make a11y node info parceling more robust" into oc-dev