Merge "Clean up UiAutomation working alongside a11y." into nyc-dev