Merge "Clear calling identity when binding a11y services" into nyc-dev