Merge "Don't recycle replaced nodes in a11y cache" into oc-mr1-dev