Merge "Add null check to destroyUiAutomationService"