Merge "Add missing locking when updating the accessibility node info cache." into klp-dev