Merge "Clean up usage of COWArrayList in a11y code"