Merge "Make a11y clickable span work after node recycle" into oc-dev