Merge "Improve handling of crashing a11y services." into nyc-mr1-dev