Merge "Update the logic of querying crashed a11y services"