Merge "Reduce unnecessary accessibility cache clearing." into nyc-dev