Merge "Handle UiAutomation dying before being connected"