Merge "Fix concurrent modify exception for A11y"