Merge "Re-enable accessibility when UiAutomation closed." into nyc-dev